From 2abc3ef28a97e20f046d0b854fb583d0b9be081b Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 3 Oct 2024 15:07:30 +0200
Subject: [PATCH 01/77] Content updates, capitalization fixes

---
 .../administration/admin_panel/admin_panel.md |   2 +-
 .../admin_panel/roles_admin_panel.md          |  30 ++--
 .../admin_panel/segments_admin_panel.md       |   6 +-
 .../system_information_admin_panel.md         |   2 +-
 .../admin_panel/users_admin_panel.md          |  12 +-
 .../back_office/add_user_setting.md           |   6 +-
 .../administration/back_office/back_office.md |  10 +-
 .../back_office/back_office_configuration.md  |   8 +-
 .../back_office_elements/add_drag_and_drop.md |   4 +-
 .../back_office_elements/add_dropdowns.md     |   4 +-
 .../back_office_elements/custom_components.md |   4 +-
 .../back_office_elements/custom_icons.md      |   4 +-
 .../extending_thumbnails.md                   |   6 +-
 .../formatting_date_and_time.md               |   4 +-
 .../reusable_components.md                    |   4 +-
 .../back_office_menus/add_menu_item.md        |   6 +-
 .../back_office_menus/back_office_menus.md    |   6 +-
 .../back_office_tabs/back_office_tabs.md      |   6 +-
 .../back_office_tabs/create_dashboard_tab.md  |   2 +-
 .../back_office/browser/add_browser_tab.md    |   2 +-
 .../back_office/browser/browser.md            |   8 +-
 .../back_office/content_tab_switcher.md       |  12 +-
 .../back_office/content_tree.md               |  12 +-
 .../back_office/customize_search_sorting.md   |   4 +-
 .../customize_search_suggestion.md            |  10 +-
 .../back_office/multifile_upload.md           |   2 +-
 .../back_office/notifications.md              |   8 +-
 .../back_office/subitems_list.md              |   2 +-
 .../configuration/configuration.md            |   2 +-
 .../configuration/repository_configuration.md |   8 +-
 .../content_organization/content_types.md     |   6 +-
 .../content_organization/object_states.md     |   4 +-
 .../content_organization/sections.md          |   2 +-
 .../dashboard/configure_default_dashboard.md  |  12 +-
 .../dashboard/customize_dashboard.md          |   2 +-
 .../project_organization/architecture.md      |   4 +-
 .../project_organization/bundles.md           |  12 +-
 .../recent_activity/recent_activity.md        |  14 +-
 docs/api/event_reference/event_reference.md   |   2 +-
 docs/api/event_reference/role_events.md       |   6 +-
 docs/api/event_reference/user_events.md       |   6 +-
 docs/api/php_api/php_api.md                   |   6 +-
 docs/api/rest_api/rest_api_authentication.md  |  12 +-
 .../rest_api/rest_api_usage/rest_api_usage.md |   2 +-
 docs/cdp/cdp_activation/cdp_configuration.md  |   4 +-
 docs/cdp/cdp_guide.md                         |   4 +-
 .../storefront/configure_storefront.md        |   2 +-
 docs/commerce/storefront/extend_storefront.md |   2 +-
 .../content_api/managing_content.md           |   2 +-
 .../content_availability.md                   |   2 +-
 .../content_management_guide.md               |  24 +--
 .../data_migration/data_migration_actions.md  |   8 +-
 .../data_migration/exporting_data.md          |   4 +-
 .../data_migration/importing_data.md          |  18 +-
 .../create_custom_field_type_comparison.md    |   2 +-
 .../create_custom_generic_field_type.md       |   2 +-
 .../customize_field_type_metadata.md          |   4 +-
 .../field_type_reference/maplocationfield.md  |   2 +-
 .../field_type_reference/measurementfield.md  |   2 +-
 .../field_type_reference/pagefield.md         |   2 +-
 .../field_types/form_and_template.md          |  10 +-
 .../binary_and_media_download.md              |   2 +-
 .../forms/create_custom_form_field.md         |   2 +-
 .../forms/create_form_attribute.md            |   2 +-
 .../images/add_image_asset_from_dam.md        |   2 +-
 docs/content_management/locations.md          |  10 +-
 .../pages/create_custom_page_block.md         |   2 +-
 .../pages/page_builder_guide.md               |   6 +-
 .../rich_text/extend_online_editor.md         |   8 +-
 .../url_management/url_management.md          |   6 +-
 .../user_generated_content.md                 |   2 +-
 docs/customer_management/cp_applications.md   |   6 +-
 docs/customer_management/cp_configuration.md  |   4 +-
 .../customer_portal_guide.md                  |  14 +-
 docs/getting_started/first_steps.md           |  24 +--
 docs/getting_started/troubleshooting.md       |   2 +-
 docs/ibexa_products/ibexa_experience.md       |   2 +-
 docs/ibexa_products/ibexa_headless.md         |  18 +-
 .../cache/http_cache/context_aware_cache.md   |   4 +-
 .../cache/http_cache/reverse_proxy.md         |   6 +-
 .../clustering/clustering_with_ddev.md        |   2 +-
 .../request_lifecycle.md                      |   2 +-
 .../security/security_checklist.md            |  22 +--
 .../support_and_maintenance_faq.md            |   8 +-
 .../languages/back_office_translations.md     |  22 +--
 docs/multisite/languages/languages.md         |   6 +-
 docs/multisite/multisite_configuration.md     |  14 +-
 .../set_up_translation_siteaccess.md          |   6 +-
 docs/multisite/site_factory/site_factory.md   |   8 +-
 .../site_factory_configuration.md             |  32 ++--
 docs/permissions/custom_policies.md           |  16 +-
 docs/permissions/limitation_reference.md      | 160 +++++++++---------
 docs/permissions/permission_overview.md       |  32 ++--
 docs/permissions/permission_use_cases.md      | 118 ++++++-------
 docs/permissions/permissions.md               |   4 +-
 docs/permissions/policies.md                  |  72 ++++----
 .../api_reference/recommendation_api.md       |   2 +-
 .../personalization/enable_personalization.md |   8 +-
 docs/pim/create_custom_attribute_type.md      |   2 +-
 docs/pim/create_custom_catalog_filter.md      |   4 +-
 docs/pim/enable_purchasing_products.md        |   4 +-
 docs/pim/pim_configuration.md                 |   2 +-
 docs/pim/pim_guide.md                         |   2 +-
 docs/pim/prices.md                            |   2 +-
 docs/pim/products.md                          |   2 +-
 docs/release_notes/ez_platform_v1.9.0.md      |   2 +-
 docs/release_notes/ez_platform_v2.1.0.md      |   2 +-
 docs/release_notes/ez_platform_v2.2.0.md      |   8 +-
 docs/release_notes/ez_platform_v2.3.md        |   8 +-
 docs/release_notes/ez_platform_v2.4.md        |   2 +-
 docs/release_notes/ez_platform_v2.5.md        |  28 +--
 docs/release_notes/ez_platform_v3.0.md        |  12 +-
 .../ez_platform_v3.0_deprecations.md          |   8 +-
 docs/release_notes/ez_platform_v3.1.md        |   6 +-
 docs/release_notes/ibexa_dxp_v3.2.md          |  14 +-
 docs/release_notes/ibexa_dxp_v4.0.md          |   2 +-
 .../ibexa_dxp_v4.0_deprecations.md            |   2 +-
 docs/release_notes/ibexa_dxp_v4.1.md          |   6 +-
 docs/release_notes/ibexa_dxp_v4.2.md          |   8 +-
 docs/release_notes/ibexa_dxp_v4.3.md          |   2 +-
 docs/release_notes/ibexa_dxp_v4.5.md          |   6 +-
 docs/release_notes/ibexa_dxp_v4.6.md          |  14 +-
 .../contributing/contribute_translations.md   |   4 +-
 docs/resources/new_in_doc.md                  |   8 +-
 docs/resources/phpstorm_plugin.md             |   2 +-
 .../criteria_reference/depth_criterion.md     |   2 +-
 .../search_criteria_reference.md              |   2 +-
 .../usermetadata_criterion.md                 |   4 +-
 .../manipulate_elasticsearch_query.md         |   2 +-
 docs/search/search_api.md                     |   4 +-
 .../depth_sort_clause.md                      |   2 +-
 .../sort_clause_reference.md                  |   2 +-
 .../layout/add_forgot_password_option.md      |   2 +-
 .../other_twig_filters.md                     |   2 +-
 .../2_create_the_content_model.md             |   2 +-
 .../4_display_single_content_item.md          |   4 +-
 .../5_display_a_list_of_content_items.md      |   4 +-
 .../8_enable_account_registration.md          |  36 ++--
 .../generic_field_type/5_add_a_field.md       |   4 +-
 .../generic_field_type/6_settings.md          |   2 +-
 .../1_get_a_starter_website.md                |   4 +-
 .../2_prepare_the_landing_page.md             |   2 +-
 .../5_create_newsletter_form.md               |   4 +-
 .../update_code/1_update_templates.md         |   2 +-
 .../update_code/7_update_extensions.md        |   4 +-
 docs/update_and_migration/from_3.3/to_4.0.md  |   4 +-
 .../from_4.2/update_from_4.2.md               |   4 +-
 .../from_4.5/update_from_4.5.md               |   8 +-
 .../migrating_from_ez_publish_platform.md     |   2 +-
 docs/users/customer_groups.md                 |   4 +-
 docs/users/invitations.md                     |  12 +-
 docs/users/login_methods.md                   |   2 +-
 docs/users/oauth_client.md                    |   4 +-
 docs/users/passwords.md                       |   6 +-
 docs/users/user_management_guide.md           |  22 +--
 docs/users/user_registration.md               |   8 +-
 docs/users/users.md                           |   2 +-
 mkdocs.yml                                    |  20 +--
 158 files changed, 693 insertions(+), 693 deletions(-)

diff --git a/docs/administration/admin_panel/admin_panel.md b/docs/administration/admin_panel/admin_panel.md
index 5d12352a0c..654b63b5a7 100644
--- a/docs/administration/admin_panel/admin_panel.md
+++ b/docs/administration/admin_panel/admin_panel.md
@@ -1,5 +1,5 @@
 ---
-description: Ibexa DXP Back Office contains managements options for permissions, users, languages, content types, as well as system information.
+description: Ibexa DXP back office contains managements options for permissions, users, languages, content types, as well as system information.
 page_type: landing_page
 ---
 
diff --git a/docs/administration/admin_panel/roles_admin_panel.md b/docs/administration/admin_panel/roles_admin_panel.md
index 84696d375d..558ef0741a 100644
--- a/docs/administration/admin_panel/roles_admin_panel.md
+++ b/docs/administration/admin_panel/roles_admin_panel.md
@@ -1,43 +1,43 @@
 ---
-description: To give users an access to your website you need to assign them Roles in the Admin Panel.
+description: To give users an access to your website you need to assign them roles in the Admin Panel.
 ---
 
 # Roles
 
-To give users an access to your website you need to assign them Roles in the Admin Panel.
+To give users an access to your website you need to assign them roles in the Admin Panel.
 
 ![Roles](admin_panel_roles.png "Roles")
 
-Each Role consists of:
+Each role consists of:
 
 **Policies**
 
 ![Policies](admin_panel_policies.png "Policies")
 
 Rules that give users access to different function in a module.
-You can restrict what user can do with Limitations.
-The available Limitations depend on the chosen Policy.
-When Policy has more than one Limitation, all of them have to apply.
+You can restrict what user can do with limitations.
+The available limitations depend on the chosen policy.
+When policy has more than one limitation, all of them have to apply.
 See [example use case](permission_use_cases.md#restrict-editing-to-part-of-the-tree).
 
 !!! note
 
-    Limitation specifies what a User can do, not what they can't do.
-    A `Location` Limitation, for example, gives the User access to content with a specific Location, 
+    Limitation specifies what a user can do, not what they can't do.
+    A `Location` limitation, for example, gives the user access to content with a specific Location, 
     not prohibits it. See [Limitation reference](limitation_reference.md) for further information.
 
 **Assignments**
 
 ![Assignments](admin_panel_assignments.png "Assignments")
 
-After you created all Policies, you can assign the Role to Users and/or User Groups with possible additional Limitations.
-Every User or User Group can have multiple Roles.
-A User can also belong to many groups, for example, Administrators, Editors, Subscribers.
+After you created all policies, you can assign the role to users and/or user groups with possible additional limitations.
+Every user or user group can have multiple roles.
+A user can also belong to many groups, for example, Administrators, Editors, Subscribers.
 
-Best practice is to avoid assigning Roles to Users directly.
-Model your content (content types, Sections, Locations etc.) in a way that can be accessed by generic Roles.
+Best practice is to avoid assigning roles to users directly.
+Model your content (content types, Sections, Locations etc.) in a way that can be accessed by generic roles.
 That way system will be more secure and easier to manage.
-This approach also improves performance. Role assignments and Policies are taken into account during search/load queries.
+This approach also improves performance. Role assignments and policies are taken into account during search/load queries.
 
 See [Permissions overview](permissions.md) for further information
-and [Permission use cases](permission_use_cases.md) for details on how to customize access to different parts of the Back Office.
\ No newline at end of file
+and [Permission use cases](permission_use_cases.md) for details on how to customize access to different parts of the back office.
\ No newline at end of file
diff --git a/docs/administration/admin_panel/segments_admin_panel.md b/docs/administration/admin_panel/segments_admin_panel.md
index ebb7da216c..80a57a83f3 100644
--- a/docs/administration/admin_panel/segments_admin_panel.md
+++ b/docs/administration/admin_panel/segments_admin_panel.md
@@ -1,11 +1,11 @@
 ---
-description: You can use Segments to display specific content to specific Users.
+description: You can use Segments to display specific content to specific users.
 edition: experience
 ---
 
 # Segments
 
-You can use Segments to display specific content to specific [Users](users.md).
+You can use Segments to display specific content to specific [ussers](users.md).
 They are used out of the box in the Targeting and Dynamic targeting blocks in the Page.
 
 Segments are collected in Segment Groups:
@@ -16,4 +16,4 @@ Each Segment Group can contain Segments that you can target content for.
 
 ![Segment](admin_panel_segment.png)
 
-You can assign Users to Segments [through the API](segment_api.md#assigning-users).
\ No newline at end of file
+You can assign users to Segments [through the API](segment_api.md#assigning-users).
\ No newline at end of file
diff --git a/docs/administration/admin_panel/system_information_admin_panel.md b/docs/administration/admin_panel/system_information_admin_panel.md
index 33a88016d9..f94d09223c 100644
--- a/docs/administration/admin_panel/system_information_admin_panel.md
+++ b/docs/administration/admin_panel/system_information_admin_panel.md
@@ -4,7 +4,7 @@ description: System information provides basic system information such as versio
 
 # System Information
 
-The System Information panel in the Back Office is sourced in the [`ibexa/system-info` repository](https://github.com/ibexa/system-info).
+The System Information panel in the back office is sourced in the [`ibexa/system-info` repository](https://github.com/ibexa/system-info).
 There you will also find basic system information such as versions of all installed packages.
 
 ![System Information](admin_panel_system_info.png "System Information")
diff --git a/docs/administration/admin_panel/users_admin_panel.md b/docs/administration/admin_panel/users_admin_panel.md
index fb8f25dd0b..2b77d93f29 100644
--- a/docs/administration/admin_panel/users_admin_panel.md
+++ b/docs/administration/admin_panel/users_admin_panel.md
@@ -1,17 +1,17 @@
 ---
-description: All User Groups and Users can be accessed in the Users tab.
+description: All user groups and users can be accessed in the users tab.
 ---
 
 # Users
 
 [Users](users.md) in [[= product_name =]] are treated the same way as content items.
-They are organized in groups such as *Guests*, *Editors*, *Anonymous*, 
+They are organized in groups such as *Guests*, *Editors*, *Anonymous*,
 which makes it easier to manage them and their permissions.
-All User Groups and Users can be accessed in the Admin panel by selecting Users.
+All user groups and users can be accessed in the Admin panel by selecting **Users**.
 
-![Users and User Groups](admin_panel_users.png "Users and User Groups")
+![Users and user groups](admin_panel_users.png "Users and user groups")
 
 !!! caution
 
-    Be careful not to delete an existing User account. 
-    If you do this, content created by this User will be broken and the application can face malfunction.
+    Be careful not to delete an existing user account.
+    If you do this, content created by this user will be broken and the application can face malfunction.
diff --git a/docs/administration/back_office/add_user_setting.md b/docs/administration/back_office/add_user_setting.md
index 0d248809c9..6f72b0040f 100644
--- a/docs/administration/back_office/add_user_setting.md
+++ b/docs/administration/back_office/add_user_setting.md
@@ -4,9 +4,9 @@ description: Add the option to select a custom preference in user menu.
 
 # Add user setting
 
-## Create new User setting
+## Create new user setting
 
-You can add new preferences to the **User Settings** menu in the Back Office.
+You can add new preferences to the **User Settings** menu in the back office.
 
 To do so, create a setting class implementing two interfaces:
 `ValueDefinitionInterface` and `FormMapperInterface`.
@@ -24,7 +24,7 @@ Register the setting as a service:
 [[= include_file('code_samples/back_office/settings/config/custom_services.yaml', 0, 5) =]]
 ```
 
-You can order the settings in the User menu by setting their `priority`.
+You can order the settings in the **User** menu by setting their `priority`.
 
 `group` indicates the group that the setting is placed in.
 It can be one of the built-in groups, or a custom one.
diff --git a/docs/administration/back_office/back_office.md b/docs/administration/back_office/back_office.md
index e7c92f0266..c7174cc8bc 100644
--- a/docs/administration/back_office/back_office.md
+++ b/docs/administration/back_office/back_office.md
@@ -1,15 +1,15 @@
 ---
-description: Back Office holds the administrator and editor interface and allows creating, publishing and managing content, users, settings and so on.
+description: Back office holds the administrator and editor interface and allows creating, publishing and managing content, users, settings and so on.
 page_type: landing_page
 ---
 
-# Back Office
+# Back office
 
-The Back Office interface is produced by the [`ibexa/admin-ui` bundle](https://github.com/ibexa/admin-ui).
+The back office interface is produced by the [`ibexa/admin-ui` bundle](https://github.com/ibexa/admin-ui).
 Additionally, it uses React-based modules that make each part of the UI extensible, and Bootstrap for styling.
 The interface is accessible in your browser at `http://<yourdomain>/admin`.
 
-To extend the Back Office with PHP code, you can use [events]([[= symfony_doc =]]/event_dispatcher.html),
+To extend the back office with PHP code, you can use [events]([[= symfony_doc =]]/event_dispatcher.html),
 either built-in Symfony events or events dispatched by the application.
 
 Some extensibility, such as [adding custom tags](extend_online_editor.md#configure-custom-tags),
@@ -18,7 +18,7 @@ is possible without writing your own code, with configuration and templating onl
 !!! note "String translations"
 
     Refer to [Custom string translations](back_office_translations.md#custom-string-translations)
-    to learn how to provide string translations when extending the Back Office.
+    to learn how to provide string translations when extending the back office.
 
 [[= cards([
     "administration/back_office/back_office_configuration",
diff --git a/docs/administration/back_office/back_office_configuration.md b/docs/administration/back_office/back_office_configuration.md
index 80ae2cfccf..3bb5a9f3d7 100644
--- a/docs/administration/back_office/back_office_configuration.md
+++ b/docs/administration/back_office/back_office_configuration.md
@@ -1,13 +1,13 @@
 ---
-title: Back Office configuration
-description: Configure default upload locations, pagination limits, and more settings for the Back Office.
+title: Back office configuration
+description: Configure default upload locations, pagination limits, and more settings for the back office.
 ---
 
-# Back Office configuration
+# Back office configuration
 
 ## Pagination limits
 
-Default pagination limits for different sections of the Back Office can be defined through respective settings in
+Default pagination limits for different sections of the back office can be defined through respective settings in
 [`ezplatform_default_settings.yaml`](https://github.com/ibexa/admin-ui/blob/main/src/bundle/Resources/config/ezplatform_default_settings.yaml#L7)
 
 You can set the pagination limit for user settings under the `ibexa.system.<scope>.pagination_user` [configuration key](configuration.md#configuration-files):
diff --git a/docs/administration/back_office/back_office_elements/add_drag_and_drop.md b/docs/administration/back_office/back_office_elements/add_drag_and_drop.md
index 1ff686327a..3a68aa93b5 100644
--- a/docs/administration/back_office/back_office_elements/add_drag_and_drop.md
+++ b/docs/administration/back_office/back_office_elements/add_drag_and_drop.md
@@ -1,10 +1,10 @@
 ---
-description: Add custom drag-and-drop interactions to Back Office interface.
+description: Add custom drag-and-drop interactions to back office interface.
 ---
 
 # Add drag and drop
 
-You can create a generic interface for drag and drop interactions that you can reuse in many places across the Back Office.
+You can create a generic interface for drag and drop interactions that you can reuse in many places across the back office.
 
 First, prepare the HTML code structure and place it in a Twig template. See the example:
 
diff --git a/docs/administration/back_office/back_office_elements/add_dropdowns.md b/docs/administration/back_office/back_office_elements/add_dropdowns.md
index f3a41fb513..655e0c935c 100644
--- a/docs/administration/back_office/back_office_elements/add_dropdowns.md
+++ b/docs/administration/back_office/back_office_elements/add_dropdowns.md
@@ -1,10 +1,10 @@
 ---
-description: Add custom drop down menus to Back Office interface.
+description: Add custom drop down menus to back office interface.
 ---
 
 # Add drop-downs
 
-In [[= product_name =]], you can create a reusable custom drop-down and implement it anywhere in the Back Office.
+In [[= product_name =]], you can create a reusable custom drop-down and implement it anywhere in the back office.
 Follow the steps below to learn how to integrate this component to fit it to your project needs.
 
 ## Create `<select>` input
diff --git a/docs/administration/back_office/back_office_elements/custom_components.md b/docs/administration/back_office/back_office_elements/custom_components.md
index 8c30a31eb3..4677cafa74 100644
--- a/docs/administration/back_office/back_office_elements/custom_components.md
+++ b/docs/administration/back_office/back_office_elements/custom_components.md
@@ -1,10 +1,10 @@
 ---
-description: Back Office components allow you to inject any custom widgets into selected places of the user interface.
+description: Back office components allow you to inject any custom widgets into selected places of the user interface.
 ---
 
 # Custom components
 
-The Back Office has designated places where you can use your own components.
+The back office has designated places where you can use your own components.
 
 Components enable you to inject widgets (for example, **My dashboard** blocks) and HTML code (for example, a tag for loading JS or CSS files).
 A component is any class that implements the `Renderable` interface.
diff --git a/docs/administration/back_office/back_office_elements/custom_icons.md b/docs/administration/back_office/back_office_elements/custom_icons.md
index 4903333d56..8d3276b3ed 100644
--- a/docs/administration/back_office/back_office_elements/custom_icons.md
+++ b/docs/administration/back_office/back_office_elements/custom_icons.md
@@ -22,7 +22,7 @@ Place the icon in `public/assets/images` and run `yarn encore <dev|prod>` after
 
 !!! note "Icons format"
 
-    To ensure proper display in the Back Office, all icons should have SVG format with `symbol`.
+    To ensure proper display in the back office, all icons should have SVG format with `symbol`.
 
 If you want to configure icons per SiteAccess, see [Icon sets](#icon-sets).
 
@@ -62,7 +62,7 @@ return (
 
 ### Icons React component
 
-You can use a React component to change icons in Back Office and Page Builder.
+You can use a React component to change icons in back office and Page Builder.
 
 The following example from the `alert.js` file shows configuration for icons in the [alert](reusable_components.md#alerts) component:
 
diff --git a/docs/administration/back_office/back_office_elements/extending_thumbnails.md b/docs/administration/back_office/back_office_elements/extending_thumbnails.md
index dd64d21b80..e9554d25be 100644
--- a/docs/administration/back_office/back_office_elements/extending_thumbnails.md
+++ b/docs/administration/back_office/back_office_elements/extending_thumbnails.md
@@ -1,5 +1,5 @@
 ---
-description: Customize thumbnails use for content items in the Back Office.
+description: Customize thumbnails use for content items in the back office.
 ---
 
 # Extending thumbnails
@@ -53,7 +53,7 @@ Next, add the strategy with the `ibexa.repository.thumbnail.strategy.content` ta
 
 Priority `100` will allow this strategy to be used first on a clean installation or before any other strategy with lower priority.
 
-At this point you can go to the Back Office and check the results.
+At this point you can go to the back office and check the results.
 
 !!! note "Thumbnail mechanism "
 
@@ -110,4 +110,4 @@ Next, add the strategy with the `ibexa.repository.thumbnail.strategy.field` tag
             - { name: ibexa.repository.thumbnail.strategy.field, priority: 100 }
 ```
  
-At this point you can go to the Back Office and check the results.
+At this point you can go to the back office and check the results.
diff --git a/docs/administration/back_office/back_office_elements/formatting_date_and_time.md b/docs/administration/back_office/back_office_elements/formatting_date_and_time.md
index 380ab8ff93..ba1992338f 100644
--- a/docs/administration/back_office/back_office_elements/formatting_date_and_time.md
+++ b/docs/administration/back_office/back_office_elements/formatting_date_and_time.md
@@ -1,5 +1,5 @@
 ---
-description: Use different formats to render dates and times in the Back Office and website front.
+description: Use different formats to render dates and times in the back office and website front.
 ---
 
 # Formatting date and time
@@ -63,7 +63,7 @@ services:
 ## Using User settings menu
 
 Users can set their preferred date and time formats in the User settings menu.
-This format is used throughout the Back Office.
+This format is used throughout the back office.
 
 You can set the list of available formats under the `ibexa.system.<scope>.user_preferences` [configuration key](configuration.md#configuration-files):
 
diff --git a/docs/administration/back_office/back_office_elements/reusable_components.md b/docs/administration/back_office/back_office_elements/reusable_components.md
index a704dd270a..7892506d08 100644
--- a/docs/administration/back_office/back_office_elements/reusable_components.md
+++ b/docs/administration/back_office/back_office_elements/reusable_components.md
@@ -1,10 +1,10 @@
 ---
-description: Speed up creating Back Office templates with the help of ready-made reusable components.
+description: Speed up creating back office templates with the help of ready-made reusable components.
 ---
 
 # Reusable components
 
-When you extend the Back Office, you can use base Twig templates for commonly used UI components such as tables or tabs.
+When you extend the back office, you can use base Twig templates for commonly used UI components such as tables or tabs.
 
 The available templates are:
 
diff --git a/docs/administration/back_office/back_office_menus/add_menu_item.md b/docs/administration/back_office/back_office_menus/add_menu_item.md
index ff9c61555e..826ae078af 100644
--- a/docs/administration/back_office/back_office_menus/add_menu_item.md
+++ b/docs/administration/back_office/back_office_menus/add_menu_item.md
@@ -1,10 +1,10 @@
 ---
-description: Create a custom menu in the Back Office.
+description: Create a custom menu in the back office.
 ---
 
 # Add menu item
 
-To add a new menu entry in the Back Office, you need to use an event subscriber
+To add a new menu entry in the back office, you need to use an event subscriber
 and subscribe to [one of the events](back_office_menus.md#menu-events) dispatched when building menus.
 
 The following example shows how to add a "Content list" item to the main top menu
@@ -49,7 +49,7 @@ Finally, create the `templates/themes/admin/list/all_content_list.html.twig` fil
 ```
 
 This template uses the [reusable table template](reusable_components.md#tables)
-to render a table that fits the style of the Back Office.
+to render a table that fits the style of the back office.
 
 You can configure the columns of the table in the `head_cols` variable
 and the regular table rows in `body_rows`.
diff --git a/docs/administration/back_office/back_office_menus/back_office_menus.md b/docs/administration/back_office/back_office_menus/back_office_menus.md
index 6bae43b570..9a928728cc 100644
--- a/docs/administration/back_office/back_office_menus/back_office_menus.md
+++ b/docs/administration/back_office/back_office_menus/back_office_menus.md
@@ -1,10 +1,10 @@
 ---
-description: All menus in the Back Office are based on KnpMenuBundle and you can easily extend them with new items.
+description: All menus in the back office are based on KnpMenuBundle and you can easily extend them with new items.
 ---
 
-# Back Office menus
+# Back office menus
 
-Back Office menus are based on the [KnpMenuBundle](https://github.com/KnpLabs/KnpMenuBundle) and are easily extensible.
+Back office menus are based on the [KnpMenuBundle](https://github.com/KnpLabs/KnpMenuBundle) and are easily extensible.
 
 !!! tip
 
diff --git a/docs/administration/back_office/back_office_tabs/back_office_tabs.md b/docs/administration/back_office/back_office_tabs/back_office_tabs.md
index 6c14247ece..820994df1b 100644
--- a/docs/administration/back_office/back_office_tabs/back_office_tabs.md
+++ b/docs/administration/back_office/back_office_tabs/back_office_tabs.md
@@ -1,10 +1,10 @@
 ---
-description: Tabs are used for content view, in dashboard, system information and other parts of the Back Office and are extensible.
+description: Tabs are used for content view, in dashboard, system information and other parts of the back office and are extensible.
 ---
 
-# Back Office tabs
+# Back office tabs
 
-Many elements of the Back Office interface, such as content view, dashboard or system information, are built using tabs.
+Many elements of the back office interface, such as content view, dashboard or system information, are built using tabs.
 
 ![Tabs in System Information](tabs_system_info.png)
 
diff --git a/docs/administration/back_office/back_office_tabs/create_dashboard_tab.md b/docs/administration/back_office/back_office_tabs/create_dashboard_tab.md
index 975755bdde..d40d21b011 100644
--- a/docs/administration/back_office/back_office_tabs/create_dashboard_tab.md
+++ b/docs/administration/back_office/back_office_tabs/create_dashboard_tab.md
@@ -1,5 +1,5 @@
 ---
-description: Add a new tab to the Back Office dashboard that welcomes every user after logging in.
+description: Add a new tab to the back office dashboard that welcomes every user after logging in.
 ---
 
 # Create dashboard tab
diff --git a/docs/administration/back_office/browser/add_browser_tab.md b/docs/administration/back_office/browser/add_browser_tab.md
index 3492289c29..f7a33a7b80 100644
--- a/docs/administration/back_office/browser/add_browser_tab.md
+++ b/docs/administration/back_office/browser/add_browser_tab.md
@@ -120,7 +120,7 @@ ibexaConfigManager.add({
 
 ## Check results
     
-In the Back Office go to **Content** -> **Dashboard**. On the top right, click the **Create content** button.
+In the back office go to **Content** -> **Dashboard**. On the top right, click the **Create content** button.
 In the UDW a new **Images** tab appears, listing all images from the Repository.
 
 ![Image tab in UDW](udw_image_tab.png)
diff --git a/docs/administration/back_office/browser/browser.md b/docs/administration/back_office/browser/browser.md
index fd172c62ca..275a68e28f 100644
--- a/docs/administration/back_office/browser/browser.md
+++ b/docs/administration/back_office/browser/browser.md
@@ -56,15 +56,15 @@ There you can set the following properties:
 |-------------------|------|--------|----------|
 |multiple</br>`multiple`|true</br>false|no|The possibility to choose multiple Locations.|
 |multiple_items_limit</br>`multipleItemsLimit`|number|no|Maximum number of items with configuration `multiple: true`.|
-|root_location_id</br>`rootLocationId`|number|no|UDW will display Locations only below this Content Tree element.|
+|root_location_id</br>`rootLocationId`|number|no|UDW will display Locations only below this content tree element.|
 |starting_location_id</br>`startingLocationId`|number|no|This Location will be displayed as a starting Location in UDW.|
 |containers_only</br>`containersOnly`|true</br>false|no|When set to `true` only containers can be selected.|
 |allowed_content_types</br>`allowedContentTypes`|null</br>[]</br>[`contentTypeIdentifier`]|yes|List of allowed content types:</br>`null` – all content types are allowed,</br>`[]` – empty table, no content types are allowed.|
-|active_sort_clause</br>`activeSortClause`|DatePublished</br>ContentName|no|Sort Clause by which children in the Content Tree will be sorted.|
-|active_sort_order</br>`activeSortOrder`|ascending</br>descending|no|Sorting order of the children in the Content Tree.|
+|active_sort_clause</br>`activeSortClause`|DatePublished</br>ContentName|no|Sort Clause by which children in the content tree will be sorted.|
+|active_sort_order</br>`activeSortOrder`|ascending</br>descending|no|Sorting order of the children in the content tree.|
 |active_tab</br>`activeTab`|browse</br>search</br>bookmarks|no|Starting tab in the UDW.|
 |active_view</br>`activeView`|finder</br>grid</br>tree|no|Starting view in the UDW.|
-|allow_redirects</br>`allowRedirects`|true</br>false|yes|Allows to redirect content from the UDW tab to another page, for example, to Content Edit page.|
+|allow_redirects</br>`allowRedirects`|true</br>false|yes|Allows to redirect content from the UDW tab to another page, for example, to content edit page.|
 |selected_locations</br>`selectedLocations`|[]</br>[locationId]|no|Location that will be selected automatically.|
 |allow_confirmation</br>`allowConfirmation`|true</br>false|yes|Shows confirmations buttons in the UDW. If set to false, it will not be possible to confirm selection.|
 
diff --git a/docs/administration/back_office/content_tab_switcher.md b/docs/administration/back_office/content_tab_switcher.md
index d1b48d2e58..cbb54634f7 100644
--- a/docs/administration/back_office/content_tab_switcher.md
+++ b/docs/administration/back_office/content_tab_switcher.md
@@ -1,7 +1,7 @@
-# Tab switcher in Content edit page
+# Tab switcher in content edit page
 
 Tabs switcher allows separating the default Field Types in the content type from the Field Types that enhance the content with new functionalities.
-The best example of such Field Types are SEO or Taxonomy, as these are not typical Field Types but a Field Types that handle functionalities for the whole Content object.
+The best example of such Field Types are SEO or Taxonomy, as these are not typical Field Types but a Field Types that handle functionalities for the whole content object.
 
 The following example shows how to add a Meta tab with automatically assigned Taxonomy Field Type.
 
@@ -32,9 +32,9 @@ ibexa:
 
 ### Configure Field groups for Meta tab
 
-The default configuration makes the `ibexa_taxonomy_entry_assignment` Field always visible in the Meta tab in the Content form. 
-With this new feature, you can indicate what Field types, previously set in the Back Office content type, are shown in the Meta tab section in the Content form. 
-You can automatically move all Field types from Metadata group to the Meta tab in the Content form.
+The default configuration makes the `ibexa_taxonomy_entry_assignment` Field always visible in the Meta tab in the content form. 
+With this new feature, you can indicate what Field types, previously set in the back office content type, are shown in the Meta tab section in the content form. 
+You can automatically move all Field types from Metadata group to the Meta tab in the content form.
 To do it, use the following configuration:
 
 ```yaml
@@ -74,7 +74,7 @@ First, create an event listener in the `src/EventListener/TextAnchorMenuTabListe
 
 A new custom tab is defined in the line 28, the line 31 defines items for the second level.
 
-For new tabs it is also required to render its section in the Content editing form. To do it, register the UI Component:
+For new tabs it is also required to render its section in the content editing form. To do it, register the UI Component:
 
 ```yaml
 [[= include_file('code_samples/back_office/content_type/config/custom_services.yaml') =]]
diff --git a/docs/administration/back_office/content_tree.md b/docs/administration/back_office/content_tree.md
index 3aa7614b39..d6ad408527 100644
--- a/docs/administration/back_office/content_tree.md
+++ b/docs/administration/back_office/content_tree.md
@@ -1,8 +1,8 @@
 ---
-description: Configure SiteAccess, displayed content items, depth and root location for the Content Tree.
+description: Configure SiteAccess, displayed content items, depth and root location for the content tree.
 ---
 
-# Content Tree
+# Content tree
 
 With this configuration you can:
 
@@ -11,7 +11,7 @@ With this configuration you can:
 - set maximum depth of expanded tree
 - hide content types
 - set a tree root Location
-- override Content Tree's root for specific Locations
+- override content tree's root for specific Locations
 
 ```yaml
 ibexa:
@@ -25,15 +25,15 @@ ibexa:
                 children_load_max_limit: 200
                 # maximum depth of expanded tree
                 tree_max_depth: 10
-                # content types to display in Content Tree, value of '*' allows all CTs to be displayed
+                # content types to display in content tree, value of '*' allows all CTs to be displayed
                 allowed_content_types: '*'
-                # Content Tree won't display these content types, can be used only when 'allowed_content_types' is set to '*'
+                # content tree won't display these content types, can be used only when 'allowed_content_types' is set to '*'
                 ignored_content_types:
                    - post
                    - article
                 # ID of Location to use as tree root. If omitted - content.tree_root.location_id setting is used.
                 tree_root_location_id: 2
-                # list of Location IDs for which Content Tree's root Location will be changed
+                # list of Location IDs for which content tree's root Location will be changed
                 contextual_tree_root_location_ids:
                    - 2 # Home (Content structure)
                    - 5 # Users
diff --git a/docs/administration/back_office/customize_search_sorting.md b/docs/administration/back_office/customize_search_sorting.md
index 5978eb0430..b4502474c5 100644
--- a/docs/administration/back_office/customize_search_sorting.md
+++ b/docs/administration/back_office/customize_search_sorting.md
@@ -1,10 +1,10 @@
 ---
-description: Add a "sort by" method to the Back Office search result page.
+description: Add a "sort by" method to the back office search result page.
 ---
 
 # Customize search sorting
 
-You can customize the **Sort by** menu in the Back Office search result page, for example, by adding new sort criteria.
+You can customize the **Sort by** menu in the back office search result page, for example, by adding new sort criteria.
 
 To do it, you must create a service that implements the `Ibexa\Contracts\Search\SortingDefinition\SortingDefinitionProviderInterface` and tag it with `ibexa.search.sorting_definition.provider`.
 
diff --git a/docs/administration/back_office/customize_search_suggestion.md b/docs/administration/back_office/customize_search_suggestion.md
index 0478a0bf33..cf527f6a90 100644
--- a/docs/administration/back_office/customize_search_suggestion.md
+++ b/docs/administration/back_office/customize_search_suggestion.md
@@ -4,7 +4,7 @@ description: Customize search suggestion configuration and sources.
 
 # Customize search suggestion
 
-In the Back Office, when you start typing in the search field on the top bar, suggestions about what you could be looking for show up directly under the field.
+In the back office, when you start typing in the search field on the top bar, suggestions about what you could be looking for show up directly under the field.
 For more information about using this feature to search for content, see [user documentation]([[= user_doc =]]/search/search_for_content).
 
 ## Configuration
@@ -35,7 +35,7 @@ After this event, the suggestion collection is sorted by score and truncated to
     ```
 
 The following example is boosting Product suggestions.
-It's a subscriber that passes after the default one (because priority is set to zero), adds matching products at a score above the earlier Content suggestions, and avoids duplicates.
+It's a subscriber that passes after the default one (because priority is set to zero), adds matching products at a score above the earlier content suggestions, and avoids duplicates.
 
 - If the suggestion source finds a number of matching products that is equal or greater than the `result_limit`, only those products end up in the suggestion.
 - If it finds less than `result_limit` products, those products are on top of the suggestion, followed by items from another suggestion source until the limit is met.
@@ -85,7 +85,7 @@ services:
     At this point, it's possible to test the suggestion JSON.
     The route is `/suggestion` with a GET parameter `query` for the searched text.
 
-    For example, log in to the Back Office to have a session cookie, then access the route through the Back Office SiteAccess, such as `<yourdomain>/admin/suggestion?query=platform`.
+    For example, log in to the back office to have a session cookie, then access the route through the back office SiteAccess, such as `<yourdomain>/admin/suggestion?query=platform`.
     If you have a product with "platform" in its name, it is returned as the first suggestion.
 
 A JavaScript renderer displays the normalized product suggestion.
@@ -103,7 +103,7 @@ It's registered as `autocomplete.renderers.<type>` by using the type identifier
  })(window, document, window.ibexa, window.Routing);
 ```
 
-To fit into the Back Office design, you can take HTML structure and CSS class names from an existing suggestion template `vendor/ibexa/admin-ui/src/bundle/Resources/views/themes/admin/ui/global_search_autocomplete_content_item.html.twig`.
+To fit into the back office design, you can take HTML structure and CSS class names from an existing suggestion template `vendor/ibexa/admin-ui/src/bundle/Resources/views/themes/admin/ui/global_search_autocomplete_content_item.html.twig`.
 
 To allow template override and ease HTML writing, the example is also loading a template to render the HTML.
 
@@ -113,7 +113,7 @@ Here is a complete `assets/js/admin.search.autocomplete.product.js` from the pro
 [[= include_file('code_samples/back_office/search/assets/js/admin.search.autocomplete.product.js') =]]
 ```
 
-To be loaded in the Back Office layout, this file must be added to Webpack entry `ibexa-admin-ui-layout-js`. 
+To be loaded in the back office layout, this file must be added to Webpack entry `ibexa-admin-ui-layout-js`. 
 At the end of `webpack.config.js`, add it by using `ibexaConfigManager`:
 
 ``` javascript
diff --git a/docs/administration/back_office/multifile_upload.md b/docs/administration/back_office/multifile_upload.md
index 2e4512d021..d166a36dbd 100644
--- a/docs/administration/back_office/multifile_upload.md
+++ b/docs/administration/back_office/multifile_upload.md
@@ -128,7 +128,7 @@ Optionally, the multi-file upload module can take a following list of properties
     - **params** _{Object}_ - params hash containing: **parentInfo** and **adminUiConfig** stored under the **config** key
 - **deleteFile** _{Function}_ - a function deleting content created from a given file. It takes three params:
     - **systemInfo** _{Object}_ - hash containing information about CSRF token and SiteAccess: **token** and **siteaccess**
-    - **struct** _{Object}_ - Content struct
+    - **struct** _{Object}_ - content struct
     - **callback** _{Function}_ - content deleted callback
 - **onPopupClose** _{Function}_ - function invoked when closing a Multi-file Upload popup. It takes one param: **itemsUploaded** - the list of uploaded items
 - **publishFile** _{Function}_ - publishes an uploaded file-based content item. Takes three params:
diff --git a/docs/administration/back_office/notifications.md b/docs/administration/back_office/notifications.md
index 8bfd64e612..5dc6db891f 100644
--- a/docs/administration/back_office/notifications.md
+++ b/docs/administration/back_office/notifications.md
@@ -1,5 +1,5 @@
 ---
-description: You can send notifications to users who work with the Back Office by using notification bars or notifications in the user menu.
+description: You can send notifications to users who work with the back office by using notification bars or notifications in the user menu.
 ---
 
 # Notifications
@@ -7,18 +7,18 @@ description: You can send notifications to users who work with the Back Office b
 You can send two types on notifications to the users.
 
 [Notification bar](#notification-bars) is displayed in specific situations as a message bar appearing at the bottom of the page.
-It appears to whoever is doing a specific operation in the Back Office.
+It appears to whoever is doing a specific operation in the back office.
 
 ![Example of an info notification](notification2.png "Example of the notification bar")
 
 [Custom notifications](#create-custom-notifications) are sent to a specific user.
-They will appear in their profile in the Back Office.
+They will appear in their profile in the back office.
 
 ![Notification in profile](notification3.png)
 
 ## Notification bars
 
-Notifications are displayed as a message bar in the Back Office.
+Notifications are displayed as a message bar in the back office.
 There are four types of notifications: `info`, `success`, `warning` and `error`.
 
 ### Displaying notifications from PHP
diff --git a/docs/administration/back_office/subitems_list.md b/docs/administration/back_office/subitems_list.md
index 316f9dc326..1293d9fd20 100644
--- a/docs/administration/back_office/subitems_list.md
+++ b/docs/administration/back_office/subitems_list.md
@@ -1,5 +1,5 @@
 ---
-description: Inject a sub-items list into your Back Office customizations.
+description: Inject a sub-items list into your back office customizations.
 ---
 
 # Sub-items list
diff --git a/docs/administration/configuration/configuration.md b/docs/administration/configuration/configuration.md
index dfcdf6f9d7..74c8ae42c9 100644
--- a/docs/administration/configuration/configuration.md
+++ b/docs/administration/configuration/configuration.md
@@ -82,7 +82,7 @@ $myParameter = $this->container->getParameter( 'myapp.parameter.name' );
 
 For specific configuration settings, see:
 
-- [Back Office configuration](back_office_configuration.md)
+- [Back office configuration](back_office_configuration.md)
 - [Repository configuration](repository_configuration.md)
 - [Content views](template_configuration.md)
 - [Multisite configuration](multisite_configuration.md)
diff --git a/docs/administration/configuration/repository_configuration.md b/docs/administration/configuration/repository_configuration.md
index af81c5a25d..e7bcde2d22 100644
--- a/docs/administration/configuration/repository_configuration.md
+++ b/docs/administration/configuration/repository_configuration.md
@@ -229,7 +229,7 @@ The command takes the following optional parameters:
 
 - `status` or `t` - status of versions to remove: `draft`, `archived` or `all`
 - `keep` or `k` - number of versions to keep
-- `user` or `u` - the User that the command will be performed as. The User must have the `content/remove`, `content/read` and `content/versionread` Policies. By default the `administrator` user is applied.
+- `user` or `u` - the User that the command will be performed as. The User must have the `content/remove`, `content/read` and `content/versionread` policies. By default the `administrator` user is applied.
 - `excluded-content-types` - exclude versions of one or multiple content types from the cleanup procedure; separate multiple content types identifiers with the comma.
 
 `ibexa:content:cleanup-versions --status <status name> --keep <number of versions> --user <user name> --excluded-content-types article,blog_post`
@@ -250,12 +250,12 @@ ibexa:
             user_group_content_type_identifier: [user_group]
 ```
 
-You can override these settings if you have other content types that should be treated as users/user groups in the Back Office.
-When viewing such Content in the Back Office you will be able to see e.g. the assigned Policies.
+You can override these settings if you have other content types that should be treated as users/user groups in the back office.
+When viewing such content in the back office you will be able to see e.g. the assigned policies.
 
 ## Top-level Locations
 
-You can change the default path for top-level Locations such as Content or Media in the Back Office, e.g.:
+You can change the default path for top-level Locations such as content or media in the back office, e.g.:
 
 ```yaml
 ibexa:
diff --git a/docs/administration/content_organization/content_types.md b/docs/administration/content_organization/content_types.md
index 43f08cbb0d..dbb7258f9e 100644
--- a/docs/administration/content_organization/content_types.md
+++ b/docs/administration/content_organization/content_types.md
@@ -36,11 +36,11 @@ Each content type is characterized by a set of metadata which define the general
 
 <a id="content-name-pattern"></a>**Content name pattern** – a pattern that defines what name a new content item based on this content type gets. The pattern usually consists of Field identifiers that tell the system which Fields it should use when generating the name of a content item. Each Field identifier has to be surrounded with angle brackets. Text outside the angle brackets will be included literally. If no pattern is provided, the system will automatically use the first Field. (Optional.)
 
-**URL alias name pattern** – a pattern which controls how the virtual URLs of the Locations will be generated when content items are created based on this content type. Note that only the last part of the virtual URL is affected. The pattern works in the same way as the Content name pattern. Text outside the angle brackets will be converted using the selected method of URL transformation. If no pattern is provided, the system will automatically use the name of the content item itself. (Optional.)
+**URL alias name pattern** – a pattern which controls how the virtual URLs of the Locations will be generated when content items are created based on this content type. Note that only the last part of the virtual URL is affected. The pattern works in the same way as the content name pattern. Text outside the angle brackets will be converted using the selected method of URL transformation. If no pattern is provided, the system will automatically use the name of the content item itself. (Optional.)
 
-!!! tip "Changing URL alias and Content name patterns"
+!!! tip "Changing URL alias and content name patterns"
 
-    If you change the Content name pattern or the URL alias name pattern,
+    If you change the content name pattern or the URL alias name pattern,
     existing content items will not be modified automatically.
     The new pattern will only be applied after you modify the content item and save a new version.
 
diff --git a/docs/administration/content_organization/object_states.md b/docs/administration/content_organization/object_states.md
index 71b5c90f86..af2f82f6f6 100644
--- a/docs/administration/content_organization/object_states.md
+++ b/docs/administration/content_organization/object_states.md
@@ -11,7 +11,7 @@ They are contained in groups.
 
 If a state group contains any states, each content item is automatically assigned a state from this group.
 
-You can assign states to content in the Back Office in the content item's **Technical details** tab.
+You can assign states to content in the back office in the content item's **Technical details** tab.
 
 ![Assigning an Object state to a content item](assigning_an_object_state.png "Assigning an Object state to a content item")
 
@@ -19,5 +19,5 @@ By default, [[= product_name =]] contains one Object state group: **Lock**, with
 
 ![**Lock** Object state](object_state_lock.png "Lock Object state")
 
-Object states can be used in conjunction with [permissions](permission_overview.md), in particular with the [Object State Limitation](limitation_reference.md#object-state-limitation).
+Object states can be used in conjunction with [permissions](permission_overview.md), in particular with the [Object State limitation](limitation_reference.md#object-state-limitation).
 Their specific use cases depend on your needs and the setup of your permission system.
\ No newline at end of file
diff --git a/docs/administration/content_organization/sections.md b/docs/administration/content_organization/sections.md
index d38d4bd78b..957fe9156c 100644
--- a/docs/administration/content_organization/sections.md
+++ b/docs/administration/content_organization/sections.md
@@ -33,6 +33,6 @@ Section ID numbers are not recycled. If a Section is removed, its ID number will
 ### Registering users
 
 Registration form for your website is placed under this address: <yourdomain>/register.
-By default, new Users created in this way are placed in the Guest accounts group.
+By default, new users created in this way are placed in the Guest accounts group.
 To give your users a possibility to register themselves, follow the instructions 
 on [enabling account registration](8_enable_account_registration.md).
\ No newline at end of file
diff --git a/docs/administration/dashboard/configure_default_dashboard.md b/docs/administration/dashboard/configure_default_dashboard.md
index 37e810b2b7..7b3c181000 100644
--- a/docs/administration/dashboard/configure_default_dashboard.md
+++ b/docs/administration/dashboard/configure_default_dashboard.md
@@ -27,31 +27,31 @@ ibexa:
 Configuration can be set per [SiteAccess](multisite_configuration.md#siteaccess-configuration)
 or [SiteAccess group](multisite_configuration.md#siteaccess-groups).
 
-All the settings in the configuration are reflected in the Back Office.
+All the settings in the configuration are reflected in the back office.
 
 ## Container remote ID
 
 Defines starting location container for all the dashboards, including customized and predifined ones.
-You can see it in the Admin panel, **Dashboards** section, **Dashboards** folder in the Content Tree. In the **Technical details** tab, it is defined as **Location remote ID**.
+You can see it in the Admin panel, **Dashboards** section, **Dashboards** folder in the content tree. In the **Technical details** tab, it is defined as **Location remote ID**.
 
 ![Container remote ID](dashboard_container_remote_id.png)
 
 ## Default dashboard remote ID
 
-Specifies default predefined dashboard. This is the dashboard that all the users see as a starting dashboard in the Back Office.
-You can see it in the Admin panel, **Dashboards** section, **Default dashboard** folder inside of **Predefined dashboards** container in the Content Tree.
+Specifies default predefined dashboard. This is the dashboard that all the users see as a starting dashboard in the back office.
+You can see it in the Admin panel, **Dashboards** section, **Default dashboard** folder inside of **Predefined dashboards** container in the content tree.
 In the **Technical details** tab, it is defined as **Location remote ID**.
 
 ## Users container remote ID
 
 Defines a container for users folders, which contain all customized dashboards.
-You can see it in the Admin panel, **Dashboards** section, **User dashboards** folder inside of main **Dashboards** container in the Content Tree.
+You can see it in the Admin panel, **Dashboards** section, **User dashboards** folder inside of main **Dashboards** container in the content tree.
 In the **Technical details** tab, it is defined as **Location remote ID**.
 
 ## Predefined container remote ID
 
 Defines a container that contains all predefined dashboards created by Administrator.
-You can see it in the Admin panel, **Dashboards** section, **Predefined dashboards** folder inside of main **Dashboards** container in the Content Tree.
+You can see it in the Admin panel, **Dashboards** section, **Predefined dashboards** folder inside of main **Dashboards** container in the content tree.
 In the **Technical details** tab, it is defined as **Location remote ID**.
 
 ## Section identifier
diff --git a/docs/administration/dashboard/customize_dashboard.md b/docs/administration/dashboard/customize_dashboard.md
index 54a0b0f5b8..80d5977b3d 100644
--- a/docs/administration/dashboard/customize_dashboard.md
+++ b/docs/administration/dashboard/customize_dashboard.md
@@ -16,7 +16,7 @@ Customized dashboard displays a set of widgets selected by the user.
 
 To customize dashboard, you need to have `dashboard/cutomize` [policy](permission_overview.md).
 
-By default, all the users belonging to the `Editors` User Group, have `Dashboard`[Role](roles_admin_panel.md) assigned, so they can edit, create, or delete dashboard.
+By default, all the users belonging to the `Editors` user group, have `Dashboard`[role](roles_admin_panel.md) assigned, so they can edit, create, or delete dashboard.
 If, by any reason, you want to narrow this permission, you can set up specific [limitations](limitations.md).
 
 ## Add custom layout
diff --git a/docs/administration/project_organization/architecture.md b/docs/administration/project_organization/architecture.md
index 71c2c9b128..0fb84ec016 100644
--- a/docs/administration/project_organization/architecture.md
+++ b/docs/administration/project_organization/architecture.md
@@ -16,7 +16,7 @@ The architecture of [[= product_name =]] is layered and uses clearly defined API
 
 | Layer                                               | Description                                                                                                                                                                                    |
 |-----------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| [Back Office](back_office_configuration.md)         | Back Office contains all the necessary parts to run the [[= product_name =]] Back Office interface.                                                                                            |
+| [Back office](back_office_configuration.md)         | Back office contains all the necessary parts to run the [[= product_name =]] back office interface.                                                                                            |
 | [HTTP Cache](http_cache.md))                        | Symfony HTTP cache is used to manage content "view" cache with an expiration model. In addition it is extended by using FOSHttpCache to add several advanced features.                         |
 | [Controllers](controllers.md)                       | Controllers created by you to read information from a Request object, create and return a Response objects.                                                                                    |
 | [Twig templates](twig_function_reference.md)        | Set of custom and built-in Twig templates. User interfaces are developed with the Twig template engine and query the public PHP API directly.                                                  |
@@ -24,7 +24,7 @@ The architecture of [[= product_name =]] is layered and uses clearly defined API
 | [GraphQL](graphql.md)                               | GraphQL for [[= product_name =]] exposes the domain model using the Repository, based on content type groups, content types and Field definitions.                                             |
 | [Public PHP API](php_api.md)                        | Public PHP API exposes the Repository which enables you to create, read, update, manage and delete all objects available in [[= product_name =]].                                              |
 | Business Logic                                      | The business logic is defined in the kernel. This business logic is exposed to applications via an API. It is used to organize development of the user interface layer.                        |
-| SPI                                                 | Service Provider Interface which defines contracts for implementing various parts of the system, including persistence layer (`SPI\Persistence`), custom Field Types, custom Limitations, etc. |
+| SPI                                                 | Service Provider Interface which defines contracts for implementing various parts of the system, including persistence layer (`SPI\Persistence`), custom Field Types, custom limitations, etc. |
 | [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](legacy_search_overview.md)     | Legacy search engine is SQL-based and uses Doctrine's database connection.                                                                                                                     |
diff --git a/docs/administration/project_organization/bundles.md b/docs/administration/project_organization/bundles.md
index a48ecb51cf..a7efcd6892 100644
--- a/docs/administration/project_organization/bundles.md
+++ b/docs/administration/project_organization/bundles.md
@@ -46,9 +46,9 @@ see the [How to Remove a Bundle]([[= symfony_doc =]]/bundles/remove.html) instru
 
 |Bundle|Description|
 |---------|-----------|
-|[ibexa/admin-ui](https://github.com/ibexa/admin-ui)|Back Office interface|
-|[ibexa/admin-ui-assets](https://github.com/ibexa/admin-ui-assets)|Assets for the Back Office|
-|[ibexa/content-forms](https://github.com/ibexa/content-forms)|Form-based integration for the Symfony Forms into Content and User objects in kernel|
+|[ibexa/admin-ui](https://github.com/ibexa/admin-ui)|Back office interface|
+|[ibexa/admin-ui-assets](https://github.com/ibexa/admin-ui-assets)|Assets for the back office|
+|[ibexa/content-forms](https://github.com/ibexa/content-forms)|Form-based integration for the Symfony Forms into content and user objects in kernel|
 |[ibexa/core](https://github.com/ibexa/core)|Core of the [[= product_name =]] application|
 |[ibexa/core-persistence](https://github.com/ibexa/core-persistence)|Core system persistence|
 |[ibexa/cron](https://github.com/ibexa/cron)|Cron package for use with the `ibexa:cron:run` command|
@@ -73,13 +73,13 @@ see the [How to Remove a Bundle]([[= symfony_doc =]]/bundles/remove.html) instru
 |Bundle|Description|
 |---------|-----------|
 |ibexa/oss|Core packages|
-|ibexa/content-tree|Content Tree functionality|
+|ibexa/content-tree|content tree functionality|
 |ibexa/connect|[Ibexa Connect](https://doc.ibexa.co/projects/connect/en/latest/)|
 |ibexa/calendar|Calendar tab with a calendar widget|
 |ibexa/connector-dam|Connector for DAM (Digital Asset Management) systems|
 |ibexa/elasticsearch|Integration with Elasticsearch search engine|
 |ibexa/fastly|Fastly support for `http-cache`, for use on Platform.sh or standalone|
-|ibexa/icons|Icon set for the Back Office|
+|ibexa/icons|Icon set for the back office|
 |ibexa/image-editor|[Image Editor](configure_image_editor.md)|
 |ibexa/installer|Provides the `ibexa:install` command|
 |ibexa/measurement|Measurement Field Type and measurement product catalog attribute|
@@ -130,7 +130,7 @@ see the [How to Remove a Bundle]([[= symfony_doc =]]/bundles/remove.html) instru
 |ibexa/order-management|Order management|
 |ibexa/payment|Payment handling|
 |ibexa/shipping|Shipping handling|
-|ibexa/commerce-admin-ui|Shop-related Back Office functionalities **deprecated** |
+|ibexa/commerce-admin-ui|Shop-related back office functionalities **deprecated** |
 |ibexa/commerce-erp-admin|ERP connection for the shop **deprecated** |
 |ibexa/commerce-order-history|Order history functionality **deprecated** |
 |ibexa/commerce-page-builder|Shop-related Page blocks **deprecated** |
diff --git a/docs/administration/recent_activity/recent_activity.md b/docs/administration/recent_activity/recent_activity.md
index 1d36b5dcf6..ab34820444 100644
--- a/docs/administration/recent_activity/recent_activity.md
+++ b/docs/administration/recent_activity/recent_activity.md
@@ -4,18 +4,18 @@ description: Log and monitor activity through UI, PHP API and REST API.
 
 # Recent activity [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
-Recent activity log displays last actions in the repository (whatever their origin is, for example, Back Office, REST, migration, CLI, or CRON).
+Recent activity log displays last actions in the repository (whatever their origin is, for example, back office, REST, migration, CLI, or CRON).
 
 ![Recent activity](admin_panel_recent_activity.png)
 
-To learn more about its Back Office usage and the actions logged by default, see [Recent activity in the User documentation]([[= user_doc =]]/recent_activity/recent_activity/).
+To learn more about its back office usage and the actions logged by default, see [Recent activity in the User documentation]([[= user_doc =]]/recent_activity/recent_activity/).
 
 ## Configuration and cronjob
 
 With some configuration, you can customize the log length in the database or on screen.
 A command maintains the log size in database, it should be scheduled through CRON.
 
-- The configuration `ibexa.system.<scope>.activity_log.pagination.activity_logs_limit` sets the number of log items shown per page in the Back Office (default value: 25). 
+- The configuration `ibexa.system.<scope>.activity_log.pagination.activity_logs_limit` sets the number of log items shown per page in the back office (default value: 25). 
 A log item is a group of entries, or an entry without group.
 - The configuration `ibexa.repositories.<repository>.activity_log.truncate_after_days` sets the number of days a log entry is kept before it's deleted by the `ibexa:activity-log:truncate` command (default value: 30 days).
 
@@ -45,7 +45,7 @@ For every exact hour, the cronjob line is:
 The [`activity_log/read`](policies.md#activity-log) policy gives a role the access to the **Admin** -> **Activity list**, the dashboard's **Recent activity** block, and the user profile's **Recent activity**.
 It can be limited to "Only own logs" ([`ActivityLogOwner`](limitation_reference.md#activitylogowner-limitation)).
 
-The policy should be given to every roles having access to the Back Office, at least with the `ActivityLogOwner` owner limitation,
+The policy should be given to every roles having access to the back office, at least with the `ActivityLogOwner` owner limitation,
 to allow them to use the "Recent activity" block in the [default dashboard](configure_default_dashboard.md) or their [custom dashboard](customize_dashboard.md).
 This policy is required to view [activity log in user profile]([[= user_doc =]]/recent_activity/recent_activity/#user-profile), if [profile]([[= user_doc =]]/getting_started/get_started/#edit-user-profile) is enabled.
 
@@ -169,7 +169,7 @@ If you log several related entries at once, you can group them into a context.
 Context is a set of actions done for the same purpose, for example, it could group the actions of a CRON that fetches third party data and updates Content items.
 The built-in contexts include:
 
-- `web` - groups actions made in the Back Office, like the update and the publishing of a new content item's version
+- `web` - groups actions made in the back office, like the update and the publishing of a new content item's version
 - `migration` - groups every action from a migration file execution
 
 A context group counts as one item in regard to `activity_logs_limit` configuration and `ActivityLogService::findGroups`'s `$limit` argument.
@@ -177,7 +177,7 @@ A context group counts as one item in regard to `activity_logs_limit` configurat
 To open a context group, use `ActivityLogService::prepareContext` which has two arguments:
 
 - `$source` - describes, usually through a short identifier, what is triggering the set of actions. 
-For example, some already existing sources are `web` (incl. actions from the Back Office), `graphql`, `rest` and `migration`
+For example, some already existing sources are `web` (incl. actions from the back office), `graphql`, `rest` and `migration`
 - `$description` - an optional, more specific contextualisation.
 For example, `migration` context source is associated with the migration file name in its context description
 
@@ -200,7 +200,7 @@ Context groups can't be nested.
 If a new context is prepared when a context is already grouping log entries, this new context is ignored.
 To start a new context, make sure to previously dismiss the existing one.
 
-When displayed in the Back Office, a context group is folded below its first entry.
+When displayed in the back office, a context group is folded below its first entry.
 The `my_feature` context from the example is folded below its first action, the `init` action.
 Other actions are displayed after you click the **Show more** button.
 
diff --git a/docs/api/event_reference/event_reference.md b/docs/api/event_reference/event_reference.md
index 2bfa959037..9bae388561 100644
--- a/docs/api/event_reference/event_reference.md
+++ b/docs/api/event_reference/event_reference.md
@@ -1,5 +1,5 @@
 ---
-description: Ibexa DXP dispatches events before and after you perform different operations in the Back Office and on the Repository.
+description: Ibexa DXP dispatches events before and after you perform different operations in the back office and on the Repository.
 page_type: reference
 ---
 
diff --git a/docs/api/event_reference/role_events.md b/docs/api/event_reference/role_events.md
index 15c23b37d6..7f21faf1de 100644
--- a/docs/api/event_reference/role_events.md
+++ b/docs/api/event_reference/role_events.md
@@ -1,5 +1,5 @@
 ---
-description: Events that are triggered when working with Roles.
+description: Events that are triggered when working with roles.
 page_type: reference
 ---
 
@@ -22,7 +22,7 @@ page_type: reference
 |`BeforeDeleteRoleEvent`|`RoleService::deleteRole`|`Role $role`|
 |`DeleteRoleEvent`|`RoleService::deleteRole`|`Role $role`|
 
-## Adding Policies
+## Adding policies
 
 | Event | Dispatched by | Properties |
 |---|---|---|
@@ -33,7 +33,7 @@ page_type: reference
 |`BeforeRemovePolicyByRoleDraftEvent`|`RoleService::removePolicyByRoleDraft`|`RoleDraft $roleDraft`</br>`PolicyDraft $policyDraft`</br>`RoleDraft|null $updatedRoleDraft`|
 |`RemovePolicyByRoleDraftEvent`|`RoleService::removePolicyByRoleDraft`|`RoleDraft $roleDraft`</br>`PolicyDraft $policyDraft`</br>`RoleDraft $updatedRoleDraft`|
 
-## Assigning Roles
+## Assigning roles
 
 | Event | Dispatched by | Properties |
 |---|---|---|
diff --git a/docs/api/event_reference/user_events.md b/docs/api/event_reference/user_events.md
index 072c661c4a..29d83c0e50 100644
--- a/docs/api/event_reference/user_events.md
+++ b/docs/api/event_reference/user_events.md
@@ -1,5 +1,5 @@
 ---
-description: Events that are triggered when working with users and User Groups.
+description: Events that are triggered when working with users and user groups.
 page_type: reference
 ---
 
@@ -14,7 +14,7 @@ page_type: reference
 |`BeforeDeleteUserEvent`|`UserService::deleteUser`|`User $user`</br>`array|null $locations`|
 |`DeleteUserEvent`|`UserService::deleteUser`|`User $user`</br>`array $locations`|
 
-## User Groups
+## User groups
 
 | Event | Dispatched by | Properties |
 |---|---|---|
@@ -27,7 +27,7 @@ page_type: reference
 |`BeforeMoveUserGroupEvent`|`UserService::moveUserGroup`|`UserGroup $userGroup`</br>`UserGroup $newParent`|
 |`MoveUserGroupEvent`|`UserService::moveUserGroup`|`UserGroup $userGroup`</br>`UserGroup $newParent`|
 
-## Assigning to User Groups
+## Assigning to user groups
 
 | Event | Dispatched by | Properties |
 |---|---|---|
diff --git a/docs/api/php_api/php_api.md b/docs/api/php_api/php_api.md
index eaa3815d2e..018d784e4e 100644
--- a/docs/api/php_api/php_api.md
+++ b/docs/api/php_api/php_api.md
@@ -95,13 +95,13 @@ One of the responsibilities of the Repository is user authentication. Every acti
 
 When using the PHP API, authentication is performed in three ways:
 
-- [automatically in the Back Office](#back-office-authentication)
+- [automatically in the back office](#back-office-authentication)
 - [using `sudo()`](#using-sudo)
 - by [setting the Repository user](#setting-the-repository-user)
 
-### Back Office authentication
+### Back office authentication
 
-When actions are performed through the Back Office, they are executed as the logged-in User.
+When actions are performed through the back office, they are executed as the logged-in User.
 This User's permissions will affect the behavior of the Repository.
 The User may, for example, not be allowed to create content, or view a particular Section.
 
diff --git a/docs/api/rest_api/rest_api_authentication.md b/docs/api/rest_api/rest_api_authentication.md
index e68db5fbcd..5210f7d213 100644
--- a/docs/api/rest_api/rest_api_authentication.md
+++ b/docs/api/rest_api/rest_api_authentication.md
@@ -361,15 +361,15 @@ If the installation has a dedicated host for REST, you can enable HTTP basic aut
                 realm: Ibexa DXP REST API
 ```
 
-!!! caution "Back Office uses REST API"
+!!! caution "Back office uses REST API"
 
-    Back Office uses the REST API too (for some parts like the Location tree or the Calendar) on its own domain.
+    Back office uses the REST API too (for some parts like the Location tree or the Calendar) on its own domain.
 
-    * If the Back Office SiteAccess matches `//admin.example.com` (through `Map\Host`, `HostElement` or `HostText`), it calls the REST API under `//admin.example.com/api/ibexa/v2`;
-    * If the Back Office SiteAccess matches `//localhost/admin` (through `URIElement`, `Map\URI` or `Regex\URI`), it calls the REST API under `//localhost/api/ibexa/v2` because SiteAccess matching with REST isn't enabled at URL level.
+    * If the back office SiteAccess matches `//admin.example.com` (through `Map\Host`, `HostElement` or `HostText`), it calls the REST API under `//admin.example.com/api/ibexa/v2`;
+    * If the back office SiteAccess matches `//localhost/admin` (through `URIElement`, `Map\URI` or `Regex\URI`), it calls the REST API under `//localhost/api/ibexa/v2` because SiteAccess matching with REST isn't enabled at URL level.
 
-    If you enable basic authentication for `pattern: ^/api/ibexa/v2` to use it in your front office across both production and development environments, your development environment's Back Office won't work correctly.
-    This Back Office tries to access REST through the same URL as the front office. Even when logged in Back Office and using the [X-SiteAccess header](rest_requests.md#siteaccess), the firewall blocks access to REST as you're not logged through basic authentification. Therefore, some Back Office features don't work.
+    If you enable basic authentication for `pattern: ^/api/ibexa/v2` to use it in your front office across both production and development environments, your development environment's back office won't work correctly.
+    This back office tries to access REST through the same URL as the front office. Even when logged in back office and using the [X-SiteAccess header](rest_requests.md#siteaccess), the firewall blocks access to REST as you're not logged through basic authentification. Therefore, some back office features don't work.
 
     If basic authentication is used only for REST API, it's better to have a dedicated domain even on a development environment. For example, map an `api.localhost` in your `hosts` file and set the firewall for `host: ^api\.(example\.com|localhost)$`.
 
diff --git a/docs/api/rest_api/rest_api_usage/rest_api_usage.md b/docs/api/rest_api/rest_api_usage/rest_api_usage.md
index f7c28459aa..f8334fe6ce 100644
--- a/docs/api/rest_api/rest_api_usage/rest_api_usage.md
+++ b/docs/api/rest_api/rest_api_usage/rest_api_usage.md
@@ -8,7 +8,7 @@ The REST API in [[= product_name =]] allows you to interact with an [[= product_
 following a [REST](https://en.wikipedia.org/wiki/Representational_state_transfer) interaction model.
 
 Each resource (URI) interacts with a part of the system (like content, users or search).
-Every interaction with the Repository than you can do from Back Office or using the [Public PHP API](php_api.md) can also be done using the REST API.
+Every interaction with the Repository than you can do from back office or using the [Public PHP API](php_api.md) can also be done using the REST API.
 
 The REST API uses HTTP methods (such as `GET` and `PUBLISH`), as well as HTTP headers to specify the type of request.
 
diff --git a/docs/cdp/cdp_activation/cdp_configuration.md b/docs/cdp/cdp_activation/cdp_configuration.md
index 52c04f243c..281298c32a 100644
--- a/docs/cdp/cdp_activation/cdp_configuration.md
+++ b/docs/cdp/cdp_activation/cdp_configuration.md
@@ -52,7 +52,7 @@ A pop-up window displays a list of all available accounts and their numbers.
 
 ## Segment group
 
-Create a segment group in the Back Office.
+Create a segment group in the back office.
 It serves as a container for all segments data generated by [[= product_name_cdp =]].
 Go to **Admin** -> **Segments** and select **Create**.
 Fill in name and identifier for a segment group.
@@ -60,7 +60,7 @@ Choose wisely, as once connected to CDP Segment Group cannot be changed.
 
 !!! caution "[[= product_name_cdp =]] Segment Group"
 
-    After you create the Segment Group in the Back Office and connect it to [[= product_name_cdp =]], you cannot change it in any way, including edit its name.
+    After you create the Segment Group in the back office and connect it to [[= product_name_cdp =]], you cannot change it in any way, including edit its name.
 
 ![Creating a new segment group](cdp_create_segment_group.png)
 
diff --git a/docs/cdp/cdp_guide.md b/docs/cdp/cdp_guide.md
index fbfb7a6970..7d54acdb66 100644
--- a/docs/cdp/cdp_guide.md
+++ b/docs/cdp/cdp_guide.md
@@ -47,9 +47,9 @@ To create a personalized customer experience, you need to group your clients int
 [[= product_name =]] comes with a ready solution - segment groups.
 Segment group information is reused by various [[= product_name =]] functionalities, such as [Personalization](personalization_guide.md) or content targeting.
 
-You can [create a segment group](https://doc.ibexa.co/projects/userguide/en/latest/personalization/segment_management/) in the Back Office of [[= product_name =]]. It serves as a container for all segments data generated by [[= product_name_cdp =]].
+You can [create a segment group](https://doc.ibexa.co/projects/userguide/en/latest/personalization/segment_management/) in the back office of [[= product_name =]]. It serves as a container for all segments data generated by [[= product_name_cdp =]].
 When you create a segment group, you need to provide its name and identifier.
-Be careful while doing so, as after you create the segment group in the Back Office and connect it to [[= product_name_cdp =]], you cannot change it in any way, including edit its name.
+Be careful while doing so, as after you create the segment group in the back office and connect it to [[= product_name_cdp =]], you cannot change it in any way, including edit its name.
 
 Remember to add a segment group identifier to the configuration, under the `segment_group_identifier` field.
 
diff --git a/docs/commerce/storefront/configure_storefront.md b/docs/commerce/storefront/configure_storefront.md
index 802646b7d0..0c9e58f4be 100644
--- a/docs/commerce/storefront/configure_storefront.md
+++ b/docs/commerce/storefront/configure_storefront.md
@@ -10,7 +10,7 @@ The Storefront is accessible under the `<yourdomain>/product-catalog`.
 
 With the `ibexa/storefront` package, you can configure the product catalog and make it available to your shop users. 
 
-Before you start configuring the Storefront, make sure you have created, configured and published [catalogs](https://doc.ibexa.co/projects/userguide/en/latest/pim/work_with_catalogs/#create-catalogs) in the Back Office.
+Before you start configuring the Storefront, make sure you have created, configured and published [catalogs](https://doc.ibexa.co/projects/userguide/en/latest/pim/work_with_catalogs/#create-catalogs) in the back office.
 
 The configuration is available under the `ibexa.system.<scope>.storefront.catalog` [configuration key](configuration.md#configuration-files).
 It accepts the following values:
diff --git a/docs/commerce/storefront/extend_storefront.md b/docs/commerce/storefront/extend_storefront.md
index 980e51de1d..ddd6b29b3f 100644
--- a/docs/commerce/storefront/extend_storefront.md
+++ b/docs/commerce/storefront/extend_storefront.md
@@ -11,7 +11,7 @@ With the `ibexa\storefront` package come the following built-in menus:
 
 | Item   | Value     | Description |
 |------------|----------|---------|
-| [Breadcrumbs](#breadcrumbs-menu)| - | Renders breadcrumbs for Content Tree Root, Taxonomy Entry, Product, User settings and User settings group | 
+| [Breadcrumbs](#breadcrumbs-menu)| - | Renders breadcrumbs for content tree Root, Taxonomy Entry, Product, User settings and User settings group | 
 | [Taxonomy](#taxonomy-menu)| - | It can render a menu for product categories or tags |               
 | Currency| `currency_menu` | Renders a menu to change the active currency |               
 | Language| `language_menu` | Renders a menu to change the active language |
diff --git a/docs/content_management/content_api/managing_content.md b/docs/content_management/content_api/managing_content.md
index 97daad2a6a..c7aea0d99e 100644
--- a/docs/content_management/content_api/managing_content.md
+++ b/docs/content_management/content_api/managing_content.md
@@ -106,7 +106,7 @@ but it copies the Location and its subtree instead of moving it.
 
 !!! note
 
-    [Copy subtree limit](back_office_configuration.md#copy-subtree-limit) only applies to operations in the Back Office.
+    [Copy subtree limit](back_office_configuration.md#copy-subtree-limit) only applies to operations in the back office.
     It is ignored when copying subtrees using the PHP API.
 
 ## Trash
diff --git a/docs/content_management/content_availability.md b/docs/content_management/content_availability.md
index 3377d61242..38bf1c2a96 100644
--- a/docs/content_management/content_availability.md
+++ b/docs/content_management/content_availability.md
@@ -19,7 +19,7 @@ corresponding to the current SiteAccess.
 
 !!! note
 
-    There is currently no way in the Back Office to edit the Content availability flag
+    There is currently no way in the back office to edit the Content availability flag
     for an already published content item.
     
     To do this via [PHP API](creating_content.md#updating-content), set the [`alwaysAvailable` property](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-ContentMetadataUpdateStruct.html#property_alwaysAvailable) of the Content metadata.
diff --git a/docs/content_management/content_management_guide.md b/docs/content_management/content_management_guide.md
index b6385a05a5..f0ecb32209 100644
--- a/docs/content_management/content_management_guide.md
+++ b/docs/content_management/content_management_guide.md
@@ -36,7 +36,7 @@ You can then publish the content directly, by building a website or a web store,
 
 ## Content structure
 
-All content in [[= product_name =]] is organized hierarchically, into what is called a [**Content Tree**](content_tree.md). 
+All content in [[= product_name =]] is organized hierarchically, into what is called a [**content tree**](content_tree.md). 
 This tree-like structure repeats throughout the system, and applies to content, taxonomies, categories, and the like.
 
 Traditional as the structure may look, with relations and multiple location support, 
@@ -110,7 +110,7 @@ Certain editions of [[= product_name =]] come with a visual [Form Builder]([[= u
 
 ## Content management capabilities
 
-Each content item has at least one location within the Content Tree, and can have several versions and multiple translations. 
+Each content item has at least one location within the content tree, and can have several versions and multiple translations. 
 It can also have related assets, such as images or other media, and assigned keywords, or tags.
 
 You can use these characteristics in combination with system features to create the most comprehensive and functional digital presence for your organization.
@@ -119,7 +119,7 @@ You can use these characteristics in combination with system features to create
 
 #### Locations
 
-When a content item is created and published, it is assigned a place in the Content Tree, designated by a Location ID. 
+When a content item is created and published, it is assigned a place in the content tree, designated by a Location ID. 
 A single content item can have more than one Location ID, which means that the same content can be found on different branches of the tree. 
 However, a single location can have only one content item assigned to it.
 
@@ -150,18 +150,18 @@ Editors can compare different translations of the same content items with the Co
 
 #### Relations
 
-A [relation](content_relations.md) can exist between any two content items in the Content Tree. 
+A [relation](content_relations.md) can exist between any two content items in the content tree. 
 For example, blog posts featured in the website's main page are in a relation with the page that they are embedded in. 
 Or, instead of direct attachments, an article can use images that are separate content items outside the article and are referenced through a relation.
 
 ## Content arrangement
 
-In [[= product_name =]], content items can be moved and copied between branches of the Content Tree. 
+In [[= product_name =]], content items can be moved and copied between branches of the content tree. 
 These operations, like in your computer’s file system, can apply both to individual content items as well as folders or groups.
 
 ![Content organization operations](img/content_arrangement.png)
 
-Content items can be hidden when necessary, for example, until a certain event, like a Holiday Sale or Board announcement comes. Hidden content items are not visible to website visitors and are greyed out in the Content Tree.
+Content items can be hidden when necessary, for example, until a certain event, like a Holiday Sale or Board announcement comes. Hidden content items are not visible to website visitors and are greyed out in the content tree.
 
 ![Hidden content item](img/hidden_content_item.png)
 
@@ -183,27 +183,27 @@ This way you can classify content and make it easier for end users to find the c
 ### Access control
 
 When your [[= product_name =]] instance has multiple contributors and visitors, administrators can give them access to different areas of the website and different capabilities. 
-It is done by creating Roles, with each role having a different set of [permissions](permission_overview.md), the most fitting example being the `content/edit` permission limited to an `Articles/BookReviews/Historical` subtree of the Content Tree.
+It is done by creating roles, with each role having a different set of [permissions](permission_overview.md), the most fitting example being the `content/edit` permission limited to an `Articles/BookReviews/Historical` subtree of the content tree.
 
-In the next steps, after you create User groups, you’d assign Roles to these groups, and add individual users to each of such groups. 
+In the next steps, after you create user groups, you’d assign roles to these groups, and add individual users to each of such groups. 
 For more technical information about permissions and limitations, see [Permission use cases](permission_use_cases.md).
 
 There are, however, mechanisms to control access to content with even more convenience.
 
 ### Sections
 
-You can divide your Content Tree into nominal parts to better organize it.
+You can divide your content tree into nominal parts to better organize it.
 Once you have defined sections, for example, Media or Forms, and assigned them to content items, 
-you can decide which Roles have access to which Section of the tree.
+you can decide which roles have access to which Section of the tree.
 
 The setting is inherited, which means that a child content item inherits a value of this setting from its parent. 
-Changing a Section setting does not result in moving a content item to a different location within a Content Tree.
+Changing a Section setting does not result in moving a content item to a different location within a content tree.
 
 ![Members of the Media Section](img/sections.png)
 
 ### Object states
 
-While reviewing the details of each individual content item in your Content Tree, you can assign a state to it, for example, “Locked” or “Not locked”. 
+While reviewing the details of each individual content item in your content tree, you can assign a state to it, for example, “Locked” or “Not locked”. 
 Then you can set a permission that allows or denies users access to content items in a specific state. 
 This setting is not inherited.
 
diff --git a/docs/content_management/data_migration/data_migration_actions.md b/docs/content_management/data_migration/data_migration_actions.md
index 19089e376c..a45f5bb6f7 100644
--- a/docs/content_management/data_migration/data_migration_actions.md
+++ b/docs/content_management/data_migration/data_migration_actions.md
@@ -1,5 +1,5 @@
 ---
-description: Data migration actions enable you to run special operations while executing data migrations, such as assigning Roles, Sections, Objects states, and so on.
+description: Data migration actions enable you to run special operations while executing data migrations, such as assigning roles, Sections, Objects states, and so on.
 page_type: reference
 ---
 
@@ -61,8 +61,8 @@ The following migration actions are available out of the box:
 - `assign_role_to_user` (Role Create / Update)
 - `assign_role_to_user_group` (Role Create / Update)
 - `assign_user_to_role` (User Create / Update)
-- `assign_user_group_to_role` (User Group Create / Update)
-- `unassign_role_user_group` (User Group Update)
+- `assign_user_group_to_role` (User group Create / Update)
+- `unassign_role_user_group` (User group Update)
 
 In contrast with Kaliop migrations, actions provide you with ability to perform additional operations and extend
 the migration functionality. 
@@ -147,7 +147,7 @@ mode: Create and Update
                     - 1
 ```
 
-### User Groups
+### User groups
 
 mode: Create and Update
 ``` yaml
diff --git a/docs/content_management/data_migration/exporting_data.md b/docs/content_management/data_migration/exporting_data.md
index 082c33a1c6..cbf680b406 100644
--- a/docs/content_management/data_migration/exporting_data.md
+++ b/docs/content_management/data_migration/exporting_data.md
@@ -137,7 +137,7 @@ Note that you should test your migrations. See [Importing data](importing_data.m
 !!! caution
 
     [`--siteaccess` option](#siteaccess) usage can be relevant when multiple languages or multiple repositories are used.
-    To prevent translation loss, it is recommended that you use the SiteAccess that has all the languages used in your implementation, most likely the Back Office one.
+    To prevent translation loss, it is recommended that you use the SiteAccess that has all the languages used in your implementation, most likely the back office one.
 
 ## type
 
@@ -200,7 +200,7 @@ The following combinations of types are modes are available:
 The optional `--siteaccess` option enables you to export (or import) data in a SiteAccess configuration's context.
 If not provided, the [default SiteAccess](multisite_configuration.md#default-siteaccess) is used.
 
-It is recommended that you use the SiteAccess of the target repository's Back Office.
+It is recommended that you use the SiteAccess of the target repository's back office.
 
 Specifying the SiteAccess can be mandatory, for example, when you use several SiteAccesses to handle [several languages](languages.md#using-siteaccesses-for-handling-translations).
 Export and import commands only work with languages supported by the context SiteAccess.
diff --git a/docs/content_management/data_migration/importing_data.md b/docs/content_management/data_migration/importing_data.md
index 629d9cc4c7..a1fd2ae176 100644
--- a/docs/content_management/data_migration/importing_data.md
+++ b/docs/content_management/data_migration/importing_data.md
@@ -275,35 +275,35 @@ enabling swift file migration regardless of storage (local, DFS).
 
 ### Roles
 
-The following example shows how to create a Role.
-A Role requires the `identifier` metadata key.
+The following example shows how to create a role.
+A role requires the `identifier` metadata key.
 
-For each Policy assigned to the Role, you select the module and function, with optional Limitations.
+For each policy assigned to the role, you select the module and function, with optional Limitations.
 
-The following example shows the creation of a `Contributor` Role:
+The following example shows the creation of a `Contributor` role:
 
 ``` yaml
 [[= include_file('code_samples/data_migration/examples/create_role.yaml') =]]
 ```
 
-To update an existing Role, two policies' modes are available:
+To update an existing role, two policies' modes are available:
 
 - `replace`: (default) All existing policies are replaced by the ones from the migration.
 - `append`: Migration policies are added while already existing ones are kept.
 
-The following example shows how to replace the policies of the existing `Editor` Role:
+The following example shows how to replace the policies of the existing `Editor` role:
 
 ``` yaml
 [[= include_file('code_samples/data_migration/examples/update_role.yaml', 0, 16) =]]
 ```
 
-The following example shows the addition of a policy to the `Anonymous` Role:
+The following example shows the addition of a policy to the `Anonymous` role:
 
 ``` yaml hl_lines="7"
 [[= include_file('code_samples/data_migration/examples/update_role.yaml', 18, 32) =]]
 ```
 
-The following example shows how to delete the `Contributor` Role:
+The following example shows how to delete the `Contributor` role:
 
 ``` yaml
 [[= include_file('code_samples/data_migration/examples/delete_role.yaml') =]]
@@ -325,7 +325,7 @@ The following example shows how to create a user.
 The required metadata keys are: `login`, `email`, `password`, `enabled`, `mainLanguage`, and `contentType`.
 You also need to provide the user group's remote content ID.
 
-You can use an [action](data_migration_actions.md) to assign a Role to the user.
+You can use an [action](data_migration_actions.md) to assign a role to the user.
 
 ``` yaml hl_lines="22-23"
 [[= include_file('code_samples/data_migration/examples/create_user.yaml') =]]
diff --git a/docs/content_management/field_types/create_custom_field_type_comparison.md b/docs/content_management/field_types/create_custom_field_type_comparison.md
index fbced9c5e0..4816a11174 100644
--- a/docs/content_management/field_types/create_custom_field_type_comparison.md
+++ b/docs/content_management/field_types/create_custom_field_type_comparison.md
@@ -4,7 +4,7 @@ description: Enable comparison of content Fields based on a custom Field Type.
 
 # Create custom Field Type comparison
 
-In the Back Office, you can compare the contents of Fields.
+In the back office, you can compare the contents of Fields.
 Comparing is possible only between two versions of the same Field that are in the same language.
 
 You can add the possibility to compare custom and other unsupported Field Types.
diff --git a/docs/content_management/field_types/create_custom_generic_field_type.md b/docs/content_management/field_types/create_custom_generic_field_type.md
index 465fa77d1c..8cb22b71fe 100644
--- a/docs/content_management/field_types/create_custom_generic_field_type.md
+++ b/docs/content_management/field_types/create_custom_generic_field_type.md
@@ -97,7 +97,7 @@ Provide the template mapping under the `ibexa.system.<scope>.field_templates` [c
 
 ## Final results
 
-Finally, you should be able to add a new content type in the Back Office interface.
+Finally, you should be able to add a new content type in the back office interface.
 Navigate to **Content types** tab and under **Content** category create a new content type:
 
 ![Creating new content type](extending_field_type_create.png)
diff --git a/docs/content_management/field_types/customize_field_type_metadata.md b/docs/content_management/field_types/customize_field_type_metadata.md
index 53a179097c..d9831c4d01 100644
--- a/docs/content_management/field_types/customize_field_type_metadata.md
+++ b/docs/content_management/field_types/customize_field_type_metadata.md
@@ -1,5 +1,5 @@
 ---
-description: You can customize which Field Type metadata should be disabled in the Back Office.
+description: You can customize which Field Type metadata should be disabled in the back office.
 ---
 
 # Customize Field Type metadata
@@ -7,7 +7,7 @@ description: You can customize which Field Type metadata should be disabled in t
 When creating a content type definition, you add Fields and configure their metadata,
 such as whether they are required, translatable, and so on.
 
-If needed, you can customize that some of those options are disabled in the Back Office for specific Field Types.
+If needed, you can customize that some of those options are disabled in the back office for specific Field Types.
 To do this, add custom service definition for `ModifyFieldDefinitionsCollectionTypeExtension` 
 
 For example, this configuration means that no Image Field can be set as required in the definition of a content type:
diff --git a/docs/content_management/field_types/field_type_reference/maplocationfield.md b/docs/content_management/field_types/field_type_reference/maplocationfield.md
index 691184cb13..1a60107f9b 100644
--- a/docs/content_management/field_types/field_type_reference/maplocationfield.md
+++ b/docs/content_management/field_types/field_type_reference/maplocationfield.md
@@ -71,4 +71,4 @@ Example:
 !!! note
 
     The option to automatically get user coordinates through the "Locate me" button
-    is only available when the Back Office is served through the `https://` protocol.
+    is only available when the back office is served through the `https://` protocol.
diff --git a/docs/content_management/field_types/field_type_reference/measurementfield.md b/docs/content_management/field_types/field_type_reference/measurementfield.md
index 317db3ebcf..dce99b79aa 100644
--- a/docs/content_management/field_types/field_type_reference/measurementfield.md
+++ b/docs/content_management/field_types/field_type_reference/measurementfield.md
@@ -126,7 +126,7 @@ to be marked as `is_base_unit` as in highlighted line above.
 
 !!! note
 
-    To be available for selection in the Back Office, each new Measurement type or unit must be enabled for the  Back Office SiteAccess.
+    To be available for selection in the back office, each new Measurement type or unit must be enabled for the  back office SiteAccess.
 
 Next, you need to define how the new unit should be converted under the `ibexa.system.<scope>.ibexa_measurement` [configuration key](configuration.md#configuration-files):
 
diff --git a/docs/content_management/field_types/field_type_reference/pagefield.md b/docs/content_management/field_types/field_type_reference/pagefield.md
index fd1600083e..6f6e171da8 100644
--- a/docs/content_management/field_types/field_type_reference/pagefield.md
+++ b/docs/content_management/field_types/field_type_reference/pagefield.md
@@ -16,7 +16,7 @@ Page Field Type is only used in the Page content type that is included in [[= pr
 
     If you create content type with both `ezlandingpage` and `ezuser` Field Types,
     you will not be redirected to Page Builder after selecting `Edit` or `Create`.
-    This is caused by `ezuser` Field Type which requires separate handling. You will be redirected to the standard Back Office edit or create mode.
+    This is caused by `ezuser` Field Type which requires separate handling. You will be redirected to the standard back office edit or create mode.
 
 ## Layout and zones
 
diff --git a/docs/content_management/field_types/form_and_template.md b/docs/content_management/field_types/form_and_template.md
index 2e0e8576af..5db3b4e5d3 100644
--- a/docs/content_management/field_types/form_and_template.md
+++ b/docs/content_management/field_types/form_and_template.md
@@ -1,5 +1,5 @@
 ---
-description: Field Type FormMappers allow Field editing, while custom templates ensure the Field can be rendered both in the Back office and on site front.
+description: Field Type FormMappers allow Field editing, while custom templates ensure the Field can be rendered both in the back office and on site front.
 ---
 
 # Form and template
@@ -180,11 +180,11 @@ ibexa:
                     priority: 10
 ```
 
-## Back Office templates
+## Back office templates
 
-### Back Office view template
+### Back office view template
 
-For templates for previewing the Field in the Back Office,
+For templates for previewing the Field in the back office,
 using the design engine is recommended with `ibexa_standard_design.override_kernel_templates` set to `true`.
 With the design engine you can apply a template (e.g. `Resources/views/themes/admin/content_fields.html.twig`) without any extra configuration.
 
@@ -200,7 +200,7 @@ ibexa:
 
 ### Field edit template
 
-To use a template for the Field edit form in the Back Office, you need to specify it in configuration
+To use a template for the Field edit form in the back office, you need to specify it in configuration
 under the `twig.form_themes` [configuration key](configuration.md#configuration-files):
 
 ``` yaml
diff --git a/docs/content_management/file_management/binary_and_media_download.md b/docs/content_management/file_management/binary_and_media_download.md
index c74c9b6b94..a58ca67006 100644
--- a/docs/content_management/file_management/binary_and_media_download.md
+++ b/docs/content_management/file_management/binary_and_media_download.md
@@ -4,7 +4,7 @@ description: Create route to to enable binary and media files download.
 
 # Binary and Media download
 
-You can restrict files stored in BinaryFile or Media Fields to certain user Roles.
+You can restrict files stored in BinaryFile or Media Fields to certain user roles.
 These files are not publicly downloadable from disk, and are instead served by Symfony, using a custom route that runs the necessary checks.
 This route is automatically generated as the `url` property for those Field values.
 
diff --git a/docs/content_management/forms/create_custom_form_field.md b/docs/content_management/forms/create_custom_form_field.md
index eea7376899..a8939659e5 100644
--- a/docs/content_management/forms/create_custom_form_field.md
+++ b/docs/content_management/forms/create_custom_form_field.md
@@ -62,7 +62,7 @@ Then, register the mapper as a service:
 [[= include_file('code_samples/forms/custom_form_field/config/custom_services.yaml', 0, 7) =]]
 ```
 
-Now you can go to Back Office and build a new form.
+Now you can go to back office and build a new form.
 You should be able to see the new section in the list of available fields:
 
 ![Custom form fields](extending_form_builder_custom_form_fields.png)
diff --git a/docs/content_management/forms/create_form_attribute.md b/docs/content_management/forms/create_form_attribute.md
index e3144cb7bd..e89fb7194e 100644
--- a/docs/content_management/forms/create_form_attribute.md
+++ b/docs/content_management/forms/create_form_attribute.md
@@ -113,7 +113,7 @@ Create a `src/FormBuilder/FormSubmission/Converter/RichtextDescriptionFieldSubmi
 [[= include_file('code_samples/forms/custom_form_attribute/src/FormBuilder/FormSubmission/Converter/RichtextDescriptionFieldSubmissionConverter.php') =]]
 ```
 
-Now you can go to Back Office and build a new form.
+Now you can go to back office and build a new form.
 In the main menu, click **Content** -> **Forms** -> **Create content**, and select **Form**.
 
 You should be able to see the new section in the list of available fields:
diff --git a/docs/content_management/images/add_image_asset_from_dam.md b/docs/content_management/images/add_image_asset_from_dam.md
index 4e80a266ce..0dbf5f62eb 100644
--- a/docs/content_management/images/add_image_asset_from_dam.md
+++ b/docs/content_management/images/add_image_asset_from_dam.md
@@ -75,7 +75,7 @@ dam_unsplash:
 You can customize the parameters according to your needs. 
 For more information about supported parameters, see the [Unsplash documentation](https://unsplash.com/documentation#dynamically-resizable-images).
 
-In the Back Office, go to **Admin** > **Content types**.
+In the back office, go to **Admin** > **Content types**.
 In the **Content** group, create a content type for DAM images, which includes the ImageAsset Field. 
 
 Now, when you use the Embed block in the Page Builder, you should see a DAM Image.
diff --git a/docs/content_management/locations.md b/docs/content_management/locations.md
index abf2839fc3..0e1db7d2ed 100644
--- a/docs/content_management/locations.md
+++ b/docs/content_management/locations.md
@@ -9,7 +9,7 @@ When a new content item is published, it is automatically placed in a new Locati
 All Locations form a tree which is the basic way of organizing content in the system.
 Every published content item has a Location and, as a consequence, also a place in this tree.
 
-![Content Tree - locations](content_management_tree_locations.png "Content Tree - locations")
+![Content tree - locations](content_management_tree_locations.png "Content tree - locations")
 
 A content item receives a Location only once it has been published.
 This means that a new unpublished draft does not have a Location yet.
@@ -21,7 +21,7 @@ A content item can have more than one Location. It is then present in two or mor
 For example, an article can be at the same time under "Local news" and "Sports news".
 Even in such a case, one of these places is always the main Location.
 
-You can change the main Location in the Back Office in the **Locations** tab,
+You can change the main Location in the back office in the **Locations** tab,
 or [through the API](managing_content.md#changing-the-main-location).
 
 ![Locations](content_management_locations.png "Locations")
@@ -65,13 +65,13 @@ It contains a Folder content item.
 ![Users in admin panel](admin_panel_users.png "Users in admin panel")
 
 A User is simply a content item of the User account content type.
-The Users are organized within User Group content items below this Location.
+The Users are organized within user group content items below this Location.
 
-In other words, the **Users** Location contains the actual Users and User Groups,
+In other words, the **Users** Location contains the actual Users and user groups,
 which can be viewed by selecting the **Users** tab in the Admin Panel.
 
 The default ID number of the **Users** Location is 5.
-It contains User Group content items.
+It contains user group content items.
 
 ### Forms [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
diff --git a/docs/content_management/pages/create_custom_page_block.md b/docs/content_management/pages/create_custom_page_block.md
index f99965830b..fdc0b28720 100644
--- a/docs/content_management/pages/create_custom_page_block.md
+++ b/docs/content_management/pages/create_custom_page_block.md
@@ -62,7 +62,7 @@ The template with the greatest priority is used as the default one.
 
 ## Add block JavaScript
 
-If your block is animated with JavaScript, you may have to take precaution to keep it working when previewed in Back Office's Page Builder.
+If your block is animated with JavaScript, you may have to take precaution to keep it working when previewed in back office's Page Builder.
 
 If you use an event related to the page being loaded to trigger the initialisation of your custom block, a freshly added block doesn't work in the Page Builder preview.
 For example, the [`DOMContentLoaded`](https://developer.mozilla.org/en-US/docs/Web/API/Document/DOMContentLoaded_event) event isn't fired when a block is dragged into the page as the DOM is already loaded.
diff --git a/docs/content_management/pages/page_builder_guide.md b/docs/content_management/pages/page_builder_guide.md
index 26e84f9cc6..a729854f2b 100644
--- a/docs/content_management/pages/page_builder_guide.md
+++ b/docs/content_management/pages/page_builder_guide.md
@@ -29,8 +29,8 @@ To create a new page:
 
 ### Edit page
 
-You can edit any existing page by using Page Builder. To do it, in the Back Office go to **Content** and select **Content structure**.
-Then, from the Content Tree choose the page and click **Edit**.
+You can edit any existing page by using Page Builder. To do it, in the back office go to **Content** and select **Content structure**.
+Then, from the content tree choose the page and click **Edit**.
 
 ## What is Page Builder
 
@@ -93,7 +93,7 @@ Page Builder has two main views that you can use while creating a page:
 
 ![Page blocks](page_blocks_toolbar.png)
 
-- Structure view - shows a structure of the page, including its division into zones and the blocks that it contains. It follows the behavior of the Content Tree. Structure view has ability to reorder blocks using drag and drop.
+- Structure view - shows a structure of the page, including its division into zones and the blocks that it contains. It follows the behavior of the content tree. Structure view has ability to reorder blocks using drag and drop.
 
 ![Structure view](structure_view.png)
 
diff --git a/docs/content_management/rich_text/extend_online_editor.md b/docs/content_management/rich_text/extend_online_editor.md
index a910df5ef9..a5d75604cf 100644
--- a/docs/content_management/rich_text/extend_online_editor.md
+++ b/docs/content_management/rich_text/extend_online_editor.md
@@ -14,7 +14,7 @@ and creating [custom buttons](https://ckeditor.com/docs/ckeditor4/latest/guide/w
 Online Editor is based on the CKEditor5.
 Refer to [CKEditor5 documentation](https://ckeditor.com/docs/ckeditor5/latest/index.html) to learn 
 how you can extend the Online Editor with even more elements.
-For more information about extending the Back Office, see [Extend Back Office](back_office.md).
+For more information about extending the back office, see [Extend back office](back_office.md).
 
 ## Configure custom tags
 
@@ -58,7 +58,7 @@ Add labels for the new tag by providing translations in `translations/custom_tag
 ```
 
 Now you can use the tag.
-In the Back Office, create or edit a content item that has a RichText Field Type.
+In the back office, create or edit a content item that has a RichText Field Type.
 In the Online Editor, click **Add**, and from the list of available tags select the FactBox tag icon.
 
 ![FactBox Tag](custom_tag_factbox.png "FactBox Tag in the Online Editor")
@@ -105,7 +105,7 @@ Add labels for the tag by providing translations in `translations/custom_tags.en
 ```
 
 Now you can use the tag.
-In the Back Office, create or edit a content item that has a RichText Field Type.
+In the back office, create or edit a content item that has a RichText Field Type.
 In the Online Editor's toolbar, click **Show more items**, and from the list of available tags select the Link tag icon.
 
 ![Link Tag](custom_tag_link.png "Link Tag in the Online Editor") 
@@ -186,7 +186,7 @@ The template files for the front end could look as follows:
 <div {% if id is defined %}id="{{ id }}"{% endif %} class="{% if align is defined %}align-{{ align }}{% endif %} ezstyle-{{ name }}">{% apply spaceless %}{{ content|raw }}{% endapply %}</div>
 ```
 
-Templates for Content View in the Back Office would be `templates/themes/admin/field_type/ezrichtext/custom_styles/highlighted_word.html.twig` and `templates/themes/admin/field_type/ezrichtext/custom_styles/highlighted_block.html.twig` respectively (assuming that the Back Office SiteAccess uses the default `admin` theme).
+Templates for Content View in the back office would be `templates/themes/admin/field_type/ezrichtext/custom_styles/highlighted_word.html.twig` and `templates/themes/admin/field_type/ezrichtext/custom_styles/highlighted_block.html.twig` respectively (assuming that the back office SiteAccess uses the default `admin` theme).
 
 ### Use cases
 
diff --git a/docs/content_management/url_management/url_management.md b/docs/content_management/url_management/url_management.md
index 5105291f39..7b4bb46063 100644
--- a/docs/content_management/url_management/url_management.md
+++ b/docs/content_management/url_management/url_management.md
@@ -4,7 +4,7 @@ description: Manage URL aliases and wildcards, and validate external URLs.
 
 # URL management
 
-You can manage external URL addresses and URL wildcards in the Back Office, **Admin** tab, the **URL Management** node.
+You can manage external URL addresses and URL wildcards in the back office, **Admin** tab, the **URL Management** node.
 Configure URL aliases to have human-readable URL addresses throughout your system.
 
 ## Link manager
@@ -228,7 +228,7 @@ Also, you can decide whether the user sees the content at the address that uses
 For example, a URL wildcard called `pictures/*/*` can use `media/images/{1}/{2}` as destination.
 In this case, accessing `<yourdomain>/pictures/home/photo/` loads `<yourdomain>/media/images/home/photo/`.
 
-You can configure URL wildcards either in the Back Office, or with the public PHP API.
+You can configure URL wildcards either in the back office, or with the public PHP API.
 
 Before you configure URL wildcards, you must enable the feature in configuration:
 
@@ -238,7 +238,7 @@ ibexa:
         enabled: true
 ```
 
-### Configuring URL wildcards in the Back Office
+### Configuring URL wildcards in the back office
 
 The URL wildcards tab contains all the information about each URL wildcard. You can delete or modify existing entries, or create new ones.
 
diff --git a/docs/content_management/user_generated_content.md b/docs/content_management/user_generated_content.md
index c820ff0832..0d9c063da4 100644
--- a/docs/content_management/user_generated_content.md
+++ b/docs/content_management/user_generated_content.md
@@ -5,7 +5,7 @@ description: You can enable users to create new content in the Repository by usi
 # User-generated content
 
 [[= product_name =]] comes with content edition features via the Symfony stack.
-They are meant to allow the implementation of user-generated content from the front end, without entering the Back Office.
+They are meant to allow the implementation of user-generated content from the front end, without entering the back office.
 
 ## Creating a new draft
 
diff --git a/docs/customer_management/cp_applications.md b/docs/customer_management/cp_applications.md
index 280857bf8e..ee857f5c83 100644
--- a/docs/customer_management/cp_applications.md
+++ b/docs/customer_management/cp_applications.md
@@ -6,7 +6,7 @@ edition: experience
 # Customer Portal applications
 
 New business customers can apply for a company account.
-Applications go through the approval process in the Back Office where they can be accepted, rejected or put on hold.
+Applications go through the approval process in the back office where they can be accepted, rejected or put on hold.
 If they are accepted, the business partner receives an invitation link to the Customer Portal,
 where they can set up their team and manage their account.
 
@@ -15,11 +15,11 @@ If provided options are too limited, you can customize an approval process by yo
 
 ## Roles and policies
 
-Any user can become application approver, as long as they have the `Company Application/Workflow` Policy assigned to their Role.
+Any user can become application approver, as long as they have the `Company Application/Workflow` policy assigned to their role.
 There, you can define between which states the user may move applications.
 For example, the assistant can put new applications on hold, or reject them, and only the manager can accept them.
 
-![Company Application Policy](img/cp_company_application_policy.png)
+![Company Application policy](img/cp_company_application_policy.png)
 
 ## Customer Portal application configuration
 
diff --git a/docs/customer_management/cp_configuration.md b/docs/customer_management/cp_configuration.md
index e529199452..1180136082 100644
--- a/docs/customer_management/cp_configuration.md
+++ b/docs/customer_management/cp_configuration.md
@@ -26,7 +26,7 @@ ibexa:
             user_content_type_identifier: ['user', 'customer']
 ```
 
-## Roles and Policies
+## Roles and policies
 
 You can add custom roles to your installation
 by listing them under the `ibexa.site_access.config.default.corporate_accounts.roles` [configuration](configuration.md#configuration-files).
@@ -45,7 +45,7 @@ You can do it per SiteAccess or SiteAccess group by using [SiteAccess-aware conf
 ## Content type names
 
 You can change names of default content types by assigning what
-content types should be used to describe `Company` and `Member` in the Back Office.
+content types should be used to describe `Company` and `Member` in the back office.
 Proceed only if you already have a `Company` content type in your system, and you don't want to change its identifier.
 
 Configuration for content type names is placed under the `ibexa_corporate_account` key,
diff --git a/docs/customer_management/customer_portal_guide.md b/docs/customer_management/customer_portal_guide.md
index 388d6d4a26..1947fe66fa 100644
--- a/docs/customer_management/customer_portal_guide.md
+++ b/docs/customer_management/customer_portal_guide.md
@@ -50,18 +50,18 @@ This setup is recommended for global markets or company-specific portals, where
 
 ### Company management
 
-The main company management takes place in the Back Office where each company has its own profile where sales representative can find:
+The main company management takes place in the back office where each company has its own profile where sales representative can find:
 
 - summary with basic information and order history
 - company profile with billing information and contact person
 - list of members and pending invitations
 - address book with multiple shipping addresses
 
-![Companies section in Back Office](img/cp_back_office.png)
+![Companies section in back office](img/cp_back_office.png)
 
 From there, they can activate and deactivate the company, edit its information, invite members, manage their roles and edit their basic information.
 
-In the Roles section, you can define Policies for each user group, for example, a Company buyer. 
+In the roles section, you can define policies for each user group, for example, a Company buyer. 
 You can also set up Policies for every user who has a business account by editing a Corporate Access role.
 
 ### Members
@@ -83,7 +83,7 @@ All roles and policies associated with them can be fully customized to fit your
 
 Members can be invited to the organization from:
 
-- the Back Office: go to **Customers** -> **Companies** -> **Select your company** -> **Invitations** -> **Invite member**
+- the back office: go to **Customers** -> **Companies** -> **Select your company** -> **Invitations** -> **Invite member**
 
 - the Customer Portal: go to your company admin profile, select **Members** -> **Invite members**
 
@@ -101,7 +101,7 @@ With it, they can register and create their account in the Customer Portal.
 ### Company self-registration
 
 Self-registration allows business customers to take charge and apply for a business account by themselves. 
-Applications go through the approval process in the Back Office where they can be accepted, rejected or put on hold. 
+Applications go through the approval process in the back office where they can be accepted, rejected or put on hold. 
 If they are accepted, the business partner receives an invitation link to the Customer Portal, where they can set up their team and manage their account.
 
 To apply for a business account, a company needs to provide their basic information, 
@@ -109,7 +109,7 @@ contact information and billing address in an application.
 
 ![Company self-registration](img/cp_registration.png)
 
-The approval process is customizable. You can decide which user has approval rights by granting them Company Application/Workflow Policy, 
+The approval process is customizable. You can decide which user has approval rights by granting them `Company Application/Workflow` policy, 
 you can also decide between which states the user may move applications:
 
 - on hold
@@ -126,7 +126,7 @@ Customer Portal comes with [REST API](https://doc.ibexa.co/en/latest/api/rest_ap
 
 ### Company management
 
-Sales representatives can manage details for companies they are associated with, such as contact persons, billing addresses, and more by accessing Back Office.
+Sales representatives can manage details for companies they are associated with, such as contact persons, billing addresses, and more by accessing back office.
 Company admins are also able to manage the company's details in the Customer Portal interface.
 By giving users power to manage their own accounts, you reduce the need for administrative interventions.
 
diff --git a/docs/getting_started/first_steps.md b/docs/getting_started/first_steps.md
index d3eea3ec7b..bada50d4b0 100644
--- a/docs/getting_started/first_steps.md
+++ b/docs/getting_started/first_steps.md
@@ -35,7 +35,7 @@ module.exports = [ eZConfig, ibexaConfig, ...customConfigs ];
 
 ## Add a content type
 
-1\. In your browser, go to the Back Office: `<your_domain>/admin`, and use the default credentials to log in: `admin/publish`.
+1\. In your browser, go to the back office: `<your_domain>/admin`, and use the default credentials to log in: `admin/publish`.
 
 !!! caution "Password change"
 
@@ -99,7 +99,7 @@ Content view templates use the [Twig templating engine](https://twig.symfony.com
 
 ## Create content and test view templates
 
-1\. Go to the Back Office, activate Content/Content structure and create a new content item by clicking **Create content**.
+1\. Go to the back office, activate Content/Content structure and create a new content item by clicking **Create content**.
 
 ![Creating a Blog Post](first-steps-create-content.png)
 
@@ -162,7 +162,7 @@ de:
 
 This means that German will be used as the main language for this SiteAccess, and English as a fallback.
 
-2\. Go to the Back Office and select **Admin** > **Languages**. Add a new language called "German", with the language code `ger-DE`.
+2\. Go to the back office and select **Admin** > **Languages**. Add a new language called "German", with the language code `ger-DE`.
 Make sure it is enabled.
 
 ![Creating a language](first-steps-create-language.png)
@@ -221,19 +221,19 @@ This means that the app will look for the `blog_post.html.twig` file in a folder
 
 To allow a group of users to edit only a specific content type (in this example, blog posts), you need to set up permissions for them.
 
-Users and User Groups are assigned Roles. A Role can contain a number of Policies, which are rules that permit the user to perform a specific function.
-Policies can be additionally restricted by Limitations.
+Users and user groups are assigned roles. A role can contain a number of policies, which are rules that permit the user to perform a specific function.
+Policies can be additionally restricted by limitations.
 
-1\. Go to Admin > Users. Create a new User Group (the same way you create regular Content).
+1\. Go to Admin > Users. Create a new user group (the same way you create regular Content).
 Call the group "Bloggers".
 
 2\. In the new group create a User. Remember their username and password. Mark the user as "Enabled".
 
 ![Creating a User](first-steps-create-user.png)
 
-3\. Go to Admin > Roles. Create a new Role called "Blogger".
+3\. Go to **Admin** -> **Roles**. Create a new role called "Blogger".
 
-4\. Add Policies that will allow the User to log in:
+4\. Add policies that will allow the User to log in:
 
 - `User/Login`
 - `Content/Read`
@@ -241,17 +241,17 @@ Call the group "Bloggers".
 - `Section/View`
 - `Content/Reverserelatedlist`
 
-5\. Now add Policies that will allow the User to create and publish content, limited to Blog Posts:
+5\. Now add policies that will allow the User to create and publish content, limited to Blog Posts:
 
 - `Content/Create` with Limitation for content type Blog Post
 - `Content/Edit` with Limitation for content type Blog Post
 - `Content/Publish` with Limitation for content type Blog Post
 
-![Adding Limitations to a Policy](first-steps-policy-limitations.png)
+![Adding Limitations to a policy](first-steps-policy-limitations.png)
 
-6\. In the Assignments tab assign the "Blogger" Role to the "Bloggers" group.
+6\. In the Assignments tab assign the "Blogger" role to the "Bloggers" group.
 
-![Assigning a Role](first-steps-assign-roles.png)
+![Assigning a role](first-steps-assign-roles.png)
 
 You can now log out and log in again as the new User.
 You will be able to create Blog Posts only.
diff --git a/docs/getting_started/troubleshooting.md b/docs/getting_started/troubleshooting.md
index 8a9cff5a00..421535ce91 100644
--- a/docs/getting_started/troubleshooting.md
+++ b/docs/getting_started/troubleshooting.md
@@ -38,7 +38,7 @@ When a system runs out of RAM, you may see `Killed` when trying to clear the cac
 
 ## Upload size limit
 
-To make use of the Back Office, the defined maximum upload size must be consistent with the maximum file size defined in the content type using a File, Media or Image Field.
+To make use of the back office, the defined maximum upload size must be consistent with the maximum file size defined in the content type using a File, Media or Image Field.
 
 This is done by setting `LimitRequestBody` for Apache or `client_max_body_size` for nginx.
 
diff --git a/docs/ibexa_products/ibexa_experience.md b/docs/ibexa_products/ibexa_experience.md
index b88a160ba9..26bad17a35 100644
--- a/docs/ibexa_products/ibexa_experience.md
+++ b/docs/ibexa_products/ibexa_experience.md
@@ -63,7 +63,7 @@ Additionaly, you can monitor and manage the information obtained from website vi
 
 #### Site Factory
 
-[Site Factory ](site_factory.md) is a site management interface, integrated with the Back Office.
+[Site Factory ](site_factory.md) is a site management interface, integrated with the back office.
 It enables you to configure new sites without leaving the administration interface and editing SiteAccess configuration.
 With this feature you can create and deploy multiple websites at lightning speed and at scale.
 It allows you to manage expenses and resources while industrializing your web presence.
diff --git a/docs/ibexa_products/ibexa_headless.md b/docs/ibexa_products/ibexa_headless.md
index 850da65191..d8123422ab 100644
--- a/docs/ibexa_products/ibexa_headless.md
+++ b/docs/ibexa_products/ibexa_headless.md
@@ -11,7 +11,7 @@ The Headless edition of [[= product_name =]] focuses on content management.
 It provides tools to collaboratively create content, and interfaces (API) to distribute this content.
 
 Multilingual, multichannel, extensible, [[= product_name_headless =]] is an advanced Content Management Framework (CMF), a Product Information Management (PIM) platform, as well as a Digital Asset Management (DAM) repository.
-It's provided without a default front office, but with a complete Back Office and several APIs to manage and access content.
+It's provided without a default front office, but with a complete back office and several APIs to manage and access content.
 
 ![Ibexa Headless](ibexa_headless.png)
 
@@ -25,7 +25,7 @@ You can [contact us](https://www.ibexa.co/about-ibexa/contact-us) or [contact on
 
 ### Editorial stage
 
-You access with any web browser from any platform to a rich Back Office, the main place to
+You access with any web browser from any platform to a rich back office, the main place to
 
 - define users and their rights (customers, subscribers, editors, etc.),
 - organize content (content types, fields, tree, tags, languages, and more),
@@ -58,7 +58,7 @@ APIs summary:
 
 ## Capabilities and benefits
 
-[[= product_name_headless =]] is a tool box with a Back Office.
+[[= product_name_headless =]] is a tool box with a back office.
 It comes without a default front office.
 You don't lose time to develop a theme for a provided front office before discovering it won't fit your needs.
 No distraction.
@@ -97,15 +97,15 @@ There are many paths to access the content in many shapes:
 - [[= product_name_headless =]] offers a complete PHP API to extend the ways to access content.
 - A design engine and a view controller offer to create plain text content views (such as HTML, JSON, XML, CSS, JS, CSV, or Markdown),
   and to factorize those views by using theme cascades.
-  This design engine is used in the Back Office which is equally extendable.
+  This design engine is used in the back office which is equally extendable.
 - Multichannel, content can be accessed through several channel configurations,
   such as the domain name it replies to, the sub-part of the content tree it starts from, the users rights, or the design theme.
-  The Back Office itself is such a channel.
+  The back office itself is such a channel.
 - Multi-repository, the same platform can use separate databases if data isolation is needed between channel groups.
 
 ### Advanced features
 
-On top of this strong core, [[= product_name_headless =]] brings tools to increase user experience, from final front users to Back Office contributors.
+On top of this strong core, [[= product_name_headless =]] brings tools to increase user experience, from final front users to back office contributors.
 
 #### Complete DXP
 
@@ -116,7 +116,7 @@ On top of this strong core, [[= product_name_headless =]] brings tools to increa
 - Content scheduler, which allows you to establish the future of the content and use events to have a living front application, even when the editorial team is absent or reduced.
 This way, visitors can discover new content at midnight, during weekends or vacations.
 A calendar summarises those scheduled content events.
-Like everything in the Back Office, the calendar is extendable: you can add an event source to coordinate content events with other company events.
+Like everything in the back office, the calendar is extendable: you can add an event source to coordinate content events with other company events.
 
 #### Many ways to structure and organize content
 
@@ -172,7 +172,7 @@ Several features help end users collaborate on the content, such as:
 
 ## Use cases
 
-As a content repository with an omnipotent Back Office,
+As a content repository with an omnipotent back office,
 many APIs to absorb, compute and distribute content,
 even a recommendation engine to deliver the right content to various readers,
 [[= product_name_headless =]] can be used in several cases.
@@ -196,4 +196,4 @@ Thanks to migration feature and PHP API, existing content has been imported from
 Fine-tuned user rights and workflows ensure that each collaborator can focus on their own tasks without the risk to disturb the content model or content organization.
 Content is distributed on several websites and applications, some running on the [[= product_name_base =]] platform itself, some on third parties' servers, some as native mobile apps.
 Part of the content has multiple locations or is translated, and reused from place to place.
-While the Back Office offers to search into the whole repository, the front end apps have correctly circumscribed search capabilities.
+While the back office offers to search into the whole repository, the front end apps have correctly circumscribed search capabilities.
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
index 81e7faf16c..2b1afda9f9 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
@@ -7,7 +7,7 @@ description: Context-aware HTTP cache caches requests depending on the logged-in
 [[= product_name =]] allows caching requests made by logged-in users.
 This is called (user) context-aware cache.
 
-It means that HTTP cache is unique per set of user permissions (Roles and Limitations), 
+It means that HTTP cache is unique per set of user permissions (roles and limitations), 
 and there are variations of cache shared only among users that have the exact same permissions. 
 So if a user browses a list of children Locations, they will only see children Locations 
 they have access to, even if their rendering is served from HTTP cache.
@@ -132,7 +132,7 @@ This solution requires more effort (controller, VCL logic and adapting your own
 
 For information on how user context hashes are generated, see [FOSHttpCacheBundle documentation](https://foshttpcachebundle.readthedocs.io/en/latest/features/user-context.html#generating-hashes).
 
-[[= product_name =]] implements a custom context provider in order to make user context hash reflect the current User's Roles and Limitations.
+[[= product_name =]] implements a custom context provider in order to make user context hash reflect the current User's roles and Limitations.
 This is needed given [[= product_name =]]'s more complex permission model compared to Symfony's.
 
 You can technically extend the user context hash by [implementing your own custom context provider(s)](https://foshttpcachebundle.readthedocs.io/en/latest/reference/configuration/user-context.html#custom-context-providers).
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md b/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
index cb1ac55e2b..e6f50c7c59 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
@@ -72,7 +72,7 @@ Failing to configure reverse proxies correctly may introduce several problems, i
 
 - [[= product_name =]] generating links with a wrong protocol schema (HTTP instead of HTTPS) if HTTPS termination is done before the web server due to the `X-Forward-Proto` headers being ignored
 - [[= product_name =]] generating links with wrong port numbers due to the `X-Forward-Port` headers being ignored
-- Back Office showing the login screen because JWT tokens are not accepted due to the `X-Forward-For` headers being ignored
+- back office showing the login screen because JWT tokens are not accepted due to the `X-Forward-For` headers being ignored
 
 ### Configure Symfony front controller
 
@@ -326,11 +326,11 @@ with the following logic in the out-of-the-box VCL:
 Serving grace is not always allowed by default because:
 
 - It is a safe default. Even if just for anonymous users, stale cache can easily be confusing during acceptance testing.
-- It means REST API, which is used by the Back Office, would serve stale data, breaking the UI.
+- It means REST API, which is used by the back office, would serve stale data, breaking the UI.
 
 !!! tip "Customizing stale cache handling"
 
     If you want to use grace handling for logged-in users as well, you can adapt the provided VCL to add a condition
-    for opting out if the request has a cookie and the path contains REST API prefix to make sure the Back Office is not negatively affected.
+    for opting out if the request has a cookie and the path contains REST API prefix to make sure the back office is not negatively affected.
 
     If you want to disable grace mode, you can adapt the VCL to do hard instead of soft purges, or set grace/stale time to `0s`.
diff --git a/docs/infrastructure_and_maintenance/clustering/clustering_with_ddev.md b/docs/infrastructure_and_maintenance/clustering/clustering_with_ddev.md
index 6d5e2c8f0d..bf2c88e792 100644
--- a/docs/infrastructure_and_maintenance/clustering/clustering_with_ddev.md
+++ b/docs/infrastructure_and_maintenance/clustering/clustering_with_ddev.md
@@ -117,7 +117,7 @@ ddev php bin/console cache:clear
 
 You can now check whether Redis works.
 
-For example, the `ddev redis-cli MONITOR` command returns outputs such as `"SETEX" "ezp:`, `"MGET" "ezp:`, `"SETEX" "PHPREDIS_SESSION:`, `"GET" "PHPREDIS_SESSION:`, etc. while navigating into the website, in particular the Back Office.
+For example, the `ddev redis-cli MONITOR` command returns outputs such as `"SETEX" "ezp:`, `"MGET" "ezp:`, `"SETEX" "PHPREDIS_SESSION:`, `"GET" "PHPREDIS_SESSION:`, etc. while navigating into the website, in particular the back office.
 
 See [Redis commands](https://redis.io/commands/) for more details such as information about the [`MONITOR`](https://redis.io/commands/monitor/) command used in the previous example.
 
diff --git a/docs/infrastructure_and_maintenance/request_lifecycle.md b/docs/infrastructure_and_maintenance/request_lifecycle.md
index 0cd5ee7eb6..1fc63749c4 100644
--- a/docs/infrastructure_and_maintenance/request_lifecycle.md
+++ b/docs/infrastructure_and_maintenance/request_lifecycle.md
@@ -118,7 +118,7 @@ The `locale_listener` (priority 16) sets the request's **`_locale`** attribute.
 
     Another `kernel.request` event listener is the `Ibexa\AdminUi\EventListener\RequestListener` (priority 13).
     When a route gets a `siteaccess_group_whitelist` parameter, this listener checks that the current SiteAccess is in one of the listed groups.
-    For example, the Back Office sets an early protection of its routes by passing them a `siteaccess_group_whitelist` containing only the `admin_group`.
+    For example, the back office sets an early protection of its routes by passing them a `siteaccess_group_whitelist` containing only the `admin_group`.
 
 Now, when the `Request` knows its controller, the `HttpKernel` dispatches the `kernel.controller` event.
 
diff --git a/docs/infrastructure_and_maintenance/security/security_checklist.md b/docs/infrastructure_and_maintenance/security/security_checklist.md
index 29cfd34d29..b9602182e9 100644
--- a/docs/infrastructure_and_maintenance/security/security_checklist.md
+++ b/docs/infrastructure_and_maintenance/security/security_checklist.md
@@ -84,7 +84,7 @@ See also [PHP's own security manual](https://www.php.net/manual/en/security.php)
 Make sure Admin users and other privileged users who have access to System Information and setup in the back end
 are vetted and fully trustworthy.
 
-As administrator you have access to full information about the system through the `setup/system_info` Policy,
+As administrator you have access to full information about the system through the `setup/system_info` policy,
 and also to user data, Role editing, and many other critical aspects.
 
 ### Strong passwords
@@ -117,7 +117,7 @@ before they have logged in, including would-be attackers. If an attacker uses th
 address, the attacker does not receive the email. But they could still try to guess the password reset link. That's why
 this interval should be as short as possible. 5 minutes is often enough.
 
-[[= product_name =]] allows you to create and send invitations to create an account in the frontend as a customer, the Back Office
+[[= product_name =]] allows you to create and send invitations to create an account in the frontend as a customer, the back office
 as an employee, or the Corporate Portal as a business partner. You can send invitations to individual users or in
 bulk. These invitations time out according to the parameter
 `ibexa.site_access.config.default.user_invitation.hash_expiration_time`. This can safely be longer than the "forgot password" time,
@@ -160,16 +160,16 @@ The older UTF8 can lead to truncation with 4-byte characters, like some emoji, w
 
 See [Change from UTF8 to UTF8MB4](update_db_to_2.5.md#change-from-utf8-to-utf8mb4).
 
-### Use secure Roles and Policies
+### Use secure roles and policies
 
-Use the following checklist to ensure the Roles and Policies are secure:
+Use the following checklist to ensure the roles and policies are secure:
 
-- Do Roles restrict read/write access to content as they should? Is read/write access to personal data, like User content items, properly restricted?
-- Are the Roles and their use properly differentiated and restricted? Is an editor Role used for everyday editorial work?
-- Is the admin Role used only for high-level administrative work? Is the number of people with admin access properly restricted and vetted?
+- Do roles restrict read/write access to content as they should? Is read/write access to personal data, like User content items, properly restricted?
+- Are the roles and their use properly differentiated and restricted? Is an editor role used for everyday editorial work?
+- Is the admin role used only for high-level administrative work? Is the number of people with admin access properly restricted and vetted?
 - Should people be allowed to create new user accounts themselves? Should such accounts be enabled by default, or require vetting by admins?
-- Is the Role of self-created new users restricted as intended?
-- Is there a clear Role separation between the organisation's internal and external users?
+- Is the role of self-created new users restricted as intended?
+- Is there a clear role separation between the organisation's internal and external users?
 - Is access to user data properly restricted, in accordance with GDPR?
 
 ### Do not use "hide" for read access restriction
@@ -188,8 +188,8 @@ Or use other permission-based [**Limitations**](https://doc.ibexa.co/en/latest/p
 
 Security should be a multi-layered exercise. It is wise to minimize what features you make available to the world, even if there are no known or suspected vulnerabilities in those features, and even if your content is properly protected by roles and policies. Reduce your attack surface by exposing only what you must.
 
-- If possible, make the Back Office unavailable on the open internet.
-- [Symfony FOSJsRoutingBundle](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle) is required in those releases where it is included, to expose routes to JavaScript. It exposes only the required routes, nothing more. It is only required in the Back Office site access though, so you can consider blocking it in other site accesses. You should also go through your own custom routes, and decide for each if you need to expose them or not. See the documentation on [YAML route definitions for exposure](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle/blob/master/Resources/doc/usage.rst#generating-uris).
+- If possible, make the back office unavailable on the open internet.
+- [Symfony FOSJsRoutingBundle](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle) is required in those releases where it is included, to expose routes to JavaScript. It exposes only the required routes, nothing more. It is only required in the back office site access though, so you can consider blocking it in other site accesses. You should also go through your own custom routes, and decide for each if you need to expose them or not. See the documentation on [YAML route definitions for exposure](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle/blob/master/Resources/doc/usage.rst#generating-uris).
 - By default, a [Powered-By header](https://doc.ibexa.co/en/latest/update_and_migration/from_1.x_2.x/update_db_to_2.5/#powered-by-header) is set. It specifies what version of the DXP is running. For example, `x-powered-by: Ibexa Experience v4`. This doesn't expose anything that couldn't be detected through other means. But if you wish to obscure this, you can either omit the version number, or disable the header entirely.
 - Consider whether certain interfaces must be left available on the open internet. For example:
     - The `/search` and `/graphql` endpoints
diff --git a/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md b/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md
index 7a18b7c63c..f19508f8e4 100644
--- a/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md
+++ b/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md
@@ -30,17 +30,17 @@ related to the code which generates the problem.
 
 The most important clues around increasing overall performance of your [[= product_name =]]-based project can be found in [the Performance documentation page](performance.md).
 
-#### How can I translate my Back Office?
+#### How can I translate my back office?
 
-The language of the Back Office is based on the browser language.
+The language of the back office is based on the browser language.
 In order to change it you should install the proper package for your language (see [language packages list](https://github.com/ezplatform-i18n)).
-Once you have language packages installed, you can switch the language of the Back Office in the User Settings menu.
+Once you have language packages installed, you can switch the language of the back office in the User Settings menu.
 
 If you do not have a language defined in the browser, it will be selected based on the `parameters.locale_fallback` parameter located in `config/packages/ibexa.yaml`.
 
 To read more about language managing in [[= product_name =]], see the following doc pages:
 
-- [Back Office languages](back_office_translations.md)
+- [Back office languages](back_office_translations.md)
 - [Multi-language SiteAccesses and corresponding translations](set_up_translation_siteaccess.md)
 
 #### How can I apply patches to the installation?
diff --git a/docs/multisite/languages/back_office_translations.md b/docs/multisite/languages/back_office_translations.md
index 238bcf4c67..616766e137 100644
--- a/docs/multisite/languages/back_office_translations.md
+++ b/docs/multisite/languages/back_office_translations.md
@@ -1,12 +1,12 @@
 ---
-description: The language of the Back Office is selected automatically based on browser language, or you can choose it manually in user settings.
+description: The language of the back office is selected automatically based on browser language, or you can choose it manually in user settings.
 ---
 
-# Back Office translations
+# Back office translations
 
-## Enabling Back Office languages
+## Enabling back office languages
 
-All translations are available as a part of [[= product_name =]]. To enable Back Office translations, use the following configuration:
+All translations are available as a part of [[= product_name =]]. To enable back office translations, use the following configuration:
 
 ``` yaml
 ibexa:
@@ -15,8 +15,8 @@ ibexa:
             enabled: true
 ```
 
-Then clear the cache. Now you can reload your [[= product_name =]] Back Office.
-If your browser language is set to French, the Back Office will be displayed in French.
+Then clear the cache. Now you can reload your [[= product_name =]] back office.
+If your browser language is set to French, the back office will be displayed in French.
 
 !!! tip "Checking browser language"
 
@@ -32,13 +32,13 @@ If your browser language is set to French, the Back Office will be displayed in
 
     Then, run `composer run post-update-cmd` and clear the cache.
 
-### Contributing Back Office translations
+### Contributing back office translations
 
 To learn how to contribute to a translation, see [Contributing translations](contribute_translations.md).
 
-### Selecting Back Office language
+### Selecting back office language
 
-Once you have language packages enabled, you can switch the language of the Back Office
+Once you have language packages enabled, you can switch the language of the back office
 in the User Settings menu.
 
 Otherwise, the language will be selected based on the browser language.
@@ -47,7 +47,7 @@ based on `parameters.locale_fallback` in `config/packages/ibexa.yaml`.
 
 ## Custom string translations
 
-When you extend the Back Office you often need to provide labels for new elements.
+When you extend the back office you often need to provide labels for new elements.
 It is good practice to provide your labels in translations files, instead of literally,
 so they can be reused and translated into other languages.
 
@@ -120,4 +120,4 @@ The language to display will then be selected automatically based on [user prefe
 
 !!! note
 
-    You may need to clear the cache after adding new translations, before they are available in the Back Office.
+    You may need to clear the cache after adding new translations, before they are available in the back office.
diff --git a/docs/multisite/languages/languages.md b/docs/multisite/languages/languages.md
index 1867872fa7..7144112ec4 100644
--- a/docs/multisite/languages/languages.md
+++ b/docs/multisite/languages/languages.md
@@ -19,7 +19,7 @@ publishing the draft will not overwrite later modifications.
 
 ### Adding available languages
 
-The multilanguage system operates based on a global translation list that contains all languages available in the installation. Languages can be [added to this list from the Admin Panel](https://doc.ibexa.co/projects/userguide/en/latest/content_management/translate_content/) in the Back Office. After adding a language be sure to dump all assets to the file system:
+The multilanguage system operates based on a global translation list that contains all languages available in the installation. Languages can be [added to this list from the Admin Panel](https://doc.ibexa.co/projects/userguide/en/latest/content_management/translate_content/) in the back office. After adding a language be sure to dump all assets to the file system:
 
 ```
 yarn encore <environment>
@@ -40,9 +40,9 @@ For example, let's say that you need to store information about marathon contest
 
 ### Access control
 
-You can control whether a User or User Group is able to translate content or not. You do this by adding a [Language Limitation](limitation_reference.md#language-limitation) to Policies that allow creating or editing content. This Limitation enables you to define which Role can work with which languages in the system. (For more information of the permissions system, see [Permissions](permissions.md).)
+You can control whether a user or user group is able to translate content or not. You do this by adding a [Language limitation](limitation_reference.md#language-limitation) to policies that allow creating or editing content. This Limitation enables you to define which role can work with which languages in the system. (For more information of the permissions system, see [Permissions](permissions.md).)
 
-In addition, you can also control the access to the global translation list by using the Content/Translations Policy. This Policy allows users to add and remove languages from the global translation list.
+In addition, you can also control the access to the global translation list by using the Content/Translations policy. This policy allows users to add and remove languages from the global translation list.
 
 ## Using SiteAccesses for handling translations
 
diff --git a/docs/multisite/multisite_configuration.md b/docs/multisite/multisite_configuration.md
index a1d62c0127..c0a8e63559 100644
--- a/docs/multisite/multisite_configuration.md
+++ b/docs/multisite/multisite_configuration.md
@@ -38,9 +38,9 @@ A SiteAccess can be part of several groups. SiteAccess configuration has always
 
 #### `admin` SiteAccess
 
-The predefined `admin` SiteAccess in `admin_group` (configured in `config/packages/ibexa_admin_ui.yaml`) serves the Back Office.
+The predefined `admin` SiteAccess in `admin_group` (configured in `config/packages/ibexa_admin_ui.yaml`) serves the back office.
 Do not remove this group.
-If you need a multisite setup with multiple Back Offices, add any additional administration SiteAccesses to `admin_group`.
+If you need a multisite setup with multiple back offices, add any additional administration SiteAccesses to `admin_group`.
 
 In cases where the sites are on separate databases, each needs its own [repository](repository_configuration.md)
 (including their own storage and search connection), var dir, [cache pool](persistence_cache.md#persistence-cache-configuration),
@@ -75,10 +75,10 @@ ibexa:
 
 ### SiteAccess name
 
-To create a better editorial experience, you can replace the SiteAccess code in the Back Office
+To create a better editorial experience, you can replace the SiteAccess code in the back office
 with a human-readable name of the website, for example `Company site` or `Summer Sale`.
 
-You can also translate SiteAccess names. Displayed names depend on the current Back Office language.
+You can also translate SiteAccess names. Displayed names depend on the current back office language.
 
 To define translations or SiteAccess names, place them in YAML file with correct language code,
 for example `translations/ibexa_siteaccess.en.yaml`:
@@ -119,9 +119,9 @@ ibexa:
             # This value is only used if there is no setting for global scope, SiteAccess or SiteAccess group
 ```
 
-`global` and `default` scopes include the `admin` SiteAccess, which is responsible for the Back Office.
+`global` and `default` scopes include the `admin` SiteAccess, which is responsible for the back office.
 For example, the following configuration defines both the front template for articles
-and the template used in the Back Office, unless you configure other templates for a specific SiteAccess or SiteAccess group:
+and the template used in the back office, unless you configure other templates for a specific SiteAccess or SiteAccess group:
 
 ``` yaml
 ibexa:
@@ -167,7 +167,7 @@ ibexa:
 
     If an admin SiteAccess in your installation uses a different domain than the front SiteAccesses,
     be sure to use SSL (https protocol).
-    Otherwise, you cannot preview content in Page Builder from the Back Office.
+    Otherwise, you cannot preview content in Page Builder from the back office.
 
 #### SiteAccess switching in Page Builder
 
diff --git a/docs/multisite/set_up_translation_siteaccess.md b/docs/multisite/set_up_translation_siteaccess.md
index 04f8756ccf..dc89753761 100644
--- a/docs/multisite/set_up_translation_siteaccess.md
+++ b/docs/multisite/set_up_translation_siteaccess.md
@@ -16,7 +16,7 @@ First, add a new language for the whole installation.
 
     For more details, see [Languages](languages.md).
 
-1. In the Back Office, go to **Admin** -> **Languages**.
+1. In the back office, go to **Admin** -> **Languages**.
 1. Click **Create a new language** and provide the language name and code (examples below use French with `fre-FR`).
 1. After creating the new language, refresh the assets by running:
 
@@ -70,10 +70,10 @@ Clear the cache by running: `php bin/console cache:clear`.
 
 ## Set permissions
 
-By default, the Anonymous user Role does not have permissions for new SiteAccesses.
+By default, the Anonymous user role does not have permissions for new SiteAccesses.
 As a next step, allow Anonymous users to read content on the new SiteAccesses:
 
-1. In the Back Office, go to **Admin** -> **Roles**.
+1. In the back office, go to **Admin** -> **Roles**.
 1. Click the **Anonymous** role.
 1. Edit the **Limitations** of the module `user`, select both SiteAccesses and click **Update**.
 1. Clear the cache by running: `php bin/console cache:clear`.
diff --git a/docs/multisite/site_factory/site_factory.md b/docs/multisite/site_factory/site_factory.md
index 4863d9897a..e1e545bd3c 100644
--- a/docs/multisite/site_factory/site_factory.md
+++ b/docs/multisite/site_factory/site_factory.md
@@ -1,11 +1,11 @@
 ---
-description: Site Factory allows creating multiple sites (SiteAccesses) from the Back Office.
+description: Site Factory allows creating multiple sites (SiteAccesses) from the back office.
 edition: experience
 ---
 
 # Site Factory
 
-Site Factory is a site management interface, integrated with the Back Office.
+Site Factory is a site management interface, integrated with the back office.
 It enables you to configure new sites without editing [YAML-based SiteAccess configuration](multisite_configuration.md).
 
 !!! note
@@ -100,7 +100,7 @@ ibexa_site_factory:
             thumbnail: /path/to/image/example-thumbnail_2.png
 ```
 
-You can check the results of your work in the Back Office by going to **Site management** and selecting **Sites**.
+You can check the results of your work in the back office by going to **Site management** and selecting **Sites**.
 
 There, you should be able to add a new site and choose a design for it.
 
@@ -174,7 +174,7 @@ Now, all new directories are created under "Ibexa DXP".
 
 The Site Factory is set up, now you can provide sufficient permissions to the Users.
 
-Set the below Policies to allow Users to:
+Set the below policies to allow users to:
 
 - `site/view` - enter the Site Factory interface
 - `site/create` - create sites
diff --git a/docs/multisite/site_factory/site_factory_configuration.md b/docs/multisite/site_factory/site_factory_configuration.md
index 0c1861600c..4e464000d2 100644
--- a/docs/multisite/site_factory/site_factory_configuration.md
+++ b/docs/multisite/site_factory/site_factory_configuration.md
@@ -68,15 +68,15 @@ ibexa_site_factory:
 
 Now, you can choose a design with a defined Site skeleton, and decide if you want to use its skeleton by toggling **Generate site using site skeleton**.
 
-## User Group skeletons
+## User group skeletons
 
-With User Group skeletons you can define Policies and Limitations that apply to selected groups of users who can access the site.
+With user group skeletons you can define policies and limitations that apply to selected groups of users who can access the site.
 
-You can create many User Group skeletons and associate them with many templates.
-One template can have many User Group skeletons assigned.
+You can create many user group skeletons and associate them with many templates.
+One template can have many user group skeletons assigned.
 
-To create a User Group skeleton, first go to **Admin** -> **Site skeletons** and add a User Group to the list of available skeletons.
-Then, review the detailed information of the newly created User Group skeleton,
+To create a user group skeleton, first go to **Admin** -> **Site skeletons** and add a user group to the list of available skeletons.
+Then, review the detailed information of the newly created user group skeleton,
 copy the Location ID or the Location remote ID, and add a configuration key to the site template definition:
 
 ``` yaml
@@ -88,19 +88,19 @@ ibexa_site_factory:
             user_group_skeleton_remote_ids: [ <id_skeleton3>, <id_skeleton4>, ... ]
 ```
 
-Manage the permissions associated to the User Group skeleton by [assigning Roles](https://doc.ibexa.co/projects/userguide/en/latest/site_organization/organizing_the_site/#managing-permissions).
-Make sure that the Roles that you assign to the User Group skeleton do not contain Location-based Limitations. 
-User Group skeletons cannot contain individual User content items either.
+Manage the permissions associated to the user group skeleton by [assigning roles](https://doc.ibexa.co/projects/userguide/en/latest/site_organization/organizing_the_site/#managing-permissions).
+Make sure that the roles that you assign to the user group skeleton do not contain Location-based limitations. 
+User group skeletons cannot contain individual User content items either.
 
-User Group skeletons are retained after deleting the site.
+User group skeletons are retained after deleting the site.
 
-## Automatic update of Roles
+## Automatic update of roles
 
-Role definitions can contain user/login Policies with Limitations that limit user access to certain sites. 
-To avoid the need to add the new SiteAccess to Limitations for all Roles,
-you can decide that the Roles you select are automatically updated when the site is created, updated or deleted.
+Role definitions can contain user/login policies with limitations that limit user access to certain sites. 
+To avoid the need to add the new SiteAccess to limitations for all roles,
+you can decide that the roles you select are automatically updated when the site is created, updated or deleted.
 
-Under the `ibexa_site_factory` [configuration key](configuration.md#configuration-files), add a list of Roles which should have access to the frontend
+Under the `ibexa_site_factory` [configuration key](configuration.md#configuration-files), add a list of roles which should have access to the frontend
 when a site is created in Site Factory, for example:
 
 ``` yaml
@@ -110,4 +110,4 @@ ibexa_site_factory:
     update_roles: [Anonymous, Administrator]
 ```
 
-For more information about Roles and Policies, see [Permissions](permissions.md). 
+For more information about roles and policies, see [Permissions](permissions.md). 
diff --git a/docs/permissions/custom_policies.md b/docs/permissions/custom_policies.md
index 9a3b368d83..8a9052d03a 100644
--- a/docs/permissions/custom_policies.md
+++ b/docs/permissions/custom_policies.md
@@ -1,10 +1,10 @@
 ---
-description: Create a custom Policy to cover non-standard permission needs.
+description: Create a custom policy to cover non-standard permission needs.
 ---
 
-# Custom Policies
+# Custom policies
 
-The content Repository uses [Roles and Policies](permissions.md) to give Users access to different functions of the system.
+The content Repository uses [roles and policies](permissions.md) to give Users access to different functions of the system.
 
 Any bundle can expose available Policies via a `PolicyProvider` which can be added to IbexaCoreBundle's [service container](php_api.md#service-container) extension.
 
@@ -12,7 +12,7 @@ Any bundle can expose available Policies via a `PolicyProvider` which can be add
 
 A `PolicyProvider` object provides a hash containing declared modules, functions and Limitations.
 
-- Each Policy provider provides a collection of permission *modules*.
+- Each policy provider provides a collection of permission *modules*.
 - Each module can provide *functions* (for example, in `content/read`, "content" is the module, and "read" is the function)
 - Each function can provide a collection of Limitations.
 
@@ -60,13 +60,13 @@ class MyPolicyProvider implements PolicyProviderInterface
 }
 ```
 
-!!! note "Extend existing Policies"
+!!! note "Extend existing policies"
 
-    While a `PolicyProvider` may provide new functions to an existing Policy module,
+    While a `PolicyProvider` may provide new functions to an existing policy module,
     or additional Limitations to an existing function,
     it's however strongly recommended to create your own modules.
 
-    It's impossible to remove an existing module, function or limitation from a Policy.
+    It's impossible to remove an existing module, function or limitation from a policy.
 
 ### YamlPolicyProvider
 
@@ -176,7 +176,7 @@ services:
 
 #### Form mapper
 
-To provide support for editing custom policies in the Back Office, you need to implement [`Ibexa\AdminUi\Limitation\LimitationFormMapperInterface`](https://github.com/ibexa/admin-ui/blob/4.5/src/lib/Limitation/LimitationFormMapperInterface.php).
+To provide support for editing custom policies in the back office, you need to implement [`Ibexa\AdminUi\Limitation\LimitationFormMapperInterface`](https://github.com/ibexa/admin-ui/blob/4.5/src/lib/Limitation/LimitationFormMapperInterface.php).
 
 - `mapLimitationForm` adds the limitation field as a child to a provided Symfony form.
 - `getFormTemplate` returns the path to the template to use for rendering the limitation form. Here it use [`form_label`]([[= symfony_doc =]]/form/form_customization.html#reference-forms-twig-label) and [`form_widget`]([[= symfony_doc =]]/form/form_customization.html#reference-forms-twig-widget) to do so.
diff --git a/docs/permissions/limitation_reference.md b/docs/permissions/limitation_reference.md
index f8c871c3ed..bc0bcd8f45 100644
--- a/docs/permissions/limitation_reference.md
+++ b/docs/permissions/limitation_reference.md
@@ -1,33 +1,33 @@
 ---
-description: Limitations let you fine-tune the permission system by specifying limits to Roles granted to users.
+description: Limitations let you fine-tune the permission system by specifying limits to roles granted to users.
 page_type: reference
 ---
 
 # Limitation reference
 
-## Blocking Limitation
+## Blocking limitation
 
-A generic Limitation type to use when no other Limitation has been implemented.
+A generic limitation type to use when no other limitation has been implemented.
 Without any Limitation assigned, a `LimitationNotFoundException` is thrown.
 
 It is called "blocking" because it always informs the permissions system that 
-the User does not have access to any Policy the Limitation is assigned to, making 
-the permissions system move on to the next Policy.
+the User does not have access to any policy the limitation is assigned to, making 
+the permissions system move on to the next policy.
 
 ### Possible values
 
 |Value|UI value|Description|
 |------|------|------|
-|`<mixed>`|`<mixed>`|This is a generic Limitation which does not validate the values provided to it. Make sure that you validate the values passed to this Limitation in your own logic.|
+|`<mixed>`|`<mixed>`|This is a generic limitation which does not validate the values provided to it. Make sure that you validate the values passed to this limitation in your own logic.|
 
 ### Configuration
 
-As this is a generic Limitation, you can configure your custom Limitations to use it.
+As this is a generic limitation, you can configure your custom limitations to use it.
 Out of the box FunctionList uses it in the following way:
 
 ``` yaml
     # FunctionList is an ezjscore limitation, it only applies to ezjscore policies not used by
-    # API/platform stack, so configure to use Blocking Limitation to avoid LimitationNotFoundException
+    # API/platform stack, so configure to use Blocking limitation to avoid LimitationNotFoundException
     ibexa.api.role.limitation_type.function_list:
         class: Ibexa\Core\Limitation\BlockingLimitationType
         arguments: ['FunctionList']
@@ -35,17 +35,17 @@ Out of the box FunctionList uses it in the following way:
             - {name: ibexa.permissions.limitation_type, alias: FunctionList}
 ```
 
-## ActivityLogOwner Limitation
+## ActivityLogOwner limitation
 
-The `ActivityLogOwner` Limitation specifies if a user can see only their own [recent activity](recent_activity.md) log entries, and not entries from other users. 
+The `ActivityLogOwner` limitation specifies if a user can see only their own [recent activity](recent_activity.md) log entries, and not entries from other users. 
 
 | Value | UI value        | Description                                                  |
 |-------|-----------------|--------------------------------------------------------------|
 | `1`   | "Only own logs" | Current user can only access their own activity log entries. |
 
-## CartOwner Limitation
+## CartOwner limitation
 
-The `CartOwner` Limitation specifies whether the user can modify a cart.
+The `CartOwner` limitation specifies whether the user can modify a cart.
 
 ### Possible values
 
@@ -54,9 +54,9 @@ The `CartOwner` Limitation specifies whether the user can modify a cart.
 |"self"|"self"|Only the User who is the owner of the cart gets access.|
 |`null`| none |User can access all carts.|
 
-## Change Owner Limitation
+## Change Owner limitation
 
-The Change Owner (`ChangeOwner`) Limitation specifies whether the user can change the owner of a content item.
+The Change Owner (`ChangeOwner`) limitation specifies whether the user can change the owner of a content item.
 
 ### Possible values
 
@@ -64,20 +64,20 @@ The Change Owner (`ChangeOwner`) Limitation specifies whether the user can chang
 |------|------|------|
 |`1`|"Forbid"|The user cannot change owner of a content item|
 
-## Content type Group Limitation
+## Content type Group limitation
 
-The content type Group (`UserGroup`) Limitation specifies that only Users with at least one common *direct* User 
+The content type Group (`UserGroup`) limitation specifies that only Users with at least one common *direct* user 
 Group with the owner of content get the selected access right.
 
 ### Possible values
 
 |Value|UI value|Description|
 |------|------|------|
-|`1`|"self"|Only a User who has at least one common *direct* User Group with the owner gets access|
+|`1`|"self"|Only a User who has at least one common *direct* user group with the owner gets access|
 
-## Content type Group of Parent Limitation
+## Content type Group of Parent limitation
 
-The content type Group of Parent (`ParentUserGroupLimitation`) Limitation specifies that only Users with at least one common *direct* User Group 
+The content type Group of Parent (`ParentUserGroupLimitation`) limitation specifies that only Users with at least one common *direct* user group 
 with the owner of the parent Location of a content item get a certain access right, 
 used by `content/create` permission.
 
@@ -85,11 +85,11 @@ used by `content/create` permission.
 
 |Value|UI value|Description|
 |------|------|------|
-|`1`|"self"|Only a User who has at least one common *direct* User Group with owner of the parent Location gets access|
+|`1`|"self"|Only a User who has at least one common *direct* user group with owner of the parent Location gets access|
 
-## Content type Limitation
+## Content type limitation
 
-The Content Typ (`ContentType`) Limitation specifies whether the User has access to content with a specific 
+The Content Typ (`ContentType`) limitation specifies whether the User has access to content with a specific 
 content type.
 
 ### Possible values
@@ -98,14 +98,14 @@ content type.
 |------|------|------|
 |`<ContentType_id>`|`<ContentType_name>`|All valid content type IDs can be set as value(s)|
 
-## Content type of Parent Limitation
+## Content type of Parent limitation
 
-The content type of Parent (`ParentContentType`) Limitation specifies whether the User has access to content whose parent Location 
+The content type of Parent (`ParentContentType`) limitation specifies whether the User has access to content whose parent Location 
 contains a specific content type, used by `content/create`.
 
-This Limitation combined with `ContentType` Limitation allows you to define business 
+This limitation combined with `ContentType` limitation allows you to define business 
 rules like allowing Users to create "Blog Post" within a "Blog." 
-If you also combine it with `Owner of Parent` Limitation, you effectively limit 
+If you also combine it with `Owner of Parent` limitation, you effectively limit 
 access to create Blog Posts in the Users' own Blogs.
 
 ### Possible values
@@ -114,11 +114,11 @@ access to create Blog Posts in the Users' own Blogs.
 |------|------|------|
 |`<ContentType_id>`|`<ContentType_name>`|All valid content type IDs can be set as value(s)|
 
-## Field Group Limitation [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
+## Field Group limitation [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
-A Field Group (`FieldGroup`) Limitation specifies whether the User can work with content Fields belonging 
+A Field Group (`FieldGroup`) limitation specifies whether the User can work with content Fields belonging 
 to a specific group.
-A user with this Limitation is allowed to edit Fields belonging to the indicated group.
+A user with this limitation is allowed to edit Fields belonging to the indicated group.
 Otherwise, the Fields are inactive and filled with the default value (if set).
 
 ### Possible values
@@ -127,11 +127,11 @@ Otherwise, the Fields are inactive and filled with the default value (if set).
 |------|------|------|
 |`<FieldGroup_identifier>`|`<FieldGroup_identifier>`|All valid Field group identifiers can be set as value(s)|
 
-## Language Limitation
+## Language limitation
 
-A Language (`Language`) Limitation specifies whether the User has access to work on the specified translation.
+A Language (`Language`) limitation specifies whether the User has access to work on the specified translation.
 
-A user with this Limitation is allowed to:
+A user with this limitation is allowed to:
 
  - Create new content with the given translation(s) only.
 This only applies to creating the first version of a content item.
@@ -145,9 +145,9 @@ This only applies to creating the first version of a content item.
 |------|------|------|
 |`<Language_code>`|`<LanguageCode_name>`|All valid language codes can be set as value(s)|
 
-## Location Limitation
+## Location limitation
 
-A Location (`Location`) Limitation specifies whether the User has access to content with a specific 
+A Location (`Location`) limitation specifies whether the User has access to content with a specific 
 Location, in case of `content/create` the parent Location is evaluated.
 
 ### Possible values
@@ -156,11 +156,11 @@ Location, in case of `content/create` the parent Location is evaluated.
 |------|------|------|
 |`<Location_id>`|`<Location_name>`|All valid Location IDs can be set as value(s)|
 
-## New Section Limitation
+## New Section limitation
 
-A New Section (`NewSection`) Limitation specifies whether the User has access to assigning content to a given Section.
+A New Section (`NewSection`) limitation specifies whether the User has access to assigning content to a given Section.
 
-In the `section/assign` Policy you can combine this with Section Limitation to 
+In the `section/assign` policy you can combine this with Section limitation to 
 limit both from and to values.
 
 ### Possible values
@@ -169,12 +169,12 @@ limit both from and to values.
 |------|------|------|
 |`<Session_id>`|`<Session_name>`|All valid session IDs can be set as value(s)|
 
-## New State Limitation
+## New State limitation
 
-A New State (`NewObjectState`) Limitation specifies whether the User has access to (assigning) a given Object 
+A New State (`NewObjectState`) limitation specifies whether the User has access to (assigning) a given Object 
 state to content.
 
-In the `state/assign` Policy you can combine this with State Limitation to limit 
+In the `state/assign` policy you can combine this with State limitation to limit 
 both from and to values.
 
 ### Possible values
@@ -183,9 +183,9 @@ both from and to values.
 |------|------|------|
 |`<State_id>`|`<State_name>`|All valid state IDs can be set as value(s)|
 
-## Object State Limitation
+## Object State limitation
 
-The Object State (`ObjectState`) Limitation specifies whether the User has access to content with a specific 
+The Object State (`ObjectState`) limitation specifies whether the User has access to content with a specific 
 Object state.
 
 ### Possible values
@@ -194,9 +194,9 @@ Object state.
 |------|------|------|
 |`<ObjectState_id>`|`<ObjectState_name>`|All valid Object state IDs can be set as value(s)|
 
-## Order Owner Limitation
+## Order Owner limitation
 
-The Order Owner (`OrderOwner`) Limitation specifies whether the user can modify an order.
+The Order Owner (`OrderOwner`) limitation specifies whether the user can modify an order.
 
 ### Possible values
 
@@ -204,9 +204,9 @@ The Order Owner (`OrderOwner`) Limitation specifies whether the user can modify
 |------|------|------|
 |"self"|"self"|Users can access only their own orders. |
 
-## Owner Limitation
+## Owner limitation
 
-The Owner (`Owner`) Limitation specifies that only the owner of the content item gets the selected 
+The Owner (`Owner`) limitation specifies that only the owner of the content item gets the selected 
 access right.
 
 ### Possible values
@@ -216,9 +216,9 @@ access right.
 |`1`|"self"|Only the User who is the owner gets access|
 |`2`|"session"|Deprecated and works exactly like "self" in public PHP API since it has no knowledge of user Sessions|
 
-## Owner of Parent Limitation
+## Owner of Parent limitation
 
-The Owner of Parent (`ParentOwner`) Limitation specifies that only the Users who own all parent Locations of 
+The Owner of Parent (`ParentOwner`) limitation specifies that only the Users who own all parent Locations of 
 a content item get a certain access right, used for `content/create` permission.
 
 ### Possible values
@@ -228,9 +228,9 @@ a content item get a certain access right, used for `content/create` permission.
 |`1`|"self"|Only the User who is the owner of all parent Locations gets access|
 |`2`|"session"|Deprecated and works exactly like "self" in public PHP API since it has no knowledge of user Sessions|
 
-## Parent Depth Limitation
+## Parent Depth limitation
 
-The Parent Depth (`ParentDepth`) Limitation specifies whether the User has access to creating content under 
+The Parent Depth (`ParentDepth`) limitation specifies whether the User has access to creating content under 
 a parent Location within a specific depth of the tree, used for `content/create` 
 permission.
 
@@ -240,9 +240,9 @@ permission.
 |------|------|------|
 |`<int>`|`<int>`|All valid integers can be set as value(s)|
 
-## PaymentOwner Limitation
+## PaymentOwner limitation
 
-The Payment Owner (`PaymentOwner`) Limitation specifies whether the user can modify a payment.
+The Payment Owner (`PaymentOwner`) limitation specifies whether the user can modify a payment.
 
 ### Possible values
 
@@ -251,14 +251,14 @@ The Payment Owner (`PaymentOwner`) Limitation specifies whether the user can mod
 |"self"|"self"|Users can access only their own payments. |
 |"all"| none |Users can access all payments.|
 
-## Personalization access Limitation
+## Personalization access limitation
 
-The Personalization Limitation specifies the SiteAccesses for which the User can view or modify 
+The Personalization limitation specifies the SiteAccesses for which the User can view or modify 
 the scenario configuration.
 
-## Product Type Limitation
+## Product Type limitation
 
-The Product Type (`ProductType`) Limitation specifies whether the User has access to products belonging to a specific Product Type.
+The Product Type (`ProductType`) limitation specifies whether the User has access to products belonging to a specific Product Type.
 
 ### Possible values
 
@@ -266,12 +266,12 @@ The Product Type (`ProductType`) Limitation specifies whether the User has acces
 |------|------|------|
 |`<ContentType_id>`|`<ContentType_name>`|All valid content type IDs can be set as value(s)|
 
-## Section Limitation
+## Section limitation
 
-The Section (`Section`) Limitation specifies whether the User has access to content within a specific 
+The Section (`Section`) limitation specifies whether the User has access to content within a specific 
 Section.
 
-This Limitation can be used as a Role Limitation.
+This limitation can be used as a role limitation.
 
 ### Possible values
 
@@ -279,12 +279,12 @@ This Limitation can be used as a Role Limitation.
 |------|------|------|
 |`<Session_id>`|`<Session_name>`|All valid session IDs can be set as value(s)|
 
-## Segment Group Limitation [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
+## Segment Group limitation [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
-The Segment Group (`SegmentGroup`) Limitation specifies whether the User has access Segments within a specific 
+The Segment Group (`SegmentGroup`) limitation specifies whether the User has access Segments within a specific 
 Segment Group.
 
-This Limitation can be used as a Role Limitation.
+This limitation can be used as a role limitation.
 
 ### Possible values
 
@@ -292,9 +292,9 @@ This Limitation can be used as a Role Limitation.
 |------|------|------|
 |`<Segment_group_id>`|`<Segment_group_name>`|All valid Segment Group IDs can be set as value(s).|
 
-## SiteAccess Limitation
+## SiteAccess limitation
 
-The SiteAccess (`SiteAccess`) Limitation specifies to which SiteAccesses a certain permission applies, used 
+The SiteAccess (`SiteAccess`) limitation specifies to which SiteAccesses a certain permission applies, used 
 by `user/login`.
 
 ### Possible values
@@ -305,12 +305,12 @@ by `user/login`.
 
 ### Legacy compatibility notes
 
-`SiteAccess` Limitation is deprecated and is not used actively in public PHP API, 
-but is allowed for being able to read / create Limitations for legacy.
+`SiteAccess` limitation is deprecated and is not used actively in public PHP API, 
+but is allowed for being able to read / create limitations for legacy.
 
-## Shipment Owner Limitation
+## Shipment Owner limitation
 
-The Shipment Owner (`ShipmentOwner`) Limitation specifies whether the user can modify a shipment.
+The Shipment Owner (`ShipmentOwner`) limitation specifies whether the user can modify a shipment.
 
 ### Possible values
 
@@ -318,13 +318,13 @@ The Shipment Owner (`ShipmentOwner`) Limitation specifies whether the user can m
 |------|------|------|
 |"self"|"self"|Users can access only their own shipments. |
 
-## Subtree Limitation
+## Subtree limitation
 
-The Subtree (`Subtree`) Limitation specifies whether the User has access to content within a specific 
+The Subtree (`Subtree`) limitation specifies whether the User has access to content within a specific 
 Subtree of Location, in case of `content/create` the parent Subtree of Location 
 is evaluated.
 
-This Limitation can be used as a Role Limitation.
+This limitation can be used as a role limitation.
 
 ### Possible values
 
@@ -337,12 +337,12 @@ This Limitation can be used as a Role Limitation.
 For more information on how to restrict User's access to part of the Subtree 
 follow [the example in the Admin management section](permission_use_cases.md#restrict-editing-to-part-of-the-tree).
 
-## Version Lock Limitation
+## Version Lock limitation
 
-The Version Lock (`VersionLock`) Limitation specifies whether the User can perform actions, for example, edit 
+The Version Lock (`VersionLock`) limitation specifies whether the User can perform actions, for example, edit 
 or unlock, on content items that are in a workflow.
 
-This Limitation can be used as a Role Limitation.
+This limitation can be used as a role limitation.
 
 ### Possible values
 
@@ -351,20 +351,20 @@ This Limitation can be used as a Role Limitation.
 | `userId` | "Assigned only" | Users can perform actions only on content items that are assigned to them or not assigned to anybody. |
 | `null` | none | Users can perform actions on all drafts, regardless of the assignments or whether drafts are locked or not. |
 
-## Workflow Stage Limitation
+## Workflow Stage limitation
 
-The Workflow Stage (`WorkflowStage`) Limitation specifies whether the User can edit content in a specific workflow 
+The Workflow Stage (`WorkflowStage`) limitation specifies whether the User can edit content in a specific workflow 
 stage.
 
 ### Possible values
 
-The Limitation takes as values stages configured for the workflow.
+The limitation takes as values stages configured for the workflow.
 
-## Workflow Transition Limitation
+## Workflow Transition limitation
 
-The Workflow Transition (`WorkflowTransition`) Limitation specifies whether the User can move the content in a workflow through 
+The Workflow Transition (`WorkflowTransition`) limitation specifies whether the User can move the content in a workflow through 
 a specific transition.
 
 ### Possible values
 
-The Limitation takes as values transitions between stages configured for the workflow.
+The limitation takes as values transitions between stages configured for the workflow.
diff --git a/docs/permissions/permission_overview.md b/docs/permissions/permission_overview.md
index 6b5d513ef6..cefbe15b72 100644
--- a/docs/permissions/permission_overview.md
+++ b/docs/permissions/permission_overview.md
@@ -1,40 +1,40 @@
 ---
-description: The permission system is based on Policies that you assign to users or user groups in the form of Roles.
+description: The permission system is based on policies that you assign to users or user groups in the form of roles.
 ---
 
 # Permission overview
 
 A new User does not have permissions for any part of the system, unless they are explicitly given access.
-To get access they need to inherit Roles, typically assigned to the User Group they belong to.
+To get access they need to inherit roles, typically assigned to the user group they belong to.
 
-Each Role can contain one or more **Policies**. A Policy is a rule that gives access to a single **function** in a **module**.
+Each role can contain one or more **Policies**. A policy is a rule that gives access to a single **function** in a **module**.
 For example, a `section/assign` Policy allows the User to assign content to Sections.
 
-When you add a Policy to a Role, you can also restrict it using one or more **Limitations**.
-A Policy with a Limitation will only apply when the condition in the Limitation is fulfilled.
-For example, a `content/publish` Policy with a `ContentType` Limitation on the "Blog Post" content type will allow the User to publish only Blog Posts, and not other content.
+When you add a policy to a role, you can also restrict it using one or more **Limitations**.
+A policy with a limitation will only apply when the condition in the limitation is fulfilled.
+For example, a `content/publish` policy with a `ContentType` limitation on the "Blog Post" content type will allow the User to publish only Blog Posts, and not other content.
 
-A Limitation, like a Policy, specifies what a User *can* do, not what they *can't do*.
-A `Section` Limitation, for example, *gives* the User access to the selected Section, not *prohibits* it.
+A limitation, like a policy, specifies what a User *can* do, not what they *can't do*.
+A `Section` limitation, for example, *gives* the User access to the selected Section, not *prohibits* it.
 
 See [Limitation reference](limitation_reference.md) for further information
 and [Permission use cases](permission_use_cases.md) for example permission setups.
 
-## Assigning Roles to Users
+## Assigning roles to users
 
-Every User or User Group can have many roles. A User can also belong to many groups, for example, Administrators, Editors, Subscribers.
+Every user or user group can have many roles. A User can also belong to many groups, for example, Administrators, Editors, Subscribers.
 
-It is best practice to avoid assigning Roles to users directly.
-Instead, try to organize your content so that it can be covered with general Roles assigned to User Groups.
+It is best practice to avoid assigning roles to users directly.
+Instead, try to organize your content so that it can be covered with general roles assigned to user groups.
 
 Using Groups is easier to manage and more secure. It also improves system performance.
-The more Role assignments and complex Policies you add for a given User, the more complex the search/load queries will be, because they always take permissions into account.
+The more role assignments and complex policies you add for a given User, the more complex the search/load queries will be, because they always take permissions into account.
 
 ## Permissions for custom controllers
 
 You can control access to a custom controller by implementing the `performAccessCheck()` method.
 
-In the following example the user does not have access to the controller unless they have the `section/view` Policy:
+In the following example the user does not have access to the controller unless they have the `section/view` policy:
 
 ``` php
 use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute;
@@ -48,9 +48,9 @@ public function performAccessCheck(): void
 
 `Attribute` accepts three arguments:
 
-- `module` is the Policy module (e.g. `content`)
+- `module` is the policy module (e.g. `content`)
 - `function` is the function inside the module (e.g. `read`)
-- `limitations` are optional Limitations to check against. Here you can provide two keys:
+- `limitations` are optional limitations to check against. Here you can provide two keys:
     - `valueObject` is the object you want to check for, for example `ContentInfo`.
     - `targets` are a table of value objects that are the target of the operation.
     For example, to check if content can be assigned to a Section, provide the Section as `targets`.
diff --git a/docs/permissions/permission_use_cases.md b/docs/permissions/permission_use_cases.md
index 28c07b0b6f..20ae0ce3ae 100644
--- a/docs/permissions/permission_use_cases.md
+++ b/docs/permissions/permission_use_cases.md
@@ -4,11 +4,11 @@ description: Set up permission sets for common use cases.
 
 # Permission use cases
 
-Here are a few examples of sets of Policies that you can use to get some common permission configurations.
+Here are a few examples of sets of policies that you can use to get some common permission configurations.
 
-## Enter Back Office
+## Enter back office
 
-To allow the User to enter the Back Office interface and view all content, set the following Policies:
+To allow the User to enter the back office interface and view all content, set the following policies:
 
 - `user/login`
 - `content/read`
@@ -16,12 +16,12 @@ To allow the User to enter the Back Office interface and view all content, set t
 - `section/view`
 - `content/reverserelatedlist`
 
-These Policies are necessary for all other cases below that require access to the content structure.
+These policies are necessary for all other cases below that require access to the content structure.
 
 ## Create content without publishing [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
 You can use this option together with [[= product_name_exp =]]'s content review options.
-Users assigned with these Policies can create content, but cannot publish it.
+Users assigned with these policies can create content, but cannot publish it.
 To publish, they must send the content for review to another User with proper permissions 
 (for example, senior editor, proofreader, etc.).
 
@@ -33,7 +33,7 @@ as [[= product_name_headless =]] does not allow the User to continue working wit
 
 ## Create and publish content
 
-To create and publish content, users must additionally have the following Policies:
+To create and publish content, users must additionally have the following policies:
 
 - `content/create`
 - `content/edit`
@@ -43,51 +43,51 @@ This also lets the user copy and move content, as well as add new Locations to a
 
 ## Move content
 
-To move a content item or a Subtree to another Location, the user must have the following Policies:
+To move a content item or a Subtree to another Location, the user must have the following policies:
 
 - `content/read` - on the source Location
 - `content/create` - on the target Location
 
 ## Remove content
 
-To send content to Trash, the User needs to have the `content/remove` Policy.
+To send content to Trash, the User needs to have the `content/remove` policy.
 If content has more than one language, the User must have access to all the languages.
-That is, the `content/remove` Policy must have either no Limitation, or a Limitation for all languages of the content item.
+That is, the `content/remove` policy must have either no limitation, or a limitation for all languages of the content item.
 
-To remove an archived version of content, the User must have the `content/versionremove` Policy.
+To remove an archived version of content, the User must have the `content/versionremove` policy.
 
-Further manipulation of Trash requires the `content/restore` Policy to restore items from Trash, and `content/cleantrash` to completely delete all content from the Trash.
+Further manipulation of Trash requires the `content/restore` policy to restore items from Trash, and `content/cleantrash` to completely delete all content from the Trash.
 
 !!! caution
 
-    With the `content/cleantrash` Policy, the User can empty the Trash even if they do not have access to the trashed content,
+    With the `content/cleantrash` policy, the User can empty the Trash even if they do not have access to the trashed content,
     for example, because it belonged to a Section that the User does not have permissions for.
 
 ## Restrict editing to part of the tree
 
-If you want to let the User create or edit content, but only in one part of the content tree, use Limitations.
-Three Limitations that you could use here are `Section` Limitation, `Location` Limitation and `Subtree of Location` Limitation.
+If you want to let the User create or edit content, but only in one part of the content tree, use limitations.
+Three limitations that you could use here are `Section` limitation, `Location` limitation and `Subtree of Location` limitation.
 
-### Section Limitation
+### Section limitation
 
 Let's assume you have two Folders under your Home: Blog and Articles.
-You can let a User create content for the blogs, but not in Articles, by adding a `Section` Limitation to 
+You can let a User create content for the blogs, but not in Articles, by adding a `Section` limitation to 
 the Blog content item.
 This allows the User to publish content anywhere under this Location in the structure.
 Section does not have to belong to the same Subtree of Location in the content structure, any Locations can be assigned to it.
 
-### Location Limitation
+### Location limitation
 
-If you add a `Location` Limitation and point to the same Location, the User is able to publish content directly 
+If you add a `Location` limitation and point to the same Location, the User is able to publish content directly 
 under the selected Location, but not anywhere deeper in its Subtree of Location.
 
-### Subtree of Location Limitation
+### Subtree of Location limitation
 
-To limit the User's access to a subtree, use the `Subtree of Location` Limitation.
-You do it by creating two new Roles for a User Group:
+To limit the User's access to a subtree, use the `Subtree of Location` limitation.
+You do it by creating two new roles for a user group:
  
- 1. Role with a `Subtree` Limitation for the User
- 1. Role with a `Location` Limitation for the Subtree
+ 1. Role with a `Subtree` limitation for the User
+ 1. Role with a `Location` limitation for the Subtree
 
 Follow the example below to learn how to do that.
 
@@ -97,45 +97,45 @@ Edit access to them in the **Admin Panel**.
 ![Subtree file structure](subtree_usability_notes_1.png)
 
 To give the vegetarian editors access only to the **Vegetarian** dinner recipes section,
- create a new Role, for example, *EditorVeg*.
-Next, add to it a `content/read` Policy with the `Subtree` Limitation for `Cookbook/Dinner recipes/Vegetarian`.
-Assign the Role to the vegetarian editors User Group.
+ create a new role, for example, *EditorVeg*.
+Next, add to it a `content/read` policy with the `Subtree` limitation for `Cookbook/Dinner recipes/Vegetarian`.
+Assign the role to the vegetarian editors user group.
 It allows users from that group to access the **Vegetarian** container but not **Cookbook** and **Dinner recipes**.
 
 To give users access to **Cookbook** and **Dinner recipes** containers, 
-create a new Role, for example, *EditorVegAccess*.
-Next, add to it a `content/read` Policy with the `Location` Limitations **Cookbook** and **Dinner recipes**.
-Assign the new Role to the vegetarian editors User Group as well.
+create a new role, for example, *EditorVegAccess*.
+Next, add to it a `content/read` policy with the `Location` limitations **Cookbook** and **Dinner recipes**.
+Assign the new role to the vegetarian editors user group as well.
 Only then the limitations are combined with `AND`, resulting in an empty set.
 
-The vegetarian editors should now see the following Content Tree:
+The vegetarian editors should now see the following content tree:
 
 ![Limited subtree file structure](subtree_usability_notes_2.png)
 
-When a Policy has more than one Limitation, all of them have to apply, or the Policy does not work.
-For example, a `Location` Limitation on Location `1/2` and `Subtree of Location` Limitation on `1/2/55` cannot work together,
+When a policy has more than one limitation, all of them have to apply, or the policy does not work.
+For example, a `Location` limitation on Location `1/2` and `Subtree of Location` limitation on `1/2/55` cannot work together,
 because no Location can satisfy both those requirements at the same time.
-To combine more than one Limitation with the *or* relation, not *and*,
-you can split your Policy in two, each with one of these Limitations.
+To combine more than one limitation with the *or* relation, not *and*,
+you can split your policy in two, each with one of these limitations.
 
 ## Manage Locations
 
-To add a new Location to a content item, the Policies required for publishing content are enough.
-To allow the User to remove a Location, grant them the following Policies:
+To add a new Location to a content item, the policies required for publishing content are enough.
+To allow the User to remove a Location, grant them the following policies:
 
 - `content/remove`
 - `content/manage_locations`
 
-Hiding and revealing Location requires one more Policy: `content/hide`.
+Hiding and revealing Location requires one more policy: `content/hide`.
 
 ## Editorial workflows
 
 You can control which stages in an editorial workflow the user can work with.
 
-Do this by adding the `WorkflowStageLimitation` to `content` Policies such as `content/edit` or `content/publish`.
+Do this by adding the `WorkflowStageLimitation` to `content` policies such as `content/edit` or `content/publish`.
 
 You can also control which transitions the user can pass content through.
-Do this by using the `workflow/change_stage` Policy together with the `WorkflowTransitionLimitation`.
+Do this by using the `workflow/change_stage` policy together with the `WorkflowTransitionLimitation`.
 
 For example, to enable the user to edit only content in the "Design" stage
 and to pass it after creating design to the "Proofread stage", use following permissions:
@@ -152,12 +152,12 @@ To enable upload, you need you set the following permissions:
 - `content/read`
 - `content/publish`
 
-You can control what content items can be uploaded and where by using Limitations
-on the `content/create` and `content/publish` Policies.
+You can control what content items can be uploaded and where by using imitations
+on the `content/create` and `content/publish` policies.
 
-A Location Limitation limits the uploading to a specific Location in the tree. 
-A content type Limitation controls the content types that are allowed.
-For example, you can set the Location Limitation on a **Pictures** Folder, and add a content type Limitation
+A Location limitation limits the uploading to a specific Location in the tree. 
+A content type limitation controls the content types that are allowed.
+For example, you can set the Location limitation on a **Pictures** Folder, and add a content type limitation
 that only allows content items of type **Image**. 
 This ensures that only files of type `image` can be uploaded,
 and only to the **Pictures** Folder.
@@ -171,18 +171,18 @@ To let users create and assign taxonomy entries, set the following permissions:
 - `taxonomy/read` to see the Taxonomy interface
 - `taxonomy/manage` to create, edit and delete tags
 
-With Limitations, you can configure whether permissions apply to Tags, Product categories or both.
+With limitations, you can configure whether permissions apply to Tags, Product categories or both.
 
 ## Register Users
 
-To allow anonymous users to register through the `/register` route, grant the `user/register` Policy to the Anonymous User Group.
+To allow anonymous users to register through the `/register` route, grant the `user/register` policy to the Anonymous user group.
 
 ## Admin
 
-To access the [administration panel](admin_panel.md) in the Back Office, the User must have the `setup/administrate` Policy.
+To access the [administration panel](admin_panel.md) in the back office, the User must have the `setup/administrate` policy.
 This allows the User to view the languages and content types.
 
-Additional Policies are needed for each section of the Admin.
+Additional policies are needed for each section of the Admin.
 
 ### System Information
 
@@ -209,8 +209,8 @@ Additional Policies are needed for each section of the Admin.
 
 ### Roles
 
-- `role/read` to view the list of Roles in Admin
-- `role/create`, `role/update`, `role/assign` and `role/delete` to manage Roles
+- `role/read` to view the list of roles in Admin
+- `role/create`, `role/update`, `role/assign` and `role/delete` to manage roles
 
 ### Users
 
@@ -250,14 +250,14 @@ Out of the box, [[= product_name_com =]] comes with the *Storefront User* Role t
 
 - `product/view`, `product_type/view` and `catalog/view`, to allow them to view a product 
 list and product details
-- `cart/view`, `cart/create` and `cart/edit` with the `CartOwner` Limitation set to `self`, to allow them to add items to their own shopping cart, modify their cart, and delete it
+- `cart/view`, `cart/create` and `cart/edit` with the `CartOwner` limitation set to `self`, to allow them to add items to their own shopping cart, modify their cart, and delete it
 - `checkout/view`, `checkout/create`, `checkout/update` and `checkout/delete`, to allow 
 them to proceed to checkout and interact with the checkout process
 
-You can modify the default Roles by preventing anonymous users from being able to proceed with the checkout process,
-and creating the *Registered Buyer* Role that enables logged-in users to purchase products. 
+You can modify the default roles by preventing anonymous users from being able to proceed with the checkout process,
+and creating the *Registered Buyer* role that enables logged-in users to purchase products. 
 
-You could do this by moving permissions that relate to checkout from the *Storefront User* Role to the *Registered Buyer* Role,
+You could do this by moving permissions that relate to checkout from the *Storefront User* role to the *Registered Buyer* role,
 and granting *Registered Buyer* with the `user/register` and `user/login` permissions which control access to registration and login.
 
 See below for a detailed listing of permissions that apply to Commerce, together with their meaning.
@@ -265,7 +265,7 @@ See below for a detailed listing of permissions that apply to Commerce, together
 !!! note "Owner limitation"
 
     For anonymous users, orders, shipments, and/or payments are saved with a 'null' user reference. 
-    Therefore, when you apply the 'Owner/self' Limitation to any of the permissions below, anonymous users are not allowed to interact with any of these entities.
+    Therefore, when you apply the `Owner/self` imitation to any of the permissions below, anonymous users are not allowed to interact with any of these entities.
 
 ### Cart 
 
@@ -277,7 +277,7 @@ interact with carts:
 - `cart/create` - to create a new cart
 - `cart/edit` - to allow user to add products to their cart
 
-To further control access to a cart, you can use the `CartOwner` Limitation 
+To further control access to a cart, you can use the `CartOwner` limitation 
 and set its value to `self`. 
 This way users can only interact with their own carts.
 
@@ -301,7 +301,7 @@ interact with orders:
 - `order/update` - to allow the user to change status of an existing order 
 - `order/cancel` - to allow the user to cancel an existing order 
 
-To further control access to an order, you can use the `OrderOwner` Limitation 
+To further control access to an order, you can use the `OrderOwner` limitation 
 and set its value to `self`. 
 This way users can only interact with their own orders.
 
@@ -324,7 +324,7 @@ interact with shipping methods and shipments.
 - `shipment/update` - to allow the user to change status of an existing shipment 
 - `shipment/delete` - to allow the user to cancel an existing shipment 
 
-To further control access to a shipment, you can use the `ShipmentOwner` Limitation 
+To further control access to a shipment, you can use the `ShipmentOwner` limitation 
 and set its value to `self`. 
 This way users can only interact with their own shipments.
 
@@ -347,6 +347,6 @@ interact with payment methods and payments.
 - `payment/edit` - to allow the user to modify an existing payment 
 - `payment/delete` - to allow the user to delete an existing payment 
 
-To further control access to a payment, you can use the `PaymentOwner` Limitation 
+To further control access to a payment, you can use the `PaymentOwner` limitation 
 and set its value to `self`. 
 This way users can only interact with their own payments.
diff --git a/docs/permissions/permissions.md b/docs/permissions/permissions.md
index 937ebd71a0..9adc744eac 100644
--- a/docs/permissions/permissions.md
+++ b/docs/permissions/permissions.md
@@ -1,11 +1,11 @@
 ---
-description: Use granular permission system to grant access to various parts of the system using Roles, Policies, and Limitations.
+description: Use granular permission system to grant access to various parts of the system using roles, policies, and limitations.
 page_type: landing_page
 ---
 
 # Permissions
 
-The permission system of [[= product_name =]] enables you to control in detail which users have access to which parts of the system, both the Back Office's administrative and editorial features, and the content of the website front.
+The permission system of [[= product_name =]] enables you to control in detail which users have access to which parts of the system, both the back office's administrative and editorial features, and the content of the website front.
 
 [[= cards([
     "permissions/permission_overview",
diff --git a/docs/permissions/policies.md b/docs/permissions/policies.md
index 4bd60ebae8..2d92795854 100644
--- a/docs/permissions/policies.md
+++ b/docs/permissions/policies.md
@@ -1,19 +1,19 @@
 ---
-description: Policies are the main building block of the permissions system which lets you define the accesses for specific user Roles.
+description: Policies are the main building block of the permissions system which lets you define the accesses for specific user roles.
 page_type: reference
 ---
 
 # Policies
 
 Policies are the main building block of the permissions system.
-Each Role you assign to user or user group consists of Policies
+Each role you assign to user or user group consists of policies
 which define, which parts of the application or website the user has access to.
 
-## Available Policies
+## Available policies
 
 ### Access to all functions
 
-| Module | Function | Effect                                                      | Possible Limitations |
+| Module | Function | Effect                                                      | Possible limitations |
 |--------|----------|-------------------------------------------------------------|----------------------|
 | `*`    | `*`      | all modules, all functions: grant all available permissions |                      |
 
@@ -32,7 +32,7 @@ which define, which parts of the application or website the user has access to.
 
 #### Customer groups
 
-| Module                        | Function              | Effect                  | Possible Limitations |
+| Module                        | Function              | Effect                  | Possible limitations |
 |-------------------------------|-----------------------|-------------------------|----------------------|
 | <nobr>`customer_group`</nobr> | <nobr>`create`</nobr> | create a customer group |
 |                               | <nobr>`delete`</nobr> | delete a customer group |
@@ -41,24 +41,24 @@ which define, which parts of the application or website the user has access to.
 
 #### Personalization
 
-| Module                         | Function            | Effect                                                            | Possible Limitations                                                                |
+| Module                         | Function            | Effect                                                            | Possible limitations                                                                |
 |--------------------------------|---------------------|-------------------------------------------------------------------|-------------------------------------------------------------------------------------|
 | <nobr>`personalization`</nobr> | <nobr>`edit`</nobr> | modify scenario configuration for selected SiteAccesses           | [Personalization access](limitation_reference.md#personalization-access-limitation) |
 |                                | <nobr>`view`</nobr> | view scenario configuration and results for selected SiteAccesses | [Personalization access](limitation_reference.md#personalization-access-limitation) |
 
 #### Roles
 
-| Module              | Function              | Effect                                                                     | Possible Limitations |
+| Module              | Function              | Effect                                                                     | Possible limitations |
 |---------------------|-----------------------|----------------------------------------------------------------------------|----------------------|
-| <nobr>`role`</nobr> | <nobr>`assign`</nobr> | assign Roles to Users and User Groups                                      |
-|                     | <nobr>`create`</nobr> | create new Roles                                                           |
-|                     | <nobr>`delete`</nobr> | delete Roles                                                               |
-|                     | <nobr>`read`</nobr>   | view the Roles list in Admin. Required for all other role-related Policies |
-|                     | <nobr>`update`</nobr> | modify existing Roles                                                      |
+| <nobr>`role`</nobr> | <nobr>`assign`</nobr> | assign roles to users and user groups                                      |
+|                     | <nobr>`create`</nobr> | create new roles                                                           |
+|                     | <nobr>`delete`</nobr> | delete roles                                                               |
+|                     | <nobr>`read`</nobr>   | view the roles list in Admin. Required for all other role-related policies |
+|                     | <nobr>`update`</nobr> | modify existing roles                                                      |
 
 #### Setup
 
-| Module               | Function                    | Effect                                   | Possible Limitations |
+| Module               | Function                    | Effect                                   | Possible limitations |
 |----------------------|-----------------------------|------------------------------------------|----------------------|
 | <nobr>`setup`</nobr> | <nobr>`administrate`</nobr> | access Admin                             |
 |                      | <nobr>`install`</nobr>      | unused                                   |
@@ -101,7 +101,7 @@ which define, which parts of the application or website the user has access to.
 
 #### Checkout [[% include 'snippets/commerce_badge.md' %]]
 
-| Module                  | Function              | Effect                                                              | Possible Limitations |
+| Module                  | Function              | Effect                                                              | Possible limitations |
 |-------------------------|-----------------------|---------------------------------------------------------------------|----------------------|
 | <nobr>`checkout`</nobr> | <nobr>`create`</nobr> | create new checkout, for example, after workflow fails to complete  |
 |                         | <nobr>`delete`</nobr> | delete checkout, for example, after workflow completes successfully |
@@ -110,14 +110,14 @@ which define, which parts of the application or website the user has access to.
 
 #### Currencies and regions
 
-| Module                  | Function                | Effect            | Possible Limitations |
+| Module                  | Function                | Effect            | Possible limitations |
 |-------------------------|-------------------------|-------------------|----------------------|
 | <nobr>`commerce`</nobr> | <nobr>`currency`</nobr> | manage currencies |
 |                         | <nobr>`region`</nobr>   | manage regions    |
 
 #### Orders [[% include 'snippets/commerce_badge.md' %]]
 
-| Module               | Function              | Effect                    | Possible Limitations                                         |
+| Module               | Function              | Effect                    | Possible limitations                                         |
 |----------------------|-----------------------|---------------------------|--------------------------------------------------------------|
 | <nobr>`order`</nobr> | <nobr>`cancel`</nobr> | cancel an order           | [OrderOwner](limitation_reference.md#order-owner-limitation) |
 |                      | <nobr>`create`</nobr> | create an order           | [OrderOwner](limitation_reference.md#order-owner-limitation) |
@@ -126,7 +126,7 @@ which define, which parts of the application or website the user has access to.
 
 #### Payments [[% include 'snippets/commerce_badge.md' %]]
 
-| Module                 | Function              | Effect           | Possible Limitations                                            |
+| Module                 | Function              | Effect           | Possible limitations                                            |
 |------------------------|-----------------------|------------------|-----------------------------------------------------------------|
 | <nobr>`payment`</nobr> | <nobr>`create`</nobr> | create a payment | [PaymentOwner](limitation_reference.md#paymentowner-limitation) |
 |                        | <nobr>`delete`</nobr> | delete a payment | [PaymentOwner](limitation_reference.md#paymentowner-limitation) |
@@ -135,7 +135,7 @@ which define, which parts of the application or website the user has access to.
 
 #### Payment methods [[% include 'snippets/commerce_badge.md' %]]
 
-| Module                        | Function              | Effect                  | Possible Limitations |
+| Module                        | Function              | Effect                  | Possible limitations |
 |-------------------------------|-----------------------|-------------------------|----------------------|
 | <nobr>`payment_method`</nobr> | <nobr>`create`</nobr> | create a payment method |
 |                               | <nobr>`delete`</nobr> | delete a payment method |
@@ -144,7 +144,7 @@ which define, which parts of the application or website the user has access to.
 
 #### Segments [[% include 'snippets/commerce_badge.md' %]]
 
-| Module                 | Function                      | Effect                   | Possible Limitations                                              |
+| Module                 | Function                      | Effect                   | Possible limitations                                              |
 |------------------------|-------------------------------|--------------------------|-------------------------------------------------------------------|
 | <nobr>`segment`</nobr> | <nobr>`assign_to_user`</nobr> | assign Segments to Users | [Segment Group](limitation_reference.md#segment-group-limitation) |
 |                        | <nobr>`create`</nobr>         | create Segments          | [Segment Group](limitation_reference.md#segment-group-limitation) |
@@ -154,7 +154,7 @@ which define, which parts of the application or website the user has access to.
 
 #### Segment groups [[% include 'snippets/commerce_badge.md' %]]
 
-| Module                       | Function              | Effect                         | Possible Limitations |
+| Module                       | Function              | Effect                         | Possible limitations |
 |------------------------------|-----------------------|--------------------------------|----------------------|
 | <nobr>`segment_group`</nobr> | <nobr>`create`</nobr> | create Segment Groups          |
 |                              | <nobr>`read`</nobr>   | load Segment Group information |
@@ -163,7 +163,7 @@ which define, which parts of the application or website the user has access to.
 
 #### Shipments [[% include 'snippets/commerce_badge.md' %]]
 
-| Module                  | Function              | Effect                      | Possible Limitations                                               |
+| Module                  | Function              | Effect                      | Possible limitations                                               |
 |-------------------------|-----------------------|-----------------------------|--------------------------------------------------------------------|
 | <nobr>`shipment`</nobr> | <nobr>`create`</nobr> | create a shipment           | [ShipmentOwner](limitation_reference.md#shipment-owner-limitation) |
 |                         | <nobr>`delete`</nobr> | delete a shipment           | [ShipmentOwner](limitation_reference.md#shipment-owner-limitation) |
@@ -172,7 +172,7 @@ which define, which parts of the application or website the user has access to.
 
 #### Shipping methods [[% include 'snippets/commerce_badge.md' %]]
 
-| Module                         | Function              | Effect                   | Possible Limitations |
+| Module                         | Function              | Effect                   | Possible limitations |
 |--------------------------------|-----------------------|--------------------------|----------------------|
 | <nobr>`shipping_method`</nobr> | <nobr>`create`</nobr> | create a shipping method |
 |                                | <nobr>`delete`</nobr> | delete a shipping method |
@@ -183,7 +183,7 @@ which define, which parts of the application or website the user has access to.
 
 #### Content
 
-| Module                 | Function                          | Effect                                                                                                                                  | Possible Limitations                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
+| Module                 | Function                          | Effect                                                                                                                                  | Possible limitations                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
 |------------------------|-----------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | <nobr>`content`</nobr> | <nobr>`cleantrash`</nobr>         | empty the Trash (even when the User does not have access to individual content items)                                                   |
 |                        | <nobr>`create`</nobr>             | create new content. Note: even without this Policy the User is able to enter edit mode, but cannot finalize work with the content item. | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Language](limitation_reference.md#language-limitation)</br>[Owner of Parent](limitation_reference.md#owner-of-parent-limitation)</br>[Content type Group of Parent](limitation_reference.md#content-type-group-of-parent-limitation)</br>[Content type of Parent](limitation_reference.md#content-type-of-parent-limitation)</br>[Parent Depth](limitation_reference.md#parent-depth-limitation)</br>[Field Group](limitation_reference.md#field-group-limitation)</br>[Change Owner](limitation_reference.md#change-owner-limitation)             |
@@ -207,7 +207,7 @@ which define, which parts of the application or website the user has access to.
 
 #### Content types
 
-| Module               | Function              | Effect                                                                   | Possible Limitations |
+| Module               | Function              | Effect                                                                   | Possible limitations |
 |----------------------|-----------------------|--------------------------------------------------------------------------|----------------------|
 | <nobr>`class`</nobr> | <nobr>`create`</nobr> | create new content types. Also required to edit exiting content types    |
 |                      | <nobr>`delete`</nobr> | delete content types                                                     |
@@ -215,7 +215,7 @@ which define, which parts of the application or website the user has access to.
 
 #### Sections
 
-| Module                 | Function              | Effect                                                                           | Possible Limitations                                                                                                                                                                                                                              |
+| Module                 | Function              | Effect                                                                           | Possible limitations                                                                                                                                                                                                                              |
 |------------------------|-----------------------|----------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | <nobr>`section`</nobr> | <nobr>`assign`</nobr> | assign Sections to content                                                       | [content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[New Section](limitation_reference.md#new-section-limitation) |
 |                        | <nobr>`edit`</nobr>   | edit existing Sections and create new ones                                       |
@@ -223,14 +223,14 @@ which define, which parts of the application or website the user has access to.
 
 #### Object States
 
-| Module               | Function                    | Effect                                | Possible Limitations                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
+| Module               | Function                    | Effect                                | Possible limitations                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
 |----------------------|-----------------------------|---------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | <nobr>`state`</nobr> | <nobr>`assign`</nobr>       | assign Object states to content items | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Content type Group](limitation_reference.md#content-type-group-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Object State](limitation_reference.md#object-state-limitation)</br>[New State](limitation_reference.md#new-state-limitation) |
 |                      | <nobr>`administrate`</nobr> | view, add and edit Object states      |
 
 #### Taxonomy
 
-| Module                  | Function              | Effect                        | Possible Limitations |
+| Module                  | Function              | Effect                        | Possible limitations |
 |-------------------------|-----------------------|-------------------------------|----------------------|
 | <nobr>`taxonomy`</nobr> | <nobr>`assign`</nobr> | tag or untag content          |
 |                         | <nobr>`manage`</nobr> | create, edit, and delete tags |
@@ -238,7 +238,7 @@ which define, which parts of the application or website the user has access to.
 
 #### Workflow and version comparison
 
-| Module                    | Function                    | Effect                                 | Possible Limitations                                                          |
+| Module                    | Function                    | Effect                                 | Possible limitations                                                          |
 |---------------------------|-----------------------------|----------------------------------------|-------------------------------------------------------------------------------|
 | <nobr>`comparison`</nobr> | <nobr>`view`</nobr>         | view version comparison                |
 | <nobr>`workflow`</nobr>   | <nobr>`change_stage`</nobr> | change stage in the specified workflow | [Workflow Transition](limitation_reference.md#workflow-transition-limitation) |
@@ -247,7 +247,7 @@ which define, which parts of the application or website the user has access to.
 
 #### Catalogs
 
-| Module                 | Function              | Effect           | Possible Limitations |
+| Module                 | Function              | Effect           | Possible limitations |
 |------------------------|-----------------------|------------------|----------------------|
 | <nobr>`catalog`</nobr> | <nobr>`create`</nobr> | create a catalog |
 |                        | <nobr>`delete`</nobr> | delete a catalog |
@@ -256,7 +256,7 @@ which define, which parts of the application or website the user has access to.
 
 #### Products
 
-| Module                 | Function              | Effect                                      | Possible Limitations                                                                                                        |
+| Module                 | Function              | Effect                                      | Possible limitations                                                                                                        |
 |------------------------|-----------------------|---------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------|
 | <nobr>`product`</nobr> | <nobr>`create`</nobr> | create a product                            | [Product Type](limitation_reference.md#product-type-limitation)</br>[Language](limitation_reference.md#language-limitation) |
 |                        | <nobr>`delete`</nobr> | delete a product                            | [Product Type](limitation_reference.md#product-type-limitation)                                                             |
@@ -265,17 +265,17 @@ which define, which parts of the application or website the user has access to.
 
 #### Product types
 
-| Module                      | Function              | Effect                                                                                                          | Possible Limitations |
+| Module                      | Function              | Effect                                                                                                          | Possible limitations |
 |-----------------------------|-----------------------|-----------------------------------------------------------------------------------------------------------------|----------------------|
 | <nobr>`product_type`</nobr> | <nobr>`create`</nobr> | create a product type, a new attribute, a new attribute group and add translation to product type and attribute |
 |                             | <nobr>`delete`</nobr> | delete a product type, attribute, attribute group                                                               |
 |                             | <nobr>`edit`</nobr>   | edit a product type, attribute, attribute group                                                                 |
 |                             | <nobr>`view`</nobr>   | view product types, attributes and attribute groups                                                             |
 
-## Combining Policies
+## Combining policies
 
-Policies on one Role are connected with the *and* relation, not *or*,
-so when Policy has more than one Limitation, all of them have to apply.
+Policies on one role are connected with the *and* relation, not *or*,
+so when policy has more than one limitation, all of them have to apply.
 
-If you want to combine more than one Limitation with the *or* relation, not *and*,
-you can split your Policy in two, each with one of these Limitations.
+If you want to combine more than one limitation with the *or* relation, not *and*,
+you can split your policy in two, each with one of these limitations.
diff --git a/docs/personalization/api_reference/recommendation_api.md b/docs/personalization/api_reference/recommendation_api.md
index 56a0187025..0a92b5b674 100644
--- a/docs/personalization/api_reference/recommendation_api.md
+++ b/docs/personalization/api_reference/recommendation_api.md
@@ -33,7 +33,7 @@ For the request to return recommendations, you must provide the following parame
 |---|---|---|
 |`customerid`|A customer ID (for example "00000"), as defined when [enabling Personalization](enable_personalization.md#set-up-customer-credentials). Can be used to identify a website in installations that [hosts multiple SiteAccesses]([[= user_doc =]]/personalization/use_cases/#multiple-website-hosting).|alphanumeric|
 |`userid`|An ID of the tracked user in the website (for example, an internal customer code, a session code or a cookie for anonymous users.|alphanumeric|
-|`scenarioid`|An ID of the scenario used for providing recommendations, as defined in the Back Office.|alphanumeric|
+|`scenarioid`|An ID of the scenario used for providing recommendations, as defined in the back office.|alphanumeric|
 |`extension`|A format of the response (either JSON or JSONP).|`json` or `jsonp`|
 
 !!! caution "Parameter encoding limitations"
diff --git a/docs/personalization/enable_personalization.md b/docs/personalization/enable_personalization.md
index 13a74fe53e..739894b1d1 100644
--- a/docs/personalization/enable_personalization.md
+++ b/docs/personalization/enable_personalization.md
@@ -324,7 +324,7 @@ The username is the customer ID and the password is the license key.
 
 ##### Personalization backend
 
-In the Back Office, go to **Personalization** > **Import** and review the list of historical import operations to see whether a full import was successful.
+In the back office, go to **Personalization** > **Import** and review the list of historical import operations to see whether a full import was successful.
 
 ![Item Import tab with full import results](reco_full_import.png)
 
@@ -332,7 +332,7 @@ In the Back Office, go to **Personalization** > **Import** and review the list o
 
 The Personalization server is automatically kept in sync with the content in [[= product_name =]].
 
-Every time an editor creates, updates or deletes content in the Back Office,
+Every time an editor creates, updates or deletes content in the back office,
 a notification is sent to https://admin.perso.ibexa.co/.
 The personalization service also notifies other components of the Personalization server
 and it eventually fetches the affected content and updates it internally.
@@ -392,7 +392,7 @@ render(controller('ibexa_personalization::showRecommendationsAction', {
 | Parameter        | Type   | Description   |
 |------------------|--------|---------------|
 | `contextItems`   | int    | ID of the content you want to get recommendations for. |
-| `scenario`       | string | Scenario used to display recommendations. You can create custom scenarios in the Back Office. |
+| `scenario`       | string | Scenario used to display recommendations. You can create custom scenarios in the back office. |
 | `outputTypeId`   | string | Item type that you expect in response, for example, `blog_post`. |
 | `crossContentType`| bool | If set to `true`, returns recommendations for all content types specified in the scenario. |
 | `limit`          | int    | Number of recommendations to fetch. |
@@ -566,6 +566,6 @@ and results that come from these websites.
 
 ## Configure recommendation logic
 
-When you enable the Personalization, you can go back to the Back Office, 
+When you enable the Personalization, you can go back to the back office, 
 refresh the Personalization dashboard and proceed with [configuring the logic]([[= user_doc =]]/personalization/perso_configuration) 
 used to calculate the recommendation results.
diff --git a/docs/pim/create_custom_attribute_type.md b/docs/pim/create_custom_attribute_type.md
index 6d025ddd5f..6e2907a99b 100644
--- a/docs/pim/create_custom_attribute_type.md
+++ b/docs/pim/create_custom_attribute_type.md
@@ -151,6 +151,6 @@ Register the storage definition as a service and tag it with `ibexa.product_cata
 
 ## Use new attribute type
 
-In the Back Office you can now add a new Percent attribute to your product type and create a product with it.
+In the back office you can now add a new Percent attribute to your product type and create a product with it.
 
 ![Creating a product with a custom Percent attribute](catalog_custom_attribute_type.png)
diff --git a/docs/pim/create_custom_catalog_filter.md b/docs/pim/create_custom_catalog_filter.md
index 7104e96122..e640c6f6b1 100644
--- a/docs/pim/create_custom_catalog_filter.md
+++ b/docs/pim/create_custom_catalog_filter.md
@@ -54,7 +54,7 @@ Now, create `ProductNameCriterionTransformer` in `src/CatalogFilter/DataTransfor
 
 ## Provide templates
 
-Now, provide the templates for the catalog editing view in the Back Office.
+Now, provide the templates for the catalog editing view in the back office.
 
 You need two templates: one for the filter form, and one for the filter badge in the product list.
 
@@ -67,7 +67,7 @@ First, add a `form_field_override.html.twig` template to `templates/themes/admin
 Here, you use the same built-in template that is used for example for the product code filter.
 It is placed in a template block corresponding to your custom filter, `catalog_criteria_product_name_values`.
 
-To ensure the template is used as a Back Office form theme, add the following configuration:
+To ensure the template is used as a back office form theme, add the following configuration:
 
 ``` yaml
 [[= include_file('code_samples/catalog/custom_catalog_filter/config/packages/catalog_filters.yaml', 8, 11) =]]
diff --git a/docs/pim/enable_purchasing_products.md b/docs/pim/enable_purchasing_products.md
index e44cc73c9b..79ad8ae1be 100644
--- a/docs/pim/enable_purchasing_products.md
+++ b/docs/pim/enable_purchasing_products.md
@@ -19,7 +19,7 @@ To enable adding product to cart and purchasing from the catalog, the following
 
 ## Region and currency
 
-All currencies available in the system must be enabled in the Back Office under **Product Catalog** -> **Currencies**.
+All currencies available in the system must be enabled in the back office under **Product Catalog** -> **Currencies**.
 
 Additionally, you must configure currencies valid for specific SiteAccesses
 under the `ibexa.system.<scope>.product_catalog.currencies` [configuration key](configuration.md#configuration-files):
@@ -113,6 +113,6 @@ ibexa:
     ```
 
 You can then assign VAT rates that apply to every product type in each of the supported regions.
-To do it, in the Back Office, [open the product type for editing]([[= user_doc =]]/pim/create_product_types/#vat), and navigate to the **VAT rates** area.
+To do it, in the back office, [open the product type for editing]([[= user_doc =]]/pim/create_product_types/#vat), and navigate to the **VAT rates** area.
 
 ![Assigning VAT rates to a product type](catalog_vat_rates.png "Assigning VAT rates to a product type")
\ No newline at end of file
diff --git a/docs/pim/pim_configuration.md b/docs/pim/pim_configuration.md
index c385850c74..910b9344af 100644
--- a/docs/pim/pim_configuration.md
+++ b/docs/pim/pim_configuration.md
@@ -117,4 +117,4 @@ ibexa:
                         - product_availability
 ```
 
-The order of filters in this configuration reflects the order in which they are displayed in the Back Office.
+The order of filters in this configuration reflects the order in which they are displayed in the back office.
diff --git a/docs/pim/pim_guide.md b/docs/pim/pim_guide.md
index 2b1df8a8f0..3592991c8a 100644
--- a/docs/pim/pim_guide.md
+++ b/docs/pim/pim_guide.md
@@ -144,7 +144,7 @@ Besides, the built-in catalog filters, you can also [create custom ones](create_
 
 ### Remote PIM support
 
-In [[= product_name =]], products are created and maintained by using the REST API or the Back Office, and their data is stored in a local database.
+In [[= product_name =]], products are created and maintained by using the REST API or the back office, and their data is stored in a local database.
 However, in your project or organization, you might have an existing product database, or be specifically concerned about product information security.
 To address such needs, [[= product_name =]] provides a foundation for remote PIM support.
 You can build upon it to connect to a remote PIM or ERP system, pull product data and present it on your website.
diff --git a/docs/pim/prices.md b/docs/pim/prices.md
index 5ee408f104..43aaf8c878 100644
--- a/docs/pim/prices.md
+++ b/docs/pim/prices.md
@@ -28,7 +28,7 @@ You must then register it as a service with the `ibexa.product_catalog.customer_
 ## Currency
 
 [[= product_name =]] ships with a list of available currencies, and you can also add custom currencies.
-To use currencies in your shop, you need to first enable them in the Back Office.
+To use currencies in your shop, you need to first enable them in the back office.
 
 ## VAT
 
diff --git a/docs/pim/products.md b/docs/pim/products.md
index 470e08703c..16dc76952c 100644
--- a/docs/pim/products.md
+++ b/docs/pim/products.md
@@ -57,7 +57,7 @@ You can create product variants automatically based on attributes
 that have the "Used for product variants" flag enabled in the product type definition.
 
 You can create variants for any combination of values of selected attributes.
-In the Back Office you can automatically generate all possible variants for a product.
+In the back office you can automatically generate all possible variants for a product.
 
 Codes for product variants are generated automatically based on the [selected strategy](pim_configuration.md#code-generation-strategy).
 
diff --git a/docs/release_notes/ez_platform_v1.9.0.md b/docs/release_notes/ez_platform_v1.9.0.md
index b32cfe128c..ff1bfb48a2 100644
--- a/docs/release_notes/ez_platform_v1.9.0.md
+++ b/docs/release_notes/ez_platform_v1.9.0.md
@@ -20,7 +20,7 @@ You can now create collections of content quickly: upload multiple files in bulk
 
 #### Content browser
 
-In version 1.8 we introduced a new Content Browser in the Universal Discovery Widget (UDW). This Content Browser is now used to browse content everywhere, also when accessing the content tree through the left pane in Platform UI. This allows users to reach the entire repository from this toolbar (which was previously limited in terms of number of items per level), it also provides a much more consistent user experience. To reflect this change, the Content tree button has been renamed **Content browse**.
+In version 1.8 we introduced a new Content Browser in the Universal Discovery Widget (UDW). This Content Browser is now used to browse content everywhere, also when accessing the content tree through the left pane in Platform UI. This allows users to reach the entire repository from this toolbar (which was previously limited in terms of number of items per level), it also provides a much more consistent user experience. To reflect this change, the content tree button has been renamed **Content browse**.
 
 ![](contentbrowse.gif)
 
diff --git a/docs/release_notes/ez_platform_v2.1.0.md b/docs/release_notes/ez_platform_v2.1.0.md
index 1d13d4bfbe..e943e695ab 100644
--- a/docs/release_notes/ez_platform_v2.1.0.md
+++ b/docs/release_notes/ez_platform_v2.1.0.md
@@ -66,7 +66,7 @@ You can now perform REST search via `POST /views` using custom `FieldCriterion`.
 
 ### Other UI improvements
 
-- When accessing the Back Office from a link to a specific content item, after logging in you will now be redirected to the proper content view.
+- When accessing the back office from a link to a specific content item, after logging in you will now be redirected to the proper content view.
 - In edit mode you can now preview content as it will look in any SiteAccess it is available in.
 - When you start editing a content item that already has an open draft, you will see a draft conflict screen:
 
diff --git a/docs/release_notes/ez_platform_v2.2.0.md b/docs/release_notes/ez_platform_v2.2.0.md
index f30707dda8..84c53f1ac2 100644
--- a/docs/release_notes/ez_platform_v2.2.0.md
+++ b/docs/release_notes/ez_platform_v2.2.0.md
@@ -59,7 +59,7 @@ You can find the list of all bookmarks in *Browse content* section. There, you c
 
 ### Standard design
 
-eZ Platform now comes with two designs using the [design engine](https://doc.ibexa.co/en/2.5/guide/design_engine): `standard` for content view and `admin` for the Back Office.
+eZ Platform now comes with two designs using the [design engine](https://doc.ibexa.co/en/2.5/guide/design_engine): `standard` for content view and `admin` for the back office.
 See [default designs](https://doc.ibexa.co/en/2.5/guide/design_engine/#default-designs) for more information.
 
 !!! caution
@@ -67,13 +67,13 @@ See [default designs](https://doc.ibexa.co/en/2.5/guide/design_engine/#default-d
     If you encounter problems during upgrading, disable the override
     by setting `ez_platform_standard_design.override_kernel_templates` to `false`.
 
-### Previewing User and User Group permissions
+### Previewing user and user group permissions
 
-When viewing User or User Group content items you can now preview what permissions are assigned to them.
+When viewing user or user group content items you can now preview what permissions are assigned to them.
 
 ![Preview of permissions assigned to a User](2.2_permissions_in_user_view.png)
 
-You can also [select which content types are treated the same way as User of User Group](https://doc.ibexa.co/en/2.5/guide/config_repository/#user-identifiers) for these purposes.
+You can also [select which content types are treated the same way as user of user group](https://doc.ibexa.co/en/2.5/guide/config_repository/#user-identifiers) for these purposes.
 
 ### Change from UTF8 to UTF8MB4
 
diff --git a/docs/release_notes/ez_platform_v2.3.md b/docs/release_notes/ez_platform_v2.3.md
index c8f3aa99e2..968c799055 100644
--- a/docs/release_notes/ez_platform_v2.3.md
+++ b/docs/release_notes/ez_platform_v2.3.md
@@ -45,7 +45,7 @@
 
     ![Form Builder](2.3_form_builder.png)
 
-    You can preview and download submissions in the Back Office.
+    You can preview and download submissions in the back office.
 
     ![Form Builder submissions](2.3_form_builder_submissions.png)
 
@@ -76,7 +76,7 @@ You can now access and set user preferences in the user menu.
 
 ![User preferences screen with time zone settings](2.3_user_preferences.png)
 
-It is covered by the `user/preferences` Policy.
+It is covered by the `user/preferences` policy.
 
 ### Dates in preferred timezone
 
@@ -97,9 +97,9 @@ Improvements to the API cover:
 - [`ASSET` Relation type](https://github.com/ezsystems/ezpublish-kernel/blob/v7.3.0-rc2/eZ/Publish/Core/REST/Client/Input/Parser/Relation.php#L84)
 - `TrashItem->trashed` timestamp covers when a content item was placed in Trash
 
-#### Back Office translations
+#### Back office translations
 
-There are three new ways you can now contribute to Back Office translations:
+There are three new ways you can now contribute to back office translations:
 - translate in-context with bookmarks
 - translate in-context with console
 - translate directly on the Crowdin website
diff --git a/docs/release_notes/ez_platform_v2.4.md b/docs/release_notes/ez_platform_v2.4.md
index 1f17e828f9..4334a85537 100644
--- a/docs/release_notes/ez_platform_v2.4.md
+++ b/docs/release_notes/ez_platform_v2.4.md
@@ -148,7 +148,7 @@ This release introduces a few simplifications to API use for content types:
 
 - Exposes `content->getContentType()` for easier use, including from Twig as `content.contentType`. When iterating over the result set of content/Locations these will effectively be loaded all at once.
 - Adds possibility to load several content types in bulk using `ContentTypeService->loadContentTypeList()`.
-- `UserService` now exposes `isUser()` and `isUserGroup()`. They do not need to do a lookup to the database in order to tell if a content item is of type User or User Group.
+- `UserService` now exposes `isUser()` and `isUserGroup()`. They do not need to do a lookup to the database in order to tell if a content item is of type user or user group.
 
 #### Load multiple Locations
 
diff --git a/docs/release_notes/ez_platform_v2.5.md b/docs/release_notes/ez_platform_v2.5.md
index d7adbd0d31..8e89001f02 100644
--- a/docs/release_notes/ez_platform_v2.5.md
+++ b/docs/release_notes/ez_platform_v2.5.md
@@ -13,17 +13,17 @@ description: eZ Platform v2.5 is the last Long Term Support release in the v2 li
 
 ## Notable changes
 
-### Content Tree
+### Content tree
 
-You can now navigate through your website with a Content Tree.
-It will allow you to easily browse your content in the Back Office.
+You can now navigate through your website with a content tree.
+It will allow you to easily browse your content in the back office.
 Each content item has a unique icon that helps you identify it without opening.
 
-![Content Tree in the menu](left_menu_tree.png "Content Tree in the menu")
+![Content tree in the menu](left_menu_tree.png "Content tree in the menu")
 
-For more information on custom configuration, see [Content Tree](https://doc.ibexa.co/en/2.5/guide/config_back_office/#content-tree) in the developer documentation.
+For more information on custom configuration, see [content tree](https://doc.ibexa.co/en/2.5/guide/config_back_office/#content-tree) in the developer documentation.
 
-For full description of the interface, see [Content Tree](https://doc.ibexa.co/projects/userguide/en/2.5/content_model/#content-tree) in the user documentation.
+For full description of the interface, see [content tree](https://doc.ibexa.co/projects/userguide/en/2.5/content_model/#content-tree) in the user documentation.
 
 ### Webpack Encore
 
@@ -94,7 +94,7 @@ You can now easily use [custom CK Editor plugins](https://doc.ibexa.co/en/2.5/gu
 
 ### Hiding and revealing content
 
-You can now hide and reveal content items from the Back Office.
+You can now hide and reveal content items from the back office.
 Hidden content will be unavailable on the front page regardless of permissions or [Location visibility](https://doc.ibexa.co/en/2.5/guide/content_management/#location-visibility).
 
 ![Icon for hiding content](2.5_hide_content_icon.png)
@@ -109,15 +109,15 @@ The Dashboard now shows the version of eZ Platform you are running.
 
 The User Settings menu has been expanded with the following options:
 
-- Preferred language of the Back Office
+- Preferred language of the back office
 - Preferred date format
 - Option to enable or disable a character counter for Rich Text Fields
 
 ![User settings screen with new settings](2.5_user_settings.png)
 
-### Various Back Office improvements
+### Various back office improvements
 
-This release introduced several Back Office improvements to facilitate editorial experience, including:
+This release introduced several back office improvements to facilitate editorial experience, including:
 
 - [Icons for content types and the ability to define them](https://doc.ibexa.co/en/2.5/guide/extending/extending_back_office/#custom-content-type-icons)
 - Ability to collapse and expand content preview to have easier access to the Sub-items list
@@ -125,13 +125,13 @@ This release introduced several Back Office improvements to facilitate editorial
 - Simpler assigning of Object States to content
 
 
-![Back Office improvements](2.5_back_office_improvements.png)
+![Back office improvements](2.5_back_office_improvements.png)
 
 ### Permissions
 
 #### Content/Create policy for Users
 
-You can now define a 'Content/Create' policy for a User or a User group.
+You can now define a 'Content/Create' policy for a User or a user group.
 It will enable or disable (if not set) the **Create** button in your dashboard.
 
 #### Universal Discovery Widget
@@ -230,7 +230,7 @@ instead of throwing an exception. The following methods are affected:
 - `RoleService::getRoleAssignmentsForUser`
 - `RoleService::getRoleAssignmentsForUserGroup`
 
-`content/cleantrash` Policy now allows the user to empty the trash
+`content/cleantrash` policy now allows the user to empty the trash
 even if they would not have access to the trashed content.
 
 ### Docker environment
@@ -277,7 +277,7 @@ With v2.5.6 you can optionally use Solr 7.7. To enable it:
 
 ### Search result improvements
 
-When searching in the Back Office you can now select languages to filter results through.
+When searching in the back office you can now select languages to filter results through.
 
 ### Searchable Matrix Field
 
diff --git a/docs/release_notes/ez_platform_v3.0.md b/docs/release_notes/ez_platform_v3.0.md
index 0c77f42e2b..e176f0de0e 100644
--- a/docs/release_notes/ez_platform_v3.0.md
+++ b/docs/release_notes/ez_platform_v3.0.md
@@ -47,8 +47,8 @@ For details, see [Bundles](https://doc.ibexa.co/en/latest/guide/bundles).
 
     ### Site Factory
 
-    The new Site management User Interface is now integrated with Back Office.
-    It enables you to easily create and manage multiple sites from the Back Office without editing the configuration files.
+    The new Site management User Interface is now integrated with back office.
+    It enables you to easily create and manage multiple sites from the back office without editing the configuration files.
 
     For more information about:
 
@@ -59,7 +59,7 @@ For details, see [Bundles](https://doc.ibexa.co/en/latest/guide/bundles).
 
     #### Schedule calendar
 
-    You can now easily view and perform scheduling actions using the Calendar widget available in the Back Office.
+    You can now easily view and perform scheduling actions using the Calendar widget available in the back office.
     By default, the widget displays content items scheduled for future publication, but custom events can be configured as well.
     You can also filter displayed events and toggle through a day, week, and month view.
 
@@ -70,7 +70,7 @@ For details, see [Bundles](https://doc.ibexa.co/en/latest/guide/bundles).
     #### Schedule hiding a content item
 
     You can now schedule hiding content items.
-    Using Calendar widget available in the Back Office you can also reschedule or cancel hiding a content item.
+    Using Calendar widget available in the back office you can also reschedule or cancel hiding a content item.
 
     ### Defining buttons in Online Editor
 
@@ -145,7 +145,7 @@ for user passwords.
 
 ### Duplicate a role
 
-You can now duplicate a role with a single click in the Back Office.
+You can now duplicate a role with a single click in the back office.
 
 ![Duplicate a role](3.0_duplicate_roles.png "Duplicate a role icon")
 
@@ -225,7 +225,7 @@ New multilingual content route for internal translations has been added.
 
 ### Renamed templates and parameters
 
-Templates and parameters used by the Back Office have been renamed for consistency.
+Templates and parameters used by the back office have been renamed for consistency.
 For A full list of changes, see [Backwards compatibility doc](https://doc.ibexa.co/en/latest/releases/ez_platform_v3.0_deprecations).
 
 ### HTTP Cache
diff --git a/docs/release_notes/ez_platform_v3.0_deprecations.md b/docs/release_notes/ez_platform_v3.0_deprecations.md
index 74c656fb22..c2ceee29e8 100644
--- a/docs/release_notes/ez_platform_v3.0_deprecations.md
+++ b/docs/release_notes/ez_platform_v3.0_deprecations.md
@@ -199,7 +199,7 @@ Selected event names have been changed.
 
 #### Templates renamed
 
-The following templates used in the Back Office have been renamed:
+The following templates used in the back office have been renamed:
 
 |Former name|New name|
 |-----------|--------|
@@ -291,9 +291,9 @@ For the full list of UDW configuration keys and their descriptions, see [UDW con
 All Online Editor front-end code and assets (such as JS, CSS, fonts, etc.)
 have been moved from `ezplatform-admin-ui` to `ezplatform-richtext`.
 
-### Adding new tabs in the Back Office
+### Adding new tabs in the back office
 
-The way of adding custom tab groups in the Back Office has changed.
+The way of adding custom tab groups in the back office has changed.
 You now need to [make use of the `TabsComponent`](https://doc.ibexa.co/en/latest/extending/extending_tabs/#adding-a-new-tab-group).
 
 ### Content type forms
@@ -301,7 +301,7 @@ You now need to [make use of the `TabsComponent`](https://doc.ibexa.co/en/latest
 Content type editing, including Action Dispatchers, Form Processors, Types and Data classes related to content types/Limitations,
 has been moved to `ezplatform-admin-ui` from `repository-forms`.
 
-### Code cleanup in Back Office
+### Code cleanup in back office
 
 The following deprecated items have been removed:
 
diff --git a/docs/release_notes/ez_platform_v3.1.md b/docs/release_notes/ez_platform_v3.1.md
index 3ecfdd9e81..3708371190 100644
--- a/docs/release_notes/ez_platform_v3.1.md
+++ b/docs/release_notes/ez_platform_v3.1.md
@@ -10,7 +10,7 @@
 
 ## Notable changes
 
-[eZ Commerce](https://github.com/ezsystems/ezcommerce) now uses Symfony 5 and is fully integrated into the eZ Platform Back Office.
+[eZ Commerce](https://github.com/ezsystems/ezcommerce) now uses Symfony 5 and is fully integrated into the eZ Platform back office.
 
 Refer to [eZ Commerce documentation](https://doc.ezplatform.com/projects/ezcommerce/en/latest/) for more information.
 
@@ -65,11 +65,11 @@ This release of eZ Platform introduces the following new features:
     
 ### URL management UI
 
-You can now manage URL addresses and URL wildcards with a comfortable user interface that is available in the Back Office. You can create, modify and delete URL wildcards, as well as decide if the user should be redirected to the new address on clicking the link.
+You can now manage URL addresses and URL wildcards with a comfortable user interface that is available in the back office. You can create, modify and delete URL wildcards, as well as decide if the user should be redirected to the new address on clicking the link.
 
 !!! note
 
-    As of this release, the Link manager is no longer part of the Content panel, and now it belongs to the Admin panel of the Back Office.
+    As of this release, the Link manager is no longer part of the Content panel, and now it belongs to the Admin panel of the back office.
 
 ![URL Management UI](3_1_URL_Management.png "URL Management UI")
 
diff --git a/docs/release_notes/ibexa_dxp_v3.2.md b/docs/release_notes/ibexa_dxp_v3.2.md
index 2879f8be64..c9f858274b 100644
--- a/docs/release_notes/ibexa_dxp_v3.2.md
+++ b/docs/release_notes/ibexa_dxp_v3.2.md
@@ -14,10 +14,10 @@
 
 ### New UI
 
-This version offers a completely reworked user interface, covering all of the Back Office,
+This version offers a completely reworked user interface, covering all of the back office,
 including eCommerce administration.
 
-![New Content structure](3.2_new_ui_content_structure.png "New Back Office interface")
+![New Content structure](3.2_new_ui_content_structure.png "New back office interface")
 
 ![Commerce administration](3.2_commerce_cockpit.png "Commerce cockpit")
 
@@ -48,7 +48,7 @@ depending on the Segments they belong to.
 
 ![Targeting block](3.2_targeting_block.png)
 
-You can [configure Segments](https://doc.ibexa.co/en/latest/guide/admin_panel/#segments) in the Back Office.
+You can [configure Segments](https://doc.ibexa.co/en/latest/guide/admin_panel/#segments) in the back office.
 
 [Segmentation API](https://doc.ibexa.co/en/latest/api/public_php_api_managing_users/#segments) enables you to create and edit Segments and Segment Groups,
 as well as assign Users to Segments.
@@ -80,11 +80,11 @@ See [Install Ibexa Platform](https://doc.ibexa.co/en/latest/getting_started/inst
 
 ### Site Factory improvements [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
-You can now define User Group skeletons where you define Policies and Limitations that apply to a specific User Group. 
+You can now define user group skeletons where you define policies and limitations that apply to a specific user group. 
 You can then associate a number of such skeletons with a site template. 
-User Group skeletons survive deleting a site.
+User group skeletons survive deleting a site.
 
-See [Configure User Group skeleton](https://doc.ibexa.co/en/latest/guide/multisite/site_factory_configuration/#user-group-skeletons) for more information.
+See [Configure user group skeleton](https://doc.ibexa.co/en/latest/guide/multisite/site_factory_configuration/#user-group-skeletons) for more information.
 
 ### Calendar widget improvements
 
@@ -97,7 +97,7 @@ For more information, see [Calendar widget](https://doc.ibexa.co/projects/usergu
 
 ### Cloning content types
 
-When creating content types in the Back Office, you do not have to start from scratch.
+When creating content types in the back office, you do not have to start from scratch.
 You can now clone an existing content type instead.
 
 To do this, click the **Copy** icon located next to the content type that you want to clone.
diff --git a/docs/release_notes/ibexa_dxp_v4.0.md b/docs/release_notes/ibexa_dxp_v4.0.md
index 1b40102032..4895dc7c8b 100644
--- a/docs/release_notes/ibexa_dxp_v4.0.md
+++ b/docs/release_notes/ibexa_dxp_v4.0.md
@@ -12,7 +12,7 @@
 
 ### Redesigned user interface
 
-The the Back Office has undergone a complete redesign, including revised look and feel,
+The the back office has undergone a complete redesign, including revised look and feel,
 simplified navigation and more streamlined workflows.
 
 ![New UI](4.0_new_ui.png)
diff --git a/docs/release_notes/ibexa_dxp_v4.0_deprecations.md b/docs/release_notes/ibexa_dxp_v4.0_deprecations.md
index e157a5b387..7a24755958 100644
--- a/docs/release_notes/ibexa_dxp_v4.0_deprecations.md
+++ b/docs/release_notes/ibexa_dxp_v4.0_deprecations.md
@@ -102,7 +102,7 @@ All service tag changes are listed in the `ibexa/compatibility-layer` repository
 Refer to [mapping reference](https://github.com/ibexa/compatibility-layer/blob/main/src/bundle/Resources/mappings/symfony-service-tag-name-map.php)
 for a full comparison of old and new service tags.
 
-## CSS classes for Back Office
+## CSS classes for back office
 
 CSS classes with the `ez-` prefix have been modified with an `ibexa-` prefix.
 
diff --git a/docs/release_notes/ibexa_dxp_v4.1.md b/docs/release_notes/ibexa_dxp_v4.1.md
index 96ed6ef113..60a61fc807 100644
--- a/docs/release_notes/ibexa_dxp_v4.1.md
+++ b/docs/release_notes/ibexa_dxp_v4.1.md
@@ -44,16 +44,16 @@ The new Measurement product attribute enables describing products with different
 
 ### User interface improvements
 
-Several improvements to the Back Office interface enhance the user experience.
+Several improvements to the back office interface enhance the user experience.
 These include:
 
 - "Go to top" button
 - new DateTime widget
 - view switcher between lists, grids and calendar.
 
-Several new options have been added to the Content Tree's contextual menu, including Hide/Reveal, Create, Edit and Add translation, Add/Remove from bookmarks.
+Several new options have been added to the content tree's contextual menu, including Hide/Reveal, Create, Edit and Add translation, Add/Remove from bookmarks.
 
-![New Content Tree options](4.1_content_tree.png)
+![New content tree options](4.1_content_tree.png)
 
 ## Other changes
 
diff --git a/docs/release_notes/ibexa_dxp_v4.2.md b/docs/release_notes/ibexa_dxp_v4.2.md
index 7d404c5075..69dc273bc7 100644
--- a/docs/release_notes/ibexa_dxp_v4.2.md
+++ b/docs/release_notes/ibexa_dxp_v4.2.md
@@ -24,9 +24,9 @@ your shipping information and view your past orders.
 You can invite members to your company, activate or deactivate their accounts,
 assign them specific roles and limitations, such as a buyer, or sales representative, and group them into teams.
 
-![Customer Portal Back Office](4.2_customer_portal.png)
+![Customer Portal back office](4.2_customer_portal.png)
 
-For more information, see [Back Office company management documentation](https://doc.ibexa.co/projects/userguide/en/latest/shop_administration/manage_users).
+For more information, see [back office company management documentation](https://doc.ibexa.co/projects/userguide/en/latest/shop_administration/manage_users).
 
 On their personal accounts in Customer Portal, members of your organisation can view their order history,
 other members of their team and information regarding their company, for example, billing addresses.
@@ -40,7 +40,7 @@ For more information, see [Customer Portal documentation](https://doc.ibexa.co/p
 
 #### Inviting users
 
-You can [invite users to create their account](https://doc.ibexa.co/projects/userguide/en/latest/users/user_management/#inviting-users) in the frontend as customers or in the Back Office as members of your team.
+You can [invite users to create their account](https://doc.ibexa.co/projects/userguide/en/latest/users/user_management/#inviting-users) in the frontend as customers or in the back office as members of your team.
 
 ![Inviting members of your team](4.2_invite_users.png)
 
@@ -187,7 +187,7 @@ If a Page block has multiple attributes, you can now group them with the [`neste
 
 ### Search in URL wildcards
 
-You can now search through the **URL wildcards** table in the Back Office.
+You can now search through the **URL wildcards** table in the back office.
 
 ### Product price events
 
diff --git a/docs/release_notes/ibexa_dxp_v4.3.md b/docs/release_notes/ibexa_dxp_v4.3.md
index 92e0d1b02e..f5d90fe681 100644
--- a/docs/release_notes/ibexa_dxp_v4.3.md
+++ b/docs/release_notes/ibexa_dxp_v4.3.md
@@ -103,7 +103,7 @@ The catalogs functionality in PIM is now covered in REST API, including:
 
 ### Personalization improvements
 
-Now, as a Personalization admin, after editing a model in the Back Office,
+Now, as a Personalization admin, after editing a model in the back office,
 [you can build this model](https://doc.ibexa.co/projects/userguide/en/master/personalization/recommendation_models/#trigger-model-build), use the **Trigger model build** button to build this model with your modifications.
 
 ### Taxonomy improvements
diff --git a/docs/release_notes/ibexa_dxp_v4.5.md b/docs/release_notes/ibexa_dxp_v4.5.md
index d6d3be93c0..bebbf0e9b2 100644
--- a/docs/release_notes/ibexa_dxp_v4.5.md
+++ b/docs/release_notes/ibexa_dxp_v4.5.md
@@ -31,7 +31,7 @@ Modules can interact with each other, for example, to decrease stock as a result
 
 With order management in place, it is now possible to create orders, configure and customize the order processing workflow, as well as manage orders by using the APIs. 
 
-New screens added to the Back Office user interface let [[= product_name =]] users search for orders and filter search results. 
+New screens added to the back office user interface let [[= product_name =]] users search for orders and filter search results. 
 Users can also review order details and completion status, as well as cancel orders.
 
 ![The order list screen](img/4.5_order_list.png "The order list screen")
@@ -39,7 +39,7 @@ Users can also review order details and completion status, as well as cancel ord
 #### Payment
 
 The all-new Payment module brings a possibility of tracking payment progress and defining a custom payment processing workflow. 
-New Back Office screens allow users to search for payment methods and payments, as well as define, enable and disable offline payment methods.
+New back office screens allow users to search for payment methods and payments, as well as define, enable and disable offline payment methods.
 
 Additionally, new APIs are available, which can be used for managing payment methods and payments.
 
@@ -47,7 +47,7 @@ Additionally, new APIs are available, which can be used for managing payment met
 
 #### Shipping
 
-With the arrival of the Shipping module, it is now possible to define and manage shipping methods of different types, together with their related costs, on a dedicated Back Office screen, as well as configure and customize the shipment workflow.
+With the arrival of the Shipping module, it is now possible to define and manage shipping methods of different types, together with their related costs, on a dedicated back office screen, as well as configure and customize the shipment workflow.
 
 New APIs enable managing shipping methods and payments, while an extension point can be used to expand the default list of shipping method types. 
 
diff --git a/docs/release_notes/ibexa_dxp_v4.6.md b/docs/release_notes/ibexa_dxp_v4.6.md
index 9f736001dd..29c2920690 100644
--- a/docs/release_notes/ibexa_dxp_v4.6.md
+++ b/docs/release_notes/ibexa_dxp_v4.6.md
@@ -35,7 +35,7 @@ For more information, see [Customizable dashboard](https://doc.ibexa.co/projects
 
 ### UX and UI improvements
 
-Several improvements to the Back Office interface enhance the user experience.
+Several improvements to the back office interface enhance the user experience.
 
 #### Page Builder improvements [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
@@ -68,7 +68,7 @@ For more information, see [Edit embedded content items](https://doc.ibexa.co/pro
 
 #### Focus mode
 
-With multiple changes to the Back Office UI intended to expose the most important information and actions, editors can now better focus on their work.
+With multiple changes to the back office UI intended to expose the most important information and actions, editors can now better focus on their work.
 The UI is now more friendly and appealing for marketers and editors, with simplified Content structure, designed with new and non-advanced users in mind.
 For more information, see [Focus mode](https://doc.ibexa.co/projects/userguide/en/latest/getting_started/discover_ui/#focus-mode).
 
@@ -79,14 +79,14 @@ As part of this effort, some other changes were introduced that apply to both re
 - In content item details view, tabs have been reordered by their relevance
 - **Authors** and **Sub-items** are now separate tabs in content item details view
 - Former **Details** tab is now called **Technical details** and changed its position
-- Preview is available in many new places, such as the **View** tab in content item details view, or as miniatures when you hover over the Content Tree
+- Preview is available in many new places, such as the **View** tab in content item details view, or as miniatures when you hover over the content tree
 - `ibexa_is_focus_mode_on` and `ibexa_is_focus_mode_off` Twig helpers have been introduced, which check whether focus mode is enabled or not.
 
 ![Sub-items tab](img/4.6_sub_items_tab.png "Sub-items tab")
 
 #### Ability to change site context
 
-With a drop-down list added to the top bar, which changes the site context, editors can choose that the Content Tree shows only those content items that belong to the selected website.
+With a drop-down list added to the top bar, which changes the site context, editors can choose that the content tree shows only those content items that belong to the selected website.
 And if content items belong to multiple websites but use different designs or languages depending on the SiteAccess settings, their previews also change.
 
 As part of this effort, the name of the "Sites" area of the main menu has changed to "Site management".
@@ -136,7 +136,7 @@ For more information, see [user profile and settings documentation](https://doc.
 #### Recent activity log
 
 Several actions on the repository or the application are logged.
-In the Back Office, last activity logs can be listed on a dedicated interface (Admin -> Activity list),
+In the back office, last activity logs can be listed on a dedicated interface (Admin -> Activity list),
 on the dashboard within Recent activity block, or on the user profile.
 
 ![Recent activity log](img/4.6_activity_list.png "Recent activity log")
@@ -145,7 +145,7 @@ For more information,
 see feature's [user documentation](https://doc.ibexa.co/projects/userguide/en/master/recent_activity/recent_activity/),
 and [developer documentation](https://doc.ibexa.co/en/master/administration/recent_activity/recent_activity/).
 
-#### Back Office search
+#### back office search
 
 ##### Search bar, suggestions, autocompletion, and spellcheck
 
@@ -173,7 +173,7 @@ and how to [customize search sorting](https://doc.ibexa.co/en/master/administrat
 
 #### New and updated content type icons
 
-To help users quickly identify different content types in the Back Office, all content type references are now accompanied with icons.
+To help users quickly identify different content types in the back office, all content type references are now accompanied with icons.
 Also, content type icons have changed slightly.
 
 ![Content type icons](img/4.6_content_type_icons.png "Content type icons")
diff --git a/docs/resources/contributing/contribute_translations.md b/docs/resources/contributing/contribute_translations.md
index cee801c559..16d1b4a6d8 100644
--- a/docs/resources/contributing/contribute_translations.md
+++ b/docs/resources/contributing/contribute_translations.md
@@ -1,5 +1,5 @@
 ---
-description: You can contribute Back Office translations to Ibexa DXP by using Crowdin.
+description: You can contribute back office translations to Ibexa DXP by using Crowdin.
 ---
 
 # Contribute translations
@@ -11,7 +11,7 @@ You can use an XLIFF editor of your choice to contribute strings in your languag
 
 ## Translating interface using Crowdin
 
-If you wish to contribute to an existing translation of Back Office or start a new one you can
+If you wish to contribute to an existing translation of back office or start a new one you can
 use the Crowdin website.
 
 Visit [[[= product_name =]]'s Crowdin page](https://crowdin.com/project/ibexa-dxp), choose a language, and you will see a list of files containing strings. Here you can suggest your translations.
diff --git a/docs/resources/new_in_doc.md b/docs/resources/new_in_doc.md
index f332cc9a38..4c39a6bb0b 100644
--- a/docs/resources/new_in_doc.md
+++ b/docs/resources/new_in_doc.md
@@ -102,10 +102,10 @@ This page contains recent highlights and notable changes in [[= product_name =]]
 - [OAuth server](https://doc.ibexa.co/en/master/users/oauth_server/)
 - Updated [OAuth client](https://doc.ibexa.co/en/master/users/oauth_client/)
 
-### Back Office
+### Back office
 
-- [Customize Back Office search suggestions](https://doc.ibexa.co/en/master/administration/back_office/customize_search_suggestion/)
-- [Customize Back Office search result sorting](https://doc.ibexa.co/en/master/administration/back_office/customize_search_sorting/)
+- [Customize back office search suggestions](https://doc.ibexa.co/en/master/administration/back_office/customize_search_suggestion/)
+- [Customize back office search result sorting](https://doc.ibexa.co/en/master/administration/back_office/customize_search_sorting/)
 
 ### Templating
 
@@ -116,7 +116,7 @@ This page contains recent highlights and notable changes in [[= product_name =]]
 
 ### Permissions
 
-- Updated [Custom Policies](https://doc.ibexa.co/en/master/permissions/custom_policies/) article
+- Updated [Custom policies](https://doc.ibexa.co/en/master/permissions/custom_policies/) article
 
 ### Content management
 
diff --git a/docs/resources/phpstorm_plugin.md b/docs/resources/phpstorm_plugin.md
index 323f05537d..3f810b8b7b 100644
--- a/docs/resources/phpstorm_plugin.md
+++ b/docs/resources/phpstorm_plugin.md
@@ -83,7 +83,7 @@ The plugin provides the following built-in file templates:
 
 | Name | Comment |
 |---|---|
-| Back Office tab | Class implementing `Ibexa\Contracts\AdminUi\Tab` |
+| Back office tab | Class implementing `Ibexa\Contracts\AdminUi\Tab` |
 | Block event subscriber | Event subscriber for `BlockRenderEvents::getBlockPreRenderEventName(...)` event |
 | Command | Symfony command that uses content repository |
 | Composite Criterion | Criterion class based on `\Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\CompositeCriterion` |
diff --git a/docs/search/criteria_reference/depth_criterion.md b/docs/search/criteria_reference/depth_criterion.md
index d65be0be56..fd8e52b72b 100644
--- a/docs/search/criteria_reference/depth_criterion.md
+++ b/docs/search/criteria_reference/depth_criterion.md
@@ -1,7 +1,7 @@
 # Depth Criterion
 
 The [`Location\Depth` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-Location-Depth.html)
-searches for Locations based on their depth in the Content tree.
+searches for Locations based on their depth in the content tree.
 
 This Criterion is available only for Location Search.
 
diff --git a/docs/search/criteria_reference/search_criteria_reference.md b/docs/search/criteria_reference/search_criteria_reference.md
index 43326db78e..86e38fa9e4 100644
--- a/docs/search/criteria_reference/search_criteria_reference.md
+++ b/docs/search/criteria_reference/search_criteria_reference.md
@@ -31,7 +31,7 @@ Due to this storage limitation, searching content using the Country Field Type o
 |[ContentTypeIdentifier](contenttypeidentifier_criterion.md)|Identifier of the content item's content type|&#10004; |&#10004; |&#10004; |
 |[CurrencyCodeCriterion](currencycode_criterion.md)|Currency code|&#10004; |&#10004; |&#10004; |
 |[DateMetadata](datemetadata_criterion.md)|The date when content was created or last modified|&#10004; |&#10004; |&#10004; |
-|[Depth](depth_criterion.md)|Location depth in the Content tree| |&#10004; |&#10004; |
+|[Depth](depth_criterion.md)|Location depth in the content tree| |&#10004; |&#10004; |
 |[Field](field_criterion.md)|Content of one of content item's Fields|&#10004; |&#10004; | |
 |[FieldRelation](fieldrelation_criterion.md)|Content items the content in question has Relations to|&#10004; |&#10004; | |
 |[FullText](fulltext_criterion.md)|Full text content of a content item's Fields|&#10004; |&#10004; | |
diff --git a/docs/search/criteria_reference/usermetadata_criterion.md b/docs/search/criteria_reference/usermetadata_criterion.md
index 89f1592efc..a9760a502d 100644
--- a/docs/search/criteria_reference/usermetadata_criterion.md
+++ b/docs/search/criteria_reference/usermetadata_criterion.md
@@ -5,9 +5,9 @@ searches for content based on its creator or modifier.
 
 ## Arguments
 
-- `target` - UserMetadata constant (OWNER, GROUP, MODIFIER); GROUP means the User Group of the content item's creator
+- `target` - UserMetadata constant (OWNER, GROUP, MODIFIER); GROUP means the user group of the content item's creator
 - `operator` - Operator constant (EQ, IN)
-- `value` - int(s) representing the User IDs or User Group IDs (in case of the UserMetadata::GROUP target)
+- `value` - int(s) representing the User IDs or user group IDs (in case of the UserMetadata::GROUP target)
 
 ## Example
 
diff --git a/docs/search/extensibility/manipulate_elasticsearch_query.md b/docs/search/extensibility/manipulate_elasticsearch_query.md
index a0ed9965df..12292eae3e 100644
--- a/docs/search/extensibility/manipulate_elasticsearch_query.md
+++ b/docs/search/extensibility/manipulate_elasticsearch_query.md
@@ -10,7 +10,7 @@ To do it, subscribe to `Ibexa\Contracts\ElasticSearchEngine\Query\Event\QueryFil
 The following example shows how to add an additional Search Criterion to all queries.
 
 Depending on your configuration, this might impact all search queries,
-including those used for search and content tree in the Back Office.
+including those used for search and content tree in the back office.
 
 ``` php hl_lines="34"
 <?php
diff --git a/docs/search/search_api.md b/docs/search/search_api.md
index 502b6fa67e..cefe3e9f5e 100644
--- a/docs/search/search_api.md
+++ b/docs/search/search_api.md
@@ -15,9 +15,9 @@ enables you to perform search queries using the PHP API.
 
 The service should be [injected into the constructor of your command or controller](php_api.md#service-container).
 
-!!! tip "SearchService in the Back Office"
+!!! tip "SearchService in the back office"
 
-    `SearchService` is also used in the Back Office of [[= product_name =]],
+    `SearchService` is also used in the back office of [[= product_name =]],
     in components such as Universal Discovery Widget or Sub-items List.
 
 ### Performing a search
diff --git a/docs/search/sort_clause_reference/depth_sort_clause.md b/docs/search/sort_clause_reference/depth_sort_clause.md
index a7caca5d49..8d92fabb5f 100644
--- a/docs/search/sort_clause_reference/depth_sort_clause.md
+++ b/docs/search/sort_clause_reference/depth_sort_clause.md
@@ -1,7 +1,7 @@
 # Depth Sort Clause
 
 The [`Location\Depth` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-Depth.html)
-sorts search results by the depth of the Location in the Content tree.
+sorts search results by the depth of the Location in the content tree.
 
 ## Arguments
 
diff --git a/docs/search/sort_clause_reference/sort_clause_reference.md b/docs/search/sort_clause_reference/sort_clause_reference.md
index 5ab7a74efa..f9e9290e58 100644
--- a/docs/search/sort_clause_reference/sort_clause_reference.md
+++ b/docs/search/sort_clause_reference/sort_clause_reference.md
@@ -24,7 +24,7 @@ All Sort Clauses can take the following optional argument:
 | [CustomField](customfield_sort_clause.md)                     | Raw search index fields                                                                     | &#10004;       | &#10004;        |           |
 | [DateModified](datemodified_sort_clause.md)                   | The date when content was last modified                                                     | &#10004;       | &#10004;        | &#10004;  |
 | [DatePublished](datepublished_sort_clause.md)                 | The date when content was created                                                           | &#10004;       | &#10004;        | &#10004;  |
-| [Depth](depth_sort_clause.md)                                 | Location depth in the Content Tree                                                          |                | &#10004;        | &#10004;  |
+| [Depth](depth_sort_clause.md)                                 | Location depth in the content tree                                                          |                | &#10004;        | &#10004;  |
 | [Field](field_sort_clause.md)                                 | Content of one of content item's Fields                                                     | &#10004;       | &#10004;        |           |
 | [Id](id_sort_clause.md)                                       | Location ID                                                                                 |                | &#10004;        | &#10004;  |
 | [IsMainLocation](ismainlocation_sort_clause.md)               | Whether a Location is the main Location of a content item                                   |                | &#10004;        |           |
diff --git a/docs/templating/layout/add_forgot_password_option.md b/docs/templating/layout/add_forgot_password_option.md
index 6e7dd4a2b5..786df1923c 100644
--- a/docs/templating/layout/add_forgot_password_option.md
+++ b/docs/templating/layout/add_forgot_password_option.md
@@ -25,7 +25,7 @@ Under the `templates` key, provide the path to templates responsible for renderi
 which users receive after they request a password change.
 
 The [default templates](https://github.com/ibexa/user/tree/main/src/bundle/Resources/views) for forgot password form and email are located in `ibexa/user/src/bundle/Resources/views`.
-The [templates](https://github.com/ibexa/admin-ui/tree/main/src/bundle/Resources/views/themes/admin/account/forgot_password) specific for the Back Office are in `ibexa/admin-ui/src/bundle/Resources/views/themes/admin/account`.
+The [templates](https://github.com/ibexa/admin-ui/tree/main/src/bundle/Resources/views/themes/admin/account/forgot_password) specific for the back office are in `ibexa/admin-ui/src/bundle/Resources/views/themes/admin/account`.
 
 You can also modify [other user management templates](user_registration.md#other-user-management-templates).
 
diff --git a/docs/templating/twig_function_reference/other_twig_filters.md b/docs/templating/twig_function_reference/other_twig_filters.md
index efd5836785..a64de6cdc1 100644
--- a/docs/templating/twig_function_reference/other_twig_filters.md
+++ b/docs/templating/twig_function_reference/other_twig_filters.md
@@ -21,7 +21,7 @@ page_type: reference
 
 #### Icon size variants
 
-The default icon size in the Back Office is `32px`. To change the default size, in the template add the modifier to the class name.
+The default icon size in the back office is `32px`. To change the default size, in the template add the modifier to the class name.
 
 ``` twig
 <svg class="ibexa-icon ibexa-icon--medium">
diff --git a/docs/tutorials/beginner_tutorial/2_create_the_content_model.md b/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
index 4cadee7c4c..149a3f4d4c 100644
--- a/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
+++ b/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
@@ -74,7 +74,7 @@ Confirm the creation of the content type by clicking **Save and close**.
     You can learn how to work with Pages in [another tutorial](page_and_form_tutorial.md).
 
 Go back to the content by selecting **Content structure** in the main menu. 
-Then browse the Content tree and create a Folder named *All Rides* using the **Create content** button on the top right of the screen. 
+Then browse the content tree and create a Folder named *All Rides* using the **Create content** button on the top right of the screen. 
 Publish the Folder.
 
 While in the folder, create a few of Rides using the **Create content** button, add photos and publish them.
diff --git a/docs/tutorials/beginner_tutorial/4_display_single_content_item.md b/docs/tutorials/beginner_tutorial/4_display_single_content_item.md
index ba5be5b1e0..41b6887aa3 100644
--- a/docs/tutorials/beginner_tutorial/4_display_single_content_item.md
+++ b/docs/tutorials/beginner_tutorial/4_display_single_content_item.md
@@ -93,9 +93,9 @@ This tells the application to use this template whenever it renders the full vie
 Because you do not have a list of Rides on the front page yet, you cannot simply click a Ride to preview it.
 But you still can see how the template works in two ways:
 
-#### Preview in the Back Office
+#### Preview in the back office
 
-You can use the [preview]([[= user_doc =]]/content_management/preview_content_items/) while editing in the Back Office to see how the content will be rendered in full view.
+You can use the [preview]([[= user_doc =]]/content_management/preview_content_items/) while editing in the back office to see how the content will be rendered in full view.
 
 ![Full ride preview in admin](bike_tutorial_preview_full_ride.png)
 
diff --git a/docs/tutorials/beginner_tutorial/5_display_a_list_of_content_items.md b/docs/tutorials/beginner_tutorial/5_display_a_list_of_content_items.md
index de852fed08..64aa06abcf 100644
--- a/docs/tutorials/beginner_tutorial/5_display_a_list_of_content_items.md
+++ b/docs/tutorials/beginner_tutorial/5_display_a_list_of_content_items.md
@@ -177,11 +177,11 @@ Because this template will be rendered inside a table, it starts with a `<tr>` t
 
 To be able to view the `photo` Field you have to add a `read` permission to `Media` section.
 
-In the main menu, go to **Admin** (gear icon) -> **Roles**, and click the **Anonymous** Role.
+In the main menu, go to **Admin** (gear icon) -> **Roles**, and click the **Anonymous** role.
 
 ![Policies for the Anonymous Role without Media section](step5_admin_anonymous_policies_without_media_section.png)
 
-Edit the **Content/Read** Policy line to add the `Media` section to **Limitation** along with the `Standard` section.
+Edit the **Content/Read** policy line to add the `Media` section to **Limitation** along with the `Standard` section.
 
 ![Policies for the Anonymous Role with Media section](step5_admin_anonymous_policies_with_media_section.png)
 
diff --git a/docs/tutorials/beginner_tutorial/8_enable_account_registration.md b/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
index 81cdb546f6..06fdde16e0 100644
--- a/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
+++ b/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
@@ -4,15 +4,15 @@ description: See how you can enable external users to register and contribute to
 
 # Step 8 — Enable account registration
 
-In this step you will enable other users to create accounts on your site, access the Back Office and create content.
+In this step you will enable other users to create accounts on your site, access the back office and create content.
 
 ## Enable registration
 
 In the main menu, go to **Admin** (gear icon) -> **Roles**, and click the **Anonymous** Role.
 
-![Available Roles](step_8_role_mgmt_screen.png)
+![Available roles](step_8_role_mgmt_screen.png)
 
-Add the `User/Register` Policy to the Anonymous User. This will allow any visitor to the website to access the registration form.
+Add the `User/Register` policy to the Anonymous User. This will allow any visitor to the website to access the registration form.
 
 ![Policies for the Anonymous Role](step8_admin_anonymous_policies.png)
 
@@ -160,13 +160,13 @@ Fill in the form and register a user.
 
 !!! tip
 
-    If you log in as the new user at this point, you need to go to the Back Office (`<yourdomain>/admin`)
+    If you log in as the new user at this point, you need to go to the back office (`<yourdomain>/admin`)
     to log out again re-log in as Admin.
 
 ## Set up Permissions
 
-Users created through the registration form are placed in the _Guest accounts_ User Group.
-The User you have just created will have the Roles assigned to this group.
+Users created through the registration form are placed in the _Guest accounts_ user group.
+The User you have just created will have the roles assigned to this group.
 
 !!! tip
 
@@ -174,12 +174,12 @@ The User you have just created will have the Roles assigned to this group.
     See [Registering new users](user_registration.md) for more information.
 
 At this point you don't want anyone who registers to be able to add content to the website.
-That's why you'll create a new User Group with additional permissions.
+That's why you'll create a new user group with additional permissions.
 When the administrator accepts a new User, they can move them to this new group.
 
-### Create a User Group
+### Create a user group
 
-In the Back Office, go to **Admin** -> **Users**, click the **Create content** button and create a User Group named `Go Bike Members`.
+In the back office, go to **Admin** -> **Users**, click the **Create content** button and create a user group named `Go Bike Members`.
 
 ### Create a Folder for contributed Rides
 
@@ -188,32 +188,32 @@ Go Bike Members will only be able to create Content in this Folder.
 
 ### Set permissions for Go Bike Members
 
-From Admin in the **Roles** screen, create a new Role named *Contributors*.
+From Admin in the **Roles** screen, create a new role named *Contributors*.
 
-Now add the following Policies to the Contributors Role.
+Now add the following policies to the Contributors role.
 
 - User/Login
 - User/Password
 - Content/Read
 - Content/Versionread
-- Content/Create with Limitations: content type limited to Ride and Landmark content types and Subtree to the `Member Rides`
-- Content/Publish with Limitations: content type limited to Ride and Landmark content types and Subtree to the `Member Rides`
-- Content/Edit with Limitation: Owner limited to `Self`
+- Content/Create with limitations: content type limited to Ride and Landmark content types and Subtree to the `Member Rides`
+- Content/Publish with limitations: content type limited to Ride and Landmark content types and Subtree to the `Member Rides`
+- Content/Edit with limitation: Owner limited to `Self`
 - Section/View
 - Content/Reverserelatedlist
 
 !!! tip
 
-    The Limitations are a powerful tool for fine-tuning the permission management of the Users.
-    See [the documentation about Limitations for more technical details](limitation_reference.md#content-type-group-limitation).
+    The limitations are a powerful tool for fine-tuning the permission management of the Users.
+    See [the documentation about limitations for more technical details](limitation_reference.md#content-type-group-limitation).
 
-Once the Policies are set, go to the "Assignments" tab and assign the Role to the User Group *Go Bike Members*.
+Once the policies are set, go to the "Assignments" tab and assign the role to the user group *Go Bike Members*.
 
 Next, go to the Users page. Select the user you have just created and move them into the *Go Bike Members* user group.
 
 ### Create content as a Go Bike Member
 
-Log out as admin and then log in again into the Back Office with the credentials of the new user.
+Log out as admin and then log in again into the back office with the credentials of the new user.
 You now have the ability to create new Rides and Landmarks in the selected folder.
 
 ## Congratulations!
diff --git a/docs/tutorials/generic_field_type/5_add_a_field.md b/docs/tutorials/generic_field_type/5_add_a_field.md
index 6e982c5ba8..7b24dba7f9 100644
--- a/docs/tutorials/generic_field_type/5_add_a_field.md
+++ b/docs/tutorials/generic_field_type/5_add_a_field.md
@@ -4,12 +4,12 @@ description: Learn how to use your custom Field Type by adding a Field to a cont
 
 # Step 5 - Add a new Point 2D Field
 
-All actions in this step are done in the admin interface also called the Back Office.
+All actions in this step are done in the admin interface also called the back office.
 Go to the admin interface (`<yourdomain>/admin`) and log in with the default username: `admin` and the default password: `publish`. 
 
 ## Add new content type
 
-In the Back Office, the main menu, go to the **Content types** page.
+In the back office, the main menu, go to the **Content types** page.
 Under **Content** category, create a new content type:
 
 ![Creating new content type](create_new_content_type.png)
diff --git a/docs/tutorials/generic_field_type/6_settings.md b/docs/tutorials/generic_field_type/6_settings.md
index d9b2446de9..05e02d2a9c 100644
--- a/docs/tutorials/generic_field_type/6_settings.md
+++ b/docs/tutorials/generic_field_type/6_settings.md
@@ -94,7 +94,7 @@ In `templates/point2d_field.html.twig` replace the content with:
 
 ## Edit the content type
 
-Now, in the Back Office, you can go to **Content types** and see the results of your work by editing the Point 2D content type.
+Now, in the back office, you can go to **Content types** and see the results of your work by editing the Point 2D content type.
 
 !!! tip
 
diff --git a/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md b/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md
index b47cd7a1fd..d208a9265f 100644
--- a/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md
+++ b/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md
@@ -15,7 +15,7 @@ Get it by following the [Install Ibexa DXP](install_ibexa_dxp.md) guide.
 
 ## Add content types
 
-Log in to the Back Office – add `/admin` to your installation's address (`<yourdomain>/admin`) and log in using `admin` as the login and `publish` as the password. Disable the Focus mode, go to content types screen and (under the Content category) add two content types with the following settings:
+Log in to the back office – add `/admin` to your installation's address (`<yourdomain>/admin`) and log in using `admin` as the login and `publish` as the password. Disable the Focus mode, go to content types screen and (under the Content category) add two content types with the following settings:
 
 ### Dog Breed
 
@@ -105,7 +105,7 @@ This is what the structure of the new and modified files should look like:
 
 ## Create content
 
-Now return to the Back Office and create some content for your website.
+Now return to the back office and create some content for your website.
 
 First, you can hide unneeded content items from the project root.
 
diff --git a/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md b/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
index 0ec757d629..20615c7149 100644
--- a/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
+++ b/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
@@ -21,7 +21,7 @@ Go to the front page of your website (`<yourdomain>`). You can see that it looks
 
     `yarn encore <dev|prod>`
 
-Log in to the Back Office. Go to **Content Structure**.
+Log in to the back office. Go to **Content Structure**.
 The **Ibexa Digital Experience Platform** content item is the first page that is shown to the visitor.
 Here you can check what content type it belongs to: it is a Landing Page.
 
diff --git a/docs/tutorials/page_and_form_tutorial/5_create_newsletter_form.md b/docs/tutorials/page_and_form_tutorial/5_create_newsletter_form.md
index 12242e1cc8..2b0502e83f 100644
--- a/docs/tutorials/page_and_form_tutorial/5_create_newsletter_form.md
+++ b/docs/tutorials/page_and_form_tutorial/5_create_newsletter_form.md
@@ -117,8 +117,8 @@ Refresh the Page and enter a couple of mock submissions.
 
 ### Manage the submissions
 
-You can view all submissions in the Back Office.
-Go to **Forms** page. From the Content tree, select the Form and click the **Submissions** tab.
+You can view all submissions in the back office.
+Go to **Forms** page. From the content tree, select the Form and click the **Submissions** tab.
 There, after selecting submission(s), click **Download submissions** or **Delete submission**.
 To see details about a submission, click the view icon.
 
diff --git a/docs/update_and_migration/from_2.5/update_code/1_update_templates.md b/docs/update_and_migration/from_2.5/update_code/1_update_templates.md
index a7f70284af..a955a0eded 100644
--- a/docs/update_and_migration/from_2.5/update_code/1_update_templates.md
+++ b/docs/update_and_migration/from_2.5/update_code/1_update_templates.md
@@ -2,7 +2,7 @@
 
 ## Back-Office templates
 
-The naming and location of templates in the Back Office have been changed.
+The naming and location of templates in the back office have been changed.
 If you extend or modify these templates, you need to adapt your code.
 
 For the full list of template changes, see [the list of removals and deprecations](ez_platform_v3.0_deprecations.md#template-organization).
diff --git a/docs/update_and_migration/from_2.5/update_code/7_update_extensions.md b/docs/update_and_migration/from_2.5/update_code/7_update_extensions.md
index 9caef1b753..8095c9282e 100644
--- a/docs/update_and_migration/from_2.5/update_code/7_update_extensions.md
+++ b/docs/update_and_migration/from_2.5/update_code/7_update_extensions.md
@@ -6,7 +6,7 @@ If you extended the Universal Discovery Widget
 (e.g. added your own tabs or triggered opening the UDW for your own customizations),
 you need to rewrite this extension using the [new YAML configuration](https://doc.ibexa.co/en/3.3/extending/extending_udw/).
 
-## Back Office extensibility
+## Back office extensibility
 
-If you added custom tab groups in the Back Office,
+If you added custom tab groups in the back office,
 you now need to [make use of the `TabsComponent`](back_office_tabs.md#tab-groups).
diff --git a/docs/update_and_migration/from_3.3/to_4.0.md b/docs/update_and_migration/from_3.3/to_4.0.md
index 670804776c..7fef4e8f8c 100644
--- a/docs/update_and_migration/from_3.3/to_4.0.md
+++ b/docs/update_and_migration/from_3.3/to_4.0.md
@@ -163,9 +163,9 @@ php bin/console ibexa:migrations:migrate
 
 ## Update your custom code
 
-### Back Office customization
+### Back office customization
 
-The v4 version of [[= product_name =]] is using Bootstrap 5 in the Back Office. If you were using Bootstrap 4 for styling, you need to update and adjust all custom Back Office components [following the migration guide from Bootstrap 4](https://getbootstrap.com/docs/5.0/migration/).
+The v4 version of [[= product_name =]] is using Bootstrap 5 in the back office. If you were using Bootstrap 4 for styling, you need to update and adjust all custom back office components [following the migration guide from Bootstrap 4](https://getbootstrap.com/docs/5.0/migration/).
 
 ### Online editor
 
diff --git a/docs/update_and_migration/from_4.2/update_from_4.2.md b/docs/update_and_migration/from_4.2/update_from_4.2.md
index 4b3971bdf4..e00af144be 100644
--- a/docs/update_and_migration/from_4.2/update_from_4.2.md
+++ b/docs/update_and_migration/from_4.2/update_from_4.2.md
@@ -92,8 +92,8 @@ Use this option to define a user group that should be migrated to a new content
 php bin/console ibexa:migrate:customers  --input-user-group=3a3beb3d09ae0dacebf1d324f61bbc34 --create-content-type
 ```
 
-- `--input-user-group` - represents the remote ID of a User Group you want to migrate to a new content type.
-After migration, this will also be the ID of a new Private Customer User Group.
+- `--input-user-group` - represents the remote ID of a user group you want to migrate to a new content type.
+After migration, this will also be the ID of a new Private Customer user group.
 - `--create-content-type` - if you add this parameter, the system creates the new content type based on the one defined in `--input-user-content-type`
 
 ##### Additional parameters
diff --git a/docs/update_and_migration/from_4.5/update_from_4.5.md b/docs/update_and_migration/from_4.5/update_from_4.5.md
index 76cf54aa2b..f980cd4076 100644
--- a/docs/update_and_migration/from_4.5/update_from_4.5.md
+++ b/docs/update_and_migration/from_4.5/update_from_4.5.md
@@ -265,7 +265,7 @@ php bin/console ibexa:migrations:migrate --file=2023_09_23_14_15_dashboard_struc
 
 !!! caution
 
-    The `2023_10_10_16_14_dashboard_permissions.yaml` migration creates a Role dedicated for dashboard management and assigns it to the Editors User Group. If you have custom User Groups which need to manipulate dashboards, you need to skip this migration, copy it to your migrations folder (by default, `src/Migrations/Ibexa/migrations`) and adjust it according to your needs before execution.
+    The `2023_10_10_16_14_dashboard_permissions.yaml` migration creates a Role dedicated for dashboard management and assigns it to the Editors user group. If you have custom user groups which need to manipulate dashboards, you need to skip this migration, copy it to your migrations folder (by default, `src/Migrations/Ibexa/migrations`) and adjust it according to your needs before execution.
 
 For [[= product_name_com =]] there's an additional migration:
 ``` bash
@@ -340,7 +340,7 @@ ibexa:
                 field_groups: ['about', 'contact']
 ```
 
-You can use your own content type that represents the Back Office user, or use the default one provided by [[= product_name =]]:
+You can use your own content type that represents the back office user, or use the default one provided by [[= product_name =]]:
 
 ```bash
 php bin/console ibexa:migrations:import vendor/ibexa/installer/src/bundle/Resources/install/migrations/2023_12_07_20_23_editor_content_type.yaml --name=2023_12_07_20_23_editor_content_type.yaml
@@ -350,7 +350,7 @@ php bin/console ibexa:migrations:migrate --file=2023_12_07_20_23_editor_content_
 
 #### Site context
 
-Site context is used in Content Tree to display only those content items that belong to the selected website.
+Site context is used in content tree to display only those content items that belong to the selected website.
 
 You can add locations that shoudn't be publicly accessible to the list of excluded paths:
 
@@ -392,7 +392,7 @@ ibexa:
 
 #### Recent activity [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
-You must add the "Activity Log / Read" policy (`activity_log/read`) to every role that has access to the Back Office, at least with the "Only own log" limitation.
+You must add the "Activity Log / Read" policy (`activity_log/read`) to every role that has access to the back office, at least with the "Only own log" limitation.
 This policy is mandatory to display the "Recent activity" block in [dashboards](#dashboard-migration), and the "Recent activity" block in [user profiles](#user-profile).
 
 The following migration example allows users with the `Editor` role to access their own activity log:
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
index d1ed3d3ebe..e039efce2b 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
@@ -495,7 +495,7 @@ php bin/console assetic:dump --env=prod
 
 ##### Unstyled login screen after upgrade
 
-It is possible that after the upgrade your admin screen will be unstyled. This may happen because the new SiteAccess will not be available in the database. You can fix it by editing the permissions for the Anonymous user. Go to Roles in the Admin Panel and edit the Limitations of the Anonymous user's user/login policy. Add all SiteAccesses to the Limitation, save, and clear the browser cache. The login screen should now show proper styling.
+It is possible that after the upgrade your admin screen will be unstyled. This may happen because the new SiteAccess will not be available in the database. You can fix it by editing the permissions for the Anonymous user. Go to **Roles** in the Admin Panel and edit the limitations of the Anonymous user's `user/login` policy. Add all SiteAccesses to the limitation, save, and clear the browser cache. The login screen should now show proper styling.
 
 ##### Translating URLs
 
diff --git a/docs/users/customer_groups.md b/docs/users/customer_groups.md
index 5c91c586e2..ae3296fd04 100644
--- a/docs/users/customer_groups.md
+++ b/docs/users/customer_groups.md
@@ -11,8 +11,8 @@ For example, you can offer a 10% discount for all products in the catalog to use
 
 !!! tip
 
-    Note that customer groups are not the same as [User Groups](user_registration.md#user-groups).
-    User Groups concern all users in the system and can be used, for example, to handle permissions.
+    Note that customer groups are not the same as [user groups](user_registration.md#user-groups).
+    User groups concern all users in the system and can be used, for example, to handle permissions.
     Customer groups refer specifically to the commerce functionalities and enable handling prices.
 
 ## Enabling customer groups
diff --git a/docs/users/invitations.md b/docs/users/invitations.md
index 341f6cd655..b3b142c81e 100644
--- a/docs/users/invitations.md
+++ b/docs/users/invitations.md
@@ -1,18 +1,18 @@
 ---
-description: Manage user invitations to create an account in the frontend or the Back Office.
+description: Manage user invitations to create an account in the frontend or the back office.
 ---
 
 # Inviting users
 
 [[= product_name =]] allows you to create and send invitations to create an account in
-the frontend as a customer, the Back Office as an employee, or the Corporate Portal as an organisation member.
+the frontend as a customer, the back office as an employee, or the Corporate Portal as an organisation member.
 You can send invitations to individual users or in bulk.
 
-## Roles and Policies
+## Roles and policies
 
-To invite other members to the site or the Back Office, a user needs to have the `User:Invite` permission added to their Role.
-You can limit the ability to invite other members to specific User Groups, 
-such as Editors, or to the specific Roles within the group, for example: Admin, Buyer.
+To invite other members to the site or the back office, a user needs to have the `User:Invite` permission added to their role.
+You can limit the ability to invite other members to specific user groups, 
+such as Editors, or to the specific roles within the group, for example: Admin, Buyer.
 
 ## Creating and sending invitations
 
diff --git a/docs/users/login_methods.md b/docs/users/login_methods.md
index c5d64ac09f..b5e41514e4 100644
--- a/docs/users/login_methods.md
+++ b/docs/users/login_methods.md
@@ -50,7 +50,7 @@ It lists all User accounts with duplicate emails.
 
 ## Login rules
 
-You can set the rules for allowed User names in the Back Office per User Field.
+You can set the rules for allowed User names in the back office per User Field.
 The rules are set using regular expressions.
 
 For example, to ensure that User names can only contain lowercase letters,
diff --git a/docs/users/oauth_client.md b/docs/users/oauth_client.md
index b2c729be47..2825f0b574 100644
--- a/docs/users/oauth_client.md
+++ b/docs/users/oauth_client.md
@@ -107,7 +107,7 @@ Configure the service by using the `ibexa.oauth2_client.resource_owner_mapper` t
 ## Add login button
 
 After you have activated the OAuth2 client for the `admin` SiteAccess,
-you need to add a **Log in with Google** to the Back Office login form.
+you need to add a **Log in with Google** to the back office login form.
 
 Create the following template file in `templates/themes/admin/account/login/oauth2_login.html.twig`:
 
@@ -128,4 +128,4 @@ services:
 [[= include_file('code_samples/user_management/oauth_google/config/custom_services.yaml', 7, 13) =]]
 ```
 
-![Log in to the Back Office with Google](log_in_via_google.png)
+![Log in to the back office with Google](log_in_via_google.png)
diff --git a/docs/users/passwords.md b/docs/users/passwords.md
index 1a3eeb54c5..d535027be5 100644
--- a/docs/users/passwords.md
+++ b/docs/users/passwords.md
@@ -25,7 +25,7 @@ By default, it is set to `PT1H` (one hour).
 
 In case of a security situation such as a data leakage, you may need to force users to change their passwords.
 You can do it with the help of the `ibexa:user:expire-password` command,
-which revokes the passwords for specific users, User Groups or users belonging to the chosen content type.
+which revokes the passwords for specific users, user groups or users belonging to the chosen content type.
 
 To select which users to revoke passwords for, use one of the following options with the command:
 
@@ -59,7 +59,7 @@ You can change the [password attributes](#password-attributes) or [password expi
 
 To access the password settings:
 
-1. In the Back Office, go to **Content** -> **Content types**.
+1. In the back office, go to **Content** -> **Content types**.
 1. In the **Content type groups** table, click **Users**.
 1. Edit the **User** content type.
 1. In the **Field definitions** list, view the settings for **User account (ezuser)**.
@@ -87,7 +87,7 @@ In the **User account (ezuser)** Field definition, you can set password expirati
 ![Password expiry settings](password_expiry.png)
 
 You can also decide when the user is notified that they need to change their password.
-The notification is displayed in the Back Office after login and in the User content item's preview.
+The notification is displayed in the back office after login and in the User content item's preview.
 
 ## Repeating passwords
 
diff --git a/docs/users/user_management_guide.md b/docs/users/user_management_guide.md
index 34764b9c81..0512770383 100644
--- a/docs/users/user_management_guide.md
+++ b/docs/users/user_management_guide.md
@@ -1,5 +1,5 @@
 ---
-description: Find out what's User management and check what functions Ibexa DXP offers in this area to effectively manage the digital ecosystem.
+description: Find out what's user management and check what functions Ibexa DXP offers in this area to effectively manage the digital ecosystem.
 ---
 
 # User management product guide
@@ -19,8 +19,8 @@ User management is available in all [[= product_name =]] versions.
 ## How does user management work
 
 [[= product_name =]] simplifies user management with an intuitive and powerful system of accounts, Roles, Permissions, groups, and Segments.
-You can find all user groups and Users in the **Admin Panel** by selecting **Users**.
-Here, you can manage users, their relations, Roles, and Policies.
+You can find all user groups and users in the **Admin Panel** by selecting **Users**.
+Here, you can manage users, their relations, roles, and policies.
 
 ![User's section](users_section.png)
 
@@ -28,7 +28,7 @@ Here's how it works:
 
 - User accounts - create and manage user accounts. This includes capturing user information, such as name, email, and profile details.
 
-- Roles and Permissions - define Roles and assign Permissions to them. This ensures that users have appropriate access to content and functionalities. Roles can be customized to match the organization's specific needs.
+- Roles and permissions - define roles and assign permissions to them. This ensures that users have appropriate access to content and functionalities. Roles can be customized to match the organization's specific needs.
 
 - Authentication methods - enable multiple authentication methods, including traditional username and password, OAuth, and external service logins. This flexibility allows organizations to adapt to various user authentication requirements.
 
@@ -46,9 +46,9 @@ The detailed capabilities of [[= product_name_base =]] User Management,
 which provide organizations with the tools they need to deliver personalized, secure,
 and efficient user experiences while ensuring that user access and content delivery align with their business goals and strategies.
 
-### User Roles and Permissions
+### User roles and permissions
 
-[[= product_name_base =]] allows you to define custom user [Roles with granular Permissions](permission_overview.md), ensuring that users have access to only the specific parts of the system they need.
+[[= product_name_base =]] allows you to define custom user [roles with granular permissions](permission_overview.md), ensuring that users have access to only the specific parts of the system they need.
 Furthermore, you can create user groups to simplify Permission management.
 Assign multiple users to a group to ensure consistency and ease of access control.
 This helps maintain effortless security and control.
@@ -57,16 +57,16 @@ To help you understand further the role each element serves, here's a brief summ
 
 - Role - represents a collection of Permissions that can be assigned to users or user groups. Roles streamline permission management by grouping related Permissions together.
 - Permission - defines a specific action or access level that can be granted or denied within the system.
-- Policy - is a set of rules or conditions that determine under what circumstances a specific permission is granted or denied by applying Limitations.
+- Policy - is a set of rules or conditions that determine under what circumstances a specific permission is granted or denied by applying limitations.
 Policies allow for fine-grained control of access based on various factors, such as user attributes or system states.
 
-### Custom Policies
+### Custom policies
 
 [Tailor user access control](custom_policies.md) to your unique requirements using custom policies. Define complex rules and access criteria for different users or groups.
 
 ### Limitations
 
-[Implement Limitations](limitations.md) on user actions based on specific criteria, such as time-based restrictions or geographic locations.
+[Implement limitations](limitations.md) on user actions based on specific criteria, such as time-based restrictions or geographic locations.
 
 ### Authentication methods
 
@@ -118,9 +118,9 @@ With role-based access control and personalized content, users have a more engag
 
 ### Enhanced security
 
-The flexible authentication methods and Permission management help safeguard sensitive data and maintain security.
+The flexible authentication methods and permission management help safeguard sensitive data and maintain security.
 
-With the ability to define and manage user Roles and Permissions, clients can ensure that sensitive data and actions are protected.
+With the ability to define and manage user roles and permissions, clients can ensure that sensitive data and actions are protected.
 User management helps prevent unauthorized access.
 
 ### Efficient user onboarding
diff --git a/docs/users/user_registration.md b/docs/users/user_registration.md
index ebcc57b46c..6bc58f7d0f 100644
--- a/docs/users/user_registration.md
+++ b/docs/users/user_registration.md
@@ -4,12 +4,12 @@ description: Register new users.
 
 # Register new users
 
-You can allow your users to create accounts by employing the `/register` route. This route leads to a registration form that, when filled in, creates a new User content item in the repository.
+You can allow your users to create accounts by employing the `/register` route. This route leads to a registration form that, when filled in, creates a new user content item in the repository.
 
 ## User types
 
 There are two user types defined: `users` and `customers`.
-`users` are Back Office users that are involved in creating the page such as editors, and `customers` are frontend users.
+`users` are back office users that are involved in creating the page such as editors, and `customers` are frontend users.
 To decide where the user should be registered to, you need to specify their user type under the `ibexa.system.<scope>.user_type_identifier` [configuration key](configuration.md#configuration-files).
 
 ```yaml
@@ -20,9 +20,9 @@ ibexa:
                 user_type_identifier: user
 ```
 
-## User Groups
+## User groups
 
-By default, new Users generated in this way are placed in the Guest accounts group. You can select a different default group in the following section of configuration:
+By default, new users generated in this way are placed in the Guest accounts group. You can select a different default group in the following section of configuration:
 
 ``` yaml
 ibexa:
diff --git a/docs/users/users.md b/docs/users/users.md
index 9c244383df..2e0fadcbf9 100644
--- a/docs/users/users.md
+++ b/docs/users/users.md
@@ -7,7 +7,7 @@ page_type: landing_page
 
 Users in [[= product_name =]] refer to all kinds of user accounts: administrators, editors,
 managers or shop customers.
-All such user accounts have the same underlying mechanism and enable you to control access to te application, both the Back Office and the website front, by using the [permission system](permissions.md).
+All such user accounts have the same underlying mechanism and enable you to control access to te application, both the back office and the website front, by using the [permission system](permissions.md).
 
 ## Invite nad manage users
 
diff --git a/mkdocs.yml b/mkdocs.yml
index 6eae9cb411..975d02b04c 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -119,11 +119,11 @@ nav:
             - Configuration: administration/configuration/configuration.md
             - Dynamic configuration: administration/configuration/dynamic_configuration.md
             - Repository configuration: administration/configuration/repository_configuration.md
-        - Back Office:
-            - Back Office: administration/back_office/back_office.md
+        - Back office:
+            - Back office: administration/back_office/back_office.md
             - Configuration: administration/back_office/back_office_configuration.md
-            - Content Tree: administration/back_office/content_tree.md
-            - Back Office elements:
+            - Content tree: administration/back_office/content_tree.md
+            - Back office elements:
                 - Reusable components: administration/back_office/back_office_elements/reusable_components.md
                 - Add drop-downs: administration/back_office/back_office_elements/add_dropdowns.md
                 - Custom icons: administration/back_office/back_office_elements/custom_icons.md
@@ -132,13 +132,13 @@ nav:
                 - Formatting date and time: administration/back_office/back_office_elements/formatting_date_and_time.md
                 - Extending thumbnails: administration/back_office/back_office_elements/extending_thumbnails.md
                 - Importing assets from a bundle: administration/back_office/back_office_elements/importing_assets_from_bundle.md
-            - Back Office tabs:
-                - Back Office tabs:  administration/back_office/back_office_tabs/back_office_tabs.md
+            - Back office tabs:
+                - Back office tabs:  administration/back_office/back_office_tabs/back_office_tabs.md
                 - Create dashboard tab: administration/back_office/back_office_tabs/create_dashboard_tab.md
             - Tab switcher in Content edit page: administration/back_office/content_tab_switcher.md
             - Add anchor menu to content type edit screen: administration/back_office/content_type_anchor_menu.md
-            - Back Office menus:
-                - Back Office menus: administration/back_office/back_office_menus/back_office_menus.md
+            - Back office menus:
+                - Back office menus: administration/back_office/back_office_menus/back_office_menus.md
                 - Add menu item: administration/back_office/back_office_menus/add_menu_item.md
             - Add user setting: administration/back_office/add_user_setting.md
             - Customize calendar: administration/back_office/customize_calendar.md
@@ -408,7 +408,7 @@ nav:
         - Languages:
             - Languages: multisite/languages/languages.md
             - Language API: multisite/languages/language_api.md
-            - Back Office translations: multisite/languages/back_office_translations.md
+            - Back office translations: multisite/languages/back_office_translations.md
     - Permissions:
         - Permissions: permissions/permissions.md
         - Permission overview: permissions/permission_overview.md
@@ -416,7 +416,7 @@ nav:
         - Policies: permissions/policies.md
         - Limitations: permissions/limitations.md
         - Limitation reference: permissions/limitation_reference.md
-        - Custom Policies: permissions/custom_policies.md
+        - Custom policies: permissions/custom_policies.md
     - Users:
         - Users: users/users.md
         - User management guide: users/user_management_guide.md

From 7255d1ad6e5e7d02117b994ff7d4fb5ed11612c0 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Wed, 9 Oct 2024 12:26:16 +0200
Subject: [PATCH 02/77] New fixes

---
 .../admin_panel/segments_admin_panel.md       |  2 +-
 .../admin_panel/users_admin_panel.md          |  2 +-
 .../back_office/content_tab_switcher.md       |  2 +-
 .../back_office/content_type_anchor_menu.md   |  2 +-
 .../back_office/multifile_upload.md           |  2 +-
 .../back_office/subitems_list.md              |  2 +-
 .../configuration/configuration.md            |  4 +--
 .../configuration/dynamic_configuration.md    |  2 +-
 .../configuration/repository_configuration.md |  6 ++--
 .../content_organization/content_types.md     |  2 +-
 .../content_organization/object_states.md     |  2 +-
 .../project_organization/bundles.md           |  2 +-
 .../project_organization.md                   |  2 +-
 docs/api/graphql/graphql.md                   |  2 +-
 docs/api/graphql/graphql_custom_ft.md         |  8 ++---
 docs/api/graphql/graphql_queries.md           |  2 +-
 docs/api/php_api/php_api.md                   |  8 ++---
 .../creating_new_rest_resource.md             |  2 +-
 docs/api/rest_api/rest_api_authentication.md  |  6 ++--
 docs/cdp/cdp_activation/cdp_configuration.md  |  2 +-
 docs/cdp/cdp_activation/cdp_data_export.md    |  2 +-
 docs/cdp/cdp_guide.md                         |  2 +-
 docs/commerce/checkout/checkout.md            |  2 +-
 docs/commerce/checkout/configure_checkout.md  |  2 +-
 docs/commerce/checkout/customize_checkout.md  |  4 +--
 docs/commerce/checkout/reorder.md             |  2 +-
 .../order_management/order_management_api.md  |  2 +-
 docs/commerce/payment/extend_payment.md       |  2 +-
 docs/commerce/payment/payment_method_api.md   |  2 +-
 .../shipping_management/shipment_api.md       |  2 +-
 docs/commerce/storefront/storefront.md        |  2 +-
 .../content_api/browsing_content.md           |  2 +-
 .../content_api/managing_content.md           |  4 +--
 .../content_availability.md                   |  6 ++--
 .../content_management_api/section_api.md     |  2 +-
 .../content_management_guide.md               | 12 +++----
 docs/content_management/content_model.md      | 10 +++---
 docs/content_management/content_relations.md  |  4 +--
 .../create_data_migration_action.md           |  2 +-
 .../create_data_migration_step.md             |  2 +-
 .../data_migration/data_migration.md          |  2 +-
 .../data_migration/data_migration_actions.md  |  2 +-
 .../data_migration/exporting_data.md          |  8 ++---
 .../data_migration/managing_migrations.md     |  6 ++--
 .../create_custom_generic_field_type.md       |  2 +-
 .../customize_field_type_metadata.md          |  2 +-
 .../field_type_reference/authorfield.md       |  2 +-
 .../field_type_reference/binaryfilefield.md   |  2 +-
 .../field_type_reference/checkboxfield.md     |  2 +-
 .../field_type_reference/countryfield.md      |  4 +--
 .../field_type_reference/dateandtimefield.md  |  2 +-
 .../field_type_reference/datefield.md         |  2 +-
 .../field_type_reference.md                   |  4 +--
 .../field_type_reference/imagefield.md        |  8 ++---
 .../field_type_reference/mediafield.md        |  2 +-
 .../field_type_reference/nullfield.md         |  2 +-
 .../field_type_reference/richtextfield.md     |  2 +-
 .../field_type_reference/sesprofiledata.md    |  2 +-
 .../taxonomyentryfield.md                     |  2 +-
 .../field_type_reference/textblockfield.md    |  2 +-
 .../field_type_reference/textlinefield.md     |  2 +-
 .../field_type_reference/timefield.md         |  2 +-
 .../field_type_reference/urlfield.md          |  2 +-
 .../field_types/field_type_search.md          |  2 +-
 .../field_types/field_type_storage.md         |  8 ++---
 .../field_types/field_type_validation.md      |  2 +-
 .../field_types/form_and_template.md          |  2 +-
 .../field_types/type_and_value.md             | 16 +++++-----
 .../file_management/file_url_handling.md      |  2 +-
 .../forms/customize_email_notifications.md    |  2 +-
 .../forms/form_builder_guide.md               |  2 +-
 .../forms/work_with_forms.md                  |  4 +--
 .../images/add_image_asset_from_dam.md        |  2 +-
 docs/content_management/images/fastly_io.md   |  2 +-
 docs/content_management/images/images.md      |  4 +--
 docs/content_management/locations.md          |  8 ++---
 docs/content_management/pages/page_blocks.md  |  2 +-
 .../pages/page_builder_guide.md               |  6 ++--
 .../rich_text/extend_online_editor.md         | 10 +++---
 .../url_management/url_management.md          |  4 +--
 .../user_generated_content.md                 |  2 +-
 .../workflow/add_custom_workflow_action.md    |  2 +-
 docs/content_management/workflow/workflow.md  |  2 +-
 docs/customer_management/cp_applications.md   |  2 +-
 docs/customer_management/cp_page_builder.md   |  4 +--
 .../customer_portal_guide.md                  | 10 +++---
 docs/fonts/Work_Sans/OFL.txt                  |  2 +-
 docs/getting_started/first_steps.md           |  4 +--
 docs/getting_started/install_ibexa_dxp.md     | 16 +++++-----
 .../install_on_mac_os_and_windows.md          |  2 +-
 docs/getting_started/requirements.md          | 22 ++++++-------
 docs/getting_started/troubleshooting.md       |  4 +--
 docs/ibexa_cloud/ddev_and_ibexa_cloud.md      |  2 +-
 docs/ibexa_cloud/install_on_ibexa_cloud.md    |  4 +--
 docs/ibexa_engage/create_campaign.md          |  2 +-
 docs/ibexa_engage/install_ibexa_engage.md     |  2 +-
 docs/ibexa_products/ibexa_commerce.md         |  2 +-
 docs/ibexa_products/ibexa_headless.md         |  2 +-
 .../cache/http_cache/content_aware_cache.md   | 32 +++++++++----------
 .../cache/http_cache/context_aware_cache.md   |  6 ++--
 .../cache/http_cache/fastly.md                | 10 +++---
 .../http_cache/http_cache_configuration.md    |  4 +--
 .../cache/http_cache/reverse_proxy.md         |  6 ++--
 .../cache/persistence_cache.md                | 12 +++----
 .../clustering/clustering.md                  | 14 ++++----
 .../clustering/clustering_with_aws_s3.md      |  2 +-
 .../databases.md                              |  2 +-
 docs/infrastructure_and_maintenance/devops.md |  4 +--
 .../performance.md                            |  4 +--
 .../request_lifecycle.md                      |  2 +-
 .../security/development_security.md          |  4 +--
 .../security/reporting_issues.md              |  4 +--
 .../security/security_checklist.md            | 16 +++++-----
 .../sessions.md                               |  6 ++--
 .../support_and_maintenance_faq.md            |  4 +--
 .../languages/back_office_translations.md     |  6 ++--
 docs/multisite/languages/languages.md         |  4 +--
 docs/multisite/multisite_configuration.md     |  4 +--
 docs/multisite/set_up_campaign_siteaccess.md  |  4 +--
 .../set_up_translation_siteaccess.md          |  2 +-
 docs/multisite/site_factory/site_factory.md   |  4 +--
 .../siteaccess_aware_configuration.md         | 14 ++++----
 .../siteaccess/siteaccess_matching.md         |  2 +-
 docs/permissions/limitation_reference.md      |  2 +-
 docs/permissions/permission_overview.md       |  4 +--
 .../api_reference/content_api.md              |  4 +--
 .../api_reference/recommendation_api.md       |  2 +-
 .../api_reference/tracking_api.md             | 32 +++++++++----------
 .../personalization/api_reference/user_api.md |  4 +--
 .../attribute_search_in_elasticsearch.md      |  2 +-
 .../personalization/enable_personalization.md |  6 ++--
 ...importing_historical_user_tracking_data.md |  2 +-
 .../legacy_recommendation_api.md              | 22 ++++++-------
 .../recommendation_integration.md             |  4 +--
 docs/personalization/tracking_integration.md  |  4 +--
 .../tracking_with_ibexa-tracker.md            |  6 ++--
 docs/pim/add_remote_pim_support.md            |  2 +-
 docs/pim/create_custom_catalog_filter.md      |  4 +--
 docs/pim/pim_configuration.md                 |  4 +--
 docs/pim/pim_guide.md                         |  8 ++---
 docs/pim/product_api.md                       |  2 +-
 docs/release_notes/ez_platform_v1.10.0.md     |  2 +-
 docs/release_notes/ez_platform_v1.11.0.md     |  4 +--
 docs/release_notes/ez_platform_v1.12.0.md     |  4 +--
 docs/release_notes/ez_platform_v1.8.0.md      |  2 +-
 docs/release_notes/ez_platform_v1.9.0.md      |  4 +--
 docs/release_notes/ez_platform_v2.1.0.md      |  2 +-
 docs/release_notes/ez_platform_v2.2.0.md      |  2 +-
 docs/release_notes/ez_platform_v2.3.md        |  2 +-
 docs/release_notes/ez_platform_v2.4.md        |  2 +-
 docs/release_notes/ez_platform_v2.5.md        |  4 +--
 docs/release_notes/ibexa_dxp_v4.4.md          |  2 +-
 docs/release_notes/ibexa_dxp_v4.5.md          |  4 +--
 docs/release_notes/ibexa_dxp_v4.6.md          |  4 +--
 .../contributing/package_structure.md         |  2 +-
 .../contributing/report_and_follow_issues.md  |  6 ++--
 docs/resources/phpstorm_plugin.md             |  2 +-
 docs/resources/release_process_and_roadmap.md |  2 +-
 .../custompricestats_aggregation.md           |  2 +-
 .../ismainlocation_criterion.md               |  2 +-
 .../languagecode_criterion.md                 |  2 +-
 .../criteria_reference/matchall_criterion.md  |  2 +-
 .../criteria_reference/matchnone_criterion.md |  2 +-
 .../productcategory_criterion.md              |  2 +-
 .../criteria_reference/sectionid_criterion.md |  2 +-
 .../sectionidentifier_criterion.md            |  2 +-
 .../criteria_reference/taxonomy_entry_id.md   |  2 +-
 .../visibility_criterion.md                   |  2 +-
 .../manipulate_elasticsearch_query.md         |  2 +-
 docs/search/search_api.md                     |  8 ++---
 .../search_criteria_and_sort_clauses.md       |  6 ++--
 .../configure_elastic_search.md               |  4 +--
 .../elastic_search/elastic_search_overview.md |  2 +-
 .../legacy_search_overview.md                 |  4 +--
 .../solr_search_engine/configure_solr.md      |  4 +--
 .../solr_search_engine/install_solr.md        |  4 +--
 .../matchall_url_criterion.md                 |  2 +-
 .../matchnone_url_criterion.md                |  2 +-
 .../url_search_sort_clauses.md                |  2 +-
 docs/snippets/update/check_out_version.md     |  4 +--
 docs/snippets/update/db/db_backup_warning.md  |  2 +-
 docs/snippets/update/db/update_db_2.5-3.3.md  |  4 +--
 docs/snippets/update/finish_the_update.md     |  6 ++--
 docs/snippets/update/merge_composer.md        |  4 +--
 .../templating/design_engine/design_engine.md |  2 +-
 .../embed_and_list_content/list_content.md    |  2 +-
 .../embed_and_list_content/render_images.md   |  2 +-
 .../create_custom_query_type.md               |  2 +-
 docs/templating/templates/templates.md        |  2 +-
 .../field_twig_functions.md                   |  2 +-
 .../site_context_twig_functions.md            |  2 +-
 .../urls_and_routes/urls_and_routes.md        |  2 +-
 .../2_create_the_content_model.md             |  8 ++---
 .../3_customize_the_front_page.md             |  4 +--
 .../5_display_a_list_of_content_items.md      |  2 +-
 .../8_enable_account_registration.md          |  2 +-
 .../1_implement_the_point2d_value_class.md    |  4 +--
 .../1_get_a_starter_website.md                |  4 +--
 .../2_prepare_the_landing_page.md             |  4 +--
 .../3_use_existing_blocks.md                  |  2 +-
 .../4_create_a_custom_block.md                |  2 +-
 .../from_1.x_2.x/update_app_to_2.5.md         |  4 +--
 .../from_1.x_2.x/update_db_to_2.5.md          | 18 +++++------
 .../from_1.x_2.x/update_from_1.x_2.x.md       |  2 +-
 .../from_2.5/adapt_code_to_v3.md              |  2 +-
 docs/update_and_migration/from_2.5/to_3.2.md  |  2 +-
 .../from_2.5/to_3.3.latest.md                 |  8 ++---
 docs/update_and_migration/from_2.5/to_3.3.md  |  4 +--
 .../from_2.5/update_from_2.5.md               |  4 +--
 docs/update_and_migration/from_3.3/to_4.0.md  |  8 ++---
 .../from_3.3/update_from_3.3.md               | 20 ++++++------
 docs/update_and_migration/from_4.0/to_4.1.md  |  6 ++--
 .../from_4.1/update_from_4.1.md               |  6 ++--
 .../from_4.2/update_from_4.2.md               |  4 +--
 .../from_4.3/update_from_4.3.md               |  2 +-
 .../from_4.3/update_from_4.3_new_commerce.md  | 10 +++---
 .../from_4.3/update_from_4.3_old_commerce.md  |  6 ++--
 .../from_4.4/update_from_4.4.md               |  4 +--
 .../from_4.5/update_from_4.5.md               |  6 ++--
 .../migrate_to_ibexa_dxp/common_issues.md     |  2 +-
 .../migrating_from_ez_publish.md              |  2 +-
 .../migrating_from_ez_publish_platform.md     | 26 +++++++--------
 docs/update_and_migration/update_ibexa_dxp.md |  8 ++---
 docs/users/oauth_client.md                    |  2 +-
 docs/users/passwords.md                       |  2 +-
 docs/users/user_authentication.md             |  4 +--
 226 files changed, 493 insertions(+), 493 deletions(-)

diff --git a/docs/administration/admin_panel/segments_admin_panel.md b/docs/administration/admin_panel/segments_admin_panel.md
index 80a57a83f3..ac65d10b63 100644
--- a/docs/administration/admin_panel/segments_admin_panel.md
+++ b/docs/administration/admin_panel/segments_admin_panel.md
@@ -6,7 +6,7 @@ edition: experience
 # Segments
 
 You can use Segments to display specific content to specific [ussers](users.md).
-They are used out of the box in the Targeting and Dynamic targeting blocks in the Page.
+they're used out of the box in the Targeting and Dynamic targeting blocks in the Page.
 
 Segments are collected in Segment Groups:
 
diff --git a/docs/administration/admin_panel/users_admin_panel.md b/docs/administration/admin_panel/users_admin_panel.md
index 2b77d93f29..2a61f042d8 100644
--- a/docs/administration/admin_panel/users_admin_panel.md
+++ b/docs/administration/admin_panel/users_admin_panel.md
@@ -5,7 +5,7 @@ description: All user groups and users can be accessed in the users tab.
 # Users
 
 [Users](users.md) in [[= product_name =]] are treated the same way as content items.
-They are organized in groups such as *Guests*, *Editors*, *Anonymous*,
+they're organized in groups such as *Guests*, *Editors*, *Anonymous*,
 which makes it easier to manage them and their permissions.
 All user groups and users can be accessed in the Admin panel by selecting **Users**.
 
diff --git a/docs/administration/back_office/content_tab_switcher.md b/docs/administration/back_office/content_tab_switcher.md
index cbb54634f7..d6a6428170 100644
--- a/docs/administration/back_office/content_tab_switcher.md
+++ b/docs/administration/back_office/content_tab_switcher.md
@@ -74,7 +74,7 @@ First, create an event listener in the `src/EventListener/TextAnchorMenuTabListe
 
 A new custom tab is defined in the line 28, the line 31 defines items for the second level.
 
-For new tabs it is also required to render its section in the content editing form. To do it, register the UI Component:
+For new tabs it's also required to render its section in the content editing form. To do it, register the UI Component:
 
 ```yaml
 [[= include_file('code_samples/back_office/content_type/config/custom_services.yaml') =]]
diff --git a/docs/administration/back_office/content_type_anchor_menu.md b/docs/administration/back_office/content_type_anchor_menu.md
index 615b7cadfd..4f7330d556 100644
--- a/docs/administration/back_office/content_type_anchor_menu.md
+++ b/docs/administration/back_office/content_type_anchor_menu.md
@@ -43,4 +43,4 @@ Enable the toggle to display the SEO section on the content item edit page.
 
 !!! note
 
-    If you add multiple Field Types as anchor menus, they are automatically displayed as separate sections. 
+    If you add multiple Field Types as anchor menus, they're automatically displayed as separate sections. 
diff --git a/docs/administration/back_office/multifile_upload.md b/docs/administration/back_office/multifile_upload.md
index d166a36dbd..90177d24ac 100644
--- a/docs/administration/back_office/multifile_upload.md
+++ b/docs/administration/back_office/multifile_upload.md
@@ -10,7 +10,7 @@ It provides an interface to publish content based on dropped files while uploadi
 !!! caution
 
     If you want to load the multi-file upload module, you need to load the JS code for it in your view,
-    as it is not available by default.
+    as it's not available by default.
 
 ## Use multi-file upload
 
diff --git a/docs/administration/back_office/subitems_list.md b/docs/administration/back_office/subitems_list.md
index 1293d9fd20..031a491942 100644
--- a/docs/administration/back_office/subitems_list.md
+++ b/docs/administration/back_office/subitems_list.md
@@ -10,7 +10,7 @@ It provides an interface for listing the sub-items of any Location.
 !!! caution
 
     If you want to load the Sub-items module, you need to load the JS code for it in your view,
-    as it is not available by default.
+    as it's not available by default.
 
 ## Use sub-items list
 
diff --git a/docs/administration/configuration/configuration.md b/docs/administration/configuration/configuration.md
index 74c8ae42c9..99ac169b26 100644
--- a/docs/administration/configuration/configuration.md
+++ b/docs/administration/configuration/configuration.md
@@ -9,7 +9,7 @@ It contains everything from selecting the content Repository to SiteAccesses to
 
 ### Configuration format
 
-The recommended configuration format is YAML. It is used by default in the kernel (and in examples throughout the documentation).
+The recommended configuration format is YAML. It's used by default in the kernel (and in examples throughout the documentation).
 However, you can also use XML or PHP formats for configuration.
 
 ### Configuration files
@@ -29,7 +29,7 @@ These files contain additional settings and point to the general (not environmen
 
 !!! note "New configuration files"
 
-    It is good practice to provide your own configuration in separate files.
+    It's good practice to provide your own configuration in separate files.
     Any YAML files placed in the `config/packages` folder is automatically included in the system configuration.
 
 !!! tip
diff --git a/docs/administration/configuration/dynamic_configuration.md b/docs/administration/configuration/dynamic_configuration.md
index 0385ca7471..7822bf81cc 100644
--- a/docs/administration/configuration/dynamic_configuration.md
+++ b/docs/administration/configuration/dynamic_configuration.md
@@ -77,7 +77,7 @@ You can also use the [autowire feature]([[= symfony_doc =]]/service_container/au
 
 !!! note
 
-    Do not store the retrieved config value unless you know what you are doing. 
+    Do not store the retrieved config value unless you know what you're doing. 
     SiteAccess can change during code execution, which means you might work on the wrong value.
 
 ``` php
diff --git a/docs/administration/configuration/repository_configuration.md b/docs/administration/configuration/repository_configuration.md
index e7bcde2d22..9ba061e09d 100644
--- a/docs/administration/configuration/repository_configuration.md
+++ b/docs/administration/configuration/repository_configuration.md
@@ -57,7 +57,7 @@ For example:
 But the following configuration would be invalid:
 
 - `ibexa.co` domain can use `ibexa_repo`
-- `ibexa.co/doc` **cannot** use `doc_repo`, as it is under the same domain.
+- `ibexa.co/doc` **cannot** use `doc_repo`, as it's under the same domain.
 
 Invalid configuration causes problems for different parts of the system,
 for example back-end UI, REST interface and other non-SiteAccess-aware Symfony routes
@@ -66,7 +66,7 @@ such as `/_fos_user_context_hash` used by [HTTP cache](http_cache.md).
 ### Entity manager
 
 If you use the [Doctrine entity manager](https://www.doctrine-project.org/projects/doctrine-orm/en/2.10/tutorials/getting-started.html#obtaining-the-entitymanager),
-you are unable to connect different SiteAccesses to different databases.
+you're unable to connect different SiteAccesses to different databases.
 
 To have this possibility, you need to use the SiteAccess-aware entity manager: `ibexa.doctrine.orm.entity_manager`.
 
@@ -184,7 +184,7 @@ user_data: User data
 ## Limit of archived content versions
 
 `default_version_archive_limit` controls the number of archived versions per content item that are stored in the Repository.
-By default it is set to 5. This setting is configured in the following way (typically in `ibexa.yaml`):
+By default it's set to 5. This setting is configured in the following way (typically in `ibexa.yaml`):
 
 ``` yaml
 ibexa:
diff --git a/docs/administration/content_organization/content_types.md b/docs/administration/content_organization/content_types.md
index dbb7258f9e..5caa2cfe23 100644
--- a/docs/administration/content_organization/content_types.md
+++ b/docs/administration/content_organization/content_types.md
@@ -76,7 +76,7 @@ They determine what Fields of what Field Types will be included in all content i
 !!! caution
 
     In case of content types containing many Field Types you should be aware of possible memory-related issues with publishing/editing.
-    They are caused by the limitation of how many `$_POST` input variables can be accepted.
+    they're caused by the limitation of how many `$_POST` input variables can be accepted.
 
     The easiest way to fix them is by increasing the `max_input_vars` value in the `php.ini` configuration file.
     Note that this solution is not universally recommended and you're proceeding on your own risk.
diff --git a/docs/administration/content_organization/object_states.md b/docs/administration/content_organization/object_states.md
index af2f82f6f6..876dd54779 100644
--- a/docs/administration/content_organization/object_states.md
+++ b/docs/administration/content_organization/object_states.md
@@ -5,7 +5,7 @@ description: Object states are user-defined states that can be assigned to conte
 ## Object States
 
 Object states are user-defined states that can be assigned to content items.
-They are contained in groups.
+they're contained in groups.
 
 ![Object State group](admin_panel_object_state_groups.png "Object State group")
 
diff --git a/docs/administration/project_organization/bundles.md b/docs/administration/project_organization/bundles.md
index a7efcd6892..73fb4d479c 100644
--- a/docs/administration/project_organization/bundles.md
+++ b/docs/administration/project_organization/bundles.md
@@ -17,7 +17,7 @@ For example, for [[= product_name_headless =]], see the [JSON file on GitHub](ht
 !!! caution "Deprecated legacy Commerce bundles"
 
     As of [[= product_name =]] v4.4 all `ibexa/commerce` packages are deprecated. 
-    They are gradually replaced by their revamped counterparts and removed 
+    they're gradually replaced by their revamped counterparts and removed 
     completely from the product in version v5.0.
 
 ## Working with bundles
diff --git a/docs/administration/project_organization/project_organization.md b/docs/administration/project_organization/project_organization.md
index 0ab2682a4c..d8c0b01217 100644
--- a/docs/administration/project_organization/project_organization.md
+++ b/docs/administration/project_organization/project_organization.md
@@ -44,7 +44,7 @@ See [Configuration](configuration.md) for more information.
 
 ### Importing configuration from a bundle
 
-If you are keeping some of your code in a bundle, dealing with core bundle semantic configuration can be tedious
+If you're keeping some of your code in a bundle, dealing with core bundle semantic configuration can be tedious
 if you maintain it in the main `config/packages/ibexa.yaml` configuration file.
 
 You can import configuration from a bundle by following the Symfony tutorial [How to Import Configuration Files/Resources]([[= symfony_doc =]]/service_container/import.html).
diff --git a/docs/api/graphql/graphql.md b/docs/api/graphql/graphql.md
index a2fce8c199..0fc1813a5f 100644
--- a/docs/api/graphql/graphql.md
+++ b/docs/api/graphql/graphql.md
@@ -30,7 +30,7 @@ for example names that start with a digit.
 
 This concerns image variations, content types, content type groups, product types, and Field definition identifiers.
 
-It is recommended to rename the relevant identifiers. Failure to generate schema is registered in logs.
+it's recommended to rename the relevant identifiers. Failure to generate schema is registered in logs.
 To find identifiers that are not included in the schema, look for "Skipped schema generation" log messages, for example:
 `Skipped schema generation for Image Variation`.
 
diff --git a/docs/api/graphql/graphql_custom_ft.md b/docs/api/graphql/graphql_custom_ft.md
index a71a9a78d9..859661b4f0 100644
--- a/docs/api/graphql/graphql_custom_ft.md
+++ b/docs/api/graphql/graphql_custom_ft.md
@@ -20,7 +20,7 @@ There are two ways of mapping a custom Field Type:
 - configuration
 - custom `FieldDefinitionMapper`
 
-You need to write a custom `FieldDefinitionMapper` if the field definition settings and constraints impact how it is mapped to GraphQL.
+You need to write a custom `FieldDefinitionMapper` if the field definition settings and constraints impact how it's mapped to GraphQL.
 For example, the selection Field Type has a "multiple" option. 
 If set to false, it accepts and returns a single value, 
 but if set to true, it accepts and returns an array of values.
@@ -31,7 +31,7 @@ If your field definition doesn't require additional clarifications, you can map
 
 To map a custom Field Type with configuration use a compiler pass to modify a container parameter, `ibexa.graphql.schema.content.mapping.field_definition_type`.
 
-It is a hash that maps a Field Type identifier (`ezstring`) to the following entries:
+it's a hash that maps a Field Type identifier (`ezstring`) to the following entries:
 
 - `value_type` - the GraphQL type values of the custom field. It can be a native type (string, int), or a custom type. If none is specified, string will be used.
 - `value_resolver` - how values of this field are resolved and passed to the defined value type. If not specified, it will receive the `Field` object for the field type: `field`.
@@ -76,7 +76,7 @@ The `FieldDefinitionMapper` interface defines following methods:
 
 Only implement methods that you need, the rest will be handled by other mappers (configuration or default).
 When a mapper method is decorated, you need to call the decorated service method for unsupported types.
-To do that, you need to replace `mapXXX` by the method it is in:
+To do that, you need to replace `mapXXX` by the method it's in:
 
 ```php
         if (!$this->canMap($fieldDefinition)) {
@@ -84,7 +84,7 @@ To do that, you need to replace `mapXXX` by the method it is in:
          }
 ```
 
-It is required for every implemented method, so that other mappers are called for the other Field Types.
+it's required for every implemented method, so that other mappers are called for the other Field Types.
 
 The [`RelationFieldDefinitionMapper`](https://github.com/ibexa/graphql/blob/main/src/lib/Schema/Domain/Content/Mapper/FieldDefinition/RelationFieldDefinitionMapper.php) example:
 
diff --git a/docs/api/graphql/graphql_queries.md b/docs/api/graphql/graphql_queries.md
index 7051db4841..85b498a4d7 100644
--- a/docs/api/graphql/graphql_queries.md
+++ b/docs/api/graphql/graphql_queries.md
@@ -314,7 +314,7 @@ Response:
 ## Getting children of a Location
 
 To get a [Location's](#querying-locations) children,
-it is recommended to use the [Query Field](content_queries.md#content-query-field).
+it's recommended to use the [Query Field](content_queries.md#content-query-field).
 
 Alternatively, you can query the `children` property of an `item` or `content` object:
 
diff --git a/docs/api/php_api/php_api.md b/docs/api/php_api/php_api.md
index 018d784e4e..e592793be0 100644
--- a/docs/api/php_api/php_api.md
+++ b/docs/api/php_api/php_api.md
@@ -101,7 +101,7 @@ When using the PHP API, authentication is performed in three ways:
 
 ### Back office authentication
 
-When actions are performed through the back office, they are executed as the logged-in User.
+When actions are performed through the back office, they're executed as the logged-in User.
 This User's permissions will affect the behavior of the Repository.
 The User may, for example, not be allowed to create content, or view a particular Section.
 
@@ -156,9 +156,9 @@ $permissionResolver->setCurrentUserReference($user);
 PHP API uses [Exceptions](https://www.php.net/exceptions) to handle errors.
 Each API method may throw different exceptions, depending on what it does.
 
-It is good practice to cover every exception you expect to happen.
+It's good practice to cover every exception you expect to happen.
 
-For example if you are using a command which takes the Content ID as a parameter,
+For example if you're using a command which takes the Content ID as a parameter,
 the ID may either not exist, or the referenced content item may not be visible to the user.
 
 Both cases should be covered with error messages:
@@ -180,7 +180,7 @@ try {
 [Symfony dependency injection]([[= symfony_doc =]]/components/dependency_injection.html) ensures that any required services are available in your custom code
 (for example, controllers) when you inject them into the constructor.
 
-Symfony service container uses service tags to dedicate services to a specific purpose. They are usually used for extension points.
+Symfony service container uses service tags to dedicate services to a specific purpose. they're usually used for extension points.
 
 [[= product_name =]] exposes multiple features using service tags. For example, Field Types are tagged `ibexa.field_type`.
 
diff --git a/docs/api/rest_api/extending_rest_api/creating_new_rest_resource.md b/docs/api/rest_api/extending_rest_api/creating_new_rest_resource.md
index a9abbc098c..857f62e7f5 100644
--- a/docs/api/rest_api/extending_rest_api/creating_new_rest_resource.md
+++ b/docs/api/rest_api/extending_rest_api/creating_new_rest_resource.md
@@ -13,7 +13,7 @@ To create a new REST resource, you need to prepare:
 * Optionally, the addition of this resource route to the REST root.
 
 In the following example, you add a greeting resource to the REST API.
-It is available through `GET` and `POST` methods. `GET` sets default values while `POST` allows inputting custom values.
+It's available through `GET` and `POST` methods. `GET` sets default values while `POST` allows inputting custom values.
 
 ## Route
 
diff --git a/docs/api/rest_api/rest_api_authentication.md b/docs/api/rest_api/rest_api_authentication.md
index 5210f7d213..f0886a8faf 100644
--- a/docs/api/rest_api/rest_api_authentication.md
+++ b/docs/api/rest_api/rest_api_authentication.md
@@ -35,7 +35,7 @@ Enabling any other method disables session.
 
 ### Usage examples
 
-You can create a session for a visitor even if they are not logged in by sending the **`POST`** request to `/user/sessions`.
+You can create a session for a visitor even if they're not logged in by sending the **`POST`** request to `/user/sessions`.
 To log out, use the **`DELETE`** request on the same resource.
 
 #### Establishing session
@@ -231,7 +231,7 @@ If an unsafe request is missing the CSRF token, or the token has incorrect value
 
 ##### Rich client application security concerns
 
-The purpose of CSRF protection is to prevent users from accidentally running harmful operations by being tricked into executing an HTTP(S) request against a web applications they are logged into.
+The purpose of CSRF protection is to prevent users from accidentally running harmful operations by being tricked into executing an HTTP(S) request against a web applications they're logged into.
 In browsers this action will be blocked by lack of CSRF token.
 
 However, if you develop a rich client application (JavaScript, JAVA, iOS, Android, etc.), that is:
@@ -247,7 +247,7 @@ Then, you have to make sure to confirm with the user if they want to perform an
 Example:
 
 A rich JavaScript/web application is using `navigator.registerProtocolHandler()` to register "web+ez:" links to go against REST API.
-It uses a session-based authentication, and it is in widespread use across the net, or/and it is used by everyone within a company.
+It uses a session-based authentication, and it's in widespread use across the net, or/and it's used by everyone within a company.
 A person with minimal insight into this application and the company can easily send out the following link to all employees in that company in email:
 `<a href="web+ez:DELETE /content/locations/1/2">latest reports</a>`.
 
diff --git a/docs/cdp/cdp_activation/cdp_configuration.md b/docs/cdp/cdp_activation/cdp_configuration.md
index 281298c32a..ba9c2a11b7 100644
--- a/docs/cdp/cdp_activation/cdp_configuration.md
+++ b/docs/cdp/cdp_activation/cdp_configuration.md
@@ -36,7 +36,7 @@ ibexa:
 - `account_number` - a [number](#account-number) obtained from Accounts settings in [[= product_name_cdp =]] dashboard
 - `stream_id` - stream ID generated when importing data from the stream file in Data Manage
 - `activations` - activation details. You can configure multiple activations. They have to be of type `Ibexa` in [[= product_name =]] dashboard
-- `client_id` and `client_secret` - client credentials are used to authenticate against the Webhook endpoint. Make sure they are random and secure
+- `client_id` and `client_secret` - client credentials are used to authenticate against the Webhook endpoint. Make sure they're random and secure
 - `segment_group_identifier` - a [location](#segment-group) to which CDP data is imported
 
 ## Account number
diff --git a/docs/cdp/cdp_activation/cdp_data_export.md b/docs/cdp/cdp_activation/cdp_data_export.md
index c87d40f493..8910eea823 100644
--- a/docs/cdp/cdp_activation/cdp_data_export.md
+++ b/docs/cdp/cdp_activation/cdp_data_export.md
@@ -121,7 +121,7 @@ Specify name of your activation, select `userid` as **Person Identifier** and cl
 
 Next, you can fill in **Ibexa information** they must match the ones provided in the YAML configuration:
 
-- **Client Secret** and **Client ID** - are used to authenticate against Webhook endpoint. In the configuration they are taken from environment variables in `.env` file.
+- **Client Secret** and **Client ID** - are used to authenticate against Webhook endpoint. In the configuration they're taken from environment variables in `.env` file.
 
 - **Segment Group Identifier** - identifier of the segment group in [[= product_name =]]. It points to a segment group where all the CDP audiences will be stored.
 - **Base URL** - URL of your instance with added `/cdp/webhook` at the end.
diff --git a/docs/cdp/cdp_guide.md b/docs/cdp/cdp_guide.md
index 7d54acdb66..f1f0fad684 100644
--- a/docs/cdp/cdp_guide.md
+++ b/docs/cdp/cdp_guide.md
@@ -73,7 +73,7 @@ For more information, see [CDP data export](https://doc.ibexa.co/en/latest/cdp/c
 ### Data customization
 
 ​You can customize Content and Product data exported to [[= product_name_cdp =]] and control what Field Type information you want to export.
-With [[= product_name_cdp =]], you can export Field Types and Field Type values. They are exported with metadata and attributes, for example, ID, Field Definition name, type, value.
+With [[= product_name_cdp =]], you can export Field Types and Field Type values. they're exported with metadata and attributes, for example, ID, Field Definition name, type, value.
 
 For more information, see [data customization](https://doc.ibexa.co/en/latest/cdp/cdp_data_customization/#data-customization) documentation in Developer Documentation.
 
diff --git a/docs/commerce/checkout/checkout.md b/docs/commerce/checkout/checkout.md
index a0efde604e..50f0a69da9 100644
--- a/docs/commerce/checkout/checkout.md
+++ b/docs/commerce/checkout/checkout.md
@@ -10,7 +10,7 @@ of [[= product_name =]].
 In a course of a multi-step process, it collects necessary transaction data, such 
 as billing and shipping addresses, and payment and shipping information.
 
-From the front-end perspective, it is a reusable component that provides access 
+From the front-end perspective, it's a reusable component that provides access 
 to the workflow and allows buyers to place an order for cart items.
 
 ![Address selection stage](checkout.png "Checkout stages")
diff --git a/docs/commerce/checkout/configure_checkout.md b/docs/commerce/checkout/configure_checkout.md
index b9d50a9dc9..0fb6dff33c 100644
--- a/docs/commerce/checkout/configure_checkout.md
+++ b/docs/commerce/checkout/configure_checkout.md
@@ -38,7 +38,7 @@ Each step configuration includes the following settings:
 - `controller` - A mandatory setting pointing to a library that governs the behavior of the process. The controller contains all the required business logic and submits the whole step, so that a transition can happen.
 - `next_step` - An optional name of the next workflow transition. If not provided, the next workflow-enabled transition is processed.
 - `label` - An optional name of the step that can be displayed in the Twig helper.
-- `translation_domain` - A optional setting that defines the domain for a site with translated content. By default it is set to `checkout`.
+- `translation_domain` - A optional setting that defines the domain for a site with translated content. By default it's set to `checkout`.
 
 ### Checkout customization example
 
diff --git a/docs/commerce/checkout/customize_checkout.md b/docs/commerce/checkout/customize_checkout.md
index 0f4e665208..6610e1ef06 100644
--- a/docs/commerce/checkout/customize_checkout.md
+++ b/docs/commerce/checkout/customize_checkout.md
@@ -25,7 +25,7 @@ where [one page checkout](#create-a-one-page-checkout) would be enough.
 
 There are several factors that make checkout particularly flexible and customizable:
 
-- it is based on Symfony workflow
+- it's based on Symfony workflow
 - it exposes a variety of APIs
 - it exposes Twig functions that help you render the steps
 
@@ -119,7 +119,7 @@ ibexa:
 
 ### Restart application
 
-You are now ready to see the results of your work.
+you're now ready to see the results of your work.
 Shut down the application, clear browser cache, and restart the application.
 You should be able to see a different checkout applied after you have added products to a cart.
 
diff --git a/docs/commerce/checkout/reorder.md b/docs/commerce/checkout/reorder.md
index b9e3a96f00..b3d0d9d888 100644
--- a/docs/commerce/checkout/reorder.md
+++ b/docs/commerce/checkout/reorder.md
@@ -76,7 +76,7 @@ The following methods can be used to modify the reorder flow to fit your busines
 #### `ReorderService:addToCartFromOrder` 
 
 Allows you to add items from a previous order to a cart.
-It uses historical data from previously ordered items even if they are no longer available.
+It uses historical data from previously ordered items even if they're no longer available.
 Those items are validated against available stock.
 The method uses the following parameters:
 
diff --git a/docs/commerce/order_management/order_management_api.md b/docs/commerce/order_management/order_management_api.md
index eb1de31951..58ac2b745f 100644
--- a/docs/commerce/order_management/order_management_api.md
+++ b/docs/commerce/order_management/order_management_api.md
@@ -52,7 +52,7 @@ it with the `Ibexa\Contracts\OrderManagement\Value\OrderCreateStruct` object tha
 
 ## Update order
 
-You can update the order after it is created. 
+You can update the order after it's created. 
 You could do it to support a scenario when, for example, the order is processed manually and its status has to be changed in the system. 
 To update order information, use the `OrderService::updateOrder` method:
 
diff --git a/docs/commerce/payment/extend_payment.md b/docs/commerce/payment/extend_payment.md
index 69d1407f0f..d50210bb5d 100644
--- a/docs/commerce/payment/extend_payment.md
+++ b/docs/commerce/payment/extend_payment.md
@@ -18,7 +18,7 @@ Code samples below show how this could be done if your organization wants to use
 
 !!! note "Gateway integration requirement"
 
-    [[= product_name =]] does not come with gateway redirects. Whether you are an integrator or an end customer, it is your responsibility to implement payment gateway integration.
+    [[= product_name =]] does not come with gateway redirects. Whether you're an integrator or an end customer, it's your responsibility to implement payment gateway integration.
 
 ### Define custom payment method type
 
diff --git a/docs/commerce/payment/payment_method_api.md b/docs/commerce/payment/payment_method_api.md
index 4364438c24..c3e515a774 100644
--- a/docs/commerce/payment/payment_method_api.md
+++ b/docs/commerce/payment/payment_method_api.md
@@ -58,7 +58,7 @@ an `Ibexa\Contracts\Payment\PaymentMethod\PaymentMethodCreateStruct` object that
 
 ## Update payment method
 
-You can update the payment method after it is created. 
+You can update the payment method after it's created. 
 An `Ibexa\Contracts\Payment\PaymentMethod\PaymentMethodUpdateStruct` object can take the following arguments: `identifier` string, `names` array of string values, `descriptions` array of string values, `enabled` boolean value, and an `options` object.
 To update payment method information, use the `PaymentMethodServiceInterface::updatePaymentMethod` method:
 
diff --git a/docs/commerce/shipping_management/shipment_api.md b/docs/commerce/shipping_management/shipment_api.md
index 49d92c893e..51a99dfa5b 100644
--- a/docs/commerce/shipping_management/shipment_api.md
+++ b/docs/commerce/shipping_management/shipment_api.md
@@ -47,7 +47,7 @@ an `Ibexa\Contracts\Shipping\Value\ShipmentCreateStruct` object that takes two p
 
 ## Update shipment
 
-You can update the shipment after it is created. 
+You can update the shipment after it's created. 
 You could do it to support a scenario when, for example, the shipment is processed offline and its status has to be updated in the system. 
 To update shipment information, use the `ShipmentService::updateShipment` method:
 
diff --git a/docs/commerce/storefront/storefront.md b/docs/commerce/storefront/storefront.md
index 1500ce6261..bd2e3e5c22 100644
--- a/docs/commerce/storefront/storefront.md
+++ b/docs/commerce/storefront/storefront.md
@@ -6,7 +6,7 @@ edition: commerce
 # Storefront
 
 The Storefront package provides a starting kit for the developers.
-It is a set of components that serves as a basis, which developers can 
+It's a set of components that serves as a basis, which developers can 
 customize and extend to create their own implementation of a web store.
 
 ## Default UI components
diff --git a/docs/content_management/content_api/browsing_content.md b/docs/content_management/content_api/browsing_content.md
index 5fa8eecf96..22f40d7c83 100644
--- a/docs/content_management/content_api/browsing_content.md
+++ b/docs/content_management/content_api/browsing_content.md
@@ -245,7 +245,7 @@ $nameComparison = $this->comparisonService->compare($versionFrom, $versionTo)->g
 ```
 
 `getComparisonResult` returns a `ComparisonResult` object, which depends on the Field Type being compared.
-In the example of a Text Line (ezstring) Field, it is an array of `StringDiff` objects.
+In the example of a Text Line (ezstring) Field, it's an array of `StringDiff` objects.
 
 Each diff contains a section of the Field to compare (e.g. a part of a text line)
 and its status, which can be "unchanged", "added" or "removed".
diff --git a/docs/content_management/content_api/managing_content.md b/docs/content_management/content_api/managing_content.md
index c7aea0d99e..9313e4c484 100644
--- a/docs/content_management/content_api/managing_content.md
+++ b/docs/content_management/content_api/managing_content.md
@@ -16,7 +16,7 @@ using [`LocationService`](../../api/php_api/php_api_reference/classes/Ibexa-Cont
 ### Adding a new Location to a content item
 
 Every published content item must have at least one Location.
-One content item can have more that one Location, which means it is presented in more than one place
+One content item can have more that one Location, which means it's presented in more than one place
 in the content tree.
 
 Creating a new Location, like creating content, requires using a struct,
@@ -107,7 +107,7 @@ but it copies the Location and its subtree instead of moving it.
 !!! note
 
     [Copy subtree limit](back_office_configuration.md#copy-subtree-limit) only applies to operations in the back office.
-    It is ignored when copying subtrees using the PHP API.
+    It's ignored when copying subtrees using the PHP API.
 
 ## Trash
 
diff --git a/docs/content_management/content_availability.md b/docs/content_management/content_availability.md
index 38bf1c2a96..3d5b9b6026 100644
--- a/docs/content_management/content_availability.md
+++ b/docs/content_management/content_availability.md
@@ -7,12 +7,12 @@ description: Control the availability of content items with relation to translat
 The Default content availability flag enables you to control whether content is available when its translation is missing.
 
 You can set the flag in content type definition by checking the "Make content available even with missing translations" option.
-It is automatically applied to any new content item of this Type.
+It's automatically applied to any new content item of this Type.
 
 ![Default content availability](availability_flag.png "Default content availability")
 
 A content item with this flag will be available in its main language
-even if it is not translated into the language of the current SiteAccess.
+even if it's not translated into the language of the current SiteAccess.
 
 Without the flag, a content item will not be available at all if it does not have a language version
 corresponding to the current SiteAccess.
@@ -33,5 +33,5 @@ For example, you can assign the flag to a Blog content type which is intended to
 in multiple languages. If the Blog is in English only, it would not be visible for readers
 using the Norwegian or German SiteAcceses.
 However, if you set the default availability flag for the Blog content type,
-it will be displayed to them in English (if it is set as a main language) and will enable the users to browse individual
+it will be displayed to them in English (if it's set as a main language) and will enable the users to browse individual
 posts in other languages.
diff --git a/docs/content_management/content_management_api/section_api.md b/docs/content_management/content_management_api/section_api.md
index 4bdc917f1a..317a1c6b4b 100644
--- a/docs/content_management/content_management_api/section_api.md
+++ b/docs/content_management/content_management_api/section_api.md
@@ -24,7 +24,7 @@ and pass it to the [`SectionService::createSection`](../../api/php_api/php_api_r
 
 ## Getting Section information
 
-You can use `SectionService` to retrieve Section information such as whether it is in use:
+You can use `SectionService` to retrieve Section information such as whether it's in use:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/SectionCommand.php', 76, 81) =]]
diff --git a/docs/content_management/content_management_guide.md b/docs/content_management/content_management_guide.md
index f0ecb32209..2e3837d491 100644
--- a/docs/content_management/content_management_guide.md
+++ b/docs/content_management/content_management_guide.md
@@ -119,7 +119,7 @@ You can use these characteristics in combination with system features to create
 
 #### Locations
 
-When a content item is created and published, it is assigned a place in the content tree, designated by a Location ID. 
+When a content item is created and published, it's assigned a place in the content tree, designated by a Location ID. 
 A single content item can have more than one Location ID, which means that the same content can be found on different branches of the tree. 
 However, a single location can have only one content item assigned to it.
 
@@ -133,7 +133,7 @@ By [swapping locations]([[= user_doc =]]/content_management/content_organization
 
 Content items can have several [versions]([[= user_doc =]]/content_management/content_versions/). 
 By default, there are three version statuses available: draft, published, and archived. 
-Before they are published, drafts can be routed between different user roles for review and approval.
+Before they're published, drafts can be routed between different user roles for review and approval.
 
 ![Versions](img/versions.png)
 
@@ -151,7 +151,7 @@ Editors can compare different translations of the same content items with the Co
 #### Relations
 
 A [relation](content_relations.md) can exist between any two content items in the content tree. 
-For example, blog posts featured in the website's main page are in a relation with the page that they are embedded in. 
+For example, blog posts featured in the website's main page are in a relation with the page that they're embedded in. 
 Or, instead of direct attachments, an article can use images that are separate content items outside the article and are referenced through a relation.
 
 ## Content arrangement
@@ -183,7 +183,7 @@ This way you can classify content and make it easier for end users to find the c
 ### Access control
 
 When your [[= product_name =]] instance has multiple contributors and visitors, administrators can give them access to different areas of the website and different capabilities. 
-It is done by creating roles, with each role having a different set of [permissions](permission_overview.md), the most fitting example being the `content/edit` permission limited to an `Articles/BookReviews/Historical` subtree of the content tree.
+It's done by creating roles, with each role having a different set of [permissions](permission_overview.md), the most fitting example being the `content/edit` permission limited to an `Articles/BookReviews/Historical` subtree of the content tree.
 
 In the next steps, after you create user groups, you’d assign roles to these groups, and add individual users to each of such groups. 
 For more technical information about permissions and limitations, see [Permission use cases](permission_use_cases.md).
@@ -219,7 +219,7 @@ For example, you can build Pages that contain different recommendations, dependi
 
 ## How to get started
 
-Once you have integrated the headless implementation, installed a local instance of [[= product_name =]] or set up an instance on [[= product_name_cloud =]], you are ready to employ the content management features to good use.
+Once you have integrated the headless implementation, installed a local instance of [[= product_name =]] or set up an instance on [[= product_name_cloud =]], you're ready to employ the content management features to good use.
 
 Since content management is an ongoing process, and, in your implementation, you might prefer focusing on other areas of configuration, the order of operations below is by all means conventional.
 
@@ -233,7 +233,7 @@ Reuse existing Fields Types or [customize them to fit your needs](create_custom_
 **2\. Define permissions**
 
 Although this step is not directly related to content management, 
-it is a good time to [set up user roles and permissions]([[= user_doc =]]/permission_management/work_with_permissions/), which users would need to work with content.
+it's a good time to [set up user roles and permissions]([[= user_doc =]]/permission_management/work_with_permissions/), which users would need to work with content.
 
 **3\. Author content**
 
diff --git a/docs/content_management/content_model.md b/docs/content_management/content_model.md
index 3839989436..f4e93c501d 100644
--- a/docs/content_management/content_model.md
+++ b/docs/content_management/content_model.md
@@ -48,7 +48,7 @@ See [Sections](sections.md) for more information.
 **`published`** - true if a published version exists, otherwise false.
 
 **`ownerId`** - ID of the User who initially created the content item.
-It is set by the system the first time the content item is published.
+It's set by the system the first time the content item is published.
 The ownership of an item cannot be modified and will not change even if the owner is removed from the system.
 
 **`modificationDate`** - date and time when the content item was last modified.
@@ -58,7 +58,7 @@ This is set by the system and cannot be modified manually, but will change every
 This is set by the system and cannot be modified.
 
 **`alwaysAvailable`** - indicates if the content item is shown in the main language when it's not present in another requested language.
-It is [set per content type](content_availability.md).
+It's [set per content type](content_availability.md).
 
 **`remoteId`** - a global unique ID of the content item.
 Accepts up to 100 characters. Cannot contain non-printable characters and control sequences (anything in ASCII range `\x00` - `\x1F`).
@@ -72,7 +72,7 @@ If the `alwaysAvailable` flag is set to true, the content item is shown in this
 **`status`** - status of the content item. It can have three statuses: 0 – *draft*, 1 – *published* and 2 – *archived*.
 When an item is created, its status is set to *draft*. After publishing the status changes to *published*.
 When a published content item is moved to Trash, the item becomes *archived*.
-If a published item is removed from the Trash (or removed without being put in the Trash first), it is permanently deleted.
+If a published item is removed from the Trash (or removed without being put in the Trash first), it's permanently deleted.
 
 ![Diagram of an example content item](content_model_item_diagram.png)
 
@@ -86,7 +86,7 @@ Beyond the built-in set of Field Types, you can [create your own](create_custom_
 
 ### Field value validation
 
-The values entered in a Field may undergo validation, which means the system makes sure that they are correct for the chosen Field Type and can be used without a problem.
+The values entered in a Field may undergo validation, which means the system makes sure that they're correct for the chosen Field Type and can be used without a problem.
 
 Validation depends on the settings of a particular Field Type. It cannot be turned off for a Field if its Field Type supports it.
 
@@ -133,7 +133,7 @@ Only one version can be published at the same time.
 When you publish a new version, the previous published version changes its status to Archived.
 
 The number of preserved archived versions is set in `ibexa.repositories.default.options.default_version_archive_limit`.
-By default it is set to 5.
+By default it's set to 5.
 
 A new version is also created when a new [language](languages.md) is added to the content item.
 
diff --git a/docs/content_management/content_relations.md b/docs/content_management/content_relations.md
index 6170b4b5bc..c55eed1730 100644
--- a/docs/content_management/content_relations.md
+++ b/docs/content_management/content_relations.md
@@ -4,13 +4,13 @@ description: Content Relations control links between different content items, ei
 
 # Content Relations
 
-Content items are located in a tree structure through the Locations they are placed in.
+Content items are located in a tree structure through the Locations they're placed in.
 However, content items themselves can also be related to one another.
 
 ![Content Relations](content_management_relations.png "Content Relations")
 
 A **Relation** can exist between any two content items in the Repository.
-For example, images are linked to news articles they are used in.
+For example, images are linked to news articles they're used in.
 Instead of using a fixed set of image attributes, the images are stored as separate content items outside the article.
 
 There are different types of Relations available in the system.
diff --git a/docs/content_management/data_migration/create_data_migration_action.md b/docs/content_management/data_migration/create_data_migration_action.md
index cc4e2e8597..36d3f344c5 100644
--- a/docs/content_management/data_migration/create_data_migration_action.md
+++ b/docs/content_management/data_migration/create_data_migration_action.md
@@ -25,7 +25,7 @@ in `src/Migrations/Action/AssignSectionDenormalizer.php`:
 [[= include_file('code_samples/data_migration/src/Migrations/Action/AssignSectionDenormalizer.php') =]]
 ```
 
-Then, tag the action denormalizer so it is recognized by the serializer used for migrations.
+Then, tag the action denormalizer so it's recognized by the serializer used for migrations.
 
 ``` yaml
 [[= include_file('code_samples/data_migration/config/custom_services.yaml', 0, 5) =]]
diff --git a/docs/content_management/data_migration/create_data_migration_step.md b/docs/content_management/data_migration/create_data_migration_step.md
index bd777713cf..793e297714 100644
--- a/docs/content_management/data_migration/create_data_migration_step.md
+++ b/docs/content_management/data_migration/create_data_migration_step.md
@@ -32,7 +32,7 @@ in `src/Migrations/Step/ReplaceNameStepNormalizer.php`:
 [[= include_file('code_samples/data_migration/src/Migrations/Step/ReplaceNameStepNormalizer.php') =]]
 ```
 
-Then, tag the step normalizer, so it is recognized by the serializer used for migrations.
+Then, tag the step normalizer, so it's recognized by the serializer used for migrations.
 
 ``` yaml
 [[= include_file('code_samples/data_migration/config/custom_services.yaml', 18, 23) =]]
diff --git a/docs/content_management/data_migration/data_migration.md b/docs/content_management/data_migration/data_migration.md
index c30522a796..cde2f3286e 100644
--- a/docs/content_management/data_migration/data_migration.md
+++ b/docs/content_management/data_migration/data_migration.md
@@ -15,7 +15,7 @@ between installations.
 You can use migrations in projects that require the same data to be present across multiple instances.
 They can be useful for project templates. Migrations are able to store shared data, so they can be applied for each new project you start,
 or incrementally upgrade older projects to your new standard, if needed.
-They are a developer-friendly tool that allows you to share data without writing code.
+they're a developer-friendly tool that allows you to share data without writing code.
 
 You can run data migrations either with a command, or with the [PHP API](data_migration_api.md).
 
diff --git a/docs/content_management/data_migration/data_migration_actions.md b/docs/content_management/data_migration/data_migration_actions.md
index a45f5bb6f7..016b3bc530 100644
--- a/docs/content_management/data_migration/data_migration_actions.md
+++ b/docs/content_management/data_migration/data_migration_actions.md
@@ -20,7 +20,7 @@ You can find which migration steps support actions in the table below:
 Actions are optional operations that can be run after the main "body" of a migration has been executed
 (that is, content has been created / updated, Object state has been added, and so on).
 Their purpose is to allow additional operations to be performed as part of this particular migration.
-They are executed inside the same transaction, so in the event of failure they cause database rollback to occur.
+they're executed inside the same transaction, so in the event of failure they cause database rollback to occur.
 
 For example, when updating a content type object, some fields might be removed:
 ``` yaml
diff --git a/docs/content_management/data_migration/exporting_data.md b/docs/content_management/data_migration/exporting_data.md
index cbf680b406..87049921a9 100644
--- a/docs/content_management/data_migration/exporting_data.md
+++ b/docs/content_management/data_migration/exporting_data.md
@@ -76,7 +76,7 @@ For example, you could:
 - Add fields for other languages present in the system.
 
 Similarly, you can create update and delete operations.
-They are particularly useful combined with `match-property`.
+they're particularly useful combined with `match-property`.
 This option is automatically added as part of `match` expression in the update/delete migration:
 
 ``` bash
@@ -137,7 +137,7 @@ Note that you should test your migrations. See [Importing data](importing_data.m
 !!! caution
 
     [`--siteaccess` option](#siteaccess) usage can be relevant when multiple languages or multiple repositories are used.
-    To prevent translation loss, it is recommended that you use the SiteAccess that has all the languages used in your implementation, most likely the back office one.
+    To prevent translation loss, it's recommended that you use the SiteAccess that has all the languages used in your implementation, most likely the back office one.
 
 ## type
 
@@ -200,7 +200,7 @@ The following combinations of types are modes are available:
 The optional `--siteaccess` option enables you to export (or import) data in a SiteAccess configuration's context.
 If not provided, the [default SiteAccess](multisite_configuration.md#default-siteaccess) is used.
 
-It is recommended that you use the SiteAccess of the target repository's back office.
+It's recommended that you use the SiteAccess of the target repository's back office.
 
 Specifying the SiteAccess can be mandatory, for example, when you use several SiteAccesses to handle [several languages](languages.md#using-siteaccesses-for-handling-translations).
 Export and import commands only work with languages supported by the context SiteAccess.
@@ -293,7 +293,7 @@ php bin/console ibexa:migrations:generate --type=content --mode=create --file=my
 !!! note
 
     When migrating multiple files at once (for example when calling `ibexa:migrations:migrate` without options),
-    they are executed in alphabetical order.
+    they're executed in alphabetical order.
 
 ## user-context
 
diff --git a/docs/content_management/data_migration/managing_migrations.md b/docs/content_management/data_migration/managing_migrations.md
index 9a0e7056ad..a1d71dae93 100644
--- a/docs/content_management/data_migration/managing_migrations.md
+++ b/docs/content_management/data_migration/managing_migrations.md
@@ -159,14 +159,14 @@ For example:
 -
     type: reference
     mode: save
-    # You can also use 'references.yaml', in this case it is overridden
+    # You can also use 'references.yaml', in this case it's overridden
     filename: 'new_references.yaml'
 ```
 
 !!! note
 
-    You don't need to save references if they are used in the same migration file.
-    References are stored in memory during migration, whether they are used or not.
+    You don't need to save references if they're used in the same migration file.
+    References are stored in memory during migration, whether they're used or not.
 
 ## Available reference types
 
diff --git a/docs/content_management/field_types/create_custom_generic_field_type.md b/docs/content_management/field_types/create_custom_generic_field_type.md
index 8cb22b71fe..35a211a778 100644
--- a/docs/content_management/field_types/create_custom_generic_field_type.md
+++ b/docs/content_management/field_types/create_custom_generic_field_type.md
@@ -18,7 +18,7 @@ reduces the number of classes which must be created, and simplifies the tagging
 ## Define value object
 
 First, create `Value.php` in the `src/FieldType/HelloWorld` directory.
-The Value class of a Field Type contains only the basic logic of a Field Type, the rest of it is handled by the `Type` class.
+The Value class of a Field Type contains only the basic logic of a Field Type, the rest of it's handled by the `Type` class.
 For more information about Field Type Value see [Value handling](type_and_value.md#value-handling).
 
 The `HelloWorld` Value class should contain:
diff --git a/docs/content_management/field_types/customize_field_type_metadata.md b/docs/content_management/field_types/customize_field_type_metadata.md
index d9831c4d01..d39a03f897 100644
--- a/docs/content_management/field_types/customize_field_type_metadata.md
+++ b/docs/content_management/field_types/customize_field_type_metadata.md
@@ -5,7 +5,7 @@ description: You can customize which Field Type metadata should be disabled in t
 # Customize Field Type metadata
 
 When creating a content type definition, you add Fields and configure their metadata,
-such as whether they are required, translatable, and so on.
+such as whether they're required, translatable, and so on.
 
 If needed, you can customize that some of those options are disabled in the back office for specific Field Types.
 To do this, add custom service definition for `ModifyFieldDefinitionsCollectionTypeExtension` 
diff --git a/docs/content_management/field_types/field_type_reference/authorfield.md b/docs/content_management/field_types/field_type_reference/authorfield.md
index fc33732642..9ccd66ca08 100644
--- a/docs/content_management/field_types/field_type_reference/authorfield.md
+++ b/docs/content_management/field_types/field_type_reference/authorfield.md
@@ -1,6 +1,6 @@
 # Author Field Type
 
-This Field Type allows the storage and retrieval of one or more authors. For each author, it can handle a name and an email address. It is typically used to store information about additional authors who have written/created different parts of a content item.
+This Field Type allows the storage and retrieval of one or more authors. For each author, it can handle a name and an email address. It's typically used to store information about additional authors who have written/created different parts of a content item.
 
 | Name     | Internal name | Expected input | Output   |
 |----------|---------------|----------------|----------|
diff --git a/docs/content_management/field_types/field_type_reference/binaryfilefield.md b/docs/content_management/field_types/field_type_reference/binaryfilefield.md
index b64cff6897..d8bc4d2035 100644
--- a/docs/content_management/field_types/field_type_reference/binaryfilefield.md
+++ b/docs/content_management/field_types/field_type_reference/binaryfilefield.md
@@ -2,7 +2,7 @@
 
 This Field Type represents and handles a single binary file. It also counts the number of times the file has been downloaded from the `content/download` module.
 
-It is capable of handling virtually any file type and is typically used for storing legacy document types such as PDF files, Word documents, spreadsheets, etc. The maximum allowed file size is determined by the "Max file size" class attribute edit parameter and the `upload_max_filesize` directive in the main PHP configuration file (`php.ini`).
+It's capable of handling virtually any file type and is typically used for storing legacy document types such as PDF files, Word documents, spreadsheets, etc. The maximum allowed file size is determined by the "Max file size" class attribute edit parameter and the `upload_max_filesize` directive in the main PHP configuration file (`php.ini`).
 
 | Name         | Internal name  | Expected input | Output  |
 |--------------|----------------|----------------|---------|
diff --git a/docs/content_management/field_types/field_type_reference/checkboxfield.md b/docs/content_management/field_types/field_type_reference/checkboxfield.md
index c68e04abd5..034baafb14 100644
--- a/docs/content_management/field_types/field_type_reference/checkboxfield.md
+++ b/docs/content_management/field_types/field_type_reference/checkboxfield.md
@@ -46,4 +46,4 @@ $checkboxValue = new Checkbox\Value( true );
 
 ##### String representation
 
-As this Field Type is not a string but a boolean, it will return "1" (true) or "0" (false) in cases where it is cast to string, and it is never considered empty.
+As this Field Type is not a string but a boolean, it will return "1" (true) or "0" (false) in cases where it's cast to string, and it's never considered empty.
diff --git a/docs/content_management/field_types/field_type_reference/countryfield.md b/docs/content_management/field_types/field_type_reference/countryfield.md
index 7b2854c960..23f65b35c3 100644
--- a/docs/content_management/field_types/field_type_reference/countryfield.md
+++ b/docs/content_management/field_types/field_type_reference/countryfield.md
@@ -23,7 +23,7 @@ Example array:
 ];
 ```
 
-When you set an array directly on a Content Field you don't need to provide all this information, the Field Type will assume it is a hash and in this case will accept a simplified structure described below under [Hash format](#hash-format).
+When you set an array directly on a Content Field you don't need to provide all this information, the Field Type will assume it's a hash and in this case will accept a simplified structure described below under [Hash format](#hash-format).
 
 ### Validation
 
@@ -46,7 +46,7 @@ $settings = [
 
 ### Hash format
 
-The format used for serialization is simpler than the full format. It is also available when setting value on the content Field, by setting the value to an array instead of the Value object. Example of that shown below:
+The format used for serialization is simpler than the full format. It's also available when setting value on the content Field, by setting the value to an array instead of the Value object. Example of that shown below:
 
 ``` php
 // Value object content example
diff --git a/docs/content_management/field_types/field_type_reference/dateandtimefield.md b/docs/content_management/field_types/field_type_reference/dateandtimefield.md
index 16a5eb92b4..d36bed6605 100644
--- a/docs/content_management/field_types/field_type_reference/dateandtimefield.md
+++ b/docs/content_management/field_types/field_type_reference/dateandtimefield.md
@@ -12,7 +12,7 @@ This Field Type represents a full date and time information.
 
 If input value is of type `string` or `integer`, it will be passed directly to the [PHP's built-in `\DateTime` class constructor](https://www.php.net/manual/en/datetime.construct.php), therefore the same input format expectations apply.
 
-It is also possible to directly pass an instance of `\DateTime`.
+It's also possible to directly pass an instance of `\DateTime`.
 
 |Type|Example|
 |------|------|
diff --git a/docs/content_management/field_types/field_type_reference/datefield.md b/docs/content_management/field_types/field_type_reference/datefield.md
index 88cdf96804..e645a6e6a6 100644
--- a/docs/content_management/field_types/field_type_reference/datefield.md
+++ b/docs/content_management/field_types/field_type_reference/datefield.md
@@ -12,7 +12,7 @@ This Field Type represents a date without time information.
 
 If input value is in `string` or `integer` format, it will be passed directly to [PHP's built-in `\DateTime` class constructor](https://www.php.net/manual/en/datetime.construct.php), therefore the same input format expectations apply.
 
-It is also possible to directly pass an instance of `\DateTime`.
+It's also possible to directly pass an instance of `\DateTime`.
 
 |Type|Example|
 |------|------|
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
index d518fa1837..a950ac5561 100644
--- 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
@@ -7,7 +7,7 @@ page_type: reference
 
 A Field Type is the underlying building block of the content model. It consists of two entities: Field value and Field definition. Field value is determined by values entered into the Content Field. Field definition is provided by the content type, and holds any user defined rules used by Field Type to determine how a Field Value is validated, stored, retrieved, formatted and so on.
 
-[[= product_name =]] comes with a collection of Field Types that can be used to build powerful and complex content structures. In addition, it is possible to extend the system by creating custom types for special needs.
+[[= product_name =]] comes with a collection of Field Types that can be used to build powerful and complex content structures. In addition, it's possible to extend the system by creating custom types for special needs.
 
 !!! tip
 
@@ -63,5 +63,5 @@ Custom Field Types have to be programmed in PHP. However, the built-in Field Ty
 Legacy Search/Storage Engine index is limited to 255 characters in database design,
 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.
+only the first choices are indexed. they're indexed only as a text blob separated by string separator.
 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_reference/imagefield.md b/docs/content_management/field_types/field_type_reference/imagefield.md
index b295b77040..fcac2a8f17 100644
--- a/docs/content_management/field_types/field_type_reference/imagefield.md
+++ b/docs/content_management/field_types/field_type_reference/imagefield.md
@@ -19,7 +19,7 @@ The `value` property of an Image Field returns an `Ibexa\Core\FieldType\Image\V
 |Property|Type|Example|Description|
 |------|------|------|------|
 |`id`|string|`0/8/4/1/1480-1-eng-GB/image.png`|The image's unique identifier. Usually the path, or a part of the path. To get the full path, use the `uri` property.|
-|`alternativeText`|string|`Picture of an apple.`|The alternative text, as entered in the Field's properties. This property is optional. It is recommended that you require the alternative text for an image when you add the Image Field to a content type, by selecting the "Alternative text is required" checkbox.|
+|`alternativeText`|string|`Picture of an apple.`|The alternative text, as entered in the Field's properties. This property is optional. It's recommended that you require the alternative text for an image when you add the Image Field to a content type, by selecting the "Alternative text is required" checkbox.|
 |`fileName`|string|`image.png`|The original image's filename, without the path.|
 |`fileSize`|int|`37931`|The original image's size, in bytes.|
 |`uri`|string|`var/ezdemo_site/storage/images/0/8/4/1/1480-1-eng-GB/image.png`|The original image's URI.|
@@ -30,7 +30,7 @@ The `value` property of an Image Field returns an `Ibexa\Core\FieldType\Image\V
 
 !!! caution
 
-    Properties marked with an asterisk are currently unsupported. They are available but their value is always `null`.
+    Properties marked with an asterisk are currently unsupported. they're available but their value is always `null`.
 
     Follow [EZP-27987](https://issues.ibexa.co/browse/EZP-27987) for future progress on this issue.
 
@@ -40,7 +40,7 @@ This Field Type does not support settings.
 
 ### Image Variations
 
-Using the variation Service, variations of the original image can be obtained. They are `Ibexa\Contracts\Core\Variation\Values\ImageVariation` objects with the following properties:
+Using the variation Service, variations of the original image can be obtained. they're `Ibexa\Contracts\Core\Variation\Values\ImageVariation` objects with the following properties:
 
 | Property       | Type     | Example  | Description|
 |----------------|----------|----------|------------|
@@ -57,7 +57,7 @@ Using the variation Service, variations of the original image can be obtained. T
 
 !!! caution
 
-    Properties marked with an asterisk are currently unsupported. They are available but their value is always `null`.
+    Properties marked with an asterisk are currently unsupported. they're available but their value is always `null`.
 
     Follow [EZP-27987](https://issues.ibexa.co/browse/EZP-27987) for future progress on this issue.
 
diff --git a/docs/content_management/field_types/field_type_reference/mediafield.md b/docs/content_management/field_types/field_type_reference/mediafield.md
index bbb39c5adf..7f7903deea 100644
--- a/docs/content_management/field_types/field_type_reference/mediafield.md
+++ b/docs/content_management/field_types/field_type_reference/mediafield.md
@@ -2,7 +2,7 @@
 
 This Field Type represents and handles a media (audio/video) binary file.
 
-It is capable of handling the following types of files:
+It's capable of handling the following types of files:
 
 - Apple QuickTime
 - Adobe Flash
diff --git a/docs/content_management/field_types/field_type_reference/nullfield.md b/docs/content_management/field_types/field_type_reference/nullfield.md
index 9171e2294c..5052056255 100644
--- a/docs/content_management/field_types/field_type_reference/nullfield.md
+++ b/docs/content_management/field_types/field_type_reference/nullfield.md
@@ -8,7 +8,7 @@ This Field Type is used as fallback for migration scenarios, and for testing pur
 
 ## Description
 
-The Null Field Type serves as an aid when migrating from eZ Publish Platform and earlier legacy versions. It is a dummy for legacy Field Types that are not implemented in [[= product_name =]].
+The Null Field Type serves as an aid when migrating from eZ Publish Platform and earlier legacy versions. It's a dummy for legacy Field Types that are not implemented in [[= product_name =]].
 
 Null Field Type will accept anything provided as a value and is usually combined with:
 
diff --git a/docs/content_management/field_types/field_type_reference/richtextfield.md b/docs/content_management/field_types/field_type_reference/richtextfield.md
index 67a0414638..81f1b363d5 100644
--- a/docs/content_management/field_types/field_type_reference/richtextfield.md
+++ b/docs/content_management/field_types/field_type_reference/richtextfield.md
@@ -30,7 +30,7 @@ This Field Type validates and stores structured rich text, and exposes it in sev
 
 The Field Type expects an XML value as input, in the form of a string, `DOMDocument` object, or Field Type's `Value` object.
 The Field Type's `Value` object must hold the value in the Field Type's [internal format](#internal-format).
-For a string of a `DOMDocument` object, if the input does not conform to this format, it is converted into it.
+For a string of a `DOMDocument` object, if the input does not conform to this format, it's converted into it.
 
 ##### Internal format
 
diff --git a/docs/content_management/field_types/field_type_reference/sesprofiledata.md b/docs/content_management/field_types/field_type_reference/sesprofiledata.md
index 05c8226b87..a131242953 100644
--- a/docs/content_management/field_types/field_type_reference/sesprofiledata.md
+++ b/docs/content_management/field_types/field_type_reference/sesprofiledata.md
@@ -3,7 +3,7 @@
 This Field Type stores [`CustomerProfileData`] in the User content type.
 
 `CustomerProfileData` must be stored as a serialized string in base64 format,
-because it is impossible to store special HTML characters (`<`,`>`, `""`,`''`, `&`) in a text or text area field.
+because it's impossible to store special HTML characters (`<`,`>`, `""`,`''`, `&`) in a text or text area field.
 
 The name of the customer (taken from the contact section) can be used for lists.
 To do it, use the name pattern in the content type definition of the User content type.
diff --git a/docs/content_management/field_types/field_type_reference/taxonomyentryfield.md b/docs/content_management/field_types/field_type_reference/taxonomyentryfield.md
index 8e7f2bcfa2..93c480c924 100644
--- a/docs/content_management/field_types/field_type_reference/taxonomyentryfield.md
+++ b/docs/content_management/field_types/field_type_reference/taxonomyentryfield.md
@@ -1,7 +1,7 @@
 # TaxonomyEntry Field Type
 
 `TaxonomyEntry` is a general purpose Field Type that can store only one taxonomy entry (for example, tag or product category). 
-It is used as a parent for a tag or category.
+It's used as a parent for a tag or category.
 
 | Name           | Internal name         | Expected input |
 |----------------|-----------------------|----------------|
diff --git a/docs/content_management/field_types/field_type_reference/textblockfield.md b/docs/content_management/field_types/field_type_reference/textblockfield.md
index 4950e6a5e5..6516c3f6d8 100644
--- a/docs/content_management/field_types/field_type_reference/textblockfield.md
+++ b/docs/content_management/field_types/field_type_reference/textblockfield.md
@@ -1,6 +1,6 @@
 # TextBlock Field Type
 
-The Field Type handles a block of multiple lines of unformatted text. It is capable of handling up to 16,777,216 characters.
+The Field Type handles a block of multiple lines of unformatted text. It's capable of handling up to 16,777,216 characters.
 
 | Name        | Internal name | Expected input type |
 |-------------|---------------|---------------------|
diff --git a/docs/content_management/field_types/field_type_reference/textlinefield.md b/docs/content_management/field_types/field_type_reference/textlinefield.md
index 6863df8529..6483ab8dec 100644
--- a/docs/content_management/field_types/field_type_reference/textlinefield.md
+++ b/docs/content_management/field_types/field_type_reference/textlinefield.md
@@ -1,6 +1,6 @@
 # TextLine Field Type
 
-This Field Type makes possible to store and retrieve a single line of unformatted text. It is capable of handling up to 255 characters.
+This Field Type makes possible to store and retrieve a single line of unformatted text. It's capable of handling up to 255 characters.
 
 | Name       | Internal name | Expected input type |
 |------------|---------------|---------------------|
diff --git a/docs/content_management/field_types/field_type_reference/timefield.md b/docs/content_management/field_types/field_type_reference/timefield.md
index ca69490f4e..db85d97210 100644
--- a/docs/content_management/field_types/field_type_reference/timefield.md
+++ b/docs/content_management/field_types/field_type_reference/timefield.md
@@ -16,7 +16,7 @@ What is stored is the number of seconds, calculated from the beginning of the da
 
 If input value is of type `string` or `integer`, it will be passed directly to the [PHP's built-in `\DateTime` class](https://www.php.net/manual/en/datetime.construct.php) constructor, therefore the same input format expectations apply.
 
-It is also possible to directly pass an instance of `\DateTime`.
+It's also possible to directly pass an instance of `\DateTime`.
 
 |Type|Example|
 |------|------|
diff --git a/docs/content_management/field_types/field_type_reference/urlfield.md b/docs/content_management/field_types/field_type_reference/urlfield.md
index 340940566a..d38e13923e 100644
--- a/docs/content_management/field_types/field_type_reference/urlfield.md
+++ b/docs/content_management/field_types/field_type_reference/urlfield.md
@@ -1,6 +1,6 @@
 # URL Field Type
 
-This Field Type makes it possible to store and retrieve a URL. It is formed by the combination of a link and the respective text.
+This Field Type makes it possible to store and retrieve a URL. It's formed by the combination of a link and the respective text.
 
 | Name  | Internal name | Expected input |
 |-------|---------------|----------------|
diff --git a/docs/content_management/field_types/field_type_search.md b/docs/content_management/field_types/field_type_search.md
index 2b5601eede..b97df7c355 100644
--- a/docs/content_management/field_types/field_type_search.md
+++ b/docs/content_management/field_types/field_type_search.md
@@ -13,7 +13,7 @@ The `Ibexa\Contracts\Core\FieldType\Indexable` interface defines the methods bel
 
 ### `getIndexData(Field $field, FieldDefinition $fieldDefinition)`
 
-This method returns the actual index data for the provided `Ibexa\Contracts\Core\Persistence\Content\Field`. The index data consists of an array of `Ibexa\Contracts\Core\Search\Field` instances. They are described below in further detail.
+This method returns the actual index data for the provided `Ibexa\Contracts\Core\Persistence\Content\Field`. The index data consists of an array of `Ibexa\Contracts\Core\Search\Field` instances. they're described below in further detail.
 
 ### `getIndexDefinition()`
 
diff --git a/docs/content_management/field_types/field_type_storage.md b/docs/content_management/field_types/field_type_storage.md
index 4ae1510ce1..e31bde5921 100644
--- a/docs/content_management/field_types/field_type_storage.md
+++ b/docs/content_management/field_types/field_type_storage.md
@@ -30,7 +30,7 @@ The SPI `FieldValue` struct has properties which the Field Type can use:
 
 The Legacy storage engine uses the `ezcontentobject_attribute` table to store Field values,
 and `ezcontentclass_attribute` to store Field definition values.
-They are both based on the same principle.
+they're both based on the same principle.
 
 Each row represents a Field or a Field definition, and offers several free fields of different types, where the type can store its data e.g.
 
@@ -100,7 +100,7 @@ calls one of the following methods to also access the external data:
 |Method|Description|
 |------|-----------|
 |`hasFieldData()`|Returns whether the Field Type stores external data at all.|
-|`storeFieldData()`|Called right before a Field of the Field Type is stored. The method stores `$externalData`. It returns `true` if the call manipulated internal data of the given Field, so that it is updated in the internal database.|
+|`storeFieldData()`|Called right before a Field of the Field Type is stored. The method stores `$externalData`. It returns `true` if the call manipulated internal data of the given Field, so that it's updated in the internal database.|
 |`getFieldData()`|Called after a Field has been restored from the database in order to restore `$externalData`.|
 |`deleteFieldData()`|Must delete external data for the given Field, if exists.|
 |`getIndexData()`|Returns the actual index data for the provided `Ibexa\Contracts\Core\Persistence\Content\Field`. For more information, see [search service](field_type_search.md#search-field-values).|
@@ -114,7 +114,7 @@ Note that the Field Type must take care on its own for being compliant with diff
 
 ### Gateway-based storage
 
-In order to allow the usage of a Field Type that uses external data with different data storages, it is recommended to implement a gateway infrastructure and a registry for the gateways. To make this easier, the Core implementation of Field Types provides corresponding interfaces and base classes. They can also be used for custom Field Types.
+In order to allow the usage of a Field Type that uses external data with different data storages, it's recommended to implement a gateway infrastructure and a registry for the gateways. To make this easier, the Core implementation of Field Types provides corresponding interfaces and base classes. They can also be used for custom Field Types.
 
 The interface `Ibexa\Contracts\Core\FieldType\StorageGateway` is implemented by gateways, in order to be handled correctly by the registry. It has one method:
 
@@ -183,7 +183,7 @@ Also note that there can be several gateways per Field Type (one per storage eng
 
 Just like in the case of data, storing [Field Type settings](type_and_value.md#field-type-settings) 
 in content item tables may prove insufficient. 
-It is not a problem if your setting specifies, for example, just the allowed number of characters 
+It's not a problem if your setting specifies, for example, just the allowed number of characters 
 in a text field. 
 However, the Field Type may represent a more complex object, for example, it may 
 consist of two or more other fields, such as the name, SKU and price, and there 
diff --git a/docs/content_management/field_types/field_type_validation.md b/docs/content_management/field_types/field_type_validation.md
index dd4f777b46..f466b4f645 100644
--- a/docs/content_management/field_types/field_type_validation.md
+++ b/docs/content_management/field_types/field_type_validation.md
@@ -12,7 +12,7 @@ except it has an additional level, to group settings for a certain validation me
 - The key on the 1st level is a string, identifying a validator
 - Assigned to that is an associative array (2nd level) of settings
 - This associative array has a string key for each setting of the validator
-- It is assigned to a 3rd level associative array, the setting description
+- It's assigned to a 3rd level associative array, the setting description
 - This associative array should have the same format as for normal settings
 
 For example, for the `ezstring` type, the validator schema could be:
diff --git a/docs/content_management/field_types/form_and_template.md b/docs/content_management/field_types/form_and_template.md
index 5db3b4e5d3..b473bb31fb 100644
--- a/docs/content_management/field_types/form_and_template.md
+++ b/docs/content_management/field_types/form_and_template.md
@@ -176,7 +176,7 @@ ibexa:
             field_templates:
                 -
                     template: 'fields/custom_field_template.html.twig'
-                    # Priority is optional (default is 0). The higher it is, the higher your template gets in the list.
+                    # Priority is optional (default is 0). The higher it's, the higher your template gets in the list.
                     priority: 10
 ```
 
diff --git a/docs/content_management/field_types/type_and_value.md b/docs/content_management/field_types/type_and_value.md
index 539b7d19c5..18e629943e 100644
--- a/docs/content_management/field_types/type_and_value.md
+++ b/docs/content_management/field_types/type_and_value.md
@@ -13,7 +13,7 @@ The Value is used to represent an instance of the Field Type within a content it
 Each Field presents its data using an instance of the Type's Value class.
 A Value class must implement the `Ibexa\Contracts\Core\FieldType` interface.
 It may also extend the `Ibexa\Core\FieldType\Value` abstract class.
-It is meant to be stateless and as lightweight as possible.
+It's meant to be stateless and as lightweight as possible.
 This class must contain as little logic as possible, because the logic is handled by the Type class.
 
 ## Type class
@@ -33,7 +33,7 @@ By convention it should be prefixed by a unique vendor shortcut (e.g. `ibexa` fo
 
 #### `getSettingsSchema()`
 
-This method retrieves via public PHP API a schema for the Field Type settings. A typical setting would be e.g. default value. The settings structure defined by this schema is stored in the `FieldDefinition`. Since it is not possible to define a generic format for such a schema, the Field Type is free to return any serializable data structure from this method.
+This method retrieves via public PHP API a schema for the Field Type settings. A typical setting would be e.g. default value. The settings structure defined by this schema is stored in the `FieldDefinition`. Since it's not possible to define a generic format for such a schema, the Field Type is free to return any serializable data structure from this method.
 
 #### `getValidatorConfigurationSchema()`
 
@@ -47,11 +47,11 @@ The type is asked to validate the settings (provided by the user) before the pub
 
 As in `validateFieldSettings()`, this method verifies that the given validator configuration complies to the schema provided by `getValidatorConfigurationSchema()`.
 
-It is important to note that the schema definitions of the Field Type can be both of arbitrary and serializable format. It is highly recommended to use a simple hash structure.
+It's important to note that the schema definitions of the Field Type can be both of arbitrary and serializable format. It's highly recommended to use a simple hash structure.
 
 !!! note
 
-    Since it is not possible to enforce a schema format, the code using a specific Field Type must basically know all Field Types it deals with.
+    Since it's not possible to enforce a schema format, the code using a specific Field Type must basically know all Field Types it deals with.
 
 This also applies to all user interfaces and the REST API, which therefore must provide extension points to register handling code for custom Field Type. These extensions are not defined yet.
 
@@ -68,7 +68,7 @@ A Field Type needs to deal with the custom value format provided by it. In order
 
 This method is responsible for accepting and converting user input for the Field. It checks the input structure by accepting, building, and returning a different structure holding the data.
 
-For example: a user provides an HTTP link as a string, `acceptValue()` converts the link to a URL Field Type value object. Unlike the `FieldType\Value` constructor, it is possible to make this method aware of multiple input types (object or primitive).
+For example: a user provides an HTTP link as a string, `acceptValue()` converts the link to a URL Field Type value object. Unlike the `FieldType\Value` constructor, it's possible to make this method aware of multiple input types (object or primitive).
 
 !!! note
 
@@ -87,7 +87,7 @@ The value chain for filling a specific Field of the Field Type is as follows:
 #### `validate()`
 
 In contrast to `acceptValue()` this method validates the plausibility of the given value.
-It is based on the Field Type settings and validator configuration and stored in the corresponding `FieldDefinition`.
+It's based on the Field Type settings and validator configuration and stored in the corresponding `FieldDefinition`.
 
 ### Serialization
 
@@ -142,7 +142,7 @@ To make the search engine aware of the data stored in a Field Type, register it
 
 ## Field Type settings
 
-It is recommended to use a simple associative array format for the settings schema returned by `Ibexa\Contracts\Core\FieldType\FieldType::getSettingsSchema()`, which follows these rules:
+It's recommended to use a simple associative array format for the settings schema returned by `Ibexa\Contracts\Core\FieldType\FieldType::getSettingsSchema()`, which follows these rules:
 
 - The key of the associative array identifies a setting (e.g. `default`)
 - Its value is an associative array describing the setting using:
@@ -186,4 +186,4 @@ This class provides the following methods:
 |`preProcessValidatorConfigurationHash()`|Performs manipulations on a received validator configuration hash, so that it conforms to the format expected by the `validatorConfigurationFromHash()` method described above.|
 |`postProcessValidatorConfigurationHash()`|Performs manipulations on a outgoing validator configuration hash, previously generated by the `validatorConfigurationToHash()` method described above.|
 
-Base implementations of these methods simply return the given hash, so you can implement only the methods your Field Type requires. Some built-in Field Types already implement processors and you are encouraged to take a look at them.
+Base implementations of these methods simply return the given hash, so you can implement only the methods your Field Type requires. Some built-in Field Types already implement processors and you're encouraged to take a look at them.
diff --git a/docs/content_management/file_management/file_url_handling.md b/docs/content_management/file_management/file_url_handling.md
index 6de13f9765..442fce0fdc 100644
--- a/docs/content_management/file_management/file_url_handling.md
+++ b/docs/content_management/file_management/file_url_handling.md
@@ -49,7 +49,7 @@ Any BinaryFile returned by the public PHP API is prefixed with the value of thi
 Default value: `$var_dir$/$storage_dir$`
 Example: `/var/site/storage`
 
-You can use `io.url_prefix` to configure the default URL decorator service (`ibexa.core.io.default_url_decorator`), used by all binary data handlers to generate the URI of loaded files. It is always interpreted as an absolute URI, meaning that unless it contains a scheme (`http://`, `ftp://`), is prepended with a `/`.
+You can use `io.url_prefix` to configure the default URL decorator service (`ibexa.core.io.default_url_decorator`), used by all binary data handlers to generate the URI of loaded files. It's always interpreted as an absolute URI, meaning that unless it contains a scheme (`http://`, `ftp://`), is prepended with a `/`.
 
 This setting is SiteAccess-aware.
 
diff --git a/docs/content_management/forms/customize_email_notifications.md b/docs/content_management/forms/customize_email_notifications.md
index acdab4990a..3d9b93eaa7 100644
--- a/docs/content_management/forms/customize_email_notifications.md
+++ b/docs/content_management/forms/customize_email_notifications.md
@@ -25,7 +25,7 @@ Each of them is rendered independently and consists of three sets of parameters.
 ## Configure sender details
 
 Some email providers require a sender address to be set, so to avoid unsent emails when using Form Builder,
-it is recommended to configure `sender_address` in `config/packages/swiftmailer.yaml`.
+it's recommended to configure `sender_address` in `config/packages/swiftmailer.yaml`.
 This email acts as a sender and return address for all bounced messages.
 
 !!! note
diff --git a/docs/content_management/forms/form_builder_guide.md b/docs/content_management/forms/form_builder_guide.md
index 00b22a4138..411e4b5b15 100644
--- a/docs/content_management/forms/form_builder_guide.md
+++ b/docs/content_management/forms/form_builder_guide.md
@@ -121,7 +121,7 @@ The **Download submissions** button enables you to download all the submissions
 
 ### General overview
 
-With Form Builder you are allowed to build an unlimited number of forms. 
+With Form Builder you're allowed to build an unlimited number of forms. 
 These forms can be used anywhere on the website and are ready to start collecting information. 
 Form Builder interface is simple, which makes the creation of forms fast and intuitive.
 
diff --git a/docs/content_management/forms/work_with_forms.md b/docs/content_management/forms/work_with_forms.md
index db65fe60b3..a855fc9a05 100644
--- a/docs/content_management/forms/work_with_forms.md
+++ b/docs/content_management/forms/work_with_forms.md
@@ -58,8 +58,8 @@ The following table lists some of the available options and their meaning:
 | Switch | Option | Description |
 |--------------|------------|------------|
 | `-l` | `--language-code=LANGUAGE-CODE` | Passes a language code, for example, "eng-GB". |
-| `-u` | `--user[=USER]` | Passes a repository username. By default it is "admin". |
-| `-c` | `--batch-size[=BATCH-SIZE]` | Passes a number of URLs to check in a single iteration. Set it to avoid using too much memory. By default it is set to 50. |
+| `-u` | `--user[=USER]` | Passes a repository username. By default it's "admin". |
+| `-c` | `--batch-size[=BATCH-SIZE]` | Passes a number of URLs to check in a single iteration. Set it to avoid using too much memory. By default it's set to 50. |
 | | `--siteaccess[=SITEACCESS]` | Passes a SiteAccess to use for operations. If not provided, the default SiteAccess is used. |
 
 ## Form-uploaded files
diff --git a/docs/content_management/images/add_image_asset_from_dam.md b/docs/content_management/images/add_image_asset_from_dam.md
index 0dbf5f62eb..0026685098 100644
--- a/docs/content_management/images/add_image_asset_from_dam.md
+++ b/docs/content_management/images/add_image_asset_from_dam.md
@@ -41,7 +41,7 @@ First, in `templates/themes/standard/embed/`, create a custom template `dam.html
 {% endif %}
 ```
 
-The `770px` parameter in the template above is used to render the DAM image. It is the `unsplash` specific image variation and must be defined separately.
+The `770px` parameter in the template above is used to render the DAM image. It's the `unsplash` specific image variation and must be defined separately.
 
 Next, in `config/packages/ibexa.yaml`, set the `dam.html.twig` template for the `embed` view type that is matched for the content type, which you created for DAM images. 
 For more information about displaying content, see [Content rendering](render_content.md).
diff --git a/docs/content_management/images/fastly_io.md b/docs/content_management/images/fastly_io.md
index 19e571df66..36ed08ce2b 100644
--- a/docs/content_management/images/fastly_io.md
+++ b/docs/content_management/images/fastly_io.md
@@ -52,7 +52,7 @@ For more information about Fastly configuration and CLI usage examples, see [Con
 Fastly IO configuration is SiteAccess aware.
 You can define what handler should be used for a specific SiteAccess under `variation_handler_identifier` [configuration key](configuration.md#configuration-files).
 You need to set it up as `fastly`, so Fastly IO can generate all image links.
-By default, it is set as `alias`, and it points to a built-in image optimizer.
+By default, it's set as `alias`, and it points to a built-in image optimizer.
 You can also set up a custom handler if your setup requires it.
 
 ```yaml
diff --git a/docs/content_management/images/images.md b/docs/content_management/images/images.md
index 33cfe2c1c7..baa0675c34 100644
--- a/docs/content_management/images/images.md
+++ b/docs/content_management/images/images.md
@@ -66,7 +66,7 @@ The LiipImagineBundle bundle supports GD (default), Imagick or Gmagick PHP
 extensions, and enables you to define flexible filters in PHP. 
 Image files are stored by using the `IOService,` and are completely independent 
 from the Image Field Type. 
-They are generated only once and cleared on demand, for example, on content removal).
+they're generated only once and cleared on demand, for example, on content removal).
 
 LiipImagineBundle only works on image blobs, so no command line tool is needed. 
 For more information, see the [bundle's documentation](https://symfony.com/bundles/LiipImagineBundle/current/configuration.html).
@@ -127,7 +127,7 @@ You can also pass two additional parameters:
 
 With a placeholder generator you can download or generate placeholder images for 
 any missing image. 
-It proves useful when you are working on an existing database and are unable to 
+It proves useful when you're working on an existing database and are unable to 
 download uploaded images to your local development environment, due to, for 
 example, a large size of files.
 
diff --git a/docs/content_management/locations.md b/docs/content_management/locations.md
index 0e1db7d2ed..54ecd3b266 100644
--- a/docs/content_management/locations.md
+++ b/docs/content_management/locations.md
@@ -4,7 +4,7 @@ description: Locations hold published content items and can be used to control v
 
 # Locations
 
-When a new content item is published, it is automatically placed in a new Location.
+When a new content item is published, it's automatically placed in a new Location.
 
 All Locations form a tree which is the basic way of organizing content in the system.
 Every published content item has a Location and, as a consequence, also a place in this tree.
@@ -17,7 +17,7 @@ You can find drats in the **Drafts** tab in the **Content** menu.
 
 ![Drafts](content_management_drafts.png "Drafts")
 
-A content item can have more than one Location. It is then present in two or more places in the tree.
+A content item can have more than one Location. It's then present in two or more places in the tree.
 For example, an article can be at the same time under "Local news" and "Sports news".
 Even in such a case, one of these places is always the main Location.
 
@@ -96,13 +96,13 @@ When the Location of a content item is hidden, the system will not display it on
 
     The [visibility switcher](https://doc.ibexa.co/en/latest/content_management/locations/#location-visibility) is a convenient feature for withdrawing content from the frontend.
     It acts as a filter in the frontend by default. You can choose to respect it or ignore it in your code.
-    It isn't permission-based, and **doesn't restrict access to content**. Hidden content can be read through other means, like the REST API.
+    it'sn't permission-based, and **doesn't restrict access to content**. Hidden content can be read through other means, like the REST API.
 
     If you need to restrict access to a given content item, you could create a role that grants read access for a given [**Section**](sections.md) or
     [**Object State**](object_states.md), and set a different Section or Object State for the given Content.
     Or use other permission-based [**Limitations**](limitations.md).
 
-If a content item is hidden, it is invisible in all its Locations.
+If a content item is hidden, it's invisible in all its Locations.
 If a Location is hidden, all of its descendants in the tree will be hidden as well.
 This means that there are three different visibility statuses:
 
diff --git a/docs/content_management/pages/page_blocks.md b/docs/content_management/pages/page_blocks.md
index 24739adf4b..193c69e945 100644
--- a/docs/content_management/pages/page_blocks.md
+++ b/docs/content_management/pages/page_blocks.md
@@ -64,7 +64,7 @@ The highest number shows first on the list.
 !!! tip
 
     Default views have a `priority` of -255.
-    It is good practice to keep the value between -255 and 255.
+    It's good practice to keep the value between -255 and 255.
 
 ### Block modal template
 
diff --git a/docs/content_management/pages/page_builder_guide.md b/docs/content_management/pages/page_builder_guide.md
index a729854f2b..8f561289fd 100644
--- a/docs/content_management/pages/page_builder_guide.md
+++ b/docs/content_management/pages/page_builder_guide.md
@@ -35,9 +35,9 @@ Then, from the content tree choose the page and click **Edit**.
 ## What is Page Builder
 
 Page Builder is a visual tool that allows you to create and edit any page in [[= product_name =]].
-It is more than managing: it is about building pages, creating customized content and fully-targeted landing pages.
+It's more than managing: it's about building pages, creating customized content and fully-targeted landing pages.
 Creating pages in Page Builder involves composing content using ready-to-use elements - blocks, properly configured and customized.
-It is also important to choose a layout - it determines the arrangement of drop zones that contain content elements.
+It's also important to choose a layout - it determines the arrangement of drop zones that contain content elements.
 
 ![Page Builder - diagram](page_builder_diagram.png)
 
@@ -104,7 +104,7 @@ For newly created Page you can choose a [layout]([[= user_doc =]]/content_manage
 Applying a layout divides the Page into the defined zones. The zones are placeholders for content items.
 
 On the Page creation modal, select the layout and click **Create draft**.
-Now you are ready to add blocks of content to the Page.
+Now you're ready to add blocks of content to the Page.
 
 The page layouts that an editor has access to are up to you to choose.
 In the `Select layouts` section, you can select layouts that you want to be available for the Page.
diff --git a/docs/content_management/rich_text/extend_online_editor.md b/docs/content_management/rich_text/extend_online_editor.md
index a5d75604cf..c1885a6c8d 100644
--- a/docs/content_management/rich_text/extend_online_editor.md
+++ b/docs/content_management/rich_text/extend_online_editor.md
@@ -42,7 +42,7 @@ Place the `factbox.html.twig` template in the
 
 !!! tip
 
-    If an attribute is not required, check if it is defined by adding a check 
+    If an attribute is not required, check if it's defined by adding a check 
     in the template, for example:
 
     ```html+twig
@@ -72,7 +72,7 @@ You can also place custom tags inline with the following configuration:
 ```
 
 `is_inline` is an optional key.
-The default value is `false`, therefore, if it is not set, the custom tag is 
+The default value is `false`, therefore, if it's not set, the custom tag is 
 treated as a block tag.
 
 ### Use cases
@@ -80,7 +80,7 @@ treated as a block tag.
 #### Link tag
 
 You can configure a custom tag with a `link` attribute that offers a basic UI with text input.
-It is useful when migrating from eZ Publish to [[= product_name =]].
+It's useful when migrating from eZ Publish to [[= product_name =]].
 
 The configuration is:
 
@@ -170,7 +170,7 @@ Add labels for the new styles by providing translations in `translations/custom_
 ### Rendering
 
 The `template` key points to the template that is used to render the custom style. 
-It is recommended that you use the [design engine](design_engine.md).
+It's recommended that you use the [design engine](design_engine.md).
 
 The template files for the front end could look as follows:
 
@@ -312,7 +312,7 @@ You can also set each attribute to be `required` and set its `default_value`.
 
 For the `choice` type, you must provide an array of available `choices`.
 By adding `multiple`, you can decide whether more than one option can be selected.
-It is set to `false` by default.
+It's set to `false` by default.
 
 Use the example below to add two data attributes, `custom_attribute` and 
 `another_attribute` to the Heading element in the `admin_group` SiteAccess:
diff --git a/docs/content_management/url_management/url_management.md b/docs/content_management/url_management/url_management.md
index 7b4bb46063..a6fbd314e6 100644
--- a/docs/content_management/url_management/url_management.md
+++ b/docs/content_management/url_management/url_management.md
@@ -203,7 +203,7 @@ Use it when:
 
 !!! caution
 
-    Before you apply the command, back up your database and make sure it is not modified while the command is running.
+    Before you apply the command, back up your database and make sure it's not modified while the command is running.
 
 
 Execute the following command to regenerate aliases:
@@ -263,4 +263,4 @@ $repository->sudo(function ($repository) use ($urlWildcardService, $source, $des
 ```
 
 If `$redirect` is set to `true`, the redirection changes the URL address.
-If it is `false`, the old URL address is be used, with the new content.
+If it's `false`, the old URL address is be used, with the new content.
diff --git a/docs/content_management/user_generated_content.md b/docs/content_management/user_generated_content.md
index 0d9c063da4..c1cf62fb04 100644
--- a/docs/content_management/user_generated_content.md
+++ b/docs/content_management/user_generated_content.md
@@ -5,7 +5,7 @@ description: You can enable users to create new content in the Repository by usi
 # User-generated content
 
 [[= product_name =]] comes with content edition features via the Symfony stack.
-They are meant to allow the implementation of user-generated content from the front end, without entering the back office.
+they're meant to allow the implementation of user-generated content from the front end, without entering the back office.
 
 ## Creating a new draft
 
diff --git a/docs/content_management/workflow/add_custom_workflow_action.md b/docs/content_management/workflow/add_custom_workflow_action.md
index 97d227c37e..fc8c8fdcf7 100644
--- a/docs/content_management/workflow/add_custom_workflow_action.md
+++ b/docs/content_management/workflow/add_custom_workflow_action.md
@@ -21,7 +21,7 @@ Configure the first custom action under the `ibexa.system.<scope>.workflows` [co
 ```
 
 The configuration indicates the name of the custom action (`legal_transition_action`).
-`data` contains additional data that is passed to the action. In this case, it is a message to display.
+`data` contains additional data that is passed to the action. In this case, it's a message to display.
 
 ## Create event listener
 
diff --git a/docs/content_management/workflow/workflow.md b/docs/content_management/workflow/workflow.md
index 89528a84f2..8d1a84881c 100644
--- a/docs/content_management/workflow/workflow.md
+++ b/docs/content_management/workflow/workflow.md
@@ -161,7 +161,7 @@ to only allow sending content in the selected transition.
 
 For example, by using the example above, a `workflow/change_stage` Policy 
 with `WorkflowTransitionLimitation` set to `Approved by legal` allows a legal team to send content forward
-after they are done with their review.
+after they're done with their review.
 
 You can also use the [Workflow Stage Limitation](limitation_reference.md#workflow-stage-limitation) 
 together with the `content/edit` and `content/publish` Policies to limit the ability to edit content in specific stages.
diff --git a/docs/customer_management/cp_applications.md b/docs/customer_management/cp_applications.md
index ee857f5c83..603e881364 100644
--- a/docs/customer_management/cp_applications.md
+++ b/docs/customer_management/cp_applications.md
@@ -7,7 +7,7 @@ edition: experience
 
 New business customers can apply for a company account.
 Applications go through the approval process in the back office where they can be accepted, rejected or put on hold.
-If they are accepted, the business partner receives an invitation link to the Customer Portal,
+If they're accepted, the business partner receives an invitation link to the Customer Portal,
 where they can set up their team and manage their account.
 
 For more information on company self-registration, see [user guide documentation](https://doc.ibexa.co/projects/userguide/en/latest/customer_management/company_self_registration/).
diff --git a/docs/customer_management/cp_page_builder.md b/docs/customer_management/cp_page_builder.md
index 80c7c2b08c..b67a8a9a40 100644
--- a/docs/customer_management/cp_page_builder.md
+++ b/docs/customer_management/cp_page_builder.md
@@ -82,7 +82,7 @@ You need to grant the following permissions to company members, so they can view
 
 ![Single Customer Portal permissions](img/single_cp_permissions.png)
 
-If members of the company don't have sufficient permissions for any Customer Portal, they are redirected to the default Customer Portal view.
+If members of the company don't have sufficient permissions for any Customer Portal, they're redirected to the default Customer Portal view.
 
 !!! note
 
@@ -103,7 +103,7 @@ There you will see two possibilities **Customer Portal** and **Customer Portal P
 
 The first one is a separate content type used as a container for your Customer Portal pages.
 Customer Portals containers should be used to sort Customer Portal pages and any other content types used by them, such as articles, inside the root folder.
-It is recommended that you use them instead of folders to divide and store your portals.
+It's recommended that you use them instead of folders to divide and store your portals.
 Select **Customer Portal**, define its name and publish.
 
 ![Customer Portals folder](img/cp_folder_for_portals.png)
diff --git a/docs/customer_management/customer_portal_guide.md b/docs/customer_management/customer_portal_guide.md
index 1947fe66fa..df6ee26806 100644
--- a/docs/customer_management/customer_portal_guide.md
+++ b/docs/customer_management/customer_portal_guide.md
@@ -17,7 +17,7 @@ invite and view members, check their order history and more.
 
 ## Availability
 
-Customer Portal is available in [[= product_name_exp =]]. It is also compatible with PIM, Commerce and [[= product_name_connect =]].
+Customer Portal is available in [[= product_name_exp =]]. It's also compatible with PIM, Commerce and [[= product_name_connect =]].
 
 ## How does Customer Portal work?
 
@@ -102,7 +102,7 @@ With it, they can register and create their account in the Customer Portal.
 
 Self-registration allows business customers to take charge and apply for a business account by themselves. 
 Applications go through the approval process in the back office where they can be accepted, rejected or put on hold. 
-If they are accepted, the business partner receives an invitation link to the Customer Portal, where they can set up their team and manage their account.
+If they're accepted, the business partner receives an invitation link to the Customer Portal, where they can set up their team and manage their account.
 
 To apply for a business account, a company needs to provide their basic information, 
 contact information and billing address in an application.
@@ -126,7 +126,7 @@ Customer Portal comes with [REST API](https://doc.ibexa.co/en/latest/api/rest_ap
 
 ### Company management
 
-Sales representatives can manage details for companies they are associated with, such as contact persons, billing addresses, and more by accessing back office.
+Sales representatives can manage details for companies they're associated with, such as contact persons, billing addresses, and more by accessing back office.
 Company admins are also able to manage the company's details in the Customer Portal interface.
 By giving users power to manage their own accounts, you reduce the need for administrative interventions.
 
@@ -134,7 +134,7 @@ By giving users power to manage their own accounts, you reduce the need for admi
 
 Self-registration allows your customers to take control of their business accounts.
 This not only improves customer satisfaction but also reduces the administrative burden on your team. 
-With the ability to integrate with [[= product_name_connect =]], you are able to fully automate the process.
+With the ability to integrate with [[= product_name_connect =]], you're able to fully automate the process.
 
 ### Address book
 
@@ -155,7 +155,7 @@ It allows you to make use of customer targeting of the segments and create perso
 
 The overall benefit of customer portals is the help they provide to retain customers and increase loyalty, while freeing up customer service employees time for higher-level work.
 They can achieve that by providing customers with up-to-date information about their orders and deliveries, personalize shopping experience, offer special deals available only to B2B partners and do that in one, easily accessible space.
-Currently, customer portals are a standard in global sites such as Amazon. They are the level of quality that customers just expect, and all businesses strive for.
+Currently, customer portals are a standard in global sites such as Amazon. they're the level of quality that customers just expect, and all businesses strive for.
 
 ### Simplified shopping process
 
diff --git a/docs/fonts/Work_Sans/OFL.txt b/docs/fonts/Work_Sans/OFL.txt
index d3a046cf57..7dc0f597ec 100644
--- a/docs/fonts/Work_Sans/OFL.txt
+++ b/docs/fonts/Work_Sans/OFL.txt
@@ -17,7 +17,7 @@ open framework in which fonts may be shared and improved in partnership
 with others.
 
 The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
+redistributed freely as long as they're not sold by themselves. The
 fonts, including any derivative works, can be bundled, embedded, 
 redistributed and/or sold with any software provided that any reserved
 names are not used by derivative works. The fonts and derivatives,
diff --git a/docs/getting_started/first_steps.md b/docs/getting_started/first_steps.md
index bada50d4b0..9a0396119a 100644
--- a/docs/getting_started/first_steps.md
+++ b/docs/getting_started/first_steps.md
@@ -114,7 +114,7 @@ For example, if the title of the Blog post is "First blog post", the address wil
 
 You can use SiteAccesses to serve different versions of the website.
 
-SiteAccesses are used depending on matching rules. They are set up in YAML configuration under the `ibexa.siteaccess.list` key.
+SiteAccesses are used depending on matching rules. they're set up in YAML configuration under the `ibexa.siteaccess.list` key.
 
 1\. In `config/packages/ibexa.yaml` add a new SiteAccess called `de` for the German version of the website:
 
@@ -163,7 +163,7 @@ de:
 This means that German will be used as the main language for this SiteAccess, and English as a fallback.
 
 2\. Go to the back office and select **Admin** > **Languages**. Add a new language called "German", with the language code `ger-DE`.
-Make sure it is enabled.
+Make sure it's enabled.
 
 ![Creating a language](first-steps-create-language.png)
 
diff --git a/docs/getting_started/install_ibexa_dxp.md b/docs/getting_started/install_ibexa_dxp.md
index 73a77100e5..099939d3c7 100644
--- a/docs/getting_started/install_ibexa_dxp.md
+++ b/docs/getting_started/install_ibexa_dxp.md
@@ -135,7 +135,7 @@ run the following command:
 
 ??? note "Using PHP 8.2 or older"
 
-    If you are using PHP 8.2 or any older version, use a different set of commands:
+    If you're using PHP 8.2 or any older version, use a different set of commands:
 
     === "[[= product_name_headless =]]"
 
@@ -174,7 +174,7 @@ run the following command:
 
 !!! note "Platform.sh"
 
-    If you are deploying your installation on [Platform.sh](https://docs.platform.sh/guides/ibexa/deploy.html),
+    If you're deploying your installation on [Platform.sh](https://docs.platform.sh/guides/ibexa/deploy.html),
     run the following command:
     
     ``` bash
@@ -185,7 +185,7 @@ run the following command:
 
 #### Add project to version control
 
-It is recommended to add your project to version control.
+It's recommended to add your project to version control.
 Initiate your project repository:
 
 ``` bash
@@ -195,7 +195,7 @@ git init; git add . > /dev/null; git commit -m "init" > /dev/null
 ### Change installation parameters
 
 At this point configure your database via the `DATABASE_URL` in the `.env` file,
-depending of the database you are using:
+depending of the database you're using:
 
 `DATABASE_URL=mysql://user:password@host:port/database_name`.
 
@@ -234,7 +234,7 @@ and for creating signed URIs when using [ESI (Edge Side Includes)]([[= symfony_d
     After changing the app secret, make sure that you clear the application cache and log out all the users.
     For more information, see [Symfony documentation]([[= symfony_doc =]]/reference/configuration/framework.html#secret).   
 
-    It is recommended to store the database credentials in your `.env.local` file and not commit it to the Version Control System.
+    It's recommended to store the database credentials in your `.env.local` file and not commit it to the Version Control System.
 
 In `DATABASE_VERSION` you can also configure the database server version (for a MariaDB database, prefix the value with `mariadb-`).
 
@@ -349,7 +349,7 @@ Future files and directories created by these two users will need to inherit tho
     You must also make sure that the web server cannot interpret the files in the `var` directory through PHP.
     To do so, follow the instructions on [setting up a virtual host below](#set-up-virtual-host).
 
-To set up permissions for production, it is recommended to use an ACL (Access Control List).
+To set up permissions for production, it's recommended to use an ACL (Access Control List).
 See [Setting up or Fixing File Permissions]([[= symfony_doc =]]/setup/file_permissions.html) in Symfony documentation
 for information on how to do it on different systems.
 
@@ -363,7 +363,7 @@ Prepare a [virtual host configuration](https://en.wikipedia.org/wiki/Virtual_hos
     to `/etc/apache2/sites-available` as a `.conf` file and modify it to fit your project.
 
     Specify `/<your installation directory>/public` as the `DocumentRoot` and `Directory`, or ensure `BASEDIR` is set in the environment.
-    Uncomment the line that starts with `#if [APP_ENV]` and set the value to `prod` or `dev`, depending on the environment that you are configuring,
+    Uncomment the line that starts with `#if [APP_ENV]` and set the value to `prod` or `dev`, depending on the environment that you're configuring,
     or ensure `APP_ENV` is set in the environment.
 
     ```
@@ -393,7 +393,7 @@ Prepare a [virtual host configuration](https://en.wikipedia.org/wiki/Virtual_hos
 
 
     Specify `/<your installation directory>/public` as the `root`, or ensure `BASEDIR` is set in the environment.
-    Ensure `APP_ENV` is set to `prod` or `dev` in the environment, depending on the environment that you are configuring, and uncomment the line that starts with `#if[APP_ENV`.
+    Ensure `APP_ENV` is set to `prod` or `dev` in the environment, depending on the environment that you're configuring, and uncomment the line that starts with `#if[APP_ENV`.
 
     When the virtual host file is ready, enable the virtual host and disable the default.
     Finally, restart the nginx server.
diff --git a/docs/getting_started/install_on_mac_os_and_windows.md b/docs/getting_started/install_on_mac_os_and_windows.md
index c8489301ed..a12b33f5b9 100644
--- a/docs/getting_started/install_on_mac_os_and_windows.md
+++ b/docs/getting_started/install_on_mac_os_and_windows.md
@@ -22,7 +22,7 @@ If you want to use a web server, you need to install it as well:
 - For Windows: Apache
 - For macOS: Apache/nginx
 
-The instructions below assume that you are using Apache.
+The instructions below assume that you're using Apache.
 
 ??? note "Windows"
 
diff --git a/docs/getting_started/requirements.md b/docs/getting_started/requirements.md
index 8ac4ad6719..8f08fa993b 100644
--- a/docs/getting_started/requirements.md
+++ b/docs/getting_started/requirements.md
@@ -7,7 +7,7 @@ description: System, component and package requirements for running Ibexa DXP.
 # Requirements
 
 This document covers all supported versions of the product.
-To review the requirements, select the specific version of Ibexa DXP you are interested in.
+To review the requirements, select the specific version of Ibexa DXP you're interested in.
 
 The following server requirements cover both running the software on-premise and on third-party PaaS providers.
 
@@ -376,12 +376,12 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
     ### Ibexa Cloud Setup support matrix
 
-    All Ibexa DXP features are supported in accordance with the example above. For example: As Legacy Bridge is not supported with v3, it is not supported on Ibexa Cloud either.
+    All Ibexa DXP features are supported in accordance with the example above. For example: As Legacy Bridge is not supported with v3, it's not supported on Ibexa Cloud either.
 
     !!! note
 
         As Platform.sh does not support a configuration with multiple PostgreSQL databases,
-        for Ibexa Cloud / Platform.sh it is impossible to have a DFS table in a separate database.
+        for Ibexa Cloud / Platform.sh it's impossible to have a DFS table in a separate database.
 
     ### Recommended Ibexa Cloud setup
 
@@ -395,7 +395,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
     Make sure to set aside time and budget for:
 
-    - Verifying your requirements and ensuring they are supported by Platform.sh
+    - Verifying your requirements and ensuring they're supported by Platform.sh
     - Additional time for adaptation and configuration work, and testing by your development team
     - Additional consulting/onboarding time with Platform.sh, Ibexa technical services, and/or one of the many partners with prior experience using Platform.sh with Ibexa DXP
 
@@ -423,12 +423,12 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
     ### Ibexa Cloud Setup support matrix
 
-    All Ibexa DXP features are supported in accordance with the example above. For example: As Legacy Bridge is not supported with v3, it is not supported on Ibexa Cloud either.
+    All Ibexa DXP features are supported in accordance with the example above. For example: As Legacy Bridge is not supported with v3, it's not supported on Ibexa Cloud either.
 
     !!! note
 
         As Platform.sh does not support a configuration with multiple PostgreSQL databases,
-        for Ibexa Cloud / Platform.sh it is impossible to have a DFS table in a separate database.
+        for Ibexa Cloud / Platform.sh it's impossible to have a DFS table in a separate database.
 
     ### Recommended Ibexa Cloud setup
 
@@ -442,7 +442,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
     Make sure to set aside time and budget for:
 
-    - Verifying your requirements and ensuring they are supported by Platform.sh
+    - Verifying your requirements and ensuring they're supported by Platform.sh
     - Additional time for adaptation and configuration work, and testing by your development team
     - Additional consulting/onboarding time with Platform.sh, Ibexa technical services, and/or one of the many partners with prior experience using Platform.sh with Ibexa DXP
 
@@ -480,7 +480,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     Because of the large range of possible configurations of eZ Publish legacy, there is no ready-made recommended setup.
     Make sure to set aside time and budget for:
 
-    - Verifying your legacy configuration and ensuring it is supported by Platform.sh
+    - Verifying your legacy configuration and ensuring it's supported by Platform.sh
     - Additional time for adaptation and configuration work, and testing by your own team
     - Additional consulting/onboarding time with Platform.sh, Ibexa technical services, and/or one of the many partners with prior experience using Platform.sh with eZ Publish legacy
 
@@ -489,7 +489,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     ### Experimental/custom Platform.sh setups
 
     Any use of experimental versions or setups is not eligible for use with eZ Platform Cloud.
-    However, it is possible to use an eZ Enterprise subscription in combination with a Platform.sh contract,
+    However, it's possible to use an eZ Enterprise subscription in combination with a Platform.sh contract,
     where you or a partner take ownership of the configuration to set up the project.
 
     Such projects are possible by means of custom integrations/configuration,
@@ -497,14 +497,14 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
     !!! tip "Use a partner with prior experience on legacy and Platform.sh"
 
-        If you are in need of setting up your legacy project on Platform.sh for a transitional period,
+        If you're in need of setting up your legacy project on Platform.sh for a transitional period,
         eZ can put you in contact with a partner experienced in setting up older projects on Platform.sh.
         This will save you a lot of time and effort.
         
     !!! note
 
         As Platform.sh does not support a configuration with multiple PostgreSQL databases,
-        for eZ Platform Cloud / Platform.sh it is impossible to have a DFS table in a separate database.
+        for eZ Platform Cloud / Platform.sh it's impossible to have a DFS table in a separate database.
 
     ### Custom integrations
 
diff --git a/docs/getting_started/troubleshooting.md b/docs/getting_started/troubleshooting.md
index 421535ce91..63c017fe1a 100644
--- a/docs/getting_started/troubleshooting.md
+++ b/docs/getting_started/troubleshooting.md
@@ -22,7 +22,7 @@ That means changing `%env(resolve:DATABASE_URL)%` to `%env(DATABASE_URL)%`.
 ### Avoid special characters
 
 If your password only contains letters a-z, A-Z, and numbers 0-9, you don't need to do any encoding.
-You can either create your password that way, in which case it is a good idea to make it longer to maintain entropy,
+You can either create your password that way, in which case it's a good idea to make it longer to maintain entropy,
 keeping the password hard to guess for an attacker.
 Or, you can for instance convert your password with `bin2hex()`, so that e.g. `(/!=#Ƥ*;%?[` becomes `282f213d23c386c2a42a3b253f5b`.
 The output from `bin2hex` is limited to 0-9 and a-f. This more than doubles the length of the password, keeping entropy similar.
@@ -90,7 +90,7 @@ In such case, require it again when the bug is fixed and the package is updated:
 
 ## Platform.sh HTTP access credentials with Varnish
 
-If you are using Platform.sh with Varnish for HTTP cache
+If you're using Platform.sh with Varnish for HTTP cache
 and you have [HTTP access control by login/password](https://docs.platform.sh/administration/web/configure-environment.html#http-access-control) enabled,
 configure the following variables in your Platform.sh environment:
 
diff --git a/docs/ibexa_cloud/ddev_and_ibexa_cloud.md b/docs/ibexa_cloud/ddev_and_ibexa_cloud.md
index edd6c73e41..c69a2e6d6a 100644
--- a/docs/ibexa_cloud/ddev_and_ibexa_cloud.md
+++ b/docs/ibexa_cloud/ddev_and_ibexa_cloud.md
@@ -58,7 +58,7 @@ ddev launch
 
 !!! note
 
-    The Platform.sh API token is set at user profile level, therefore it is stored globally under current user root as `PLATFORMSH_CLI_TOKEN` in `~/.ddev/global_config.yaml`.
+    The Platform.sh API token is set at user profile level, therefore it's stored globally under current user root as `PLATFORMSH_CLI_TOKEN` in `~/.ddev/global_config.yaml`.
 
 ## Without the Platform.sh add-on
 
diff --git a/docs/ibexa_cloud/install_on_ibexa_cloud.md b/docs/ibexa_cloud/install_on_ibexa_cloud.md
index 164cffb10a..6d1d10fa88 100644
--- a/docs/ibexa_cloud/install_on_ibexa_cloud.md
+++ b/docs/ibexa_cloud/install_on_ibexa_cloud.md
@@ -79,7 +79,7 @@ This ensures that the token isn't exposed.
 
 ## 4. Push the project
 
-When you are done with configuration, push your project to the Platform.sh remote:
+When you're done with configuration, push your project to the Platform.sh remote:
 
 ``` bash
 git push -u <platform.sh-remote> master
@@ -103,5 +103,5 @@ ibexa_cloud push master
 
     Ibexa Cloud CLI and Platform.sh CLI share the same commands and the [same documentation](https://docs.platform.sh/administration/cli.html#3-use), but you have to replace `platform` with `ibexa_cloud`.
 
-    If you have previously set up an alias to use Platform.sh CLI with Ibexa Cloud, it is outdated.
+    If you have previously set up an alias to use Platform.sh CLI with Ibexa Cloud, it's outdated.
     Remove the alias and install Ibexa Cloud CLI instead.
diff --git a/docs/ibexa_engage/create_campaign.md b/docs/ibexa_engage/create_campaign.md
index 5fac820998..5ac8930805 100644
--- a/docs/ibexa_engage/create_campaign.md
+++ b/docs/ibexa_engage/create_campaign.md
@@ -11,7 +11,7 @@ To create new campaign, you need to use Qualifio Manager.
 You can use Qualifio's existing templates and interactive elements, such as quizzes, pools, and forms, to create visually appealing, customized campaigns.
 Users can configure the backgrounds, themes, or designs, and set up a specific time frame for each campaign.
 
-Technically, each campaign has a unique campaign ID, that is automatically defined by the Qualifio platform when it is created.
+Technically, each campaign has a unique campaign ID, that is automatically defined by the Qualifio platform when it's created.
 
 For more information about creating and managing campaigns, see [Qualifio documentation](https://support.qualifio.com/hc/en-us/categories/202280638-Campaigns).
 
diff --git a/docs/ibexa_engage/install_ibexa_engage.md b/docs/ibexa_engage/install_ibexa_engage.md
index 33627eb8e9..491688e513 100644
--- a/docs/ibexa_engage/install_ibexa_engage.md
+++ b/docs/ibexa_engage/install_ibexa_engage.md
@@ -50,4 +50,4 @@ In `config/packages` directory add the following `ibexa_connector_qualifio.yaml`
 
     [[= product_name_base =]] configures the `channel` and `client_id` values so that the selections can be filled up automatically on [[= product_name =]] side.
 
-    The `feed_url` and `variable_map` values don't need to be set at the installation process. They are preconfigured and can be overwritten.
\ No newline at end of file
+    The `feed_url` and `variable_map` values don't need to be set at the installation process. they're preconfigured and can be overwritten.
\ No newline at end of file
diff --git a/docs/ibexa_products/ibexa_commerce.md b/docs/ibexa_products/ibexa_commerce.md
index fcfc221f4d..b4b35679ab 100644
--- a/docs/ibexa_products/ibexa_commerce.md
+++ b/docs/ibexa_products/ibexa_commerce.md
@@ -71,7 +71,7 @@ Depending on their role, users can also enable or disable shipping methods, chan
 #### Storefront
 
 The [Storefront](storefront.md) package includes a starter kit for developers.
-It is a foundational set of components that developers can customize and extend to create their own web store implementations.
+it's a foundational set of components that developers can customize and extend to create their own web store implementations.
 It contains default UI components and widgets that can be modified to [create a customized web store](customize_storefront_layout.md).
 
 #### Relevant faceted search
diff --git a/docs/ibexa_products/ibexa_headless.md b/docs/ibexa_products/ibexa_headless.md
index d8123422ab..7bf2b463e8 100644
--- a/docs/ibexa_products/ibexa_headless.md
+++ b/docs/ibexa_products/ibexa_headless.md
@@ -43,7 +43,7 @@ For performance, several bricks can be added to your stack such as a reverse pro
 
 By using a version control system and environment variables, you can deploy your configuration and extensions on several environments including [[= product_name_cloud =]].
 
-Standard web APIs and [[[= product_name_connect =]]]([[= connect_doc =]]/general/ibexa_connect/) help establish interoperability, even if you aren't an advanced developer.
+Standard web APIs and [[[= product_name_connect =]]]([[= connect_doc =]]/general/ibexa_connect/) help establish interoperability, even if you'ren't an advanced developer.
 
 ![Ibexa Headless data inputs and outputs](img/headless.png)
 
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
index 9bdfd73838..eb1c788008 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
@@ -1,10 +1,10 @@
 ---
-description: Content-aware HTTP cache takes into account the content it is connected to.
+description: Content-aware HTTP cache takes into account the content it's connected to.
 ---
 
 # Content-aware HTTP cache
 
-HTTP cache in [[= product_name =]] is aware of which content or entity it is connected to.
+HTTP cache in [[= product_name =]] is aware of which content or entity it's connected to.
 This awareness is accomplished by means of cache tagging. All supported reverse proxies are content-aware.
 
 !!! note "Tag header is stripped in production for security reasons"
@@ -91,7 +91,7 @@ Apache has a [hard](https://github.com/apache/httpd/blob/5f32ea94af5f1e7ea68d6fc
 
 1\. For inline rendering just displaying the content name, image attribute, and/or link, it would be enough to:
 
-- Look into how many inline (non ESI) render calls for content rendering you are doing, and see if you can organize it differently.
+- Look into how many inline (non ESI) render calls for content rendering you're doing, and see if you can organize it differently.
 - Consider inlining the views not used elsewhere in the given template and [tagging the response in Twig](#response-tagging-in-templates) with "relation" tags.
     - (Optional) You can set reduced cache TTL for the given view, to reduce the risk of stale cache on subtree operations affecting the inlined content.
 
@@ -135,9 +135,9 @@ If the given content has several Locations, you can see several `l<location-id>`
 ### ResponseConfigurator
 
 A `ReponseCacheConfigurator` configures an HTTP Response object, makes the response public, adds tags and sets the shared max age. 
-It is provided to `ReponseTaggers` that use it to add the tags to the response.
+it's provided to `ReponseTaggers` that use it to add the tags to the response.
 
-The `ConfigurableResponseCacheConfigurator` (`Ibexa\HttpCache\ResponseConfigurator\ConfigurableResponseCacheConfigurator`) follows the `view_cache` configuration and only enables cache if it is enabled in the configuration.
+The `ConfigurableResponseCacheConfigurator` (`Ibexa\HttpCache\ResponseConfigurator\ConfigurableResponseCacheConfigurator`) follows the `view_cache` configuration and only enables cache if it's enabled in the configuration.
 
 ### Delegator and Value taggers
 
@@ -190,7 +190,7 @@ $tagHandler->addRelationTags([33, 44]);
 In PHP, FOSHttpCache exposes the `fos_http_cache.http.symfony_response_tagger` service which enables you to add tags to a response.
 
 The following example adds minimal tags when ID 33 and 34 are rendered in ESI,
-but parent response needs these tags to get refreshed if they are deleted:
+but parent response needs these tags to get refreshed if they're deleted:
 
 ``` php
 /** @var \FOS\HttpCacheBundle\Http\SymfonyResponseTagger $responseTagger */
@@ -215,7 +215,7 @@ $response->headers->set('X-Location-Id', '123,212,42');
 !!! caution "X-Location-Id use is deprecated"
 
     `X-Location-Id` is deprecated and will be removed in future.
-    For rendering content it is advised to refactor to use Content View,
+    For rendering content it's advised to refactor to use Content View,
     if not applicable `ContentTagInterface` or lastly manually output tags.
 
 ## Response tagging in templates
@@ -359,12 +359,12 @@ bin/console fos:httpcache:invalidate:tag ez-all
 
 ## Testing and debugging HTTP cache
 
-It is important to test your code in an environment which is as similar as your production environment as possible. That
+it's important to test your code in an environment which is as similar as your production environment as possible. That
 means that if only are testing locally using the default Symfony Reverse proxy when your are going to use Varnish or
-Fastly in production, you are likely ending up some (bad) surprises. Due to the symfony reverse proxy's lack of support for ESIs, it behaves
+Fastly in production, you're likely ending up some (bad) surprises. Due to the symfony reverse proxy's lack of support for ESIs, it behaves
 quite different from Varnish and Fastly in some aspects.
-If you are going to use Varnish in production, make sure you also test your code with Varnish.
-If you are going to use Fastly in production, testing with Fastly in your developer install is likely not feasible
+If you're going to use Varnish in production, make sure you also test your code with Varnish.
+If you're going to use Fastly in production, testing with Fastly in your developer install is likely not feasible
 (you're local development environment must then be accessible for Fastly). Testing with Varnish instead will in most
 cases do the job. But if you need to change the varnish configuration to make your site work, be aware that Varnish and Fastly uses different dialects, and
 that .vcl code for Varnish V6.x will likely not work as-is on Fastly.
@@ -455,13 +455,13 @@ Some notes about each of these parameters:
     - We specify `443` because we are using `https`
     - We provide the IP of the nginx endpoint at platform.sh (`1.2.3.4` in this example)
 - `--header "Surrogate-Capability: abc=ESI/1.0"`, strictly speaking not needed when fetching the user-context-hash, but this tells [[= product_name =]] that client understands ESI tags.
-  It is good practice to always include this header when imitating the HTTP Cache.
+  it's good practice to always include this header when imitating the HTTP Cache.
 - `--header "accept: application/vnd.fos.user-context-hash"` tells [[= product_name =]] that the client wants to receive the user-context-hash
 - `--header "x-fos-original-url: /"` is required by the fos-http-cache bundle in order to deliver the user-context-hash
 - `https://www.staging.foobar.com.us-2.platformsh.site/_fos_user_context_hash` : here we use the hostname we earlier told
   curl how to resolve using `---resolve`. `/_fos_user_context_hash` is the route to the controller that are able to
   deliver the user-context-hash.
-- You may also provide the session cookie (`--cookie ".....=....") for a logged-in-user if you are interested in
+- You may also provide the session cookie (`--cookie ".....=....") for a logged-in-user if you're interested in
   the x-user-context-hash for a different user but anonymous
 
 The output for this command should look similar to this:
@@ -486,7 +486,7 @@ holds the [cache tags](#cache-tags).
 
 ### Fetching HTML response
 
-Now you have the user-context-hash, and you can ask origin for the actual resource you are after:
+Now you have the user-context-hash, and you can ask origin for the actual resource you're after:
 
 ```bash
     $ curl -IXGET --resolve www.staging.foobar.com.us-2.platformsh.site:443:1.2.3.4 --header "Surrogate-Capability: abc=ESI/1.0" --header "x-user-context-hash: daea248406c0043e62997b37292bf93a8c91434e8661484983408897acd93814" https://www.staging.foobar.com.us-2.platformsh.site/
@@ -532,7 +532,7 @@ The output is:
     <esi:include src="/_fragment?_hash=lnKTnmv6bb1XpaMPWRjV3sNazbn9rDXskhjGae1BDw8%3D&_path=locationId%3D2%26contentId%3D52%26blockId%3D13%26versionNo%3D3%26languageCode%3Deng-GB%26serialized_siteaccess%3D%257B%2522name%2522%253A%2522site%2522%252C%2522matchingType%2522%253A%2522default%2522%252C%2522matcher%2522%253Anull%252C%2522provider%2522%253Anull%257D%26serialized_siteaccess_matcher%3Dnull%26_format%3Dhtml%26_locale%3Den_GB%26_controller%3DEzSystems%255CCustomBundle%255CController%255CFooController%253A%253AcustomAction" />
 ```
 
-Now, investigate the response of each of these ESI fragments to understand what is going on. It is important to
+Now, investigate the response of each of these ESI fragments to understand what is going on. it's important to
 put that URL in single quotes as the URLS to the ESIs include special characters that can be interpreted by the
 shell.
 
@@ -607,6 +607,6 @@ The `Set-Cookie` here may cause the problem. A ESI fragment should never set a c
   stops setting cookies, Fastly will still not cache that fragment. Any document referring to that ESI will be a `MISS`.
   Fastly cache needs to be purged (`Purge-all` request) in order to remove this flag.
   
-- It means that it is not recommended to always initiate a session when loading the front page.
+- It means that it's not recommended to always initiate a session when loading the front page.
 
 You must ensure that you do not unintendedly start a session in a controller used by ESIs, for example, when trying to access as session variable before a session has been initiated yet.
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
index 2b1afda9f9..f0f1bfa32b 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
@@ -70,7 +70,7 @@ It also varies on `Authorization` to cover any possible basic authorization head
 
     <a name="default-options-for-foshttpcachebundle"></a>
     The following configuration is defined by default for FOSHttpCacheBundle.
-    You should not override these settings unless you know what you are doing.
+    You should not override these settings unless you know what you're doing.
 
     ``` yaml
     fos_http_cache:
@@ -95,7 +95,7 @@ Here are some generic recommendations on how to approach personalized content wi
 1\. ESI with vary by cookie:
 
 Default VCL strips everything except session cookie, so this is effectively "per user".
-If you are on single-server setup without Varnish or Fastly, you can use the same cookie logic on the web server instead.
+If you're on single-server setup without Varnish or Fastly, you can use the same cookie logic on the web server instead.
 
 This a low effort solution, and can be enough for one fragment that is reused across the whole site, 
 for example, in header to show user name:
@@ -111,7 +111,7 @@ Example:
 
 This method does not consume memory in Varnish. 
 It can optionally be cached with custom logic: Symfony Cache on server side and/or with client side caching techniques. 
-This should be done as Ajax/JS lookup to avoid the uncached request that slows down the whole delivery of Vanish if it is done as ESI.
+This should be done as Ajax/JS lookup to avoid the uncached request that slows down the whole delivery of Vanish if it's done as ESI.
 
 This solution requires more effort depending on project requirements (traffic load, etc.).
 
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md b/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md
index 4e9ff0e105..bf07880012 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md
@@ -10,7 +10,7 @@ Fastly provides a [Fastly CLI](https://developer.fastly.com/reference/cli/) for
 Ibexa Cloud is delivered with Fastly preconfigured. 
 It means that you don't have to do any changes to the Fastly configuration to make your site work. 
 The information provided here is only applicable if you want to change the default Fastly configuration on Ibexa Cloud, 
-or if you are not using Ibexa Cloud and want to configure Fastly to work with [[= product_name =]] on premise.
+or if you're not using Ibexa Cloud and want to configure Fastly to work with [[= product_name =]] on premise.
 
 !!! note "The Fastly Web Interface is not available for Ibexa Cloud"
     It's recommend for Ibexa Cloud customers to use the Fastly CLI instead of using the Fastly API directly with `curl`, and so on.
@@ -217,10 +217,10 @@ fastly service-version activate --version=latest
 
 You can also add VCL code to the Fastly configuration without modifying the custom `.vcl` files directly. 
 You do it by creating [snippets](https://docs.fastly.com/en/guides/about-vcl-snippets).
-It is recommended that you use snippets instead of changing the VCL files provided by [[= product_name =]] as much as possible, which makes it easier to upgrade the [[= product_name =]] VCL configuration later.
+it's recommended that you use snippets instead of changing the VCL files provided by [[= product_name =]] as much as possible, which makes it easier to upgrade the [[= product_name =]] VCL configuration later.
 
 When you use snippets, the snippet code is injected into the VCL where the `#FASTLY ...` macros are placed.
-For example, if you create a snippet for the `recv` subroutine, it is injected into the `ez_main.vcl` file, the
+For example, if you create a snippet for the `recv` subroutine, it's injected into the `ez_main.vcl` file, the
 line where `#FASTLY recv` is found.
 
 ### List available snippets for specific version
@@ -236,7 +236,7 @@ KlUh0J1fnw1JY1aEQ0up    8        Re-Enable shielding on restart  false    1iJWIf
 
 ### Get details of installed snippets
 
-Use the `vcl snippet list` command with the `--verbose` option to get information such as: priority, which subroutine it is attached to (`vcl_recv`, `vcl_fetch` etc.) and the code itself.
+Use the `vcl snippet list` command with the `--verbose` option to get information such as: priority, which subroutine it's attached to (`vcl_recv`, `vcl_fetch` etc.) and the code itself.
 
 ``` bash
 fastly vcl snippet list --version=active -v
@@ -443,7 +443,7 @@ declare local var.username STRING;
 declare local var.password STRING;
 declare local var.result STRING;
 
-# Basic auth is checked on edge nodes only. The logic below makes sure that it is only run at the edge.
+# Basic auth is checked on edge nodes only. The logic below makes sure that it's only run at the edge.
 if (fastly.ff.visits_this_service == 0 && req.restarts == 0) {
   if (req.http.Authorization ~ "(?i)^Basic ([a-z0-9_=]+)$") {
     set var.credential = digest.base64_decode(re.group.1);
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/http_cache_configuration.md b/docs/infrastructure_and_maintenance/cache/http_cache/http_cache_configuration.md
index 7a07ffb8eb..917e9f4a4f 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/http_cache_configuration.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/http_cache_configuration.md
@@ -69,7 +69,7 @@ fos_http_cache:
 
 For the Page Builder, block cache by default respects `$content.ttl_cache$` and `$content.default_ttl$` settings.
 However, if the given block value has a since or till date, 
-it is taken into account for the TTL calculation for both the block and the whole page.
+it's taken into account for the TTL calculation for both the block and the whole page.
 
 To overload this behavior, listen to [`BlockResponseEvents::BLOCK_RESPONSE`](page_events.md),
 and set priority to `-200` to adapt what Page Field Type does by default.
@@ -86,7 +86,7 @@ In practice, with ESI, every sub-request is regenerated from application perspec
 - With Symfony Proxy (AppCache) there is always some overhead, even on warm cache (hits)
 - In development environment
 
-This may differ depending on your system, however, it is recommended to stay below 5 ESI 
+This may differ depending on your system, however, it's recommended to stay below 5 ESI 
 requests per page and only using them for parts that are the same across the whole site or larger parts of it.
 
 You should not use ESI for parts that are effectively uncached, 
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md b/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
index e6f50c7c59..7bdb4ce903 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
@@ -96,7 +96,7 @@ framework:
     ```
 
     When trusting remote IP like this, make sure your application is only accessible through Varnish. 
-    If it is accessible in other ways, this may result in trusting, for example, the IP of client browser instead, which would be a serious security issue.
+    If it's accessible in other ways, this may result in trusting, for example, the IP of client browser instead, which would be a serious security issue.
 
     Make sure that **all** traffic always comes from the trusted proxy/load balancer,
     and that there is no other way to configure it.
@@ -227,7 +227,7 @@ FASTLY_KEY="token"
 
 #### Configure Fastly on Platform.sh
 
-If you use Platform.sh, it is recommended to configure all environment variables through [Platform.sh variables](https://docs.platform.sh/guides/ibexa/fastly.html).
+If you use Platform.sh, it's recommended to configure all environment variables through [Platform.sh variables](https://docs.platform.sh/guides/ibexa/fastly.html).
 In [[= product_name =]], Varnish is enabled by default. To use Fastly, first you must 
 [disable Varnish](https://docs.platform.sh/guides/ibexa/fastly.html#remove-varnish-configuration) 
 
@@ -325,7 +325,7 @@ with the following logic in the out-of-the-box VCL:
 
 Serving grace is not always allowed by default because:
 
-- It is a safe default. Even if just for anonymous users, stale cache can easily be confusing during acceptance testing.
+- it's a safe default. Even if just for anonymous users, stale cache can easily be confusing during acceptance testing.
 - It means REST API, which is used by the back office, would serve stale data, breaking the UI.
 
 !!! tip "Customizing stale cache handling"
diff --git a/docs/infrastructure_and_maintenance/cache/persistence_cache.md b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
index dc06e9396a..dbedd197f7 100644
--- a/docs/infrastructure_and_maintenance/cache/persistence_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
@@ -33,14 +33,14 @@ Notes:
   order to allow clearing cache by alternative indexes.
   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).
+- Search is not defined as persistence and the queries themselves are not planned to be cached as they're too complex by design (for example, full text).
   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:
 
 - Symfony Cache tab: for Symfony Cache itself, the tab shows cache lookups to cache backends
-- [[= product_name_base =]] tab: shows calls made to database back end, and if they are cached or not
+- [[= product_name_base =]] tab: shows calls made to database back end, and if they're cached or not
 
 To see where and how to contribute additional caches, refer to the [source code](https://github.com/ibexa/core/blob/main/src/lib/Persistence/Cache/Readme.md).
 
@@ -121,7 +121,7 @@ parameters:
 
     **TTL and Limit need to have a low value.** Setting limit high will increase memory use.
     High TTL value also increases exponentially risk for system acting on stale metadata (e.g. content type definitions).
-    The only case where it is safe to increase these values is for dev environment with single concurrency on writes.
+    The only case where it's safe to increase these values is for dev environment with single concurrency on writes.
     In prod environment you should only consider reducing them if you have heavy concurrency writes.
 
 ### Redis
@@ -140,9 +140,9 @@ There are two Redis adapters available out of the box that fit different needs.
 
 **Requirement**: Redis server configured with eviction [`maxmemory-policy`](https://redis.io/docs/reference/eviction/#eviction-policies):
 `volatile-ttl`, `volatile-lru` or `volatile-lfu` (Redis 4.0+).
-Use of LRU or LFU is recommended. It is also possible to use `noeviction`, but it is usually not practical.
+Use of LRU or LFU is recommended. it's also possible to use `noeviction`, but it's usually not practical.
 
-**Pros**: It is typically faster than `RedisAdapter`, because fewer lookups needed to cache backend.
+**Pros**: it's typically faster than `RedisAdapter`, because fewer lookups needed to cache backend.
 
 **Cons**: Consumes much more memory. To avoid situations where Redis stops accepting new cache
 (warnings about `Failed to save key`), set aside enough memory for the Redis server.
@@ -292,7 +292,7 @@ And as [[= product_name =]] requires that instances use a cluster-aware cache in
 
 !!! caution "Use unique vendor prefix for Cache key"
 
-    When reusing the cache service within your own code, it is very important to not conflict with the cache keys used by others.
+    When reusing the cache service within your own code, it's very important to not conflict with the cache keys used by others.
     That is why the example of usage below starts with a unique `myApp` key.
     For the namespace of your own cache, you must do the same.
 
diff --git a/docs/infrastructure_and_maintenance/clustering/clustering.md b/docs/infrastructure_and_maintenance/clustering/clustering.md
index 521080723e..df2f42c662 100644
--- a/docs/infrastructure_and_maintenance/clustering/clustering.md
+++ b/docs/infrastructure_and_maintenance/clustering/clustering.md
@@ -26,7 +26,7 @@ The minimal requirements are:
 
 For further details on requirements, see [Requirements page](requirements.md).
 
-It is also recommended to use:
+it's also recommended to use:
 
 - [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
@@ -83,8 +83,8 @@ First, define DFS folder path as a variable in `.env` file:
 
 `DFS_NFS_PATH=/tmp/ibx_1439_nfs`
 
-Next, if you are using a separate DFS database, configure it via the `DATABASE_URL` variable in the `.env` file.
-Depending on which database you are using:
+Next, if you're using a separate DFS database, configure it via the `DATABASE_URL` variable in the `.env` file.
+Depending on which database you're using:
 
 `DFS_DATABASE_URL=mysql://root:rootpassword@127.0.0.1:3306/ibexa_dfs?serverVersion=8.0`
 
@@ -92,7 +92,7 @@ or
 
 `DATABASE_URL=postgresql://root:rootpassword@127.0.0.1:3306/ibexa_dfs?serverVersion=8.0`
 
-For production, it is recommended to create the DFS table in its own database,
+For production, it's recommended to create the DFS table in its own database,
 manually importing its schema definition:
 
 ??? note "dfs_schema.sql (MySQL)"
@@ -200,7 +200,7 @@ ibexa:
 
 !!! tip
 
-    If you are looking to [set up S3](clustering_with_aws_s3.md) or other [Flysystem](https://flysystem.thephpleague.com/docs/)/third-party adapters like Google Cloud Storage, this needs to be configured as binary handler. The rest here will still stay the same, the DFS metadata handler will take care of caching the lookups to avoid slow IO lookups.
+    If you're looking to [set up S3](clustering_with_aws_s3.md) or other [Flysystem](https://flysystem.thephpleague.com/docs/)/third-party adapters like Google Cloud Storage, this needs to be configured as binary handler. The rest here will still stay the same, the DFS metadata handler will take care of caching the lookups to avoid slow IO lookups.
 
 #### Customizing the storage directory
 
@@ -258,9 +258,9 @@ Place this before the include of `ez_params.d`/`ez_rewrite_params` in your vhost
 
 ## Migrating to a cluster setup
 
-If you are migrating an existing single-server site to a cluster setup, and not setting up clustering from scratch, you need to migrate your files.
+If you're migrating an existing single-server site to a cluster setup, and not setting up clustering from scratch, you need to migrate your files.
 Once you have configured your binarydata and metadata handlers, you can run the `ibexa:io:migrate-files` command.
-You can also use it when you are migrating from one data handler to another, e.g. from NFS to Amazon S3.
+You can also use it when you're migrating from one data handler to another, e.g. from NFS to Amazon S3.
 
 This command shows which handlers are configured:
 
diff --git a/docs/infrastructure_and_maintenance/clustering/clustering_with_aws_s3.md b/docs/infrastructure_and_maintenance/clustering/clustering_with_aws_s3.md
index d173f14c3c..7708d51b99 100644
--- a/docs/infrastructure_and_maintenance/clustering/clustering_with_aws_s3.md
+++ b/docs/infrastructure_and_maintenance/clustering/clustering_with_aws_s3.md
@@ -1,5 +1,5 @@
 ---
-description: When you are using a clustering configuration, you can store binary files on Amazon AWS S3.
+description: When you're using a clustering configuration, you can store binary files on Amazon AWS S3.
 ---
 
 # Clustering with Amazon AWS S3
diff --git a/docs/infrastructure_and_maintenance/databases.md b/docs/infrastructure_and_maintenance/databases.md
index f5dd568264..6e73ac0cbc 100644
--- a/docs/infrastructure_and_maintenance/databases.md
+++ b/docs/infrastructure_and_maintenance/databases.md
@@ -18,7 +18,7 @@ When you run `composer install`, you will be asked to [provide installation para
 
 !!! tip
 
-    It is recommended to store the database credentials in your `.env.local` file and not commit it to the Version Control System.
+    it's recommended to store the database credentials in your `.env.local` file and not commit it to the Version Control System.
 
 If you use PostgreSQL, the following parameters need to be set differently in the `.env.local` file than when using MySQL:
 
diff --git a/docs/infrastructure_and_maintenance/devops.md b/docs/infrastructure_and_maintenance/devops.md
index 8f7027cf77..f2dd63cc22 100644
--- a/docs/infrastructure_and_maintenance/devops.md
+++ b/docs/infrastructure_and_maintenance/devops.md
@@ -38,7 +38,7 @@ To install it, run the following command:
 composer require symfony/debug-pack
 ```
 
-After you have installed Symfony Web Debug Toolbar, it will be available when running [[= product_name =]] in the `dev` environment. It is extended with some [[= product_name =]]-specific information:
+After you have installed Symfony Web Debug Toolbar, it will be available when running [[= product_name =]] in the `dev` environment. it's extended with some [[= product_name =]]-specific information:
 
 ![Ibexa DXP info in Web Debug Toolbar](web_debug_toolbar.png "Ibexa DXP info in Web Debug Toolbar")
 
@@ -67,7 +67,7 @@ include Symfony cache use, and a [persistence cache](persistence_cache.md#persis
 
     For long-running scripts, see [Long-running console commands](performance.md#long-running-console-commands).
 
-If you are running out of memory and don't need to keep track of cache hits and misses, you can disable persistence cache logging, represented by the setting `parameters.ibexa.spi.persistence.cache.persistenceLogger.enableCallLogging`. In `config_dev.yaml`:
+If you're running out of memory and don't need to keep track of cache hits and misses, you can disable persistence cache logging, represented by the setting `parameters.ibexa.spi.persistence.cache.persistenceLogger.enableCallLogging`. In `config_dev.yaml`:
 
 ``` yaml
 parameters:
diff --git a/docs/infrastructure_and_maintenance/performance.md b/docs/infrastructure_and_maintenance/performance.md
index 185a9289c2..7ef5ba0539 100644
--- a/docs/infrastructure_and_maintenance/performance.md
+++ b/docs/infrastructure_and_maintenance/performance.md
@@ -11,7 +11,7 @@ What follows is a list of recommendation that will make your installation perfor
 
     All the following recommendations are valid for both development and production setups, unless otherwise noted.
 
-If you are in a hurry, the most important recommendations on this page are:
+If you're 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
@@ -133,7 +133,7 @@ The things you will need to do:
 1. Change your command so it supports taking slice parameters, like for instance a batch size and a child-offset parameter.
     1. *If defined, child-offset parameter denotes if a process is a child,
     this can be accomplished using two commands as well.*
-    2. *If not defined, it is the master process which will execute the processes until nothing is left to process.*
+    2. *If not defined, it's the master process which will execute the processes until nothing is left to process.*
 
 2. Change the command so that the master process takes care of forking child processes in slices.
     1. For execution in-order, [you may look to our platform installer code](https://github.com/ibexa/core/blob/main/src/bundle/RepositoryInstaller/Command/InstallPlatformCommand.php#L220)
diff --git a/docs/infrastructure_and_maintenance/request_lifecycle.md b/docs/infrastructure_and_maintenance/request_lifecycle.md
index 1fc63749c4..1787425b2f 100644
--- a/docs/infrastructure_and_maintenance/request_lifecycle.md
+++ b/docs/infrastructure_and_maintenance/request_lifecycle.md
@@ -98,7 +98,7 @@ The `DefaultRouter` is always added to the collection with top priority (priorit
 
 `DefaultRouter` (`router.default`):
 The `DefaultRouter` tries to match the `semanticPathinfo` against routes, close to [the way pure Symfony does](https://symfony.com/doc/current/routing.html), by extending and using `Symfony\Component\Routing\Router`.
-If a route matches, the controller associated with it is responsible for building a `View` or `Response` object.
+If a route matches, the controller associated with it's responsible for building a `View` or `Response` object.
 
 ### `UrlWildcardRouter`
 
diff --git a/docs/infrastructure_and_maintenance/security/development_security.md b/docs/infrastructure_and_maintenance/security/development_security.md
index 27e04a7243..04a4e8b11d 100644
--- a/docs/infrastructure_and_maintenance/security/development_security.md
+++ b/docs/infrastructure_and_maintenance/security/development_security.md
@@ -77,7 +77,7 @@ By default, Symfony redirects to the [URI configured in `security.yaml` as `defa
 
 #### Remember me
 
-It is possible to use the "Remember me" functionality.
+it's possible to use the "Remember me" functionality.
 Refer to the [Symfony cookbook on this topic]([[= symfony_doc =]]/security/remember_me.html).
 
 If you want to use this feature, you must at least extend the login template in order to add the required checkbox:
@@ -119,7 +119,7 @@ lexik_jwt_authentication:
 ```
 
 You also need a new Symfony firewall configuration for REST and/or GraphQL APIs.
-It is already provided in `config/packages/security.yaml`, you only need to uncomment it:
+it's already provided in `config/packages/security.yaml`, you only need to uncomment it:
 
 ``` yaml
 security:
diff --git a/docs/infrastructure_and_maintenance/security/reporting_issues.md b/docs/infrastructure_and_maintenance/security/reporting_issues.md
index 3c7190217d..5cea8dffb5 100644
--- a/docs/infrastructure_and_maintenance/security/reporting_issues.md
+++ b/docs/infrastructure_and_maintenance/security/reporting_issues.md
@@ -13,7 +13,7 @@ No engineering team is perfect though, and if you do discover a security issue i
 
 - If you're a customer or partner, please log in to your Service Portal at <https://support.ibexa.co/>, click "New Ticket", and report the issue as you would report a normal support request. Ibexa Product Support will respond, take care of the report, and keep you informed of the developments.
 - If you're not a customer or partner, please log in to the Ibexa JIRA issue tracker: <https://issues.ibexa.co/>. Create an account if you don't have one, it's free. Click the "Create" button in the top menu to create your report. For "Project", select "Ibexa IBX", or "eZ Publish / Platform", or "eZ Platform Enterprise Edition", depending on which product is affected by the bug. **Important: Select "Security Level": "Security"!** The engineering team will take care of your report.
-- It is also possible to report security issues by email to <security@ibexa.co> - this requires no account.
+- it's also possible to report security issues by email to <security@ibexa.co> - this requires no account.
 
 ## Verbosity
 
@@ -21,7 +21,7 @@ Please be verbose when reporting issues. The issue will be solved faster if you
 
 - A **title** describing the gist of the issue in one sentence
 - A **description** which includes the steps you take to produce the problem, what you expect the result to be, and what actually happens.
-- Make it clear **why you consider it a security issue**. If you know, also include what type of security issue it is (example: SQL injection, CSRF, Role/Policy failure), what the nature of it is (example: slowing/stopping a web site, leaking sensitive information, destroying data, privilege escalation) and how easy it is to exploit (example: Does it require editor login?).
+- Make it clear **why you consider it a security issue**. If you know, also include what type of security issue it's (example: SQL injection, CSRF, Role/Policy failure), what the nature of it's (example: slowing/stopping a web site, leaking sensitive information, destroying data, privilege escalation) and how easy it's to exploit (example: Does it require editor login?).
 
 ## Dialogue
 
diff --git a/docs/infrastructure_and_maintenance/security/security_checklist.md b/docs/infrastructure_and_maintenance/security/security_checklist.md
index b9602182e9..335cff8ee1 100644
--- a/docs/infrastructure_and_maintenance/security/security_checklist.md
+++ b/docs/infrastructure_and_maintenance/security/security_checklist.md
@@ -129,7 +129,7 @@ The account invitation feature defaults to "P7D" (seven days).
 
 ### Disable Varnish when using Fastly
 
-If you are using Fastly, disable Varnish.
+If you're using Fastly, disable Varnish.
 See [Security advisory: EZSA-2020-002](https://developers.ibexa.co/security-advisories/ezsa-2020-002-unauthorised-cache-purge-with-misconfigured-fastly).
 
 ### Block upload of unwanted file types
@@ -151,11 +151,11 @@ See the line below `# Disable .php(3) and other executable extensions in the var
 
 ### Use secure password hashing
 
-Use the most secure supported password hashing method. This is currently `bcrypt`, and it is enabled by default.
+Use the most secure supported password hashing method. This is currently `bcrypt`, and it's enabled by default.
 
 ### Use UTF8MB4 with MySQL/MariaDB
 
-If you are using MySQL/MariaDB, use the UTF8MB4 database character set and related collation.
+If you're using MySQL/MariaDB, use the UTF8MB4 database character set and related collation.
 The older UTF8 can lead to truncation with 4-byte characters, like some emoji, which may have unpredictable side effects.
 
 See [Change from UTF8 to UTF8MB4](update_db_to_2.5.md#change-from-utf8-to-utf8mb4).
@@ -176,7 +176,7 @@ Use the following checklist to ensure the roles and policies are secure:
 
 The [visibility switcher](https://doc.ibexa.co/en/latest/content_management/locations/#location-visibility) is a convenient feature for withdrawing content from the frontend.
 It acts as a filter in the frontend by default. You can choose to respect it or ignore it in your code.
-It isn't permission-based, and doesn't restrict read access to content. Hidden content can be read through other means, like the REST API or GraphQL.
+it'sn't permission-based, and doesn't restrict read access to content. Hidden content can be read through other means, like the REST API or GraphQL.
 
 If you need to restrict read access to a given content item, you could create a role that grants read access for a given
 [**Section**](https://doc.ibexa.co/en/latest/administration/content_organization/sections/)
@@ -186,10 +186,10 @@ Or use other permission-based [**Limitations**](https://doc.ibexa.co/en/latest/p
 
 ### Minimize exposure
 
-Security should be a multi-layered exercise. It is wise to minimize what features you make available to the world, even if there are no known or suspected vulnerabilities in those features, and even if your content is properly protected by roles and policies. Reduce your attack surface by exposing only what you must.
+Security should be a multi-layered exercise. it's wise to minimize what features you make available to the world, even if there are no known or suspected vulnerabilities in those features, and even if your content is properly protected by roles and policies. Reduce your attack surface by exposing only what you must.
 
 - If possible, make the back office unavailable on the open internet.
-- [Symfony FOSJsRoutingBundle](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle) is required in those releases where it is included, to expose routes to JavaScript. It exposes only the required routes, nothing more. It is only required in the back office site access though, so you can consider blocking it in other site accesses. You should also go through your own custom routes, and decide for each if you need to expose them or not. See the documentation on [YAML route definitions for exposure](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle/blob/master/Resources/doc/usage.rst#generating-uris).
+- [Symfony FOSJsRoutingBundle](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle) is required in those releases where it's included, to expose routes to JavaScript. It exposes only the required routes, nothing more. it's only required in the back office site access though, so you can consider blocking it in other site accesses. You should also go through your own custom routes, and decide for each if you need to expose them or not. See the documentation on [YAML route definitions for exposure](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle/blob/master/Resources/doc/usage.rst#generating-uris).
 - By default, a [Powered-By header](https://doc.ibexa.co/en/latest/update_and_migration/from_1.x_2.x/update_db_to_2.5/#powered-by-header) is set. It specifies what version of the DXP is running. For example, `x-powered-by: Ibexa Experience v4`. This doesn't expose anything that couldn't be detected through other means. But if you wish to obscure this, you can either omit the version number, or disable the header entirely.
 - Consider whether certain interfaces must be left available on the open internet. For example:
     - The `/search` and `/graphql` endpoints
@@ -221,7 +221,7 @@ Those steps aren't needed when using [[= product_name_cloud =]], where the provi
 ### Security headers
 
 There are a number of security related HTTP response headers that you can use to improve your security. 
-Headers must be adapted to the site in question, and in most cases it is site owner's responsibility. 
+Headers must be adapted to the site in question, and in most cases it's site owner's responsibility. 
 The headers can be set either by the web server, or by a proxy like Varnish. 
 You can also set headers in PHP code by making a Symfony `RequestListener` for the `kernel.response` event and adding the header to the response object headers list.
 
@@ -233,7 +233,7 @@ This header is less important during development provided that the site is on an
 - `X-Frame-Options` - ensures that the site is not be embedded in a frame by a compliant browser. 
 Set the header to `SAMEORIGIN` to allow embedding by your own site, or `DENY` to block framing completely. 
 - `X-Content-Type-Options` - prevents the browser from second-guessing the mime-type of delivered content. 
-This header is less important if users cannot upload content and/or you trust your editors. However, it is safer to use it at all times. 
+This header is less important if users cannot upload content and/or you trust your editors. However, it's safer to use it at all times. 
 Make sure that the `Content-Type` header is also correctly set, including for the top-level document, to avoid issues with HTML documents being downloaded while they should be rendered. 
 - `Content-Security-Policy` - blocks cross site scripting (XSS) attacks by setting an allowlist (whitelist) of resources to be loaded for a given page. 
 You can set separate lists for scripts, images, fonts, and so on. 
diff --git a/docs/infrastructure_and_maintenance/sessions.md b/docs/infrastructure_and_maintenance/sessions.md
index ef0b80ded6..f8c520e726 100644
--- a/docs/infrastructure_and_maintenance/sessions.md
+++ b/docs/infrastructure_and_maintenance/sessions.md
@@ -5,7 +5,7 @@ description: Ibexa DXP uses Symfony to handle user sessions, with support for Si
 # Sessions
 
 Sessions are handled by the Symfony framework, specifically API and underlying session handlers provided by the HttpFoundation component.
-It is further enhanced in [[= product_name =]] with support for SiteAccess-aware session cookie configuration.
+it's further enhanced in [[= product_name =]] with support for SiteAccess-aware session cookie configuration.
 
 !!! note
 
@@ -121,7 +121,7 @@ Alternatively if you have needs to configure Redis servers dynamically:
 
     For [[= product_name_cloud =]] (and Platform.sh), this is already configured in `config/env/platformsh.php` based on `.platform.yaml` config.
 
-If you are on `php-redis` v4.2.0 and higher, you can optionally tweak [`php-redis` settings](https://github.com/phpredis/phpredis#session-locking) for session locking.
+If you're on `php-redis` v4.2.0 and higher, you can optionally tweak [`php-redis` settings](https://github.com/phpredis/phpredis#session-locking) for session locking.
 
 Ideally keep [persistence cache](persistence_cache.md) and session data separated:
 
@@ -134,7 +134,7 @@ If you want to make sure sessions survive Redis or server restarts, consider usi
 ##### Alternative storing sessions in database using PDO
 
 For setups where database is preferred for storing sessions, you may use Symfony's PdoSessionHandler,
-although it is not currently recommended from performance perspective.
+although it's not currently recommended from performance perspective.
 
 Below is a configuration example for [[= product_name =]]. Refer to the [Symfony Cookbook]([[= symfony_doc =]]/doctrine/pdo_session_storage.html) for full documentation.
 
diff --git a/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md b/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md
index f19508f8e4..5190443baf 100644
--- a/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md
+++ b/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md
@@ -10,7 +10,7 @@ as well as references to important parts of the documentation and tools useful f
 #### What information should I specify when creating a Customer Support ticket?
 
 When reporting a problem to Customer Support the most important information is the version of [[= product_name =]] which is used in the project.
-The best way to specify it is to provide the list of currently installed packages by running:
+The best way to specify it's to provide the list of currently installed packages by running:
 
 ``` bash
 composer show ibexa/*
@@ -50,7 +50,7 @@ Remember to clear the cache afterwards.
 
 As an alternative to manually applying the patch, you can use [composer-patches](https://github.com/cweagans/composer-patches).
 You can apply patches received from the Support, community or the others by using your `composer.json` file.
-For checking the versions you are on, refer to your `composer.lock`.
+For checking the versions you're on, refer to your `composer.lock`.
 All you need is to specify which package will receive patches and give the path/URL to the actual file.
 This should be done inside the `extra` section. Packages which should receive patches
 will be removed during `composer update` or `composer require` so they can be re-installed and re-patched.
diff --git a/docs/multisite/languages/back_office_translations.md b/docs/multisite/languages/back_office_translations.md
index 616766e137..0dd9df1dca 100644
--- a/docs/multisite/languages/back_office_translations.md
+++ b/docs/multisite/languages/back_office_translations.md
@@ -20,7 +20,7 @@ If your browser language is set to French, the back office will be displayed in
 
 !!! tip "Checking browser language"
 
-    To make sure that a language is set in your browser, check if it is sent as an accepted language in the `Accept-Language` header.
+    To make sure that a language is set in your browser, check if it's sent as an accepted language in the `Accept-Language` header.
 
 !!! tip
 
@@ -48,7 +48,7 @@ based on `parameters.locale_fallback` in `config/packages/ibexa.yaml`.
 ## Custom string translations
 
 When you extend the back office you often need to provide labels for new elements.
-It is good practice to provide your labels in translations files, instead of literally,
+it's good practice to provide your labels in translations files, instead of literally,
 so they can be reused and translated into other languages.
 
 To provide label strings, make use of the `Symfony\Component\Translation\TranslatorInterface`
@@ -120,4 +120,4 @@ The language to display will then be selected automatically based on [user prefe
 
 !!! note
 
-    You may need to clear the cache after adding new translations, before they are available in the back office.
+    You may need to clear the cache after adding new translations, before they're available in the back office.
diff --git a/docs/multisite/languages/languages.md b/docs/multisite/languages/languages.md
index 7144112ec4..376e3e1ed0 100644
--- a/docs/multisite/languages/languages.md
+++ b/docs/multisite/languages/languages.md
@@ -32,7 +32,7 @@ yarn encore <environment>
 
 Language versions consist of translated values of the content item's Fields. In the content type definition every Field is set to be Translatable or not.
 
-[[= product_name =]] does not decide by itself which Fields can be translated and which cannot. For some Field values the need for a translation can be obvious, for example for the body of an article. In other cases, for instance images without text, integer numbers or e-mail addresses, translation is usually unnecessary. Despite that, [[= product_name =]] gives you the possibility to mark any Field as translatable regardless of its Field Type. It is only your decision to exclude the translation possibility for those Fields where it makes no sense.
+[[= product_name =]] does not decide by itself which Fields can be translated and which cannot. For some Field values the need for a translation can be obvious, for example for the body of an article. In other cases, for instance images without text, integer numbers or e-mail addresses, translation is usually unnecessary. Despite that, [[= product_name =]] gives you the possibility to mark any Field as translatable regardless of its Field Type. it's only your decision to exclude the translation possibility for those Fields where it makes no sense.
 
 When a Field is not flagged as Translatable, its value will be copied from the initial/main translation when a new language version is created. This copied value cannot be modified. When a Field is Translatable, you will have to enter its value in a new language version manually.
 
@@ -180,4 +180,4 @@ When setting up SiteAccesses with different language versions, you can specify a
 
 You can also assign a Default content availability flag to content types (available in the Admin Panel). When this flag is assigned, content items of this type will be available even when they do not have a language version in any of the languages configured for the current SiteAccess.
 
-Note that if a language is not provided in the list of prioritized languages and it is not the content item's first language, the URL alias for this content in this language will not be generated.
+Note that if a language is not provided in the list of prioritized languages and it's not the content item's first language, the URL alias for this content in this language will not be generated.
diff --git a/docs/multisite/multisite_configuration.md b/docs/multisite/multisite_configuration.md
index c0a8e63559..5ccca640b1 100644
--- a/docs/multisite/multisite_configuration.md
+++ b/docs/multisite/multisite_configuration.md
@@ -150,7 +150,7 @@ ibexa:
                 siteaccess_list: [site, de]
 ```
 
-If you are using multiple domains, list all domains for an admin SiteAccess under `siteaccess_hosts`:
+If you're using multiple domains, list all domains for an admin SiteAccess under `siteaccess_hosts`:
 
 ``` yaml
 ibexa:
@@ -195,7 +195,7 @@ ibexa:
 - `location_id` defines the Location ID of the content root for the SiteAccess.
 - `excluded_uri_prefixes` defines which URIs ignore the root limit set using `location_id`.
 In the example above, the Media and Images folders are accessible using their own URI,
-even though they are outside the Location provided in `content.tree_root.location_id`.
+even though they're outside the Location provided in `content.tree_root.location_id`.
 - `index_page` is the page shown when you access the root index `/`.
 
 !!! note
diff --git a/docs/multisite/set_up_campaign_siteaccess.md b/docs/multisite/set_up_campaign_siteaccess.md
index e6fb687e21..049f9ff175 100644
--- a/docs/multisite/set_up_campaign_siteaccess.md
+++ b/docs/multisite/set_up_campaign_siteaccess.md
@@ -54,7 +54,7 @@ but not `<your site>/campaign/General/Articles/Article1`.
 ## Reuse content
 
 Finally, reuse some content between sites, for example "Logos" from "Images/Media".
-You can allow the `campaign` site to access them, even though they are in a different part of the tree, via `excluded_uri_prefixes`:
+You can allow the `campaign` site to access them, even though they're in a different part of the tree, via `excluded_uri_prefixes`:
 
 ``` yaml
 ibexa:
@@ -67,7 +67,7 @@ ibexa:
 ```
 
 Now, when you use the `campaign` SiteAccess, you can reach `<your site>/campaign/Media/Images/Logos`,
-despite the fact that it is not a sub-item of the "Campaign" Location.
+despite the fact that it's not a sub-item of the "Campaign" Location.
 
 As a next step, you can configure different [designs](design_engine.md)
 for the two SiteAccesses.
diff --git a/docs/multisite/set_up_translation_siteaccess.md b/docs/multisite/set_up_translation_siteaccess.md
index dc89753761..6018853e28 100644
--- a/docs/multisite/set_up_translation_siteaccess.md
+++ b/docs/multisite/set_up_translation_siteaccess.md
@@ -49,7 +49,7 @@ ibexa:
 ```
 
 Under the `ibexa.system` key, add the new SiteAccess.
-Indicate that they are meant for translations under `site_group.translation_siteaccesses`:
+Indicate that they're meant for translations under `site_group.translation_siteaccesses`:
 
 ``` yaml
 ibexa:
diff --git a/docs/multisite/site_factory/site_factory.md b/docs/multisite/site_factory/site_factory.md
index e1e545bd3c..19a6236083 100644
--- a/docs/multisite/site_factory/site_factory.md
+++ b/docs/multisite/site_factory/site_factory.md
@@ -194,11 +194,11 @@ Enabled Site Factory may cause following performance issues:
 - Site Factory matchers are connected to the database in search for new SiteAccesses
 
 You can disable Site Factory to boost ConfigResolver performance.
-Keep in mind that with disabled Site Factory you are unable to add new sites or use existing ones.
+Keep in mind that with disabled Site Factory you're unable to add new sites or use existing ones.
 
 1\. In `config/packages/ibexa_site_factory.yaml` change `enabled` to `false`.
 
-2\. In `config/packages/ibexa.yaml` comment the `ibexa.siteaccess.match: '@Ibexa\SiteFactory\SiteAccessMatcher': ~` if it is uncommented.
+2\. In `config/packages/ibexa.yaml` comment the `ibexa.siteaccess.match: '@Ibexa\SiteFactory\SiteAccessMatcher': ~` if it's uncommented.
 
 3\. Remove separate connection to database in `config/packages/doctrine.yaml`.
 
diff --git a/docs/multisite/siteaccess/siteaccess_aware_configuration.md b/docs/multisite/siteaccess/siteaccess_aware_configuration.md
index 32a0f38933..2dab3bb7d4 100644
--- a/docs/multisite/siteaccess/siteaccess_aware_configuration.md
+++ b/docs/multisite/siteaccess/siteaccess_aware_configuration.md
@@ -6,7 +6,7 @@ description: Make sure your custom development's configuration can be used with
 
 The [Symfony Config component]([[= symfony_doc =]]/components/config.html) makes it possible to define semantic configuration, exposed to the end developer.
 This configuration is validated by rules you define, e.g. validating type (string, array, integer, boolean and so on).
-Usually, after it is validated and processed, this semantic configuration is then mapped to internal *key/value* parameters stored in the service container.
+Usually, after it's validated and processed, this semantic configuration is then mapped to internal *key/value* parameters stored in the service container.
 
 [[= product_name =]] uses this for its core configuration, but adds another configuration level, the SiteAccess.
 For each defined SiteAccess, you need to be able to use the same configuration tree to define SiteAccess-specific config.
@@ -26,7 +26,7 @@ For more information about the ConfigResolver, namespaces and scopes, see [confi
     If you need to use different settings per Repository, not per SiteAccess,
     see [Repository-aware configuration](repository_configuration.md#repository-aware-configuration).
 
-The example below assumes you are using an `Acme\ExampleBundle`.
+The example below assumes you're using an `Acme\ExampleBundle`.
 Remember to register the bundle by adding it to `config/bundles.php`:
 
 ``` php
@@ -130,17 +130,17 @@ class AcmeExampleExtension extends Extension
         $processor->mapConfig(
             $config,
             // Any kind of callable can be used here.
-            // It is called for each declared scope/SiteAccess.
+            // it's called for each declared scope/SiteAccess.
             static function ($scopeSettings, $currentScope, ContextualizerInterface $contextualizer) {
                 // Maps the "name" setting to "acme_example.<$currentScope>.name" container parameter
-                // It is then possible to retrieve this parameter through ConfigResolver in the application code:
+                // it's then possible to retrieve this parameter through ConfigResolver in the application code:
                 // $helloSetting = $configResolver->getParameter( 'name', 'acme_example' );
                 $contextualizer->setContextualParameter('name', $currentScope, $scopeSettings['name']);
             }
         );
 
         // Now map "custom_setting" and ensure the key defined for "my_siteaccess" overrides the one for "my_siteaccess_group"
-        // It is done outside the closure as it is needed only once.
+        // it's done outside the closure as it's needed only once.
         $processor->mapConfigArray('custom_setting', $config);
     }
 }
@@ -172,7 +172,7 @@ parameters:
 
 When you define a hash as semantic config, you sometimes do not want the SiteAccess settings to replace the default or group values,
 but enrich them by appending new entries. This is possible by using `$processor->mapConfigArray()`,
-which you must call outside the closure (before or after), so that it is called only once.
+which you must call outside the closure (before or after), so that it's called only once.
 
 ``` php
 $processor->mapConfigArray('custom_setting', $config);
@@ -260,7 +260,7 @@ Instead of passing a callable to `$processor->mapConfig()`, you can pass an inst
 `Ibexa\Bundle\Core\DependencyInjection\Configuration\SiteAccessAware\ConfigurationMapperInterface`.
 
 This can be useful if you have a lot of configuration to map and do not want to pollute 
-your service container extension class (it is better for maintenance).
+your service container extension class (it's better for maintenance).
 
 #### Merging hash values between scopes
 
diff --git a/docs/multisite/siteaccess/siteaccess_matching.md b/docs/multisite/siteaccess/siteaccess_matching.md
index 708d77700f..bd324a2f83 100644
--- a/docs/multisite/siteaccess/siteaccess_matching.md
+++ b/docs/multisite/siteaccess/siteaccess_matching.md
@@ -43,7 +43,7 @@ ibexa:
                 my.site: mysite
 ```
 
-If the matcher class does not start with a backslash (`\`), it is relative to `Ibexa\Core\MVC\Symfony\SiteAccess\Matcher`
+If the matcher class does not start with a backslash (`\`), it's relative to `Ibexa\Core\MVC\Symfony\SiteAccess\Matcher`
 (for example, `Map\URI` refers to `Ibexa\Core\MVC\Symfony\SiteAccess\Matcher\Map\URI`)
 
 You can specify [custom matchers](#custom-matchers) by using a fully qualified class name (e.g. `\My\SiteAccess\Matcher`)
diff --git a/docs/permissions/limitation_reference.md b/docs/permissions/limitation_reference.md
index bc0bcd8f45..d2acc7523a 100644
--- a/docs/permissions/limitation_reference.md
+++ b/docs/permissions/limitation_reference.md
@@ -10,7 +10,7 @@ page_type: reference
 A generic limitation type to use when no other limitation has been implemented.
 Without any Limitation assigned, a `LimitationNotFoundException` is thrown.
 
-It is called "blocking" because it always informs the permissions system that 
+it's called "blocking" because it always informs the permissions system that 
 the User does not have access to any policy the limitation is assigned to, making 
 the permissions system move on to the next policy.
 
diff --git a/docs/permissions/permission_overview.md b/docs/permissions/permission_overview.md
index cefbe15b72..243cff6fbe 100644
--- a/docs/permissions/permission_overview.md
+++ b/docs/permissions/permission_overview.md
@@ -4,7 +4,7 @@ description: The permission system is based on policies that you assign to users
 
 # Permission overview
 
-A new User does not have permissions for any part of the system, unless they are explicitly given access.
+A new User does not have permissions for any part of the system, unless they're explicitly given access.
 To get access they need to inherit roles, typically assigned to the user group they belong to.
 
 Each role can contain one or more **Policies**. A policy is a rule that gives access to a single **function** in a **module**.
@@ -24,7 +24,7 @@ and [Permission use cases](permission_use_cases.md) for example permission setup
 
 Every user or user group can have many roles. A User can also belong to many groups, for example, Administrators, Editors, Subscribers.
 
-It is best practice to avoid assigning roles to users directly.
+it's best practice to avoid assigning roles to users directly.
 Instead, try to organize your content so that it can be covered with general roles assigned to user groups.
 
 Using Groups is easier to manage and more secure. It also improves system performance.
diff --git a/docs/personalization/api_reference/content_api.md b/docs/personalization/api_reference/content_api.md
index 992e68f498..6fe6360a70 100644
--- a/docs/personalization/api_reference/content_api.md
+++ b/docs/personalization/api_reference/content_api.md
@@ -172,7 +172,7 @@ This can prove useful for a news agency, where new items are published very ofte
 You can also define custom attributes under the `<attributes>` key.
 This section can only contain values that are distinct and used to build pre-filtered models.
 
-By default, it is assumed that every attribute is of type "NOMINAL", which means that 
+By default, it's assumed that every attribute is of type "NOMINAL", which means that 
 there is a limited set of values, and values of an attribute are treated as distinct 
 when calculating the results of a content-based model.
 
@@ -183,7 +183,7 @@ of the same type, the Personalization server treats the two values as a range.
 <attribute key="size" value="4" type="NUMERIC" />
 ```
 
-However, if the other attribute is of type "NOMINAL", they are both treated 
+However, if the other attribute is of type "NOMINAL", they're both treated 
 as different and have no "distance-based similarity".
 
 Another typical example of a custom attribute is the color of an item. 
diff --git a/docs/personalization/api_reference/recommendation_api.md b/docs/personalization/api_reference/recommendation_api.md
index 0a92b5b674..f470aec773 100644
--- a/docs/personalization/api_reference/recommendation_api.md
+++ b/docs/personalization/api_reference/recommendation_api.md
@@ -110,7 +110,7 @@ For more information, see inline comments below.
 !!! note "Previewing recommendations"
 
     You can preview the actual responses that come from the Personalization server 
-    and how they are rendered in the user interface.
+    and how they're rendered in the user interface.
     For more information, see [Previewing scenario results]([[= user_doc =]]/personalization/previewing_scenario).
     
 For more information about integrating recommendations in the web page, 
diff --git a/docs/personalization/api_reference/tracking_api.md b/docs/personalization/api_reference/tracking_api.md
index c6755c46f4..66e7734e97 100644
--- a/docs/personalization/api_reference/tracking_api.md
+++ b/docs/personalization/api_reference/tracking_api.md
@@ -50,7 +50,7 @@ while a textile product can be defined by item type "2" and item id "3298".
 |Content publishing|Photo Gallery|ID of a photo gallery|
 
 Assuming the numbering of content is independent and the same item ID is used
-for two items of different item types, it is impossible to tell the difference
+for two items of different item types, it's impossible to tell the difference
 if there is no segmentation by item types.
 
 If an article, a video and a photo gallery have the same item ID, use different
@@ -74,11 +74,11 @@ For example:
 
 High quality recommendations can only be delivered if the underlying data
 is correct and consistent. 
-For consistent tracking it is crucial to choose and use a consistent identifier for a user.
+For consistent tracking it's crucial to choose and use a consistent identifier for a user.
 A user usually visits a website anonymously.
 Therefore, their identifier is either a first-party cookie or a session ID
 provided by the website. 
-If there is no existing user ID handling that can be re-used, it is recommended that
+If there is no existing user ID handling that can be re-used, it's recommended that
 you use your own cookie and set the expiry date to at least 90 days from the last usage.
 If there is a login mechanism, the user is usually tracked with a temporary
 identifier before the login.
@@ -89,17 +89,17 @@ After logout, the anonymous user ID can be used again.
 
 !!! note
 
-    The user identifier is required in tracking requests, otherwise it is discarded
+    The user identifier is required in tracking requests, otherwise it's discarded
     from the tracking servers.
 
     If a browser has JavaScript or cookies disabled, make sure that you put some
     "dummy" value as identifier in the tracking request to avoid losing tracking
     information.
-    Even if the event is not user-specific, it is still useful for [popularity models]([[= user_doc =]]/personalization/recommendation_models/).
+    Even if the event is not user-specific, it's still useful for [popularity models]([[= user_doc =]]/personalization/recommendation_models/).
 
 The Personalization server internally creates a hash of every user ID.
 The original ID is not saved.
-It is still possible that the original ID appears in the log files for the debugging
+it's still possible that the original ID appears in the log files for the debugging
 purposes but log files are purged regularly.
 The user ID is case sensitive.
 
@@ -113,7 +113,7 @@ In the eCommerce business you mostly have the possibility to track items based o
 - Universal Product Code (UPC)
 
 The exact identifiers that are tracked are also recommended ("what-you-track-is-what-you-get").
-By default, it is not possible to track SKUs but recommend UPCs.
+By default, it's not possible to track SKUs but recommend UPCs.
 The following use case is typical for eCommerce business:
 
 Customer A implements the Personalization server and decides to use the SKU
@@ -154,8 +154,8 @@ Like all other parameters, the category path must be URL-encoded and cannot cont
 
 The "categorypath" parameter offers the possibility to provide category-based
 recommendations without an explicit export of the structure of a customer's website.
-If enabled by [[= product_name_base =]], it is used for on-the-fly updating of item categories.
-If an item is moved to another category, it is handled as present in both
+If enabled by [[= product_name_base =]], it's used for on-the-fly updating of item categories.
+If an item is moved to another category, it's handled as present in both
 categories until the old category ages out or is forcibly deleted.
 Multiple category locations of an item (multi-homing) are therefore possible.
 
@@ -186,7 +186,7 @@ For a list of embedded parameters that each of the events may use, see the follo
 |`customerid`|A customer ID (for example "00000"). Can be used to identify a website in installations that [hosts multiple SiteAccesses]([[= user_doc =]]/personalization/use_cases/#multiple-website-hosting).|alphanumeric|
 |userid|A user's ID on the website of the customer. It could be an internal customer code, a session code or a cookie for anonymous users.|URL-encoded alphanumeric|
 |`itemtypeid`|Item type ID.|1 to 2147483647|
-|`itemid`|A unique ID of the item the user has clicked.</br>String-based identifiers are also supported as item IDs to track content on a website, but it is discouraged due to fraud and security issues. If you are unable to provide numeric identifiers for the tracking process, contact [[= product_name_base =]] for further information and implementation notes.|1 to 2147483647|
+|`itemid`|A unique ID of the item the user has clicked.</br>String-based identifiers are also supported as item IDs to track content on a website, but it's discouraged due to fraud and security issues. If you're unable to provide numeric identifiers for the tracking process, contact [[= product_name_base =]] for further information and implementation notes.|1 to 2147483647|
 |`sourceuserid`|User identifier valid up to now(usually some anonymous session ID)|URL-encoded alphanumeric|
 |`targetuserid`|User identifier valid from now on (usually an account ID or login name)|URL-encoded alphanumeric|
 
@@ -251,7 +251,7 @@ this event type is not applicable.
 #### Prices in a Buy event
 
 Every Buy event can contain a price.
-If the price is set, it is stored with the event and used for calculating the
+If the price is set, it's stored with the event and used for calculating the
 revenue for statistics.
 The price must be a price the user paid for the item, including all taxes and discounts. 
 
@@ -261,7 +261,7 @@ For more information, see [Content API](content_api.md).
 
 The currency is stored with the price and normalized only when statistic information
 is requested.
-It is often a good choice to select a base currency and convert prices before
+it's often a good choice to select a base currency and convert prices before
 sending the buy event.
 The price attached to a buy event never overwrites the price which was defined
 in an item import.
@@ -275,7 +275,7 @@ structure of the website.
 !!! note
 
     User IDs are not stored in the database.
-    They are irreversibly anonymized before saving to disk or building the
+    they're irreversibly anonymized before saving to disk or building the
     recommendation model.
 
 The URL to track user clicks has the following format:
@@ -300,7 +300,7 @@ Some optional request parameters can be set over query string parameters (GET pa
     For eCommerce stores, this event is not required but can be used in custom implementations.
 
 The event is sent when the end user stays on the page for a predefined period of time.
-It is then assumed that the user consumed the item (read an article or watched a video).
+it's then assumed that the user consumed the item (read an article or watched a video).
 
 The URL has the following format:
 
@@ -400,7 +400,7 @@ A predefined rating can be submitted when the user comments on an item.
 ### Wishlist event
 
 This event is issued when the end user puts a product on their shopping list.
-It means that they are interested in the product but plan to buy it later.
+It means that they're interested in the product but plan to buy it later.
 This information can help return better recommendations.
 It can also be used as a basis for the price drop trigger.
 
@@ -503,7 +503,7 @@ The URL for a Rendered event has the following format:
 
 For a detailed description of embedded parameters, see [event parameters](#event-parameters).
 
-It is common that recommendations are rendered as a block with multiple items.
+it's common that recommendations are rendered as a block with multiple items.
 To save traffic and speed up the process, you can bundle multiple recommendations in one request.
 Several item IDs must be comma-separated.
 
diff --git a/docs/personalization/api_reference/user_api.md b/docs/personalization/api_reference/user_api.md
index 417403e4e8..564d1ead59 100644
--- a/docs/personalization/api_reference/user_api.md
+++ b/docs/personalization/api_reference/user_api.md
@@ -4,12 +4,12 @@ description: Use HTTP methods to correlate metadata with user data and combine u
 
 # User API
 
-When generating recommendations, it is useful to have the ability to correlate metadata 
+When generating recommendations, it's useful to have the ability to correlate metadata 
 with user data and combine users into clusters of certain type.
 Such metadata can be gender, ZIP code, discount rate, etc. 
 You can use the following user metadata import format to enrich the tracked data with information that cannot be calculated and must be provided by the end-user. 
 
-If you plan to import user metadata, contact support@ibexa.co to ensure that you are compliant with privacy regulations.
+If you plan to import user metadata, contact support@ibexa.co to ensure that you're compliant with privacy regulations.
 
 !!! note "Authentication"
 
diff --git a/docs/personalization/attribute_search_in_elasticsearch.md b/docs/personalization/attribute_search_in_elasticsearch.md
index 8d08e24607..f3ab56b7c7 100644
--- a/docs/personalization/attribute_search_in_elasticsearch.md
+++ b/docs/personalization/attribute_search_in_elasticsearch.md
@@ -4,7 +4,7 @@ description: Attribute search uses Elasticsearch database to display dynamically
 
 # Attribute search in Elasticsearch database
 
-If you use external data source for personalization data, it is not possible to display external content in the Universal Discovery Widget as it is deprecated. Attribute search is used in scenario preview and editorials models instead.
+If you use external data source for personalization data, it's not possible to display external content in the Universal Discovery Widget as it's deprecated. Attribute search is used in scenario preview and editorials models instead.
 Attribute search works like an autocomplete feature, but values are dynamically taken from the Elasticsearch database.
 
 ## Configure attribute search
diff --git a/docs/personalization/enable_personalization.md b/docs/personalization/enable_personalization.md
index 739894b1d1..a909416b12 100644
--- a/docs/personalization/enable_personalization.md
+++ b/docs/personalization/enable_personalization.md
@@ -62,7 +62,7 @@ the Personalization server must receive a list of item types that are tracked.
 
 You define item types to be tracked in [configuration files](configuration.md#configuration-files).
 The content is then initially exported by a script.
-After this, it is synchronized with the Personalization service every time a change 
+After this, it's synchronized with the Personalization service every time a change 
 occurs (using any method that triggers the event).
 
 The Personalization configuration is SiteAccess-aware.
@@ -345,7 +345,7 @@ and it eventually fetches the affected content and updates it internally.
 
     Recommendations are fetched and rendered asynchronously, so there 
     is no additional load on the server.
-    Therefore, it is crucial that you check whether the content export was successful, 
+    Therefore, it's crucial that you check whether the content export was successful, 
     because certain references, for example, deeplinks and image references, are 
     included.
     If the export fails, the Personalization server does not have full content information.
@@ -509,7 +509,7 @@ if the content Fields were previously exported by the export script.
 #### Modify recommendation data
 
 You can retrieve data returned from the Personalization server and modify it 
-before it is shown to the user.
+before it's shown to the user.
 
 To modify recommendation data, subscribe to `RecommendationResponseEvent`.
 See [`Event/Subscriber/RecommendationEventSubscriber.php`](https://github.com/ibexa/personalization-client/blob/main/src/lib/Event/Subscriber/RecommendationEventSubscriber.php) for an example:
diff --git a/docs/personalization/importing_historical_user_tracking_data.md b/docs/personalization/importing_historical_user_tracking_data.md
index 8744409c78..987732cef6 100644
--- a/docs/personalization/importing_historical_user_tracking_data.md
+++ b/docs/personalization/importing_historical_user_tracking_data.md
@@ -8,7 +8,7 @@ The recommendation engine supports replaying historical user events by adding a
 This is then used as the datetime of an event instead of the current timestamp 
 of the request.
 
-To give an example: It is often requested to import the buy history of users 
+To give an example: it's often requested to import the buy history of users 
 to avoid the cold start problem and being able to start with good recommendations.
 Instead of waiting till the user profile is built by collecting events from the day,
 you implemented the tracking.
diff --git a/docs/personalization/legacy_recommendation_api.md b/docs/personalization/legacy_recommendation_api.md
index 89c2b6fb71..5c1413bab7 100644
--- a/docs/personalization/legacy_recommendation_api.md
+++ b/docs/personalization/legacy_recommendation_api.md
@@ -7,7 +7,7 @@ description: An old method of fetching recommendations from the system using rec
 !!! caution
 
     This is a page describing the old version of the recommendation API. 
-    It is available for reference purposes only.
+    it's available for reference purposes only.
 
     Use the new [Recommendation API](recommendation_api.md) instead.
 
@@ -26,7 +26,7 @@ number of events must be collected and the model build must finish successfully.
 
     If you plan to use [JSONP](https://www.w3schools.com/js/js_json_jsonp.asp), authentication 
     must be disabled.
-    If it is enabled in your solution (can be easily tested with a recommendation request in a browser), please contact the eZ Recommender support (<support@yoochoose.com>) for further information and disabling.
+    If it's enabled in your solution (can be easily tested with a recommendation request in a browser), please contact the eZ Recommender support (<support@yoochoose.com>) for further information and disabling.
 
 ## Getting recommendations
 
@@ -46,7 +46,7 @@ The embedded parameters `solutionid`, `clientid` and `userid` are the same as us
 
 | Parameter Name | Description | Values |
 |-----|-----|------|
-| `scenarioid` | The ID of the scenario used for providing recommendations. It is configured or predefined in the Administration GUI. | alphanumeric |
+| `scenarioid` | The ID of the scenario used for providing recommendations. it's configured or predefined in the Administration GUI. | alphanumeric |
 | `extension` | The format the server generates the response in. There are three formats supported: JSON, XML and JSONP. See the chapter [Response Handling](#response-handling) below for more information | json, xml or jsonp |
 
 ## Basic Request Parameters
@@ -58,8 +58,8 @@ Using additional query string parameters one can customize the recommendation re
 |`numrecs`|Defines the number of recommendations that should be delivered. Keep this amount as low as possible as this increases the response time of the recommendation call.|1 to 50 (default "10")|
 |`contextitems` (required for context based recommendations)|Comma-separated list of items that the user is currently viewing on the webpage. All items must be from the same type. The type is defined in the scenario configuration.|comma separated list of item IDs (1 to 2147483647)|
 |`itemid` (deprecated)|A single item to be used as a source for creating recommendations. This parameter is deprecated. Use `contextitems` instead.|1 to 2147483647|
-|`outputtypeid` (required, if the scenario defined multiple output item types, otherwise it is optional)|Item type of the requested recommendations. This can differ from the input item type, for example, if you want to get recommendations for pictures based on an article the item type for pictures has to be used here. For a web shop this is probably not needed as only one type of items is tracked. Multiple item types are available only for advanced license.|numeric|
-|`categorypath`|Base category path for providing recommendations. The format is the same as the category path for the event tracking. It is possible to add this parameter multiple times. The order of recommendations from the different categories is defined by the calculated relevance.|alphanumeric[/alphanumeric]*|
+|`outputtypeid` (required, if the scenario defined multiple output item types, otherwise it's optional)|Item type of the requested recommendations. This can differ from the input item type, for example, if you want to get recommendations for pictures based on an article the item type for pictures has to be used here. For a web shop this is probably not needed as only one type of items is tracked. Multiple item types are available only for advanced license.|numeric|
+|`categorypath`|Base category path for providing recommendations. The format is the same as the category path for the event tracking. it's possible to add this parameter multiple times. The order of recommendations from the different categories is defined by the calculated relevance.|alphanumeric[/alphanumeric]*|
 |`jsonpcallback` (used only for JSONP request)|Function or method name for a JSONP request. It can be a function ("callme"), or a method ("obj.callme").|valid JavaScript function call (by default "jsonpCallback")|
 
 An example of the recommendation request: 
@@ -191,7 +191,7 @@ This feature helps to find "better" template for articles, which are located in
 
 For example there is an article about football in the USA.
 The article is located in both categories "/Sport/Football" and "/America/USA".
-Depending on the category it is shown with a football field or the USA flag in the background.
+Depending on the category it's shown with a football field or the USA flag in the background.
 
 If this article is recommended and is clicked in the category "/Sport/Cricket" it must open with the "football" template.
 If the article is clicked in the category "/America/Canada" it must open with the "USA" template.
@@ -219,7 +219,7 @@ The last modification timestamp indicates a change that could influence the reco
 | Bestselling products last 7 days | no context | 24 hours | The model with the 7 days scope is usually built once a day. It can be easily cached for 24 hours. It has no context and can therefore be cached globally for all the users of a customer. |
 | Also bought products in the last month | current product | 24 hours | The model with the 30 days scope is usually built once a day. The context is always the same. It can be cached for every product. The same result can be used for all users of a customer. |
 | Also consumed read articles in the last hour | current article | 30 minutes | Models with a short scope are usually built several times a day or even per hour. In this case the expiration time is set to the half of the model build frequency/period. |
-| Personalized recommendation based on the user's statistic | customers click history | now | Although the statistic model is not updated within minutes, it is very likely that the context will be changed shortly (customer clicks another product and therefore the click is added to his history). The expiration time should not be much longer than the user activity on the web page. |
+| Personalized recommendation based on the user's statistic | customers click history | now | Although the statistic model is not updated within minutes, it's very likely that the context will be changed shortly (customer clicks another product and therefore the click is added to his history). The expiration time should not be much longer than the user activity on the web page. |
 
 In most cases you do not need to calculate the expiration time manually. The table above is provided for the orientation, how the Expires header of the HTTP response is calculated by the recommendation engine and already provided to your caching system. You just need to make sure that the Expires header is used in the configuration of your caching system instead of a static value out of your configuration.
 
@@ -229,7 +229,7 @@ There are several ways to integrate the REST calls to the Recommendation engine
 
 #### **Simple Way**
 
-The simplest way to load recommendations is to synchronously request the Recommendation Engine for recommendations as they are needed.
+The simplest way to load recommendations is to synchronously request the Recommendation Engine for recommendations as they're needed.
 This way is sufficient in most cases. The most important drawback is that the request time increases by the time of the recommendation request.
 If the network is overloaded or the Recommendation Engine is not available it can lock the request.
 
@@ -237,17 +237,17 @@ If the network is overloaded or the Recommendation Engine is not available it ca
 
 You can place the code that loads the data from the eZ Recommender at the bottom of the generated document and flush the output buffer to the client just before requesting recommendations.
 The browser will get a whole page to render and can display it even if the very end of the page is still loading.
-Then the JavaScript code with the recommendation information loaded at the bottom of the page must fill the gaps on the page with recommendation as soon as it is completely loaded.
+Then the JavaScript code with the recommendation information loaded at the bottom of the page must fill the gaps on the page with recommendation as soon as it's completely loaded.
 
 #### Non-blocking loading in the background
 
-If the website is implemented in a language which supports multithreading or non-blocking I/O, it is possible to start the recommendation request just after the browser request is received.
+If the website is implemented in a language which supports multithreading or non-blocking I/O, it's possible to start the recommendation request just after the browser request is received.
 The page generation and the recommendation requests will be accomplished in parallel.
 By combining this idea with the previous solution and placing the recommendation results at the bottom of the page you can avoid any interruption in the processing.
 
 #### Loading from JavaScript using JSONP
 
-It is not possible to request the recommendation controller server directly from the JavaScript (over AJAX library or directly over XMLHttpRequest) because of the cross-domain restriction in most browsers.
+it's not possible to request the recommendation controller server directly from the JavaScript (over AJAX library or directly over XMLHttpRequest) because of the cross-domain restriction in most browsers.
 One of the possible technique to work around this limitation is [JSONP](https://en.wikipedia.org/wiki/JSONP).
 
 #### Loading over proxy
diff --git a/docs/personalization/recommendation_integration.md b/docs/personalization/recommendation_integration.md
index fa63552e18..71e26610a6 100644
--- a/docs/personalization/recommendation_integration.md
+++ b/docs/personalization/recommendation_integration.md
@@ -20,7 +20,7 @@ see [Page block reference]([[= user_doc =]]/content_management/block_reference/)
 ## Request recommendations synchronously
 
 The simplest way to load recommendations is to synchronously request the Personalization 
-server for recommendations as they are needed. This way is sufficient in most cases. 
+server for recommendations as they're needed. This way is sufficient in most cases. 
 The most important drawback is that the request time increases by the time 
 of the recommendation request. 
 If the network is overloaded or the Personalization server is not available, 
@@ -35,7 +35,7 @@ The browser gets a whole page to render and can display it even if the very end
 of the page is still loading. 
 Then the JavaScript code with the recommendation information loaded at the bottom 
 of the page must fill the gaps on the page with recommendations as soon as 
-it is completely loaded.
+it's completely loaded.
 
 ## Non-blocking load in the background
 
diff --git a/docs/personalization/tracking_integration.md b/docs/personalization/tracking_integration.md
index 7d572bda6f..2a1b233907 100644
--- a/docs/personalization/tracking_integration.md
+++ b/docs/personalization/tracking_integration.md
@@ -41,7 +41,7 @@ See below the techniques that help avoid these problems.
 You can place the code at the very end of the generating script 
 and flush the output buffer to the client before sending the events. 
 The connection to the browser can remain open for the time of processing, 
-but it is transparent for the end user.
+but it's transparent for the end user.
 
 ### Tracking asynchronously
 
@@ -57,7 +57,7 @@ Another solution is to provide a proxy on the server side, which forwards
 script requests to the Personalization server. 
 In this model, the requests are triggered from the client, when the page is already 
 loaded and rendered. 
-It is impossible to request the recommendation controller server directly from JavaScript 
+it's impossible to request the recommendation controller server directly from JavaScript 
 (either through the AJAX library or directly over XMLHttpRequest) because of the 
 cross-domain restriction in most browsers. 
 One possible work around this limitation is [JSONP](https://www.w3schools.com/js/js_json_jsonp.asp).
diff --git a/docs/personalization/tracking_with_ibexa-tracker.md b/docs/personalization/tracking_with_ibexa-tracker.md
index 13e453e1dd..33807e9df9 100644
--- a/docs/personalization/tracking_with_ibexa-tracker.md
+++ b/docs/personalization/tracking_with_ibexa-tracker.md
@@ -11,7 +11,7 @@ The approach is very generic and evaluate it if it meets your
 
 If you want the `userid` to be generated automatically, leave out the user 
 params in the `_ycq.push` calls.
-If a predefined cookie already exists, it is used. 
+If a predefined cookie already exists, it's used. 
 Otherwise a new one is created.
 
 ## Tracking code quickstart
@@ -95,13 +95,13 @@ _ycq.push(['_trackEvent', '1', 'click', 'https://mydoc.pdf', 'user1234']);
 | `_setMandator ` | - Executed with one additional parameter: `MandatorId` | `_ycq.push (['_setMandator' , '<YOUR_MANDATOR_ID>']);` |
 | `_trackEvent` | - Executed with four additional parameters: `ItemType`, `EventType`, `ItemId`, `UserId`.<br /> - `EventType` can be any of the [described types]([[= user_doc =]]/personalization/event_types/) |  capturing an event: `_ycq.push(['_trackEvent', '1', 'buy', 'https://mydoc.pdf', 'user1234x']);` |
 | `_trackTimedEvent` | - Executed with five additional parameters: `ItemType`, `EventType`, `ItemId`, `Timeout`, `UserId`.<br /> - `EventType` can be any of the [described types]([[= user_doc =]]/personalization/event_types/).<br /> - `Timeout` can be any integer greater than than 0 representing time in ms | consume event sent after 20s: `_ycq.push(['_trackTimedEvent', '1', 'consume', 'https://mydoc.pdf', '20000', 'user1234x']);` |
-| `_login` | - Executed with two additional parameters: anonymous userId, pseudonymous userId.<br /> - It is to be triggered when a user logs in and the tracking identity is changed.<br /> |-|
+| `_login` | - Executed with two additional parameters: anonymous userId, pseudonymous userId.<br /> - it's to be triggered when a user logs in and the tracking identity is changed.<br /> |-|
 | `ycreco=true` | - If you want to send a click recommended event you can append the following parameter to the recommended item URLs: | [https://mydomain.com/mypage.html?ycreco=true](https://mydomain.com/mypage.html?ycreco=true) or <br />[https://mydomain.com/mypage.html?myparameter=x&ycreco=true](https://mydomain.com/mypage.html?myparameter=x&ycreco=true) |
 
 ## Tracking with HTML event handlers
 
 The asynchronous tracking syntax should also be used from within DOM event handlers. 
-For example, the following button generates an event when it is clicked:
+For example, the following button generates an event when it's clicked:
 
 ``` js
 <button onclick = "_ycq.push(['_trackEvent', '2', 'click', 'itemId1', 'user1234x'])"/><button>
diff --git a/docs/pim/add_remote_pim_support.md b/docs/pim/add_remote_pim_support.md
index 97451cb85a..f9f9ae42f8 100644
--- a/docs/pim/add_remote_pim_support.md
+++ b/docs/pim/add_remote_pim_support.md
@@ -47,7 +47,7 @@ ibexa:
 !!! note "Enabling the remote PIM support"
 
     By default, the `ibexa.repositories.<repository_name>.product_catalog.engine.type` key is set to `local`, which informs [[= product_name =]] that the built-in PIM solution is used.
-    By changing this setting, as well as changing the `ibexa.repositories.<repository_name>.product_catalog.engine` setting from `default` to your custom value, you inform [[= product_name =]] that you are using a remote PIM.
+    By changing this setting, as well as changing the `ibexa.repositories.<repository_name>.product_catalog.engine` setting from `default` to your custom value, you inform [[= product_name =]] that you're using a remote PIM.
 
 ## Install Remote PIM example package
 
diff --git a/docs/pim/create_custom_catalog_filter.md b/docs/pim/create_custom_catalog_filter.md
index e640c6f6b1..11faf95c5a 100644
--- a/docs/pim/create_custom_catalog_filter.md
+++ b/docs/pim/create_custom_catalog_filter.md
@@ -18,7 +18,7 @@ To create a custom catalog filter, first you need to create a filter class in `A
 ```
 
 The filter must implement `Ibexa\Contracts\ProductCatalog\CatalogFilters\FilterDefinitionInterface`,
-provide the filter identifier and name, and the group in which it is displayed in the editing menu.
+provide the filter identifier and name, and the group in which it's displayed in the editing menu.
 
 The example above uses the built-in `ProductName` Search Criterion.
 
@@ -65,7 +65,7 @@ First, add a `form_field_override.html.twig` template to `templates/themes/admin
 ```
 
 Here, you use the same built-in template that is used for example for the product code filter.
-It is placed in a template block corresponding to your custom filter, `catalog_criteria_product_name_values`.
+it's placed in a template block corresponding to your custom filter, `catalog_criteria_product_name_values`.
 
 To ensure the template is used as a back office form theme, add the following configuration:
 
diff --git a/docs/pim/pim_configuration.md b/docs/pim/pim_configuration.md
index 910b9344af..c6b274ecf0 100644
--- a/docs/pim/pim_configuration.md
+++ b/docs/pim/pim_configuration.md
@@ -64,7 +64,7 @@ ibexa:
 ```
 
 VAT rates configuration accepts additional flags under the `extras` key.
-It is an extension point that you can build upon to add custom functionalities. 
+it's an extension point that you can build upon to add custom functionalities. 
 You can use it, for example, to pass additional information to the UI or define region-specific exclusions when calculating the tax values.
 
 For each VAT category value, setting a value to "null" (~) is equal to making the following setting:
@@ -117,4 +117,4 @@ ibexa:
                         - product_availability
 ```
 
-The order of filters in this configuration reflects the order in which they are displayed in the back office.
+The order of filters in this configuration reflects the order in which they're displayed in the back office.
diff --git a/docs/pim/pim_guide.md b/docs/pim/pim_guide.md
index 3592991c8a..28265df17f 100644
--- a/docs/pim/pim_guide.md
+++ b/docs/pim/pim_guide.md
@@ -22,7 +22,7 @@ product-specific information such as attributes, assets, prices, and others.
 PIM lets you group products into categories and catalogs.
 
 Catalogs are collections of products selected by using configurable filters. 
-They are specific to each of your sites or storefronts and only contain 
+they're specific to each of your sites or storefronts and only contain 
 the products in them that you wish to sell in their associated storefronts.
 
 Catalogs contain a complete list of related products that can be displayed on a store site. You can have as many catalogs as required.
@@ -205,12 +205,12 @@ Therefore, if your specific requirements are not met, you must extend the applic
 ##### Simplified presentation of PIM-related blocks and views
 
 Enabling Remote PIM impacts a number of application views and blocks, such as Product view, Product list, Catalog and Product Collection.
-They are simplified, for example, they do not include thumbnails and other assets, or refer to URL aliases.
+they're simplified, for example, they do not include thumbnails and other assets, or refer to URL aliases.
 You can customize them by extending the default implementation.
 
 ##### Limited HTTP Caching
 
-In the context of remote PIM, it is impossible to use [content-aware HTTP caching](content_aware_cache.md) with `ibexa_http_cache_tag_relation_ids`.
+In the context of remote PIM, it's impossible to use [content-aware HTTP caching](content_aware_cache.md) with `ibexa_http_cache_tag_relation_ids`.
 
 ## How to get started
 
@@ -237,7 +237,7 @@ Products have underlying content items, which means you can customize the conten
 
 Product attributes help you to create products with detailed, complicated specification. 
 Thanks to this, you can create product variants based on multiple product attributes that include different information about a product. 
-Additionally, product attributes are collected in groups so they are easier to manage.
+Additionally, product attributes are collected in groups so they're easier to manage.
 
 ![Multiple attribute types](img/product_attribute_types.png)
 
diff --git a/docs/pim/product_api.md b/docs/pim/product_api.md
index d833aa0a30..7d25aa4899 100644
--- a/docs/pim/product_api.md
+++ b/docs/pim/product_api.md
@@ -58,7 +58,7 @@ You can access the variants of a product by using `ProductServiceInterface::find
 The method takes the product object and a `ProductVariantQuery` object as parameters.
 
 A `ProductVariantQuery` lets you define the offset and limit of the variant query.
-The default offset is 0, and limit is 25.
+The default offset is 0, and limit's 25.
 
 ``` php
 [[= include_file('code_samples/api/product_catalog/src/Command/ProductVariantCommand.php', 57, 60) =]]
diff --git a/docs/release_notes/ez_platform_v1.10.0.md b/docs/release_notes/ez_platform_v1.10.0.md
index e20b216a65..67675cddef 100644
--- a/docs/release_notes/ez_platform_v1.10.0.md
+++ b/docs/release_notes/ez_platform_v1.10.0.md
@@ -5,7 +5,7 @@
 
 **The FAST TRACK v1.10.0 release of eZ Platform and eZ Platform Enterprise Edition is available as of June 28, 2017.**
 
-If you are looking for the Long Term Support (LTS) release, see [https://ezplatform.com/Blog/Long-Term-Support-is-Here](https://ezplatform.com/Blog/Long-Term-Support-is-Here)
+If you're looking for the Long Term Support (LTS) release, see [https://ezplatform.com/Blog/Long-Term-Support-is-Here](https://ezplatform.com/Blog/Long-Term-Support-is-Here)
 
 ## Notable changes since v1.9.0
 
diff --git a/docs/release_notes/ez_platform_v1.11.0.md b/docs/release_notes/ez_platform_v1.11.0.md
index 39e6ea5a23..65d449ae64 100644
--- a/docs/release_notes/ez_platform_v1.11.0.md
+++ b/docs/release_notes/ez_platform_v1.11.0.md
@@ -4,7 +4,7 @@
 
 **The FAST TRACK v1.11.0 release of eZ Platform and eZ Platform Enterprise Edition is available as of August 24, 2017.**
 
-If you are looking for the Long Term Support (LTS) release, see [https://ezplatform.com/Blog/Long-Term-Support-is-Here](https://ezplatform.com/Blog/Long-Term-Support-is-Here)
+If you're looking for the Long Term Support (LTS) release, see [https://ezplatform.com/Blog/Long-Term-Support-is-Here](https://ezplatform.com/Blog/Long-Term-Support-is-Here)
 
 ## Notable changes since v1.10.0
 
@@ -64,7 +64,7 @@ There is a corresponding new eZ Publish legacy release called 2017.08 available
 Unlike eZ Publish 5.4LTS, this should be seen as a Fast Track release of legacy: it's tailored for those that want
 a more modern eZ Platform and Symfony version to take advantage of all new features of the platform and facilitate
 the migration. More info on this in a separate blog post soon. As with eZ Platform itself, Enterprise users will receive the same
-full support, maintenance, and priority security patch handling as they are used to for this setup.
+full support, maintenance, and priority security patch handling as they're used to for this setup.
 
 !!! note
 
diff --git a/docs/release_notes/ez_platform_v1.12.0.md b/docs/release_notes/ez_platform_v1.12.0.md
index fe7a48e8e6..5c5ae2ceaf 100644
--- a/docs/release_notes/ez_platform_v1.12.0.md
+++ b/docs/release_notes/ez_platform_v1.12.0.md
@@ -4,7 +4,7 @@
 
 **The FAST TRACK v1.12.0 release of eZ Platform and eZ Platform Enterprise Edition is available as of October 31, 2017.**
 
-If you are looking for the Long Term Support (LTS) release, see [https://ezplatform.com/Blog/Long-Term-Support-is-Here](https://ezplatform.com/Blog/Long-Term-Support-is-Here)
+If you're looking for the Long Term Support (LTS) release, see [https://ezplatform.com/Blog/Long-Term-Support-is-Here](https://ezplatform.com/Blog/Long-Term-Support-is-Here)
 
 ## Notable changes since v1.11.0
 
@@ -82,7 +82,7 @@ To update to this version, follow the [updating guide](https://doc.ibexa.co/en/
 
     This means:
     - There is a new VCL
-    - Requires Varnish 4.1+ with `varnish-modules` _(incl. xkey)_, or Varnish Plus where it is built in
+    - Requires Varnish 4.1+ with `varnish-modules` _(incl. xkey)_, or Varnish Plus where it's built in
 
     Further reading in [doc/varnish/varnish.md](https://github.com/ezsystems/ezplatform/blob/master/doc/varnish/varnish.md).
 
diff --git a/docs/release_notes/ez_platform_v1.8.0.md b/docs/release_notes/ez_platform_v1.8.0.md
index eefbe014f5..5ac63c0465 100644
--- a/docs/release_notes/ez_platform_v1.8.0.md
+++ b/docs/release_notes/ez_platform_v1.8.0.md
@@ -4,7 +4,7 @@
 
 **The FAST TRACK v1.8.0 release of eZ Platform and eZ Platform Enterprise Edition is available as of February 16, 2017.**
 
-If you are looking for the Long Term Support (LTS) release, see[ https://ezplatform.com/Blog/Long-Term-Support-is-Here](https://ezplatform.com/Blog/Long-Term-Support-is-Here)
+If you're looking for the Long Term Support (LTS) release, see[ https://ezplatform.com/Blog/Long-Term-Support-is-Here](https://ezplatform.com/Blog/Long-Term-Support-is-Here)
 
 ## Notable Changes Since v1.7.0 LTS
 
diff --git a/docs/release_notes/ez_platform_v1.9.0.md b/docs/release_notes/ez_platform_v1.9.0.md
index ff1bfb48a2..e26543dcb4 100644
--- a/docs/release_notes/ez_platform_v1.9.0.md
+++ b/docs/release_notes/ez_platform_v1.9.0.md
@@ -5,7 +5,7 @@
 
 **The FAST TRACK v1.9.0 release of eZ Platform and eZ Platform Enterprise Edition is available as of April 19, 2017.**
 
-If you are looking for the Long Term Support (LTS) release, see[ https://ezplatform.com/Blog/Long-Term-Support-is-Here](https://ezplatform.com/Blog/Long-Term-Support-is-Here)
+If you're looking for the Long Term Support (LTS) release, see[ https://ezplatform.com/Blog/Long-Term-Support-is-Here](https://ezplatform.com/Blog/Long-Term-Support-is-Here)
 
 
 ## Notable changes since v1.8.0
@@ -40,7 +40,7 @@ In version 1.8 we introduced a new Content Browser in the Universal Discovery Wi
 
 ### eZ Platform Enterprise Edition - Studio
 
--   It is now possible to configure Landing Page blocks used by the Landing Page editor in a simpler way. The configuration is done in a YAML file (see <https://issues.ibexa.co/browse/EZEE-1421>)
+-   it's now possible to configure Landing Page blocks used by the Landing Page editor in a simpler way. The configuration is done in a YAML file (see <https://issues.ibexa.co/browse/EZEE-1421>)
 -   *..lots of other bug fixes and smaller improvements..*
 
 ### eZ Platform Enterprise Edition - Studio Demo
diff --git a/docs/release_notes/ez_platform_v2.1.0.md b/docs/release_notes/ez_platform_v2.1.0.md
index e943e695ab..304dab354b 100644
--- a/docs/release_notes/ez_platform_v2.1.0.md
+++ b/docs/release_notes/ez_platform_v2.1.0.md
@@ -67,7 +67,7 @@ You can now perform REST search via `POST /views` using custom `FieldCriterion`.
 ### Other UI improvements
 
 - When accessing the back office from a link to a specific content item, after logging in you will now be redirected to the proper content view.
-- In edit mode you can now preview content as it will look in any SiteAccess it is available in.
+- In edit mode you can now preview content as it will look in any SiteAccess it's available in.
 - When you start editing a content item that already has an open draft, you will see a draft conflict screen:
 
 ![Draft conflict window](draft_conflict.png)
diff --git a/docs/release_notes/ez_platform_v2.2.0.md b/docs/release_notes/ez_platform_v2.2.0.md
index 84c53f1ac2..24c4da765a 100644
--- a/docs/release_notes/ez_platform_v2.2.0.md
+++ b/docs/release_notes/ez_platform_v2.2.0.md
@@ -53,7 +53,7 @@ You can find the list of all bookmarks in *Browse content* section. There, you c
 
 ### Image placeholders
 
-[Placeholder generator](https://doc.ibexa.co/en/2.5/guide/images/#setting-placeholder-generator) enables you to replace any missing image with downloaded or generated image placeholder. It can be used when you are working on an existing database and you are not able to download uploaded images to your local development environment because of their large size.
+[Placeholder generator](https://doc.ibexa.co/en/2.5/guide/images/#setting-placeholder-generator) enables you to replace any missing image with downloaded or generated image placeholder. It can be used when you're working on an existing database and you're not able to download uploaded images to your local development environment because of their large size.
 
 ![Placeholder GenericProvider](2.2_placeholder_generic_provider.png)
 
diff --git a/docs/release_notes/ez_platform_v2.3.md b/docs/release_notes/ez_platform_v2.3.md
index 968c799055..acedbc1bab 100644
--- a/docs/release_notes/ez_platform_v2.3.md
+++ b/docs/release_notes/ez_platform_v2.3.md
@@ -76,7 +76,7 @@ You can now access and set user preferences in the user menu.
 
 ![User preferences screen with time zone settings](2.3_user_preferences.png)
 
-It is covered by the `user/preferences` policy.
+it's covered by the `user/preferences` policy.
 
 ### Dates in preferred timezone
 
diff --git a/docs/release_notes/ez_platform_v2.4.md b/docs/release_notes/ez_platform_v2.4.md
index 4334a85537..7c70ded955 100644
--- a/docs/release_notes/ez_platform_v2.4.md
+++ b/docs/release_notes/ez_platform_v2.4.md
@@ -152,7 +152,7 @@ This release introduces a few simplifications to API use for content types:
 
 #### Load multiple Locations
 
-You are now able to load multiple Locations at once, using `LocationService->loadLocationList()`. The biggest benefit of this feature is saving load time on complex landing pages when HTTP cache is cold or disabled, including when in development mode.  
+you're now able to load multiple Locations at once, using `LocationService->loadLocationList()`. The biggest benefit of this feature is saving load time on complex landing pages when HTTP cache is cold or disabled, including when in development mode.  
 
 ### BC breaks and important behavior changes
 
diff --git a/docs/release_notes/ez_platform_v2.5.md b/docs/release_notes/ez_platform_v2.5.md
index 8e89001f02..130805ae35 100644
--- a/docs/release_notes/ez_platform_v2.5.md
+++ b/docs/release_notes/ez_platform_v2.5.md
@@ -101,7 +101,7 @@ Hidden content will be unavailable on the front page regardless of permissions o
 
 ### Product version preview
 
-The Dashboard now shows the version of eZ Platform you are running.
+The Dashboard now shows the version of eZ Platform you're running.
 
 ![eZ Platform version](2.5_product_version.png)
 
@@ -202,7 +202,7 @@ It enables you to set up a cluster of Solr servers for highly available and faul
 
 #### Custom attributes
 
-It is now possible to add [custom data attributes and CSS classes](https://doc.ibexa.co/en/2.5/guide/extending/extending_online_editor/#custom-data-attributes-and-classes) to elements in the Online Editor.
+it's now possible to add [custom data attributes and CSS classes](https://doc.ibexa.co/en/2.5/guide/extending/extending_online_editor/#custom-data-attributes-and-classes) to elements in the Online Editor.
 
 #### Translatable custom tag choice attributes
 
diff --git a/docs/release_notes/ibexa_dxp_v4.4.md b/docs/release_notes/ibexa_dxp_v4.4.md
index fab99d7fa1..9a1b036127 100644
--- a/docs/release_notes/ibexa_dxp_v4.4.md
+++ b/docs/release_notes/ibexa_dxp_v4.4.md
@@ -43,7 +43,7 @@ For more information, see [Commerce](https://doc.ibexa.co/en/4.4/commerce/commer
 
 Another addition is the Storefront package that provides a starting kit 
 for the developers.
-It is a working set of components, which you can use to test the new capabilities, 
+it's a working set of components, which you can use to test the new capabilities, 
 and then customize and extend to create your own implementation of a web store.
 
 For more information, see [Storefront](https://doc.ibexa.co/en/4.4/commerce/storefront/storefront).
diff --git a/docs/release_notes/ibexa_dxp_v4.5.md b/docs/release_notes/ibexa_dxp_v4.5.md
index bebbf0e9b2..ce61836d76 100644
--- a/docs/release_notes/ibexa_dxp_v4.5.md
+++ b/docs/release_notes/ibexa_dxp_v4.5.md
@@ -29,7 +29,7 @@ Modules can interact with each other, for example, to decrease stock as a result
 
 #### Order management
 
-With order management in place, it is now possible to create orders, configure and customize the order processing workflow, as well as manage orders by using the APIs. 
+With order management in place, it's now possible to create orders, configure and customize the order processing workflow, as well as manage orders by using the APIs. 
 
 New screens added to the back office user interface let [[= product_name =]] users search for orders and filter search results. 
 Users can also review order details and completion status, as well as cancel orders.
@@ -47,7 +47,7 @@ Additionally, new APIs are available, which can be used for managing payment met
 
 #### Shipping
 
-With the arrival of the Shipping module, it is now possible to define and manage shipping methods of different types, together with their related costs, on a dedicated back office screen, as well as configure and customize the shipment workflow.
+With the arrival of the Shipping module, it's now possible to define and manage shipping methods of different types, together with their related costs, on a dedicated back office screen, as well as configure and customize the shipment workflow.
 
 New APIs enable managing shipping methods and payments, while an extension point can be used to expand the default list of shipping method types. 
 
diff --git a/docs/release_notes/ibexa_dxp_v4.6.md b/docs/release_notes/ibexa_dxp_v4.6.md
index 29c2920690..182732e9ff 100644
--- a/docs/release_notes/ibexa_dxp_v4.6.md
+++ b/docs/release_notes/ibexa_dxp_v4.6.md
@@ -218,7 +218,7 @@ For more information, see [Create virtual products](https://doc.ibexa.co/project
 
 #### Product page URLs
 
-When you are creating a new product type, you can set up a product URL alias name pattern.
+When you're creating a new product type, you can set up a product URL alias name pattern.
 With this feature, you can also create custom URL and URL alias name pattern field based on product attributes.
 Customized URLs are easier to remember, help with SEO optimization and reduce bounce rates on the website.
 
@@ -241,7 +241,7 @@ For more information, see [VAT rates](https://doc.ibexa.co/en/master/pim/pim_con
 
 #### Ability to search through products in a catalog
 
-When you are reviewing catalog details, on the **Products** tab, you can now see what criteria are used to include products in the catalog, and search for a specific product in the catalog.
+When you're reviewing catalog details, on the **Products** tab, you can now see what criteria are used to include products in the catalog, and search for a specific product in the catalog.
 
 #### New Twig functions
 
diff --git a/docs/resources/contributing/package_structure.md b/docs/resources/contributing/package_structure.md
index 30fe79ef10..b9ee34266b 100644
--- a/docs/resources/contributing/package_structure.md
+++ b/docs/resources/contributing/package_structure.md
@@ -12,7 +12,7 @@ The following conventions apply to contributions to [[= product_name_base =]] co
 !!! note
 
     New code needs to follow the rules outlined here.
-    They are being applied progressively to existing code.
+    they're being applied progressively to existing code.
 
 ## Root PHP namespace
 
diff --git a/docs/resources/contributing/report_and_follow_issues.md b/docs/resources/contributing/report_and_follow_issues.md
index 81ef0889ab..750315e5ea 100644
--- a/docs/resources/contributing/report_and_follow_issues.md
+++ b/docs/resources/contributing/report_and_follow_issues.md
@@ -27,12 +27,12 @@ Click **Create** at the top of the bugtracker window and fill in the following f
 |||
 |------|------|
 |**Project**|Select **Ibexa IBX**.|
-|**Issue type**|Choose **Bug** or **Improvement** depending on what you are reporting, do not use other issue types (they are for internal use only).|
-|**Summary**|Write a short sentence describing what you are reporting.|
+|**Issue type**|Choose **Bug** or **Improvement** depending on what you're reporting, do not use other issue types (they're for internal use only).|
+|**Summary**|Write a short sentence describing what you're reporting.|
 |**Priority**|Select the priority you consider the issue to be. Please try to keep a cool head while selecting it. A 1 pixel alignment bug is not a "blocker".|
 |**Component/s**|This is important, as it will make your issue appear on the radar (dashboards, filters) of people dealing with various parts of Ibexa projects.|
 |**Affect version/s**|Add the versions of the application you experienced the issue on.|
-|**Assignee**|Leave blank, unless you are willing to work on the issue yourself.|
+|**Assignee**|Leave blank, unless you're willing to work on the issue yourself.|
 |**Reporter**|Leave as is (yourself).|
 |**Environment**|Enter specific information regarding your environment that could be relevant in the context of the issues.|
 |**Description**|This is the most important part of the issue report. In case of a bug, it **must** contain explicit steps to reproduce your issue. Anybody should be able to reproduce it at first try. In case of an improvement, it needs to contain use cases and detailed information regarding the expected behavior.|
diff --git a/docs/resources/phpstorm_plugin.md b/docs/resources/phpstorm_plugin.md
index 3f810b8b7b..8ca61e4caa 100644
--- a/docs/resources/phpstorm_plugin.md
+++ b/docs/resources/phpstorm_plugin.md
@@ -244,7 +244,7 @@ For example, when plugin detects deprecated configuration key usage, it marks th
 
 ## Known issues
 
-It is not possible to create new project with Docker as PHP remote interpreter.
+it's not possible to create new project with Docker as PHP remote interpreter.
 See [related JetBrains issue](https://youtrack.jetbrains.com/issue/WI-61330) for more details.
 
 ## Feedback
diff --git a/docs/resources/release_process_and_roadmap.md b/docs/resources/release_process_and_roadmap.md
index 6e88e44083..8934287fcb 100644
--- a/docs/resources/release_process_and_roadmap.md
+++ b/docs/resources/release_process_and_roadmap.md
@@ -20,7 +20,7 @@ It comes with no commercial support and maintenance services.
 We manage the release of [[= product_name =]] using an agile iterative process and a continuous software development model, which is why we provide two kinds of [[= product_name =]] releases:
 
 - Long Term Support releases (LTS) which are supported by [[= product_name_base =]] for a long period of time.
-- Fast Track releases (FT) give access to the latest features and are supported for a short period of time. They are maintained only until the next FT release is introduced.
+- Fast Track releases (FT) give access to the latest features and are supported for a short period of time. they're maintained only until the next FT release is introduced.
 
 FT releases are tailored for those who want to stay up-to-date with newest functionalities,
 while LTS releases are suitable for highly stable enterprise rollouts.
diff --git a/docs/search/aggregation_reference/custompricestats_aggregation.md b/docs/search/aggregation_reference/custompricestats_aggregation.md
index d047ae99d5..bba30bd0c3 100644
--- a/docs/search/aggregation_reference/custompricestats_aggregation.md
+++ b/docs/search/aggregation_reference/custompricestats_aggregation.md
@@ -13,7 +13,7 @@ and provides statistical information for the values. You can use the provided ge
 
 - `name` - name of the Aggregation
 - `\Ibexa\Contracts\ProductCatalog\Values\CurrencyInterface` - currency of the price
-- `\Ibexa\Contracts\ProductCatalog\Values\CustomerGroupInterface|null` - customer group that defines custom pricing, by default it is the one assigned to current user
+- `\Ibexa\Contracts\ProductCatalog\Values\CustomerGroupInterface|null` - customer group that defines custom pricing, by default it's the one assigned to current user
 
 ## Example
 
diff --git a/docs/search/criteria_reference/ismainlocation_criterion.md b/docs/search/criteria_reference/ismainlocation_criterion.md
index 091cca98a3..9d92192fea 100644
--- a/docs/search/criteria_reference/ismainlocation_criterion.md
+++ b/docs/search/criteria_reference/ismainlocation_criterion.md
@@ -1,7 +1,7 @@
 # IsMainLocation Criterion
 
 The [`IsMainLocation` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-LanguageCode.html)
-searches for Locations based on whether they are the main Location of a content item or not.
+searches for Locations based on whether they're the main Location of a content item or not.
 
 This Criterion is available only for Location Search.
 
diff --git a/docs/search/criteria_reference/languagecode_criterion.md b/docs/search/criteria_reference/languagecode_criterion.md
index 775502a21a..3c9a1c0586 100644
--- a/docs/search/criteria_reference/languagecode_criterion.md
+++ b/docs/search/criteria_reference/languagecode_criterion.md
@@ -1,7 +1,7 @@
 # LanguageCode Criterion
 
 The [`LanguageCode` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-Location.html)
-searches for content based on whether it is translated into the selected language.
+searches for content based on whether it's translated into the selected language.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/matchall_criterion.md b/docs/search/criteria_reference/matchall_criterion.md
index 702b9c77db..1c65cbbf5f 100644
--- a/docs/search/criteria_reference/matchall_criterion.md
+++ b/docs/search/criteria_reference/matchall_criterion.md
@@ -2,6 +2,6 @@
 
 The [`MatchAll` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-MatchAll.html)
 is an auxiliary Criterion that returns all search results.
-It is used internally when no filter or query is provided on a Query object.
+it's used internally when no filter or query is provided on a Query object.
 
 The Criterion takes no arguments.
diff --git a/docs/search/criteria_reference/matchnone_criterion.md b/docs/search/criteria_reference/matchnone_criterion.md
index 5cc70a571a..350ccc09a2 100644
--- a/docs/search/criteria_reference/matchnone_criterion.md
+++ b/docs/search/criteria_reference/matchnone_criterion.md
@@ -2,6 +2,6 @@
 
 The [`MatchNone` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-MatchNone.html)
 is an auxiliary Criterion that returns no search results.
-It is used internally when no filter or query is provided on a Query object.
+it's used internally when no filter or query is provided on a Query object.
 
 The Criterion takes no arguments.
diff --git a/docs/search/criteria_reference/productcategory_criterion.md b/docs/search/criteria_reference/productcategory_criterion.md
index 2aa791c55f..cf17b6a41e 100644
--- a/docs/search/criteria_reference/productcategory_criterion.md
+++ b/docs/search/criteria_reference/productcategory_criterion.md
@@ -1,6 +1,6 @@
 # ProductCategory Criterion
 
-The `ProductCategory` Search Criterion searches for products by the category they are assigned to.
+The `ProductCategory` Search Criterion searches for products by the category they're assigned to.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/sectionid_criterion.md b/docs/search/criteria_reference/sectionid_criterion.md
index c03b63b90a..efafd14af0 100644
--- a/docs/search/criteria_reference/sectionid_criterion.md
+++ b/docs/search/criteria_reference/sectionid_criterion.md
@@ -1,7 +1,7 @@
 # SectionId Criterion
 
 The [`SectionId` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-SectionId.html)
-searches for content based on the ID of the Section it is assigned to.
+searches for content based on the ID of the Section it's assigned to.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/sectionidentifier_criterion.md b/docs/search/criteria_reference/sectionidentifier_criterion.md
index 695446a451..4ced12b44d 100644
--- a/docs/search/criteria_reference/sectionidentifier_criterion.md
+++ b/docs/search/criteria_reference/sectionidentifier_criterion.md
@@ -1,7 +1,7 @@
 # SectionIdentifier Criterion
 
 The [`SectionIdentifier` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-SectionIdentifier.html)
-searches for content based on the identifier of the Section it is assigned to.
+searches for content based on the identifier of the Section it's assigned to.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/taxonomy_entry_id.md b/docs/search/criteria_reference/taxonomy_entry_id.md
index eafc86c58a..4852317722 100644
--- a/docs/search/criteria_reference/taxonomy_entry_id.md
+++ b/docs/search/criteria_reference/taxonomy_entry_id.md
@@ -1,7 +1,7 @@
 # TaxonomyEntryId Criterion
 
 The [`TaxonomyEntryId` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Taxonomy-Search-Query-Criterion-TaxonomyEntryId.html)
-searches for content based on the ID of the Taxonomy Entry it is assigned to.
+searches for content based on the ID of the Taxonomy Entry it's assigned to.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/visibility_criterion.md b/docs/search/criteria_reference/visibility_criterion.md
index 21b68fa5bc..9d64656a48 100644
--- a/docs/search/criteria_reference/visibility_criterion.md
+++ b/docs/search/criteria_reference/visibility_criterion.md
@@ -1,7 +1,7 @@
 # Visibility Criterion
 
 The [`Visibility` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-Visibility.html)
-searches for content based on whether it is visible or not.
+searches for content based on whether it's visible or not.
 
 This Criterion takes into account both hiding content and hiding Locations.
 
diff --git a/docs/search/extensibility/manipulate_elasticsearch_query.md b/docs/search/extensibility/manipulate_elasticsearch_query.md
index 12292eae3e..af243ea264 100644
--- a/docs/search/extensibility/manipulate_elasticsearch_query.md
+++ b/docs/search/extensibility/manipulate_elasticsearch_query.md
@@ -4,7 +4,7 @@ description: Manipulate the search query when using the Elasticsearch search eng
 
 # Manipulate Elasticsearch query
 
-You can customize the search query before it is executed.
+You can customize the search query before it's executed.
 To do it, subscribe to `Ibexa\Contracts\ElasticSearchEngine\Query\Event\QueryFilterEvent`.
 
 The following example shows how to add an additional Search Criterion to all queries.
diff --git a/docs/search/search_api.md b/docs/search/search_api.md
index cefe3e9f5e..e090f06d97 100644
--- a/docs/search/search_api.md
+++ b/docs/search/search_api.md
@@ -182,7 +182,7 @@ $filter
 
 !!! tip
 
-    It is recommended to use an IDE that can recognize type hints when working with Repository Filtering.
+    it's recommended to use an IDE that can recognize type hints when working with Repository Filtering.
     If you try to use an unsupported Criterion or Sort Clause, the IDE will indicate an issue.
 
 ## Searching in a controller
@@ -208,7 +208,7 @@ When using Repository filtering, provide the results of `ContentService::find()`
 
 ### Paginating search results
 
-To paginate search or filtering results, it is recommended to use the [Pagerfanta library](https://github.com/BabDev/Pagerfanta) and [[[= product_name =]]'s adapters for it.](https://github.com/ibexa/core/blob/main/src/lib/Pagination/Pagerfanta/Pagerfanta.php)
+To paginate search or filtering results, it's recommended to use the [Pagerfanta library](https://github.com/BabDev/Pagerfanta) and [[[= product_name =]]'s adapters for it.](https://github.com/ibexa/core/blob/main/src/lib/Pagination/Pagerfanta/Pagerfanta.php)
 
 ``` php
 // ...
@@ -315,7 +315,7 @@ For a list of supported Criteria and Sort Clauses, see [Search in trash referenc
 
 !!! note
 
-    Searching through the trashed content items operates directly on the database, therefore you cannot use external search engines, such as Solr or Elasticsearch, and it is impossible to reindex the data.
+    Searching through the trashed content items operates directly on the database, therefore you cannot use external search engines, such as Solr or Elasticsearch, and it's impossible to reindex the data.
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/FindInTrashCommand.php', 34, 41) =]]
@@ -324,7 +324,7 @@ For a list of supported Criteria and Sort Clauses, see [Search in trash referenc
 !!! caution
 
     Make sure that you set the Criterion on the `filter` property.
-    It is impossible to use the `query` property, because the search in trash operation filters the database instead of querying.
+    it's impossible to use the `query` property, because the search in trash operation filters the database instead of querying.
 
 ## Aggregation
 
diff --git a/docs/search/search_criteria_and_sort_clauses.md b/docs/search/search_criteria_and_sort_clauses.md
index 91385b5376..428ef1b899 100644
--- a/docs/search/search_criteria_and_sort_clauses.md
+++ b/docs/search/search_criteria_and_sort_clauses.md
@@ -11,7 +11,7 @@ For an example of how to use and combine Criteria and Sort Clauses, refer to [Se
 
 ## Search engine handling of Search Criteria and Sort Clauses
 
-As Search Criteria and Sort Clauses are value objects which are used to define the query from API perspective, they are common for all storage engines.
+As Search Criteria and Sort Clauses are value objects which are used to define the query from API perspective, they're common for all storage engines.
 Each storage engine needs to implement its own handlers for the corresponding Criterion and Sort Clause value object,
 which will be used to translate the value object into a storage-specific search query.
 
@@ -26,7 +26,7 @@ Sometimes you will find that standard Search Criteria and Sort Clauses provided
 
     Legacy (SQL-based) search can also be used in `ezkeyword` external storage.
 
-In such cases you can implement a custom Criterion or Sort Clause, together with the corresponding handlers for the storage engine you are using.
+In such cases you can implement a custom Criterion or Sort Clause, together with the corresponding handlers for the storage engine you're using.
 
 !!! caution "Using Field Criterion or Sort Clause with large databases"
 
@@ -58,7 +58,7 @@ Content Search explicitly refuses to accept Criteria and Sort Clauses implementi
 
 ### Configuring custom Criterion and Sort Clause handlers
 
-After you have implemented your Criterion / Sort Clause and its handler, you will need to configure the handler for the [service container](php_api.md#service-container) by using dedicated service tags for each type of search. Doing so will automatically register it and handle your Criterion / Search Clause when it is given as a parameter to one of the Search Service methods.
+After you have implemented your Criterion / Sort Clause and its handler, you will need to configure the handler for the [service container](php_api.md#service-container) by using dedicated service tags for each type of search. Doing so will automatically register it and handle your Criterion / Search Clause when it's given as a parameter to one of the Search Service methods.
 
 Available tags for Criterion handlers in Legacy Storage Engine are:
 
diff --git a/docs/search/search_engines/elastic_search/configure_elastic_search.md b/docs/search/search_engines/elastic_search/configure_elastic_search.md
index be23a734f6..ae4fc839e6 100644
--- a/docs/search/search_engines/elastic_search/configure_elastic_search.md
+++ b/docs/search/search_engines/elastic_search/configure_elastic_search.md
@@ -133,7 +133,7 @@ For more information and a list of available choices, see [Connection pool](http
 
 !!! tip "Load tests recommendation"
 
-    If you change the connection pool setting, it is recommended that you to perform load tests
+    If you change the connection pool setting, it's recommended that you to perform load tests
     to check whether the change does not negatively impact the performance of your environment.
 
 #### Connection selector
@@ -302,7 +302,7 @@ ibexa_elasticsearch:
 If you configure both `ca_cert` and `cert` entries, the `ca_cert` parameter takes precedence over the `cert` parameter.
 
 After you have configured SSL, you can still disable it, for example when the certificates
-expire, or you are migrating to a new set of certificates.
+expire, or you're migrating to a new set of certificates.
 To do this, pass the following setting under the `ssl` key:
 
 ``` yaml
diff --git a/docs/search/search_engines/elastic_search/elastic_search_overview.md b/docs/search/search_engines/elastic_search/elastic_search_overview.md
index d856be6dbf..90179d06ee 100644
--- a/docs/search/search_engines/elastic_search/elastic_search_overview.md
+++ b/docs/search/search_engines/elastic_search/elastic_search_overview.md
@@ -11,7 +11,7 @@ Elasticsearch enables you to use filtering, query, query-time boosting, fulltext
 It organizes data into documents, that then are grouped into indices.
 
 As a result of having distributed architecture, Elasticsearch can analyze massive amounts of data with almost real-time performance.
-Instead of searching text directly, it searches and index. Thanks to this mechanism, it is able to achieve fast response.
+Instead of searching text directly, it searches and index. Thanks to this mechanism, it's able to achieve fast response.
 
 For a detailed description of advanced settings that you might require in a specific production environment, 
 see the documentation provided by Elastic.
diff --git a/docs/search/search_engines/legacy_search_engine/legacy_search_overview.md b/docs/search/search_engines/legacy_search_engine/legacy_search_overview.md
index f95f5a5c5b..c6ea657a32 100644
--- a/docs/search/search_engines/legacy_search_engine/legacy_search_overview.md
+++ b/docs/search/search_engines/legacy_search_engine/legacy_search_overview.md
@@ -4,7 +4,7 @@ description: Legacy search engine overview.
 
 # Legacy search engine
 
-Legacy search engine is the default search engine. It is SQL-based and uses Doctrine's database connection.
+Legacy search engine is the default search engine. it's SQL-based and uses Doctrine's database connection.
 The connections are defined in the same way as for storage engine, and no further specific configuration is needed.
 Legacy search engine is recommended for basic needs and is not intended in production.
 It allows you to use filtering and fulltext search, but with some limitations.
@@ -13,7 +13,7 @@ For more information, check [search engine comparison](search_engines.md#search-
 !!! tip
 
     The features and performance of Legacy search engine are limited.
-    If you have specific search or performance needs, it is recommended to use [Solr](solr_overview.md)
+    If you have specific search or performance needs, it's recommended to use [Solr](solr_overview.md)
     or [Elasticsearch](elastic_search_overview.md) instead.
     
     Using the Legacy search engine disables most shop features, such as product search.
diff --git a/docs/search/search_engines/solr_search_engine/configure_solr.md b/docs/search/search_engines/solr_search_engine/configure_solr.md
index 129f171652..e79f4f99d2 100644
--- a/docs/search/search_engines/solr_search_engine/configure_solr.md
+++ b/docs/search/search_engines/solr_search_engine/configure_solr.md
@@ -184,7 +184,7 @@ You have to edit the same file on the slave server, and use the code below:
 <requestHandler name="/replication" class="solr.ReplicationHandler">
   <lst name="slave">
 
-    <!-- fully qualified url for the replication handler of master. It is
+    <!-- fully qualified url for the replication handler of master. it's
          possible to pass on this as a request param for the fetchindex command -->
     <str name="masterUrl">http://123.456.789.0:8983/solr/collection1/replication</str>
 
@@ -198,7 +198,7 @@ You have to edit the same file on the slave server, and use the code below:
          values are internal|external.  If the value is 'external' make sure
          that your master Solr has the settings to honor the accept-encoding header.
          See here for details: http://wiki.apache.org/solr/SolrHttpCompression
-         If it is 'internal' everything will be taken care of automatically.
+         If it's 'internal' everything will be taken care of automatically.
          USE THIS ONLY IF YOUR BANDWIDTH IS LOW.
          THIS CAN ACTUALLY SLOWDOWN REPLICATION IN A LAN -->
     <str name="compression">internal</str>
diff --git a/docs/search/search_engines/solr_search_engine/install_solr.md b/docs/search/search_engines/solr_search_engine/install_solr.md
index fd8b494889..f707f9977f 100644
--- a/docs/search/search_engines/solr_search_engine/install_solr.md
+++ b/docs/search/search_engines/solr_search_engine/install_solr.md
@@ -52,12 +52,12 @@ To set SolrCloud up follow [SolrCloud reference guide](https://lucene.apache.org
 
 The bundle does not 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. It is strongly recommended to set-up `solrconfig.xml` like this:
+This setting is **required** if you want to see the changes after publish. it's strongly recommended to set-up `solrconfig.xml` like this:
 
 ``` xml
 <!--solrconfig.xml-->
 <autoCommit>
-  <!-- autoCommit is here left as-is like it is out of the box in Solr, this controls hard commits for durability/replication -->
+  <!-- autoCommit's here left as-is like it's out of the box in Solr, this controls hard commits for durability/replication -->
   <maxTime>${solr.autoCommit.maxTime:15000}</maxTime>
   <openSearcher>false</openSearcher>
 </autoCommit>
diff --git a/docs/search/url_search_reference/matchall_url_criterion.md b/docs/search/url_search_reference/matchall_url_criterion.md
index 9189be8511..65ae5fdb6a 100644
--- a/docs/search/url_search_reference/matchall_url_criterion.md
+++ b/docs/search/url_search_reference/matchall_url_criterion.md
@@ -2,6 +2,6 @@
 
 The [`MatchAll` URL Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-Criterion-MatchAll.html)
 is an auxiliary Criterion that returns all search results.
-It is used internally when no filter or query is provided on a Query object.
+it's used internally when no filter or query is provided on a Query object.
 
 The Criterion takes no arguments.
diff --git a/docs/search/url_search_reference/matchnone_url_criterion.md b/docs/search/url_search_reference/matchnone_url_criterion.md
index cb394ec61a..5e047ac4b9 100644
--- a/docs/search/url_search_reference/matchnone_url_criterion.md
+++ b/docs/search/url_search_reference/matchnone_url_criterion.md
@@ -2,6 +2,6 @@
 
 The [`MatchNone` URL Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-Criterion-MatchNone.html)
 is an auxiliary Criterion that returns no search results.
-It is used internally when no filter or query is provided on a Query object.
+it's used internally when no filter or query is provided on a Query object.
 
 The Criterion takes no arguments.
diff --git a/docs/search/url_search_reference/url_search_sort_clauses.md b/docs/search/url_search_reference/url_search_sort_clauses.md
index 425f3d29fc..f1dd506078 100644
--- a/docs/search/url_search_reference/url_search_sort_clauses.md
+++ b/docs/search/url_search_reference/url_search_sort_clauses.md
@@ -6,7 +6,7 @@ page_type: reference
 # URL Sort Clauses
 
 URL Sort Clauses are the sorting options for URLs.
-They are only supported by [URL Search (`URLService::findUrls`)](url_api.md).
+they're only supported by [URL Search (`URLService::findUrls`)](url_api.md).
 
 All URL Sort Clauses can take the following optional argument:
 
diff --git a/docs/snippets/update/check_out_version.md b/docs/snippets/update/check_out_version.md
index 1ebf442daa..7c4ec5f328 100644
--- a/docs/snippets/update/check_out_version.md
+++ b/docs/snippets/update/check_out_version.md
@@ -1,6 +1,6 @@
 ### A. Create branch
 
-Create a new branch for handling update changes from the branch you are updating on:
+Create a new branch for handling update changes from the branch you're updating on:
 
 ``` bash
 git checkout -b update-[[= target_version =]]
@@ -10,7 +10,7 @@ This creates a new project branch (`update-[[= target_version =]]`) for the upda
 
 ### B. Add `upstream` remote
 
-If it is not added as a remote yet, add an `upstream` remote:
+If it's not added as a remote yet, add an `upstream` remote:
 
 === "ezplatform"
 
diff --git a/docs/snippets/update/db/db_backup_warning.md b/docs/snippets/update/db/db_backup_warning.md
index e7392a19de..4b94a1f91f 100644
--- a/docs/snippets/update/db/db_backup_warning.md
+++ b/docs/snippets/update/db/db_backup_warning.md
@@ -5,5 +5,5 @@
     After updating the database, clear the cache.
     
     Do not use `--force` argument for `mysql` / `psql` commands when performing update queries.
-    If there is any problem during the update, it is best if the query fails immediately, so you can fix the underlying problem before you execute the update again.
+    If there is any problem during the update, it's best if the query fails immediately, so you can fix the underlying problem before you execute the update again.
     If you leave this for later you risk ending up with an incompatible database, though the problems might not surface immediately.
diff --git a/docs/snippets/update/db/update_db_2.5-3.3.md b/docs/snippets/update/db/update_db_2.5-3.3.md
index c5eaa462e1..9fc914f031 100644
--- a/docs/snippets/update/db/update_db_2.5-3.3.md
+++ b/docs/snippets/update/db/update_db_2.5-3.3.md
@@ -4,7 +4,7 @@ Apply the following database update script:
 mysql -u <username> -p <password> <database_name> < vendor/ibexa/installer/upgrade/db/mysql/ezplatform-2.5-to-ibexa-3.3.0.sql
 ```
 
-If you are updating from an installation based on the `ezsystems/ezplatform-ee` metarepository, 
+If you're updating from an installation based on the `ezsystems/ezplatform-ee` metarepository, 
 run the following command to upgrade your database:
 
 ``` bash
@@ -21,5 +21,5 @@ Check the Location ID of the "Components" content item and set it as a value of
 - 60 # Components
 ```
 
-If you are upgrading between [[= product_name_com =]] versions,
+If you're upgrading between [[= product_name_com =]] versions,
 add the `content/read` Policy with the Owner Limitation set to `self` to the "Ecommerce registered users" Role.
diff --git a/docs/snippets/update/finish_the_update.md b/docs/snippets/update/finish_the_update.md
index 19b838766f..ed81a423ce 100644
--- a/docs/snippets/update/finish_the_update.md
+++ b/docs/snippets/update/finish_the_update.md
@@ -1,11 +1,11 @@
 ### A. Platform.sh changes
 
-If you are hosting your site on Ibexa Cloud be aware of the fact that Varnish is enabled by default as of v1.13.5, v2.4.3 and v2.5.0.
-If you are using Fastly, read about [how to disable Varnish](https://docs.platform.sh/frameworks/ibexa/fastly.html#remove-varnish-configuration).
+If you're hosting your site on Ibexa Cloud be aware of the fact that Varnish is enabled by default as of v1.13.5, v2.4.3 and v2.5.0.
+If you're using Fastly, read about [how to disable Varnish](https://docs.platform.sh/frameworks/ibexa/fastly.html#remove-varnish-configuration).
 
 ### B. Dump assets
 
-Dump web assets if you are using the `prod` environment. In `dev` this happens automatically:
+Dump web assets if you're using the `prod` environment. In `dev` this happens automatically:
 
 ``` sh
 yarn install
diff --git a/docs/snippets/update/merge_composer.md b/docs/snippets/update/merge_composer.md
index 2713ba4633..c84d28252f 100644
--- a/docs/snippets/update/merge_composer.md
+++ b/docs/snippets/update/merge_composer.md
@@ -6,7 +6,7 @@ or from [ezplatform.com](https://ezplatform.com), you may have incomplete histor
 To load the full history, run `git fetch upstream --unshallow` from the `update-[[= target_version =]]` branch, and run the merge again.
 
 Ignore the conflicts in `composer.lock`, because this file is regenerated when you execute `composer update` later.
-It is easiest to check out the version of `composer.lock` from the tag and add it to the changes:
+it's easiest to check out the version of `composer.lock` from the tag and add it to the changes:
 
 ``` bash
 git checkout --theirs composer.lock && git add composer.lock
@@ -41,7 +41,7 @@ git checkout -p composer.json
 Answer `no` (do not discard) to the requirement changes of `ezsystems` / `ibexa`  dependencies.
 Answer `yes` (discard) to removals of your changes.
 
-After you are done, inspect the file (you can use an editor or run `git diff composer.json`).
+After you're done, inspect the file (you can use an editor or run `git diff composer.json`).
 You may also test the file with `composer validate`,
 and test the dependencies by running `composer update --dry-run`
 (it outputs what it would do to the dependencies, without applying the changes).
diff --git a/docs/templating/design_engine/design_engine.md b/docs/templating/design_engine/design_engine.md
index 27d1038d86..904e18df72 100644
--- a/docs/templating/design_engine/design_engine.md
+++ b/docs/templating/design_engine/design_engine.md
@@ -75,7 +75,7 @@ ibexa_design_engine:
 ```
 
 Theme directories that you define have priority over the ones defined in `templates_theme_paths`.
-This ensures that it is always possible to override a template at the application level.
+This ensures that it's always possible to override a template at the application level.
 
 You can also add a global override directory, by listing paths without assigning them to a theme:
 
diff --git a/docs/templating/embed_and_list_content/list_content.md b/docs/templating/embed_and_list_content/list_content.md
index 109c14082a..2ab7b18564 100644
--- a/docs/templating/embed_and_list_content/list_content.md
+++ b/docs/templating/embed_and_list_content/list_content.md
@@ -21,7 +21,7 @@ First, in the [content view configuration](template_configuration.md), add the f
 ```
 
 `controller` defines which controller is used to render the view.
-In this example, it is the default [Query controller](content_queries.md).
+In this example, it's the default [Query controller](content_queries.md).
 
 ``` yaml
 [[= include_file('code_samples/front/list_content/config/packages/views.yaml', 11, 12) =]]
diff --git a/docs/templating/embed_and_list_content/render_images.md b/docs/templating/embed_and_list_content/render_images.md
index 7660c497e1..b2b32b1275 100644
--- a/docs/templating/embed_and_list_content/render_images.md
+++ b/docs/templating/embed_and_list_content/render_images.md
@@ -82,7 +82,7 @@ The following example shows how to use an image contained in an Image Field as a
 
 !!! note
 
-    This implementation is only an example and depends on the JavaScript framework you are using.
+    This implementation is only an example and depends on the JavaScript framework you're using.
 
 First, in the main template, render the Image Field with a custom template:
 
diff --git a/docs/templating/queries_and_controllers/create_custom_query_type.md b/docs/templating/queries_and_controllers/create_custom_query_type.md
index 1801a2d87c..be3700841e 100644
--- a/docs/templating/queries_and_controllers/create_custom_query_type.md
+++ b/docs/templating/queries_and_controllers/create_custom_query_type.md
@@ -18,7 +18,7 @@ First, add the following `LatestContentQueryType.php` file to `src/QueryType`:
 
 !!! tip
 
-    When the custom Query type is in the `App` namespace, like in the example above, it is registered automatically as a service.
+    When the custom Query type is in the `App` namespace, like in the example above, it's registered automatically as a service.
     Otherwise, register it with the `ibexa.query_type` service tag.
 
 The name defined in `getName()` is the one you use to identify the Query type in content view configuration.
diff --git a/docs/templating/templates/templates.md b/docs/templating/templates/templates.md
index 537a75f6bb..765e9c8f07 100644
--- a/docs/templating/templates/templates.md
+++ b/docs/templating/templates/templates.md
@@ -107,4 +107,4 @@ params:
 !!! note
 
     A custom variable can overwrite an existing variable,
-    so it is good practice to avoid existing variable names such as `content` or `location`.
+    so it's good practice to avoid existing variable names such as `content` or `location`.
diff --git a/docs/templating/twig_function_reference/field_twig_functions.md b/docs/templating/twig_function_reference/field_twig_functions.md
index abcfb39ad2..2256f377f4 100644
--- a/docs/templating/twig_function_reference/field_twig_functions.md
+++ b/docs/templating/twig_function_reference/field_twig_functions.md
@@ -104,7 +104,7 @@ the function returns the Field object in the main language.
 | `forcedLanguage` | `string` | {optional) Language to use (for example, "fre-FR"). |
 
 You can access the Field's value by using `(ibexa_field(content, 'my_field').value)`,
-but it is recommended to use the dedicated [`ibexa_field_value()`](#ibexa_field_value) function for this.
+but it's recommended to use the dedicated [`ibexa_field_value()`](#ibexa_field_value) function for this.
 
 You can use `ibexa_field()` to access the Field Type identifier:
 
diff --git a/docs/templating/twig_function_reference/site_context_twig_functions.md b/docs/templating/twig_function_reference/site_context_twig_functions.md
index 7275852298..f997166f81 100644
--- a/docs/templating/twig_function_reference/site_context_twig_functions.md
+++ b/docs/templating/twig_function_reference/site_context_twig_functions.md
@@ -10,7 +10,7 @@ To determine if given location is site context-aware, you can use site context [
 
 ### `ibexa_site_context_aware()`
 
-`ibexa_site_context_aware()` checks whether a given location is site context-aware, meaning it is not excluded from Site context using the 
+`ibexa_site_context_aware()` checks whether a given location is site context-aware, meaning it's not excluded from Site context using the 
 `ibexa.system.<scope>.site_context.excluded_paths` configuration.
 
 #### Examples
diff --git a/docs/templating/urls_and_routes/urls_and_routes.md b/docs/templating/urls_and_routes/urls_and_routes.md
index 1280fe7300..476ba68863 100644
--- a/docs/templating/urls_and_routes/urls_and_routes.md
+++ b/docs/templating/urls_and_routes/urls_and_routes.md
@@ -24,7 +24,7 @@ Use [`ibexa_url()`](url_twig_functions.md#ibexa_url) to get an absolute URL to a
 You can use the [`ibexa_route()`](url_twig_functions.md#ibexa_route) Twig function
 to create a RouteReference object based on the provided information.
 
-A RouteReference contains a route with its parameters and can be modified after it is created.
+A RouteReference contains a route with its parameters and can be modified after it's created.
 Here, the route is based on the ID of the Location.
 
 ``` html+twig
diff --git a/docs/tutorials/beginner_tutorial/2_create_the_content_model.md b/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
index 149a3f4d4c..f9a725346c 100644
--- a/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
+++ b/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
@@ -25,7 +25,7 @@ Every Field Type may have its own options, and comes with its own editing and vi
 
 The site will use two content types: **Ride** and **Landmark**.
 A Ride is a route of a bike trip. It can include one or more Landmarks - interesting places you can see along the way.
-More than one Ride can visit the same Landmark, so it is similar to an N-N relationship model in a database.
+More than one Ride can visit the same Landmark, so it's similar to an N-N relationship model in a database.
 
 In this step you'll add the first content type, Ride.
 
@@ -35,7 +35,7 @@ In the upper-right corner, click the avatar icon to unfold the drop-down menu an
 
 In the main menu, go to **Content** -> **Content types**.
 
-You will see a list of **Content type groups**. They are used to group content types in a logical way.
+You will see a list of **Content type groups**. they're used to group content types in a logical way.
 
 Select **Content** and then click the **Create** button. 
 
@@ -63,7 +63,7 @@ Confirm the creation of the content type by clicking **Save and close**.
 
 !!! note
 
-    If you are using [[= product_name_exp =]], the root content item in your installation is
+    If you're using [[= product_name_exp =]], the root content item in your installation is
     a Page called "Ibexa Digital Experience Platform".
     
     For this tutorial, swap it with its child, a Folder called "Ibexa Platform".
@@ -81,4 +81,4 @@ While in the folder, create a few of Rides using the **Create content** button,
 
 ![Ready for Step 3](bike_tutorial_all_rides_admin.png)
 
-Once you have two or more Rides in the Folder, you are ready to customize the homepage of the website.
+Once you have two or more Rides in the Folder, you're ready to customize the homepage of the website.
diff --git a/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md b/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md
index aa560e5cdc..c306b0ef18 100644
--- a/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md
+++ b/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md
@@ -74,7 +74,7 @@ Refresh the page and you will see a simple, unstyled version of the message.
 ### Add the site's main layout
 
 Most sites have a general layout which includes things like header with a logo or footer.
-It is displayed on every page, and the content of the page is placed inside it.
+it's displayed on every page, and the content of the page is placed inside it.
 
 To add a template like this to your site, create a `main_layout.html.twig` file in `templates/` and paste the following code into it:
 
@@ -252,7 +252,7 @@ yarn encore <dev|prod>
 
 !!! tip
 
-    You should run the `yarn encore` command with the [environment](environments.md) you are using.
+    You should run the `yarn encore` command with the [environment](environments.md) you're using.
 
     By default, [[= product_name =]] installs in the dev environment.
     If you changed it to prod, use `yarn encore prod`.
diff --git a/docs/tutorials/beginner_tutorial/5_display_a_list_of_content_items.md b/docs/tutorials/beginner_tutorial/5_display_a_list_of_content_items.md
index 64aa06abcf..ff4b7c7182 100644
--- a/docs/tutorials/beginner_tutorial/5_display_a_list_of_content_items.md
+++ b/docs/tutorials/beginner_tutorial/5_display_a_list_of_content_items.md
@@ -187,4 +187,4 @@ Edit the **Content/Read** policy line to add the `Media` section to **Limitation
 
 Now go to the homepage of your website and you will see the list of Rides.
 However, the Ride photos are too large and stretch the table.
-In the next step you will ensure they are displayed in proper size.
+In the next step you will ensure they're displayed in proper size.
diff --git a/docs/tutorials/beginner_tutorial/8_enable_account_registration.md b/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
index 06fdde16e0..40d8d2a3b6 100644
--- a/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
+++ b/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
@@ -139,7 +139,7 @@ Then create the `templates/user/registration_confirmation.html.twig` template:
             <h2>{{ 'Registration completed'|trans }}</h2>
 
             <div class="row confirmation-label">
-                {{ 'You are all set up and ready to go'|trans }}
+                {{ 'you're all set up and ready to go'|trans }}
             </div>
 
             <div class="row">
diff --git a/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md b/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md
index fbb5d20fb7..9341ccad63 100644
--- a/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md
+++ b/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md
@@ -17,7 +17,7 @@ Open your project with a clean installation and create the base directory for a
 ## The Value class
 
 The Value class of a Field Type is by design very simple.
-It is used to represent an instance of the Field Type within a content item.
+it's used to represent an instance of the Field Type within a content item.
 Each Field presents its data using an instance of the Type's Value class.
 For more information about Field Type Value, see [Value handling](type_and_value.md#value-handling).
 
@@ -39,7 +39,7 @@ The Point 2D is going to store two elements (coordinates for point 2D):
 - `x` value
 - `y` value
 
-At this point, it does not matter where they are stored. You want to focus on what the Field Type exposes as an API.
+At this point, it does not matter where they're stored. You want to focus on what the Field Type exposes as an API.
 
 `src/FieldType/Point2D/Value.php` should have the following properties:
 
diff --git a/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md b/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md
index d208a9265f..0517a54739 100644
--- a/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md
+++ b/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md
@@ -97,7 +97,7 @@ php bin/console cache:clear
 In the `src` folder create a `QueryType` subfolder and add [`QueryType/MenuQueryType.php`](https://github.com/ibexa/documentation-developer/blob/master/code_samples/tutorials/page_tutorial_starting_point/src/QueryType/MenuQueryType.php) to it.
 
 This file takes care of displaying the top menu (read up on it [in the documentation](content_queries.md#query-types)).
-It is not the scope of this tutorial and we won't go here into detail on how it works.
+it's not the scope of this tutorial and we won't go here into detail on how it works.
 
 This is what the structure of the new and modified files should look like:
 
@@ -128,4 +128,4 @@ Next, create a few content items of proper content types in each of these folder
 When you need an image, you can use one from [this image pack](img/photos.zip).
 This will let you compare effects of your work to screenshots in the tutorial.
 
-At this point you are ready to proceed with the next step.
+At this point you're ready to proceed with the next step.
diff --git a/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md b/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
index 20615c7149..d4d59082a9 100644
--- a/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
+++ b/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
@@ -23,7 +23,7 @@ Go to the front page of your website (`<yourdomain>`). You can see that it looks
 
 Log in to the back office. Go to **Content Structure**.
 The **Ibexa Digital Experience Platform** content item is the first page that is shown to the visitor.
-Here you can check what content type it belongs to: it is a Landing Page.
+Here you can check what content type it belongs to: it's a Landing Page.
 
 ![Ibexa Digital Experience Platform is a Landing Page](enterprise_tut_home_is_an_lp.png)
 
@@ -37,7 +37,7 @@ Remove the Tag block. Hover over it and select the trash icon from the menu.
 Click the **Field** button on the left of the top bar to switch to editing Page Fields.
 Change the Title of the page to "Home". Then, publish the Page to update its name.
 
-The design for the website you are making needs a layout with two zones: a main column and a narrower sidebar.
+The design for the website you're making needs a layout with two zones: a main column and a narrower sidebar.
 [[= product_name_exp =]] provides only a one-zone default layout, so you need to create a new one.
 
 Preparing a new layout requires three things:
diff --git a/docs/tutorials/page_and_form_tutorial/3_use_existing_blocks.md b/docs/tutorials/page_and_form_tutorial/3_use_existing_blocks.md
index d5bccbb861..bef044d26d 100644
--- a/docs/tutorials/page_and_form_tutorial/3_use_existing_blocks.md
+++ b/docs/tutorials/page_and_form_tutorial/3_use_existing_blocks.md
@@ -23,7 +23,7 @@ In `config/packages/ibexa_fieldtype_page.yaml` add the following code at the end
 ```
 
 The template makes use of an [image variation](images.md) (line 10).
-It is the thumbnail of the Dog Breed image that will be displayed in the block.
+it's the thumbnail of the Dog Breed image that will be displayed in the block.
 To configure this variation, open the `config/packages/image_variations.yaml` file and add the following code under the `image_variations` key:
 
 ``` yaml
diff --git a/docs/tutorials/page_and_form_tutorial/4_create_a_custom_block.md b/docs/tutorials/page_and_form_tutorial/4_create_a_custom_block.md
index c8efa53830..02f8d3b371 100644
--- a/docs/tutorials/page_and_form_tutorial/4_create_a_custom_block.md
+++ b/docs/tutorials/page_and_form_tutorial/4_create_a_custom_block.md
@@ -35,7 +35,7 @@ You also need to create the block template, `templates/blocks/random/default.ht
 
 ### Block listener
 
-Block listener provides the logic for the block. It is contained in `src/Event/RandomBlockListener.php`:
+Block listener provides the logic for the block. it's contained in `src/Event/RandomBlockListener.php`:
 
 ``` php
 [[= include_file('code_samples/tutorials/page_tutorial/src/Event/RandomBlockListener.php') =]]
diff --git a/docs/update_and_migration/from_1.x_2.x/update_app_to_2.5.md b/docs/update_and_migration/from_1.x_2.x/update_app_to_2.5.md
index 8c329fb2ce..d904197a85 100644
--- a/docs/update_and_migration/from_1.x_2.x/update_app_to_2.5.md
+++ b/docs/update_and_migration/from_1.x_2.x/update_app_to_2.5.md
@@ -21,8 +21,8 @@ disable it by removing the `new EzSystems\PlatformEEAssetsBundle\EzSystemsPlatfo
 Since v2.5 eZ Platform uses [Webpack Encore]([[= symfony_doc =]]/frontend.html#webpack-encore) for asset management.
 You need to install [Node.js](https://nodejs.org/en) and [Yarn](https://classic.yarnpkg.com/en/docs/install) to update to this version.
 
-In v2.5 it is still possible to use Assetic, like in earlier versions.
-However, if you are using the latest Bootstrap version, [`scssphp`](https://github.com/leafo/scssphp)
+In v2.5 it's still possible to use Assetic, like in earlier versions.
+However, if you're using the latest Bootstrap version, [`scssphp`](https://github.com/leafo/scssphp)
 will not compile correctly with Assetic.
 In this case, use Webpack Encore. See [Importing assets from a bundle](importing_assets_from_bundle.md) for more information.
 
diff --git a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
index 39d1a2c470..c14f3b25dd 100644
--- a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
+++ b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
@@ -14,7 +14,7 @@ Before you start this procedure, make sure you have completed the previous step,
 
 !!! note
 
-    If you are starting from version v2.2 or later, skip to the relevant section.
+    If you're starting from version v2.2 or later, skip to the relevant section.
 
 ### A. Update to v2.2
 
@@ -693,14 +693,14 @@ to add database tables for the Editorial Workflow.
 
 The built-in Forms folder is located in the Form Section in versions 2.4+.
 
-If you are updating your Enterprise installation, you need to add this Section manually and move the folder to it.
+If you're updating your Enterprise installation, you need to add this Section manually and move the folder to it.
 
 To allow anonymous users to access Forms, you also need to add the `content/read` Policy
 with the *Form* Section to the Anonymous User.
 
 #### Changes to Custom tags
 
-v2.4 changed the way of configuring custom tags. They are no longer configured under the `ezpublish` key,
+v2.4 changed the way of configuring custom tags. they're no longer configured under the `ezpublish` key,
 but one level higher in the YAML structure:
 
 ``` yaml
@@ -776,9 +776,9 @@ php bin/console ezplatform:reindex
 
 The introduction of [support for PostgreSQL](databases.md#using-postgresql) includes a change in the way database schema is generated.
 
-It is now created based on [YAML configuration](https://github.com/ezsystems/ezpublish-kernel/blob/master/eZ/Bundle/EzPublishCoreBundle/Resources/config/storage/legacy/schema.yaml), using the new [`DoctrineSchemaBundle`](https://github.com/ezsystems/doctrine-dbal-schema).
+it's now created based on [YAML configuration](https://github.com/ezsystems/ezpublish-kernel/blob/master/eZ/Bundle/EzPublishCoreBundle/Resources/config/storage/legacy/schema.yaml), using the new [`DoctrineSchemaBundle`](https://github.com/ezsystems/doctrine-dbal-schema).
 
-If you are updating your application according to the usual procedure, no additional actions are required.
+If you're updating your application according to the usual procedure, no additional actions are required.
 However, if you do not update your meta-repository, you need to take two additional steps:
 
 - enable `EzSystems\DoctrineSchemaBundle\DoctrineSchemaBundle()` in `AppKernel.php`
@@ -794,7 +794,7 @@ bin/console ezplatform:migrate:legacy_matrix
 
 #### Required manual cache clearing if using Redis
 
-If you are using Redis as your persistence cache storage you should always clear it manually after an upgrade.
+If you're using Redis as your persistence cache storage you should always clear it manually after an upgrade.
 You can do it in two ways, by using `redis-cli` and executing the following command:
 
 ```bash
@@ -833,7 +833,7 @@ CREATE INDEX ezpage_pages_content_id_version_no ON ezpage_pages(content_id, vers
 ##### Powered-By header
 
 In order to promote use of eZ Platform, `ezsystems/ez-support-tools` v1.0.10, as of eZ Platform v2.5.16, sets the Powered-By header.
-It is enabled by default and generates a header like `Powered-By: eZ Platform Enterprise v2`.
+it's enabled by default and generates a header like `Powered-By: eZ Platform Enterprise v2`.
 
 To omit the version number, use the following configuration:
 ``` yaml
@@ -854,7 +854,7 @@ ezplatform_support_tools:
 
 #### Updating to v2.5.18
 
-To update to v2.5.18, if you are using MySQL, additionally run the following update SQL command:
+To update to v2.5.18, if you're using MySQL, additionally run the following update SQL command:
 
 ``` sql
 ALTER TABLE ezpage_attributes MODIFY value LONGTEXT;
@@ -949,4 +949,4 @@ CREATE INDEX idx_workflow_name ON ezeditorialworkflow_workflows(workflow_name);
 
 ## Update to v3.3
 
-It is strongly recommended to also [update to the latest LTS, v3.3](update_from_2.5.md).
+it's strongly recommended to also [update to the latest LTS, v3.3](update_from_2.5.md).
diff --git a/docs/update_and_migration/from_1.x_2.x/update_from_1.x_2.x.md b/docs/update_and_migration/from_1.x_2.x/update_from_1.x_2.x.md
index 849ce4498e..7a84c569b4 100644
--- a/docs/update_and_migration/from_1.x_2.x/update_from_1.x_2.x.md
+++ b/docs/update_and_migration/from_1.x_2.x/update_from_1.x_2.x.md
@@ -6,7 +6,7 @@ latest_tag: '2.5.30'
 
 # From 1.13 and 2.x
 
-This update procedure applies if you are using:
+This update procedure applies if you're using:
 
 - v1.13
 - v2.x
diff --git a/docs/update_and_migration/from_2.5/adapt_code_to_v3.md b/docs/update_and_migration/from_2.5/adapt_code_to_v3.md
index 6bd5710b7c..710f64f5b9 100644
--- a/docs/update_and_migration/from_2.5/adapt_code_to_v3.md
+++ b/docs/update_and_migration/from_2.5/adapt_code_to_v3.md
@@ -44,7 +44,7 @@ In order to adapt, you'll need to move all your PHP code, such as controllers or
     ],
     ```
     
-    Once you are ready to refactor the code to `App` namespace, follow [Bye Bye AppBundle](https://symfonycasts.com/screencast/symfony4-upgrade/bye-appbundle) article.
+    Once you're ready to refactor the code to `App` namespace, follow [Bye Bye AppBundle](https://symfonycasts.com/screencast/symfony4-upgrade/bye-appbundle) article.
 
 #### View templates
 
diff --git a/docs/update_and_migration/from_2.5/to_3.2.md b/docs/update_and_migration/from_2.5/to_3.2.md
index a1c6cb0465..8c0e441b84 100644
--- a/docs/update_and_migration/from_2.5/to_3.2.md
+++ b/docs/update_and_migration/from_2.5/to_3.2.md
@@ -7,7 +7,7 @@ latest_tag: '3.2.8'
 
 !!! caution
 
-    Before you start updating to v3.3, make sure that you are currently using the latest version of v2.5 (v[[= latest_tag_2_5 =]]).
+    Before you start updating to v3.3, make sure that you're currently using the latest version of v2.5 (v[[= latest_tag_2_5 =]]).
     If not, refer to the [update guide for v2.5](update_db_to_2.5.md#d-update-to-v25).
 
 To move from v2.5 to v3.3, first, you need to bring the app to version v3.2.
diff --git a/docs/update_and_migration/from_2.5/to_3.3.latest.md b/docs/update_and_migration/from_2.5/to_3.3.latest.md
index 8e876f1ae4..f563756254 100644
--- a/docs/update_and_migration/from_2.5/to_3.3.latest.md
+++ b/docs/update_and_migration/from_2.5/to_3.3.latest.md
@@ -76,7 +76,7 @@ php bin/console ibexa:upgrade --force
 
 #### Database update
 
-If you are using MySQL, run the following update script:
+If you're using MySQL, run the following update script:
 
 ``` sql
 mysql -u <username> -p <password> <database_name> < vendor/ibexa/installer/upgrade/db/mysql/ibexa-3.3.1-to-3.3.2.sql
@@ -86,7 +86,7 @@ mysql -u <username> -p <password> <database_name> < vendor/ibexa/installer/upgra
 
 #### Commerce configuration
 
-If you are using Commerce, run the following migration action to update the way Commerce configuration is stored:
+If you're using Commerce, run the following migration action to update the way Commerce configuration is stored:
 
 ``` bash
 php bin/console ibexa:migrations:migrate --file=src/bundle/Resources/install/migrations/content/Components/move_configuration_to_settings.yaml
@@ -160,11 +160,11 @@ Run the following scripts:
 
 #### VCL configuration for Fastly
 
-[[= product_name =]] now supports Fastly shielding. If you are using Fastly and want to use shielding, you need to update your VCL files.
+[[= product_name =]] now supports Fastly shielding. If you're using Fastly and want to use shielding, you need to update your VCL files.
 
 !!! tip
 
-    Even if you do not plan to use Fastly shielding, it is recommended to update the VCL files for future compatibility.
+    Even if you do not plan to use Fastly shielding, it's recommended to update the VCL files for future compatibility.
 
 1. Locate the `vendor/ezsystems/ezplatform-http-cache-fastly/fastly/ez_main.vcl` file and update your VCL file with the recent changes.
 2. Do the same with `vendor/ezsystems/ezplatform-http-cache-fastly/fastly/ez_user_hash.vcl`.
diff --git a/docs/update_and_migration/from_2.5/to_3.3.md b/docs/update_and_migration/from_2.5/to_3.3.md
index c35fadd4b4..2851f41459 100644
--- a/docs/update_and_migration/from_2.5/to_3.3.md
+++ b/docs/update_and_migration/from_2.5/to_3.3.md
@@ -41,7 +41,7 @@ If you have not done it before, add the relevant meta-repository as an `upstream
 
 !!! tip
 
-    It is good practice to make git commits after every step of the update procedure.
+    it's good practice to make git commits after every step of the update procedure.
 
 ### A. Merge project skeleton
 
@@ -88,7 +88,7 @@ Resolve the conflicts in the following way:
 
 !!! caution
 
-    It is impossible to update an Enterprise edition (`ezsystems/ezplatform-ee`)
+    it's impossible to update an Enterprise edition (`ezsystems/ezplatform-ee`)
     to an [[= product_name_content =]] edition.
 
     Also, make sure that `composer.json` has the following `repositories` entry:
diff --git a/docs/update_and_migration/from_2.5/update_from_2.5.md b/docs/update_and_migration/from_2.5/update_from_2.5.md
index 506966bc0b..47deee7aaf 100644
--- a/docs/update_and_migration/from_2.5/update_from_2.5.md
+++ b/docs/update_and_migration/from_2.5/update_from_2.5.md
@@ -5,11 +5,11 @@ target_version: '3.2'
 
 # From 2.5
 
-This update procedure applies if you are using v2.5.
+This update procedure applies if you're using v2.5.
 
 Go through the following steps to update to the v3.3 LTS (v[[= latest_tag_3_3 =]]).
 
-Afterwards, it is strongly recommended to also [update to the latest v4.6 LTS](to_4.0.md).
+Afterwards, it's strongly recommended to also [update to the latest v4.6 LTS](to_4.0.md).
 
 1. [Check out a version](to_3.2.md)
 1. [Resolve conflicts](to_3.2.md#2-resolve-conflicts)
diff --git a/docs/update_and_migration/from_3.3/to_4.0.md b/docs/update_and_migration/from_3.3/to_4.0.md
index 7fef4e8f8c..5bafc7ba06 100644
--- a/docs/update_and_migration/from_3.3/to_4.0.md
+++ b/docs/update_and_migration/from_3.3/to_4.0.md
@@ -1,6 +1,6 @@
 # Update from v3.3.x to v4.0
 
-This update procedure applies if you are using v3.3.
+This update procedure applies if you're using v3.3.
 
 Go through the following steps to update to v4.0.
 
@@ -13,7 +13,7 @@ An additional compatibility layer makes the process of updating your code easier
 
 !!! note "Symfony 5.4"
 
-    If you are using Symfony 5.3, you need to update your installation to Symfony 5.4.
+    If you're using Symfony 5.3, you need to update your installation to Symfony 5.4.
     To do this, update your composer.json to refer to `5.4.*` instead or `5.3.*`.
 
     Refer to the relevant website skeleton for an example: [content](https://github.com/ibexa/content-skeleton/blob/v4.0.1/composer.json), [experience](https://github.com/ibexa/experience-skeleton/blob/v4.0.1/composer.json), [commerce](https://github.com/ibexa/commerce-skeleton/blob/v4.0.1/composer.json).
@@ -43,7 +43,7 @@ First, run:
 ### Update Flex server
 
 The `flex.ibexa.co` Flex server has been disabled.
-If you are using v4.0.2 or earlier v4.0 version, you need to update your Flex server.
+If you're using v4.0.2 or earlier v4.0 version, you need to update your Flex server.
 
 To do it, in your `composer.json` check whether the `https://flex.ibexa.co` endpoint is still listed in `extra.symfony.endpoint`. 
 If so, replace it with the new [`https://api.github.com/repos/ibexa/recipes/contents/index.json?ref=flex/main`](https://github.com/ibexa/website-skeleton/blob/v4.0.7/composer.json#L98) endpoint.
@@ -140,7 +140,7 @@ If you have no access to [[= product_name =]]'s `ibexa/installer` package, apply
 For every database connection you have configured, perform the following steps:
 
 1. Run `php bin/console doctrine:schema:update --dump-sql --em=ibexa_{connection}`
-2. Check the queries and verify that they are safe and will not damage the data.
+2. Check the queries and verify that they're safe and will not damage the data.
 3. Run `php bin/console doctrine:schema:update --dump-sql --em=ibexa_{connection} --force`
 
 Next, run the following commands to import necessary data migration scripts:
diff --git a/docs/update_and_migration/from_3.3/update_from_3.3.md b/docs/update_and_migration/from_3.3/update_from_3.3.md
index 9802d61a8e..1833eb9396 100644
--- a/docs/update_and_migration/from_3.3/update_from_3.3.md
+++ b/docs/update_and_migration/from_3.3/update_from_3.3.md
@@ -4,7 +4,7 @@ description: Update your installation to the latest v3.3 version from an earlier
 
 # Update from v3.3.x to v3.3.latest
 
-This update procedure applies if you are using a v3.3 installation without the latest maintenance release.
+This update procedure applies if you're using a v3.3 installation without the latest maintenance release.
 
 Go through the following steps to update to the latest maintenance release of v3.3 (v[[= latest_tag_3_3 =]]).
 
@@ -16,7 +16,7 @@ Go through the following steps to update to the latest maintenance release of v3
 
 !!! note
 
-    If you are using v3.3.15 or earlier v3.3 version, or encounter an error related to flex.ibexa.co, you need to [update your Flex server](#update-flex-server) first.
+    If you're using v3.3.15 or earlier v3.3 version, or encounter an error related to flex.ibexa.co, you need to [update your Flex server](#update-flex-server) first.
 
 Run:
 
@@ -48,7 +48,7 @@ composer dump-autoload
 ### Update Flex server
 
 The `flex.ibexa.co` Flex server has been disabled.
-If you are using v3.3.15 or earlier v3.3 version, you need to update your Flex server.
+If you're using v3.3.15 or earlier v3.3 version, you need to update your Flex server.
 In your `composer.json` check whether the `https://flex.ibexa.co` endpoint is still listed in `extra.symfony.endpoint`.
 If that's the case, you need to perform the following update procedure.
 
@@ -93,11 +93,11 @@ Review the changes to make sure your custom configuration wasn't affected.
 
 Remove the `vendor` folder to prevent issues related to the [new Flex server](#update-flex-server).
 
-Then, perform a database upgrade and other steps relevant to the version you are updating to.
+Then, perform a database upgrade and other steps relevant to the version you're updating to.
 
 !!! caution "Clear Redis cache"
 
-    If you are using Redis as your persistence cache storage you should always clear it manually after an upgrade.
+    If you're using Redis as your persistence cache storage you should always clear it manually after an upgrade.
     You can do it by executing the following command:
 
     ```bash
@@ -164,7 +164,7 @@ php bin/console ibexa:upgrade --force
 
 #### Database update
 
-If you are using MySQL, run the following update script:
+If you're using MySQL, run the following update script:
 
 ``` sql
 mysql -u<username> -p<password> <database_name> < vendor/ibexa/installer/upgrade/db/mysql/ibexa-3.3.1-to-3.3.2.sql
@@ -212,7 +212,7 @@ See https://github.com/ibexa/website-skeleton/pull/5/files for details of the pa
 
 #### Commerce configuration
 
-If you are using Commerce, run the following migration action to update the way Commerce configuration is stored:
+If you're using Commerce, run the following migration action to update the way Commerce configuration is stored:
 
 ``` bash
 mkdir --parent src/Migrations/Ibexa/migrations
@@ -292,7 +292,7 @@ Run the following scripts:
 
     Prior to v3.3.13, Symfony 5.3 was used by default.
 
-    If you are still using Symfony 5.3, you need to update your installation to Symfony 5.4.
+    If you're still using Symfony 5.3, you need to update your installation to Symfony 5.4.
     To do this, update your `composer.json` to refer to `5.4.*` instead or `5.3.*`.
 
     Refer to the relevant website skeleton: [content](https://github.com/ibexa/content-skeleton/blob/v3.3.13/composer.json), [experience](https://github.com/ibexa/experience-skeleton/blob/v3.3.13/composer.json), [commerce](https://github.com/ibexa/commerce-skeleton/blob/v3.3.13/composer.json).
@@ -368,11 +368,11 @@ See [Update Flex server](#update-flex-server).
 
 #### VCL configuration for Fastly
 
-Ibexa DXP now supports Fastly shielding. If you are using Fastly and want to use shielding, you need to update your VCL files.
+Ibexa DXP now supports Fastly shielding. If you're using Fastly and want to use shielding, you need to update your VCL files.
 
 !!! tip
 
-    Even if you do not plan to use Fastly shielding, it is recommended to update the VCL files for future compatibility.
+    Even if you do not plan to use Fastly shielding, it's recommended to update the VCL files for future compatibility.
 
 1. Locate the `vendor/ezsystems/ezplatform-http-cache-fastly/fastly/ez_main.vcl` file and update your VCL file with the recent changes.
 2. Do the same with `vendor/ezsystems/ezplatform-http-cache-fastly/fastly/ez_user_hash.vcl`.
diff --git a/docs/update_and_migration/from_4.0/to_4.1.md b/docs/update_and_migration/from_4.0/to_4.1.md
index 64a21a86e5..e0705b455e 100644
--- a/docs/update_and_migration/from_4.0/to_4.1.md
+++ b/docs/update_and_migration/from_4.0/to_4.1.md
@@ -4,7 +4,7 @@ description: Update your installation to the latest v4.1 version from v4.0.
 
 # Update from v4.0.x to v4.1
 
-This update procedure applies if you are using v4.0.0.
+This update procedure applies if you're using v4.0.0.
 
 Go through the following steps to update to v4.1.
 
@@ -25,7 +25,7 @@ First, update your application to the latest version of v4.0: v4.0.8.
 ### Update Flex server
 
 The `flex.ibexa.co` Flex server has been disabled.
-If you are using earlier v4.x versions, and you have not done it before,
+If you're using earlier v4.x versions, and you have not done it before,
 you have to update your Flex server.
 
 To do it, in your `composer.json`, check whether the `https://flex.ibexa.co` endpoint is still listed in `extra.symfony.endpoint`.
@@ -119,7 +119,7 @@ Apply the following database update scripts:
 
 #### Ibexa Open Source
 
-If you are using [[= product_name_oss =]] and have no access to [[= product_name =]]'s `ibexa/installer` package, database upgrade is not necessary.
+If you're using [[= product_name_oss =]] and have no access to [[= product_name =]]'s `ibexa/installer` package, database upgrade is not necessary.
 
 ## Update the app to latest version of v4.1
 
diff --git a/docs/update_and_migration/from_4.1/update_from_4.1.md b/docs/update_and_migration/from_4.1/update_from_4.1.md
index 4074a00473..f63b4ea71f 100644
--- a/docs/update_and_migration/from_4.1/update_from_4.1.md
+++ b/docs/update_and_migration/from_4.1/update_from_4.1.md
@@ -4,7 +4,7 @@ description: Update your installation to the v4.2.latest version from an v4.1 ve
 
 # Update from v4.1.x to v4.2
 
-This update procedure applies if you are using a v4.1 installation.
+This update procedure applies if you're using a v4.1 installation.
 
 [[% include 'snippets/update/temporary_v4_conflicts.md' %]]
 
@@ -86,13 +86,13 @@ Next, run data migration required by Product Categories:
 php bin/console ibexa:migrations:import vendor/ibexa/product-catalog/src/bundle/Resources/migrations/2022_06_23_09_39_product_categories.yaml --name=013_product_categories.yaml
 ```
 
-If you are using [[= product_name_exp =]] or [[= product_name_com =]], run data migration required by the Customer portal feature:
+If you're using [[= product_name_exp =]] or [[= product_name_com =]], run data migration required by the Customer portal feature:
 
 ``` bash
 php bin/console ibexa:migrations:import vendor/ibexa/corporate-account/src/bundle/Resources/migrations/corporate_account.yaml --name=001_corporate_account.yaml
 ```
 
-If you are using [[= product_name_com =]], additionally run:
+If you're using [[= product_name_com =]], additionally run:
 
 ``` bash
 php bin/console ibexa:migrations:import vendor/ibexa/corporate-account/src/bundle/Resources/migrations/corporate_account_commerce.yaml --name=002_corporate_account_commerce.yaml
diff --git a/docs/update_and_migration/from_4.2/update_from_4.2.md b/docs/update_and_migration/from_4.2/update_from_4.2.md
index e00af144be..0eea86cae2 100644
--- a/docs/update_and_migration/from_4.2/update_from_4.2.md
+++ b/docs/update_and_migration/from_4.2/update_from_4.2.md
@@ -4,7 +4,7 @@ description: Update your installation to the latest v4.3 version from v4.2.x.
 
 # Update from v4.2.x to v4.3
 
-This update procedure applies if you are using a v4.2 installation.
+This update procedure applies if you're using a v4.2 installation.
 
 [[% include 'snippets/update/temporary_v4_conflicts.md' %]]
 
@@ -70,7 +70,7 @@ Review the old YAML files and move your custom configuration to the relevant new
 
 #### Customer Portal self-registration
 
-If you are using [[= product_name_exp =]] or [[= product_name_com =]],
+If you're using [[= product_name_exp =]] or [[= product_name_com =]],
 run data migration required by the Customer Portal self-registration feature:
 
 ```bash
diff --git a/docs/update_and_migration/from_4.3/update_from_4.3.md b/docs/update_and_migration/from_4.3/update_from_4.3.md
index 8bcdc94a8b..dbc2b03471 100644
--- a/docs/update_and_migration/from_4.3/update_from_4.3.md
+++ b/docs/update_and_migration/from_4.3/update_from_4.3.md
@@ -4,7 +4,7 @@ description: Update your installation to the latest v4.4 version from v4.3.x.
 
 # Update from v4.3.x to v4.4
 
-This update procedure applies if you are using the newest v4.3 installation.
+This update procedure applies if you're using the newest v4.3 installation.
 
 This release deprecates all Commerce packages in[[= product_name =]]. They will be removed in v5.
 Until that time, they will be maintained by Ibexa with fixes, including security fixes, but they won't be further developed.
diff --git a/docs/update_and_migration/from_4.3/update_from_4.3_new_commerce.md b/docs/update_and_migration/from_4.3/update_from_4.3_new_commerce.md
index 9fa615f70c..ad2475a351 100644
--- a/docs/update_and_migration/from_4.3/update_from_4.3_new_commerce.md
+++ b/docs/update_and_migration/from_4.3/update_from_4.3_new_commerce.md
@@ -126,7 +126,7 @@ Review the old YAML files and move your custom configuration to the relevant new
 ### Flysystem v2
 
 Local adapters' `directory` key changed to `location`.
-It is defined in `config/packages/oneup_flysystem.yaml`:
+it's defined in `config/packages/oneup_flysystem.yaml`:
 
 ```yaml
 oneup_flysystem:
@@ -145,7 +145,7 @@ composer recipe:install --force --reset -- oneup/flysystem-bundle
 ### Remove `ibexa/commerce-*` packages with dependencies
 
 Remove the following bundles from `config/bundles.php`.
-You do not have to remove third-party bundles (`FOS\` to `JMS\`) if they are used by your installation.
+You do not have to remove third-party bundles (`FOS\` to `JMS\`) if they're used by your installation.
 
 === "[[= product_name_content =]]"
 
@@ -246,7 +246,7 @@ You do not have to remove third-party bundles (`FOS\` to `JMS\`) if they are use
     ```
 
 Next, remove related extensions' configuration.
-You do not have to remove third-party bundles (for example `config/packages/fos_rest.yaml`) if they are used by your installation.
+You do not have to remove third-party bundles (for example `config/packages/fos_rest.yaml`) if they're used by your installation.
 
 === "[[= product_name_content =]]"
 
@@ -299,7 +299,7 @@ Finally, remove related routes by deleting `config/routes/ibexa_commerce.yaml` f
 
 ### Update the database
 
-Next, update the database if you are using Ibexa Commerce.
+Next, update the database if you're using Ibexa Commerce.
 Ibexa Content and Ibexa Experience do not require the database update.
 
 [[% include 'snippets/update/db/db_backup_warning.md' %]]
@@ -339,7 +339,7 @@ composer run post-install-cmd
 
 ### Customer Portal self-registration
 
-If you are using Ibexa Experience or Ibexa Commerce,
+If you're using Ibexa Experience or Ibexa Commerce,
 you can now run data migration required by the Customer Portal applications feature to finish the update process:
 
 ```bash
diff --git a/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md b/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md
index 2d1fdeb3af..c8634734c0 100644
--- a/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md
+++ b/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md
@@ -73,7 +73,7 @@ Review the old YAML files and move your custom configuration to the relevant new
 #### Flysystem v2
 
 Local adapters' `directory` key changed to `location`.
-It is defined in `config/packages/oneup_flysystem.yaml`:
+it's defined in `config/packages/oneup_flysystem.yaml`:
 
 ```yaml
 oneup_flysystem:
@@ -174,7 +174,7 @@ ibexa:
 
 ### Update the database
 
-Next, update the database if you are using Ibexa Commerce.
+Next, update the database if you're using Ibexa Commerce.
 Ibexa Content and Ibexa Experience do not require the database update.
 
 [[% include 'snippets/update/db/db_backup_warning.md' %]]
@@ -215,7 +215,7 @@ composer run post-install-cmd
 
 ### Customer Portal self-registration
 
-If you are using Ibexa Experience or Ibexa Commerce,
+If you're using Ibexa Experience or Ibexa Commerce,
 run data migration required by the Customer Portal applications feature:
 
 ```bash
diff --git a/docs/update_and_migration/from_4.4/update_from_4.4.md b/docs/update_and_migration/from_4.4/update_from_4.4.md
index f392bab65a..c3efd53566 100644
--- a/docs/update_and_migration/from_4.4/update_from_4.4.md
+++ b/docs/update_and_migration/from_4.4/update_from_4.4.md
@@ -4,7 +4,7 @@ description: Update your installation to the latest v4.5 version from v4.4.x.
 
 # Update from v4.4.x to v4.5
 
-This update procedure applies if you are using a v4.4 installation.
+This update procedure applies if you're using a v4.4 installation.
 
 ## Update from v4.4.x to v4.4.latest
 
@@ -193,7 +193,7 @@ composer run post-install-cmd
 
 ## Run data migration
 
-If you are using Ibexa Experience or Ibexa Commerce,
+If you're using Ibexa Experience or Ibexa Commerce,
 you can now run data migration required by the Customer Portal and Commerce features to finish the update process:
 
 - Customer Portal [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
diff --git a/docs/update_and_migration/from_4.5/update_from_4.5.md b/docs/update_and_migration/from_4.5/update_from_4.5.md
index f980cd4076..b41783863c 100644
--- a/docs/update_and_migration/from_4.5/update_from_4.5.md
+++ b/docs/update_and_migration/from_4.5/update_from_4.5.md
@@ -4,7 +4,7 @@ description: Update your installation to the latest v4.6 version from v4.5.x.
 
 # Update from v4.5.x to v4.6
 
-This update procedure applies if you are using a v4.5 installation.
+This update procedure applies if you're using a v4.5 installation.
 
 ## Update from v4.5.x to v4.5.latest
 
@@ -251,7 +251,7 @@ php bin/console ibexa:migrations:migrate --file=2023_12_06_15_00_image_content_t
 
 ### Dashboard migration [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
-If you are using [[= product_name_exp =]] or [[= product_name_com =]],
+If you're using [[= product_name_exp =]] or [[= product_name_com =]],
 you must run data migration required by the dashboard and other features to finish the upgrade process:
 
 ```bash
@@ -500,7 +500,7 @@ Run the following scripts:
 The configuration of the package `ibexa/notifications` has changed.
 This package is required by other packages, such as `ibexa/connector-actito` for [Transactional emails](https://doc.ibexa.co/en/latest/commerce/transactional_emails/transactional_emails/), `ibexa/payment`, or `ibexa/user`.
 
-If you are customizing the configuration of the `ibexa/notifications` package, and using SiteAccess aware configuration to change the `Notification` subscriptions, you have to manually change your configuration by using the new node name `notifier` instead of the old `notifications`.
+If you're customizing the configuration of the `ibexa/notifications` package, and using SiteAccess aware configuration to change the `Notification` subscriptions, you have to manually change your configuration by using the new node name `notifier` instead of the old `notifications`.
 
 For example, the following v4.6.2 config:
 
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/common_issues.md b/docs/update_and_migration/migrate_to_ibexa_dxp/common_issues.md
index 6e1fc5b471..c90114e893 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/common_issues.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/common_issues.md
@@ -77,7 +77,7 @@ You can read more about this issue here: [EZP-24882](https://issues.ibexa.co/bro
 
 ## Listing sub-content
 
-It is possible that after upgrade `sort_key_string` is left empty. This may cause problems
+it's possible that after upgrade `sort_key_string` is left empty. This may cause problems
 in searches throughout the API. The cleanup script will check if Fields of given Field
 Type have correct sort key, and update it if needed.
 
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish.md b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish.md
index 716cbdaa64..5a58fc5066 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish.md
@@ -35,7 +35,7 @@ Together these major improvements make it practically impossible to run eZ Platf
 
 ### From legacy (4.x or 5.x) to Platform stack (5.4/2014.11)
 
-If you are coming directly from legacy (4.x), you need to follow the best practice 5.x Platform migration path and do the following:
+If you're coming directly from legacy (4.x), you need to follow the best practice 5.x Platform migration path and do the following:
 
 - Rewrite custom Field Types for the new Platform stack. Alternatively you can use Null Field Type as a dummy implementation for the custom Field Types that you don't want to migrate. Using Null Field Type will prevent errors from the Platform Stack, see [Null Field Type Reference](nullfield.md)
 - Rewrite custom web front end to use the new Platform/Symfony stack, see [Beginner Tutorial](beginner_tutorial.md)
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
index e039efce2b..dcb8c740b3 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
@@ -29,9 +29,9 @@ You can then proceed with consecutive upgrades to further versions: v1.13 LTS an
 
 !!! note
 
-    If you are migrating from a legacy eZ Publish version, this page contains the information you need. However, first have a look at an overview of the process in [Migrating from eZ Publish](migrating_from_ez_publish.md).
+    If you're migrating from a legacy eZ Publish version, this page contains the information you need. However, first have a look at an overview of the process in [Migrating from eZ Publish](migrating_from_ez_publish.md).
 
-This section describes how to upgrade your existing  eZ Publish Platform  5.4/2014.11 installation to eZ Platform and eZ Enterprise. Make sure that you have a working [backup](backup.md) of the site before you do the actual upgrade, and that the installation you are performing the upgrade on is offline.
+This section describes how to upgrade your existing  eZ Publish Platform  5.4/2014.11 installation to eZ Platform and eZ Enterprise. Make sure that you have a working [backup](backup.md) of the site before you do the actual upgrade, and that the installation you're performing the upgrade on is offline.
 
 ### Note on Paths
 
@@ -44,7 +44,7 @@ This section describes how to upgrade your existing  eZ Publish Platform  5.4
     - PHP 7.1 or higher
     - MariaDB or MySQL 5.5 or higher _(Postgres possible for upgrades, but not yet supported by the installer for new installations)_
     - Browser from 2017 or newer for use with eZ Platform backend UI
-- This page assumes you have composer installed on the machine and that it is a recent version.
+- This page assumes you have composer installed on the machine and that it's a recent version.
 
 !!! tip "Clearing cache"
 
@@ -181,7 +181,7 @@ As eZ Publish legacy is installed via composer, we need to take care of placing
 
 1. For design and settings files that you typically version in git, you can now take advantage of Legacy Bridge's built-in symlink convention. So as installation already hinted about, you can generate a structure and set up symlinks using `bin/console ezpublish:legacy:symlink -c`. This will create folders you can use below in `<new-ez-root>/src/legacy_files/`.
 
-1. The same goes for the `<new-ez-root>/ezpublish_legacy/var/[<site>/]storage` folder. However, as it is typically not versioned in git, there's no predefined convention for this. If you create a folder within your project structure for symlinking into this folder, as opposed to a mount somewhere else, make sure to mark this folder as ignored by git once it and the corresponding `.keep` file have been added to your checkout. The example below will assume `<new-ez-root>/src/legacy_files/storage` was created for this purpose, if you opt for something else just adjust the instructions.
+1. The same goes for the `<new-ez-root>/ezpublish_legacy/var/[<site>/]storage` folder. However, as it's typically not versioned in git, there's no predefined convention for this. If you create a folder within your project structure for symlinking into this folder, as opposed to a mount somewhere else, make sure to mark this folder as ignored by git once it and the corresponding `.keep` file have been added to your checkout. The example below will assume `<new-ez-root>/src/legacy_files/storage` was created for this purpose, if you opt for something else just adjust the instructions.
 
 #### 2.5.2 Upgrade the legacy distribution files
 
@@ -238,9 +238,9 @@ Import to your database the changes provided in one of the following files. It's
 
 `Postgres: <new-ez-root>/vendor/ezsystems/ezpublish-kernel/data/update/postgres/dbupdate-5.4.0-to-6.13.0.sql`
 
-### 3.2. Once you are ready to migrate content to Platform Field Types
+### 3.2. Once you're ready to migrate content to Platform Field Types
 
-Steps here should only be done once you are ready to move away from legacy and Legacy Bridge, as the following Field Types are not supported by legacy. In other words, content you have migrated will not be editable in legacy admin interface anymore, but rather in the more modern eZ Platform back-end UI, allowing you to take full advantage of what the Platform has to offer.
+Steps here should only be done once you're ready to move away from legacy and Legacy Bridge, as the following Field Types are not supported by legacy. In other words, content you have migrated will not be editable in legacy admin interface anymore, but rather in the more modern eZ Platform back-end UI, allowing you to take full advantage of what the Platform has to offer.
 
 The Field Types unsupported in eZ Platform are:
 
@@ -264,13 +264,13 @@ For Field Types which do not have specific procedures below, you must take one o
 
 #### 3.2.1 Migrate XmlText content to RichText
 
-You should test the XmlText to RichText conversion before you apply it to a production database. RichText has a stricter validation compared to XmlText and you may have to fix some of your XmlText before you are able to convert it to RichText.
+You should test the XmlText to RichText conversion before you apply it to a production database. RichText has a stricter validation compared to XmlText and you may have to fix some of your XmlText before you're able to convert it to RichText.
 Run the conversion script on a copy of your production database as the script is rather resource-intensive.
 
 `php -d memory_limit=1536M bin/console ezxmltext:convert-to-richtext --dry-run --export-dir=ezxmltext-export --export-dir-filter=notice,warning,error --concurrency 4 -v`
 
 - `-d memory_limit=1536M` specifies that each conversion process gets 1536MB of memory. This should be more than sufficient for most databases. If you have small `ezxmltext` documents, you may decrease the limit. If you have huge `ezxmltext` documents, you may need to increase it. See PHP documentation for more information about the [memory_limit setting](http://php.net/manual/en/ini.core.php#ini.memory-limit).
-- `--dry-run` prevents the conversion script from writing anything back to the database. It just tests if it is able to convert all the `ezxmltext` documents.
+- `--dry-run` prevents the conversion script from writing anything back to the database. It just tests if it's able to convert all the `ezxmltext` documents.
 - `--export-dir` specifies a directory where it will dump the `ezxmltext` for content object attributes which the conversion script finds problems with
 - `--export-dir-filter` specifies what severity the problems found needs to be before the script dumps the `ezxmltext`:
     - `notice`: `ezxmltext` contains problems which the conversion tool was able to fix automatically and likely do not need manual intervention
@@ -305,7 +305,7 @@ If the `--image-content-types` option is not specified, the default setting `ima
 
     There is no corresponding `ImagesClassList[]` setting in eZ Platform. So even though you have customer image classes, you don't need to configure this in the eZ Platform configuration when migrating.
 
-If you later realize that you provided the convert script with incorrect image content type identifiers, it is perfectly safe to re-execute the command as long as you use the `--fix-embedded-images-only`.
+If you later realize that you provided the convert script with incorrect image content type identifiers, it's perfectly safe to re-execute the command as long as you use the `--fix-embedded-images-only`.
 
 So, if you first ran the command:
 
@@ -428,7 +428,7 @@ When the conversion tool detects links with no reference it will issue a warning
 
 The `<literal>` tag is not yet supported in eZ Platform. For more information about this, please have a look at [EZP-29328](https://issues.ibexa.co/browse/EZP-29328) and [EZP-29027](https://issues.ibexa.co/browse/EZP-29027).
 
-When you are ready to migrate your eZ Publish XmlText content to the eZ Platform RichText format and start using pure eZ Platform setup, start the conversion script without the `--dry-run` option. Execute the following from &lt;new-ez-root&gt;:
+When you're ready to migrate your eZ Publish XmlText content to the eZ Platform RichText format and start using pure eZ Platform setup, start the conversion script without the `--dry-run` option. Execute the following from &lt;new-ez-root&gt;:
 
 `php -d memory_limit=1536M bin/console ezxmltext:convert-to-richtext --export-dir=ezxmltext-export --export-dir-filter=notice,warning,error --concurrency 4 -v`
 
@@ -480,7 +480,7 @@ If you use Varnish, the recommended Varnish (4 or higher) VCL configuration can
 
 The officially recommended virtual configuration is now shipped in the `doc` folder, for both apache2 (`doc/apache2`) and nginx (`doc/nginx`). Both are built to be easy to understand and use, but aren't meant as drop-in replacements for your existing configuration.
 
-As was the case starting 5.4, one notable change is that `SetEnvIf` is now used to dynamically change rewrite rules depending on the Symfony environment. It is currently used for the assetic production rewrite rules.
+As was the case starting 5.4, one notable change is that `SetEnvIf` is now used to dynamically change rewrite rules depending on the Symfony environment. it's currently used for the assetic production rewrite rules.
 
 ## Step 5: Link assets
 
@@ -495,7 +495,7 @@ php bin/console assetic:dump --env=prod
 
 ##### Unstyled login screen after upgrade
 
-It is possible that after the upgrade your admin screen will be unstyled. This may happen because the new SiteAccess will not be available in the database. You can fix it by editing the permissions for the Anonymous user. Go to **Roles** in the Admin Panel and edit the limitations of the Anonymous user's `user/login` policy. Add all SiteAccesses to the limitation, save, and clear the browser cache. The login screen should now show proper styling.
+it's possible that after the upgrade your admin screen will be unstyled. This may happen because the new SiteAccess will not be available in the database. You can fix it by editing the permissions for the Anonymous user. Go to **Roles** in the Admin Panel and edit the limitations of the Anonymous user's `user/login` policy. Add all SiteAccesses to the limitation, save, and clear the browser cache. The login screen should now show proper styling.
 
 ##### Translating URLs
 
@@ -575,7 +575,7 @@ bin/console ezflow:migrate <legacy path> —ini=<block definitions> [—ini=<ano
 bin/console ezflow:migrate /var/www/legacy.application.com/ —ini=extension/myapplication/settings/block.ini.append.php
 ```
 
-**5.** You will be warned about the need to create a [backup](backup.md) of your database. **Proceed only if you are sure you have done it.**
+**5.** You will be warned about the need to create a [backup](backup.md) of your database. **Proceed only if you're sure you have done it.**
 
 A `MigrationBundle` will be generated in the `src/` folder.
 
diff --git a/docs/update_and_migration/update_ibexa_dxp.md b/docs/update_and_migration/update_ibexa_dxp.md
index bbeba46794..7175101c17 100644
--- a/docs/update_and_migration/update_ibexa_dxp.md
+++ b/docs/update_and_migration/update_ibexa_dxp.md
@@ -4,26 +4,26 @@ description: Update your installation to the latest supported version.
 
 # Updating Ibexa DXP
 
-To update [[= product_name =]] to a newer version, select the version you are currently using:
+To update [[= product_name =]] to a newer version, select the version you're currently using:
 
 === "I am using v1.13 or v2.x"
 
     If you have a v1.13 installation, or a v2.x installation lower than the latest v2.5,
     [update to the v2.5 LTS](from_1.x_2.x/update_from_1.x_2.x.md).
 
-    Afterwards, it is strongly recommended to [update to the v3.3 LTS](from_2.5/update_from_2.5.md) and then update to the latest LTS, [v4.6](from_4.5/update_from_4.5.md) (through [v4.0](from_3.3/to_4.0.md) up to v4.6).
+    Afterwards, it's strongly recommended to [update to the v3.3 LTS](from_2.5/update_from_2.5.md) and then update to the latest LTS, [v4.6](from_4.5/update_from_4.5.md) (through [v4.0](from_3.3/to_4.0.md) up to v4.6).
 
 === "I am using v2.5"
 
     If you have a v2.5 installation, [update to the v3.3 LTS](from_2.5/update_from_2.5.md).
 
-    Afterwards, it is strongly recommended to also update to the latest LTS, [v4.6](from_4.5/update_from_4.5.md) (through [v4.0](from_3.3/to_4.0.md) up to v4.6).
+    Afterwards, it's strongly recommended to also update to the latest LTS, [v4.6](from_4.5/update_from_4.5.md) (through [v4.0](from_3.3/to_4.0.md) up to v4.6).
 
 === "I am using v3.3"
 
     If you already have a v3.3 installation, [update to the latest v3.3 version](from_3.3/update_from_3.3.md).
 
-    Afterwards, it is strongly recommended to also update to the latest LTS, [v4.6](from_4.5/update_from_4.5.md) (through [v4.0](from_3.3/to_4.0.md) up to v4.6).
+    Afterwards, it's strongly recommended to also update to the latest LTS, [v4.6](from_4.5/update_from_4.5.md) (through [v4.0](from_3.3/to_4.0.md) up to v4.6).
 
 === "I am using v4.x"
 
diff --git a/docs/users/oauth_client.md b/docs/users/oauth_client.md
index 2825f0b574..7de09b83c9 100644
--- a/docs/users/oauth_client.md
+++ b/docs/users/oauth_client.md
@@ -74,7 +74,7 @@ To use `ResourceOwnerToExistingOrNewUserMapper`, you need to extend it in your c
 !!! tip "OAuth User content type"
 
     When you implement your own mapper for external login,
-    it is good practice to create a special User content type for users registered in this way.
+    it's good practice to create a special User content type for users registered in this way.
     The users who register through an external service do not have a separate password in the system.
     Instead, they log in by their external service's password.
 
diff --git a/docs/users/passwords.md b/docs/users/passwords.md
index d535027be5..5903c3e91f 100644
--- a/docs/users/passwords.md
+++ b/docs/users/passwords.md
@@ -19,7 +19,7 @@ The template for this email is located in `Resources/views/forgot_password/mail/
 You can [customize it according to your needs](add_login_form.md#customize-login-form).
 
 The validity of the password recovery token can be set using the `ibexa.system.<siteaccess>.security.token_interval_spec` parameter.
-By default, it is set to `PT1H` (one hour).
+By default, it's set to `PT1H` (one hour).
 
 ## Revoking passwords
 
diff --git a/docs/users/user_authentication.md b/docs/users/user_authentication.md
index 2aae30000a..eec22a098e 100644
--- a/docs/users/user_authentication.md
+++ b/docs/users/user_authentication.md
@@ -17,7 +17,7 @@ Depending on your context, you either want to create a Platform User, return an
 Whenever an *external* user is matched (i.e. one that does not come from Platform repository, like coming from LDAP), [[= product_name =]] kernel initiates an `MVCEvents::INTERACTIVE_LOGIN` event.
 Every service listening to this event receives an `Ibexa\Core\MVC\Symfony\Event\InteractiveLoginEvent` object which contains the original security token (that holds the matched user) and the request.
 
-Then, it is up to the listener to retrieve a Platform User from the Repository and to assign it back to the event object.
+Then, it's up to the listener to retrieve a Platform User from the Repository and to assign it back to the event object.
 This user is injected into the repository and used for the rest of the request.
 
 If no [[= product_name =]] User is returned, the Anonymous User is used.
@@ -31,7 +31,7 @@ The *API user* is mainly used for permission checks against the repository and
 
 ### Customize the User class
 
-It is possible to customize the user class used by extending `Ibexa\Core\MVC\Symfony\Security\EventListener\SecurityListener` service, which defaults to `Ibexa\Core\MVC\Symfony\Security\EventListener\SecurityListener`.
+it's possible to customize the user class used by extending `Ibexa\Core\MVC\Symfony\Security\EventListener\SecurityListener` service, which defaults to `Ibexa\Core\MVC\Symfony\Security\EventListener\SecurityListener`.
 
 You can override `getUser()` to return whatever User class you want, as long as it implements `Ibexa\Core\MVC\Symfony\Security\UserInterface`.
 

From 2a2efd2ae274191e606f8be4280f1da5c50dcfd7 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Wed, 9 Oct 2024 14:03:43 +0200
Subject: [PATCH 03/77] New fixes

---
 .../admin_panel/roles_admin_panel.md          |  2 +-
 .../system_information_admin_panel.md         |  2 +-
 .../admin_panel/users_admin_panel.md          |  2 +-
 .../back_office_elements/add_dropdowns.md     |  2 +-
 .../extending_thumbnails.md                   | 14 +++++-----
 .../back_office/browser/browser.md            | 16 ++++++------
 .../back_office/content_tree.md               |  4 +--
 .../back_office/notifications.md              |  4 +--
 .../back_office/subitems_list.md              |  2 +-
 .../configuration/dynamic_configuration.md    |  4 +--
 .../configuration/repository_configuration.md |  8 +++---
 .../content_organization/content_types.md     | 26 +++++++++----------
 .../content_organization/sections.md          | 14 +++++-----
 .../project_organization/architecture.md      |  2 +-
 docs/api/graphql/graphql_custom_ft.md         | 10 +++----
 docs/api/graphql/graphql_customization.md     |  4 +--
 docs/api/graphql/graphql_queries.md           |  2 +-
 docs/api/php_api/php_api.md                   |  4 +--
 .../adding_custom_media_type.md               |  2 +-
 docs/cdp/cdp.md                               |  4 +--
 docs/cdp/cdp_activation/cdp_data_export.md    | 24 ++++++++---------
 docs/cdp/cdp_installation.md                  |  8 +++---
 docs/commerce/checkout/checkout.md            |  6 ++---
 docs/commerce/checkout/checkout_api.md        |  2 +-
 .../content_availability.md                   |  6 ++---
 docs/content_management/content_model.md      | 10 +++----
 docs/content_management/content_relations.md  |  2 +-
 docs/content_management/locations.md          | 26 +++++++++----------
 28 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/docs/administration/admin_panel/roles_admin_panel.md b/docs/administration/admin_panel/roles_admin_panel.md
index 558ef0741a..87fbfdc2ae 100644
--- a/docs/administration/admin_panel/roles_admin_panel.md
+++ b/docs/administration/admin_panel/roles_admin_panel.md
@@ -36,7 +36,7 @@ A user can also belong to many groups, for example, Administrators, Editors, Sub
 
 Best practice is to avoid assigning roles to users directly.
 Model your content (content types, Sections, Locations etc.) in a way that can be accessed by generic roles.
-That way system will be more secure and easier to manage.
+That way system is be more secure and easier to manage.
 This approach also improves performance. Role assignments and policies are taken into account during search/load queries.
 
 See [Permissions overview](permissions.md) for further information
diff --git a/docs/administration/admin_panel/system_information_admin_panel.md b/docs/administration/admin_panel/system_information_admin_panel.md
index f94d09223c..37be8c2c22 100644
--- a/docs/administration/admin_panel/system_information_admin_panel.md
+++ b/docs/administration/admin_panel/system_information_admin_panel.md
@@ -5,6 +5,6 @@ description: System information provides basic system information such as versio
 # System Information
 
 The System Information panel in the back office is sourced in the [`ibexa/system-info` repository](https://github.com/ibexa/system-info).
-There you will also find basic system information such as versions of all installed packages.
+There you can also find basic system information such as versions of all installed packages.
 
 ![System Information](admin_panel_system_info.png "System Information")
diff --git a/docs/administration/admin_panel/users_admin_panel.md b/docs/administration/admin_panel/users_admin_panel.md
index 2a61f042d8..50f07a070a 100644
--- a/docs/administration/admin_panel/users_admin_panel.md
+++ b/docs/administration/admin_panel/users_admin_panel.md
@@ -14,4 +14,4 @@ All user groups and users can be accessed in the Admin panel by selecting **User
 !!! caution
 
     Be careful not to delete an existing user account.
-    If you do this, content created by this user will be broken and the application can face malfunction.
+    If you do this, content created by this user can be broken and the application can face malfunction.
diff --git a/docs/administration/back_office/back_office_elements/add_dropdowns.md b/docs/administration/back_office/back_office_elements/add_dropdowns.md
index 655e0c935c..a74834b483 100644
--- a/docs/administration/back_office/back_office_elements/add_dropdowns.md
+++ b/docs/administration/back_office/back_office_elements/add_dropdowns.md
@@ -131,7 +131,7 @@ The following attributes are available:
 ### Initialize
 
 All drop-downs are searched and initialized automatically in `admin.dropdown.js`.
-To extend or modify the search, you need to add a `custom_init` attribute to the drop-down Twig parameters. Otherwise it will be initialized two times.
+To extend or modify the search, you need to add a `custom_init` attribute to the drop-down Twig parameters. Otherwise it's initialized two times.
 Next, run the following JavaScript code:
 
 ```javascript
diff --git a/docs/administration/back_office/back_office_elements/extending_thumbnails.md b/docs/administration/back_office/back_office_elements/extending_thumbnails.md
index e9554d25be..7b262a74b7 100644
--- a/docs/administration/back_office/back_office_elements/extending_thumbnails.md
+++ b/docs/administration/back_office/back_office_elements/extending_thumbnails.md
@@ -5,7 +5,7 @@ description: Customize thumbnails use for content items in the back office.
 # Extending thumbnails
 
 The thumbnails API enable you to easily choose an image for a specific content.
-If you do not want to use custom thumbnails, `ContentType` will be used instead.
+If you do not want to use custom thumbnails, `ContentType` is used instead.
 
 ## Thumbnail mechanism 
 
@@ -25,16 +25,16 @@ For example for users thumbnails can be downloaded from an avatar-generating ser
 For this layer there are following default implementations:
 
 - The mechanism looks for Fields that can be thumbnail, if found, the mechanism moves to the second layer.
-- If there are no Fields that can be a thumbnail, the content type icon will be used as a thumbnail.
+- If there are no Fields that can be a thumbnail, the content type icon is used as a thumbnail.
 
 ### Second layer
 
 Second layer of mechanism enables selection of thumbnail from a Field that the first layer has found. 
 It searches the content type for all the Fields e.g. images with function "Can be a thumbnail" turned on.
 
-If there is more than one Field in the content type that can be used as a thumbnail, this layer will return the first nonempty Field as a thumbnail.
+If there is more than one Field in the content type that can be used as a thumbnail, this layer returns the first nonempty Field as a thumbnail.
 
-This mechanism can be modified to fit your site needs, so you can decide from where and how the thumbnails will be downloaded.
+This mechanism can be modified to fit your site needs, so you can decide from where and how the thumbnails is downloaded.
 
 ### Create a thumbnail mechanism 
 
@@ -51,7 +51,7 @@ Next, add the strategy with the `ibexa.repository.thumbnail.strategy.content` ta
 [[= include_file('code_samples/back_office/thumbnails/config/custom_services.yaml') =]]
 ```
 
-Priority `100` will allow this strategy to be used first on a clean installation or before any other strategy with lower priority.
+Priority `100` allows this strategy to be used first on a clean installation or before any other strategy with lower priority.
 
 At this point you can go to the back office and check the results.
 
@@ -69,8 +69,8 @@ Any Field Type can generate a thumbnail, e.g.:
 
 ### Add eztext Field as thumbnail
 
-First, create a strategy that will add support for `eztext` as the thumbnail.
-It will enable you to add a thumbnail URL in the text field.
+First, create a strategy that adds support for `eztext` as the thumbnail.
+It enables you to add a thumbnail URL in the text field.
 
 Add `FieldValueUrl.php` in `src/Thumbnails`.
 
diff --git a/docs/administration/back_office/browser/browser.md b/docs/administration/back_office/browser/browser.md
index 275a68e28f..6ff384c574 100644
--- a/docs/administration/back_office/browser/browser.md
+++ b/docs/administration/back_office/browser/browser.md
@@ -56,17 +56,17 @@ There you can set the following properties:
 |-------------------|------|--------|----------|
 |multiple</br>`multiple`|true</br>false|no|The possibility to choose multiple Locations.|
 |multiple_items_limit</br>`multipleItemsLimit`|number|no|Maximum number of items with configuration `multiple: true`.|
-|root_location_id</br>`rootLocationId`|number|no|UDW will display Locations only below this content tree element.|
-|starting_location_id</br>`startingLocationId`|number|no|This Location will be displayed as a starting Location in UDW.|
+|root_location_id</br>`rootLocationId`|number|no|UDW displays Locations only below this content tree element.|
+|starting_location_id</br>`startingLocationId`|number|no|This Location is displayed as a starting Location in UDW.|
 |containers_only</br>`containersOnly`|true</br>false|no|When set to `true` only containers can be selected.|
 |allowed_content_types</br>`allowedContentTypes`|null</br>[]</br>[`contentTypeIdentifier`]|yes|List of allowed content types:</br>`null` – all content types are allowed,</br>`[]` – empty table, no content types are allowed.|
-|active_sort_clause</br>`activeSortClause`|DatePublished</br>ContentName|no|Sort Clause by which children in the content tree will be sorted.|
+|active_sort_clause</br>`activeSortClause`|DatePublished</br>ContentName|no|Sort Clause by which children in the content tree is sorted.|
 |active_sort_order</br>`activeSortOrder`|ascending</br>descending|no|Sorting order of the children in the content tree.|
 |active_tab</br>`activeTab`|browse</br>search</br>bookmarks|no|Starting tab in the UDW.|
 |active_view</br>`activeView`|finder</br>grid</br>tree|no|Starting view in the UDW.|
 |allow_redirects</br>`allowRedirects`|true</br>false|yes|Allows to redirect content from the UDW tab to another page, for example, to content edit page.|
-|selected_locations</br>`selectedLocations`|[]</br>[locationId]|no|Location that will be selected automatically.|
-|allow_confirmation</br>`allowConfirmation`|true</br>false|yes|Shows confirmations buttons in the UDW. If set to false, it will not be possible to confirm selection.|
+|selected_locations</br>`selectedLocations`|[]</br>[locationId]|no|Location that is selected automatically.|
+|allow_confirmation</br>`allowConfirmation`|true</br>false|yes|Shows confirmations buttons in the UDW. If set to false, it's not possible to confirm selection.|
 
 ### Content on the Fly group
 
@@ -77,7 +77,7 @@ There you can set the following properties:
 |preselected_language</br>`preselectedLanguage`|null</br>languageCode|yes|First language on the Content on the Fly language list:</br>null - language order defined in the system.|
 |preselected_content_type</br>`preselectedContentType`|null</br>contentTypeIdentifier|yes|Content selected in Content on the Fly.|
 |hidden</br>`hidden`|true</br>false|yes|Content on the Fly visibility.|
-|auto_confirm_after_publish</br>`autoConfirmAfterPublish`|true</br>false|yes|If set to `true` UDW will be automatically closed after publishing the content.|
+|auto_confirm_after_publish</br>`autoConfirmAfterPublish`|true</br>false|yes|If set to `true` UDW is automatically closed after publishing the content.|
 
 ### Tabs config group
 
@@ -125,7 +125,7 @@ ibexa:
 
 ### Add new configuration to button
 
-In the `ibexa_udw_config` Twig helper, define a specific part of YAML configuration that will be used to render the **Content Browser**.
+In the `ibexa_udw_config` Twig helper, define a specific part of YAML configuration that is used to render the **Content Browser**.
 You can find Twig helper in your button template.
 In the example below, a key is pointing to `my_custom_udw` configuration and has additional parameter `johndoe`.
 
@@ -141,7 +141,7 @@ In the example below, a key is pointing to `my_custom_udw` configuration and has
 
 ### Additional parameters
 
-If an event listener catches additional parameters passed with context, it will use a configuration specified for it in the event subscriber.
+If an event listener catches additional parameters passed with context, it uses a configuration specified for it in the event subscriber.
 
 In the example below, the `johndoe` parameter enables the user to choose multiple items from a **Browser window** by changing `multiple: false` from `my_custom_udw` configuration to `multiple: true`.
 
diff --git a/docs/administration/back_office/content_tree.md b/docs/administration/back_office/content_tree.md
index d6ad408527..71d0e76f36 100644
--- a/docs/administration/back_office/content_tree.md
+++ b/docs/administration/back_office/content_tree.md
@@ -19,7 +19,7 @@ ibexa:
         # any SiteAccess or SiteAccess group
         admin_group:
             content_tree_module:
-                # defines how many children will be shown after expanding parent
+                # defines how many children is be shown after expanding parent
                 load_more_limit: 15
                 # users won't be able to load more children than that
                 children_load_max_limit: 200
@@ -33,7 +33,7 @@ ibexa:
                    - article
                 # ID of Location to use as tree root. If omitted - content.tree_root.location_id setting is used.
                 tree_root_location_id: 2
-                # list of Location IDs for which content tree's root Location will be changed
+                # list of Location IDs for which content tree's root Location is changed
                 contextual_tree_root_location_ids:
                    - 2 # Home (Content structure)
                    - 5 # Users
diff --git a/docs/administration/back_office/notifications.md b/docs/administration/back_office/notifications.md
index 5dc6db891f..cb0d83597b 100644
--- a/docs/administration/back_office/notifications.md
+++ b/docs/administration/back_office/notifications.md
@@ -12,7 +12,7 @@ It appears to whoever is doing a specific operation in the back office.
 ![Example of an info notification](notification2.png "Example of the notification bar")
 
 [Custom notifications](#create-custom-notifications) are sent to a specific user.
-They will appear in their profile in the back office.
+They appears in their profile in the back office.
 
 ![Notification in profile](notification3.png)
 
@@ -53,7 +53,7 @@ Dispatch the event with `document.body.dispatchEvent(eventInfo);`.
 
 ## Create custom notifications
 
-You can send your own custom notifications to the user which will be displayed in the user menu.
+You can send your own custom notifications to the user which are displayed in the user menu.
 
 To create a new notification you must use the `createNotification(Ibexa\Contracts\Core\Repository\Values\Notification\CreateStruct $createStruct)` method from `Ibexa\Contracts\Core\Repository\NotificationService`.
 
diff --git a/docs/administration/back_office/subitems_list.md b/docs/administration/back_office/subitems_list.md
index 031a491942..23de941093 100644
--- a/docs/administration/back_office/subitems_list.md
+++ b/docs/administration/back_office/subitems_list.md
@@ -51,7 +51,7 @@ The `<SubItemsModule />` module can handle additional properties. There are two
 
 ### Required props
 
-Without all the following properties the Sub-items module will not work.
+Without all the following properties the Sub-items module cannot work.
 
 - **parentLocationId** _{Number}_ - parent Location ID
 - **restInfo** _{Object}_ - backend config object:
diff --git a/docs/administration/configuration/dynamic_configuration.md b/docs/administration/configuration/dynamic_configuration.md
index 7822bf81cc..c8a37b5e43 100644
--- a/docs/administration/configuration/dynamic_configuration.md
+++ b/docs/administration/configuration/dynamic_configuration.md
@@ -55,8 +55,8 @@ $myParamSettingAdmin = $configResolver->getParameter( 'my_param', 'myapp', 'admi
 Both `getParameter()` and `hasParameter()` can take three arguments:
 
 1. `$paramName` - the name of the parameter
-2. `$namespace` - your application namespace, `myapp` in the previous example. If null, the default namespace will be used, which is `ibexa.site_access.config` by default.
-3. `$scope` - a SiteAccess name. If null, the current SiteAccess will be used.
+2. `$namespace` - your application namespace, `myapp` in the previous example. If null, the default namespace is used, which is `ibexa.site_access.config` by default.
+3. `$scope` - a SiteAccess name. If null, the current SiteAccess is used.
 
 ## Inject ConfigResolver into services
 
diff --git a/docs/administration/configuration/repository_configuration.md b/docs/administration/configuration/repository_configuration.md
index 9ba061e09d..66e0cc72a6 100644
--- a/docs/administration/configuration/repository_configuration.md
+++ b/docs/administration/configuration/repository_configuration.md
@@ -31,7 +31,7 @@ ibexa:
     As such, you can refer to [DoctrineBundle's documentation](https://github.com/doctrine/DoctrineBundle/blob/2.7.x/Resources/doc/configuration.rst#doctrine-dbal-configuration).
 
 If no Repository is specified for a SiteAccess or SiteAccess group,
-the first Repository defined under `ibexa.repositories` will be used:
+the first Repository defined under `ibexa.repositories` is used:
 
 ``` yaml
 ibexa:
@@ -199,7 +199,7 @@ This limit is enforced on publishing a new version and only covers archived vers
 !!! tip
 
     Don't set `default_version_archive_limit` too high.
-    In Legacy storage engine you will see performance degradation if you store too many versions.
+    In Legacy storage engine you can see performance degradation if you store too many versions.
     The default value of 5 is the recommended value, but the less content you have overall,
     the more you can increase this to, for instance, 25 or even 50.
 
@@ -229,7 +229,7 @@ The command takes the following optional parameters:
 
 - `status` or `t` - status of versions to remove: `draft`, `archived` or `all`
 - `keep` or `k` - number of versions to keep
-- `user` or `u` - the User that the command will be performed as. The User must have the `content/remove`, `content/read` and `content/versionread` policies. By default the `administrator` user is applied.
+- `user` or `u` - the User that the command is performed as. The User must have the `content/remove`, `content/read` and `content/versionread` policies. By default the `administrator` user is applied.
 - `excluded-content-types` - exclude versions of one or multiple content types from the cleanup procedure; separate multiple content types identifiers with the comma.
 
 `ibexa:content:cleanup-versions --status <status name> --keep <number of versions> --user <user name> --excluded-content-types article,blog_post`
@@ -251,7 +251,7 @@ ibexa:
 ```
 
 You can override these settings if you have other content types that should be treated as users/user groups in the back office.
-When viewing such content in the back office you will be able to see e.g. the assigned policies.
+When viewing such content in the back office you are able to see e.g. the assigned policies.
 
 ## Top-level Locations
 
diff --git a/docs/administration/content_organization/content_types.md b/docs/administration/content_organization/content_types.md
index 5caa2cfe23..0fb56f429d 100644
--- a/docs/administration/content_organization/content_types.md
+++ b/docs/administration/content_organization/content_types.md
@@ -5,7 +5,7 @@ description: A content type is a base for new content items.
 # Content types
 
 A content type is a base for new content items.
-It defines what Fields will be available in the content item.
+It defines what Fields are available in the content item.
 
 ![Content types](admin_panel_content_types.png "Content types")
 
@@ -34,17 +34,17 @@ Each content type is characterized by a set of metadata which define the general
 
 **Description** – a detailed description of the content type. (Optional.)
 
-<a id="content-name-pattern"></a>**Content name pattern** – a pattern that defines what name a new content item based on this content type gets. The pattern usually consists of Field identifiers that tell the system which Fields it should use when generating the name of a content item. Each Field identifier has to be surrounded with angle brackets. Text outside the angle brackets will be included literally. If no pattern is provided, the system will automatically use the first Field. (Optional.)
+<a id="content-name-pattern"></a>**Content name pattern** – a pattern that defines what name a new content item based on this content type gets. The pattern usually consists of Field identifiers that tell the system which Fields it should use when generating the name of a content item. Each Field identifier has to be surrounded with angle brackets. Text outside the angle brackets is included literally. If no pattern is provided, the system automatically uses the first Field. (Optional.)
 
-**URL alias name pattern** – a pattern which controls how the virtual URLs of the Locations will be generated when content items are created based on this content type. Note that only the last part of the virtual URL is affected. The pattern works in the same way as the content name pattern. Text outside the angle brackets will be converted using the selected method of URL transformation. If no pattern is provided, the system will automatically use the name of the content item itself. (Optional.)
+**URL alias name pattern** – a pattern which controls how the virtual URLs of the Locations are generated when content items are created based on this content type. Note that only the last part of the virtual URL is affected. The pattern works in the same way as the content name pattern. Text outside the angle brackets is converted using the selected method of URL transformation. If no pattern is provided, the system automatically uses the name of the content item itself. (Optional.)
 
 !!! tip "Changing URL alias and content name patterns"
 
     If you change the content name pattern or the URL alias name pattern,
-    existing content items will not be modified automatically.
-    The new pattern will only be applied after you modify the content item and save a new version.
+    existing content items cannot be modified automatically.
+    The new pattern is only applied after you modify the content item and save a new version.
 
-    The old URL aliases will continue to redirect to the same content items.
+    The old URL aliases continue to redirect to the same content items.
 
 **Container** – a flag which indicates if content items based on this content type are allowed to have sub-items or not (mainly relevant for actions via the UI, not validated by every PHP API).
 
@@ -52,7 +52,7 @@ Each content type is characterized by a set of metadata which define the general
 
     This flag was added for convenience and only affects the interface. In other words, it doesn't control any actual low-level logic, it simply controls the way the graphical user interface behaves.
 
-**Sort children by default by** – rule for sorting sub-items. If the instances of this content type can serve as containers, their children will be sorted according to what is selected here.
+**Sort children by default by** – rule for sorting sub-items. If the instances of this content type can serve as containers, their children are sorted according to what is selected here.
 
 **Sort children by default in order** – another rule for sorting sub-items. This decides the sort order for the criterion chosen above.
 
@@ -63,7 +63,7 @@ Each content type is characterized by a set of metadata which define the general
 ## Field definitions
 
 Aside from the metadata, a content type may contain any number of Field definitions (but has to contain at least one).
-They determine what Fields of what Field Types will be included in all content items based on this content type.
+They determine what Fields of what Field Types are included in all content items based on this content type.
 
 ![Field definitions](admin_panel_field_definitions.png)
 
@@ -89,16 +89,16 @@ They determine what Fields of what Field Types will be included in all content i
 
 A content type and its Field definitions can be modified after creation,
 even if there are already content items based on it in the system.
-When a content type is modified, each of its instances will be changed as well.
-If a new Field definition is added to a content type, this Field will appear (empty) in every relevant content item.
-If a Field definition is deleted from the content type, all the corresponding Fields will be removed from content items of this type.
+When a content type is modified, each of its instances are changed as well.
+If a new Field definition is added to a content type, this Field appears (empty) in every relevant content item.
+If a Field definition is deleted from the content type, all the corresponding Fields are removed from content items of this type.
 
 ## Removing content types
 
-System content types are by default used for the File Uploads and removing them will cause errors.
+System content types are by default used for the File Uploads and removing them can cause errors.
 
 If you decide to remove a `file` or `image` content type, or change their identifiers,
-you will need to change the configuration, so it reflects the available content types.
+you need to change the configuration, so it reflects the available content types.
 
 Example configuration:
 
diff --git a/docs/administration/content_organization/sections.md b/docs/administration/content_organization/sections.md
index 957fe9156c..decc5d5b6a 100644
--- a/docs/administration/content_organization/sections.md
+++ b/docs/administration/content_organization/sections.md
@@ -14,21 +14,21 @@ Content items are placed in Sections by being assigned the Section ID. One item
 
 When a new content item is created, its Section ID is set to the default Section (which is usually Standard).
 When the item is published it is assigned to the same Section as its parent. Because content must always be in a Section, unassigning happens by choosing a different Section to move it into.
-If a content item has multiple Location assignments then it is always the Section ID of the item referenced by the parent of the main Location that will be used.
-In addition, if the main Location of a content item with multiple Location assignments is changed then the Section ID of that item will be updated.
+If a content item has multiple Location assignments then it is always the Section ID of the item referenced by the parent of the main Location that is used.
+In addition, if the main Location of a content item with multiple Location assignments is changed then the Section ID of that item is updated.
 
-When content is moved to a different Location, the item itself and all of its subtree will be assigned to the Section of the new Location.
-Note that it works only for copy and move; assigning a new Section to a parent content item does not affect the subtree, meaning that subtree cannot currently be updated this way.
+When content is moved to a different Location, the item itself and all of its subtree are assigned to the Section of the new Location.
+It works only for copy and move; assigning a new Section to a parent content item does not affect the subtree, meaning that subtree cannot currently be updated this way.
 
 Sections can only be removed if no content items are assigned to them. Even then, it should be done carefully.
-When a Section is deleted, it is only its definition itself that will be removed.
-Other references to the Section will remain and thus the system will most likely lose consistency.
+When a Section is deleted, it's only its definition itself that is removed.
+Other references to the Section remain and thus the system most likely loses consistency.
 
 !!! caution
 
     Removing Sections may corrupt permission settings, template output and other things in the system.
 
-Section ID numbers are not recycled. If a Section is removed, its ID number will not be reused when a new Section is created.
+Section ID numbers are not recycled. If a Section is removed, its ID number cannot be reused when a new Section is created.
 
 ### Registering users
 
diff --git a/docs/administration/project_organization/architecture.md b/docs/administration/project_organization/architecture.md
index 0fb84ec016..4b74756500 100644
--- a/docs/administration/project_organization/architecture.md
+++ b/docs/administration/project_organization/architecture.md
@@ -4,7 +4,7 @@ description: Ibexa DXP architecture is structured in multiple layers connected b
 
 # Architecture
 
-[[= product_name =]] architecture is based on the philosophy to **use APIs** that will be maintained in the long term. This **makes upgrades easier and provides lossless couplings** between all parts of the architecture, at the same time improving the migration capabilities of the system.
+[[= product_name =]] architecture is based on the philosophy to **use APIs** that is maintained in the long term. This **makes upgrades easier and provides lossless couplings** between all parts of the architecture, at the same time improving the migration capabilities of the system.
 
 The structure of an [[= product_name =]] app is based on the Symfony framework
 but content management functions rely on the public PHP API.
diff --git a/docs/api/graphql/graphql_custom_ft.md b/docs/api/graphql/graphql_custom_ft.md
index 859661b4f0..3d74957360 100644
--- a/docs/api/graphql/graphql_custom_ft.md
+++ b/docs/api/graphql/graphql_custom_ft.md
@@ -33,9 +33,9 @@ To map a custom Field Type with configuration use a compiler pass to modify a co
 
 it's a hash that maps a Field Type identifier (`ezstring`) to the following entries:
 
-- `value_type` - the GraphQL type values of the custom field. It can be a native type (string, int), or a custom type. If none is specified, string will be used.
-- `value_resolver` - how values of this field are resolved and passed to the defined value type. If not specified, it will receive the `Field` object for the field type: `field`.
-- `definition_type` - the GraphQL type the field definitions is mapped to. If not specified, it will use `FieldDefinition`.
+- `value_type` - the GraphQL type values of the custom field. It can be a native type (string, int), or a custom type. If none is specified, string is used.
+- `value_resolver` - how values of this field are resolved and passed to the defined value type. If not specified, it receives the `Field` object for the field type: `field`.
+- `definition_type` - the GraphQL type the field definitions is mapped to. If not specified, it uses `FieldDefinition`.
 
 Compiler pass example that should be placed in `src/DependencyInjection/Compiler`:
 
@@ -74,7 +74,7 @@ The `FieldDefinitionMapper` interface defines following methods:
 - `mapToFieldValueResolver` - returns the resolver, as an expression language string, values are resolved with
 - `mapToFieldDefinitionType`- returns the GraphQL type field definitions of the mapped type
 
-Only implement methods that you need, the rest will be handled by other mappers (configuration or default).
+Only implement methods that you need, the rest is handled by other mappers (configuration or default).
 When a mapper method is decorated, you need to call the decorated service method for unsupported types.
 To do that, you need to replace `mapXXX` by the method it's in:
 
@@ -135,7 +135,7 @@ class RelationFieldDefinitionMapper extends DecoratingFieldDefinitionMapper impl
 
 The value type depends on the field definition allowed content types setting:
 
-- for types that return content items if there are no restrictions, or several types are allowed, the value will be an `Item`
+- for types that return content items if there are no restrictions, or several types are allowed, the value is an `Item`
 
 The cardinality (single or collection) depends on the selection limit setting:
 
diff --git a/docs/api/graphql/graphql_customization.md b/docs/api/graphql/graphql_customization.md
index d53d244119..7496aa287e 100644
--- a/docs/api/graphql/graphql_customization.md
+++ b/docs/api/graphql/graphql_customization.md
@@ -10,7 +10,7 @@ You can customize the GraphQL schema that is generated from your repository.
 
 You can use it if your application requires custom GraphQL resources, for instance for Doctrine entities.
 
-To do so, create a `config/graphql/types/Query.types.yaml` file. It will be used as the GraphQL query root.
+To do so, create a `config/graphql/types/Query.types.yaml` file. It is used as the GraphQL query root.
 
 In that file, add new fields that use any custom type or custom logic you require, based
 on [overblog/GraphQLBundle](https://github.com/overblog/GraphQLBundle).
@@ -57,7 +57,7 @@ Query:
 ### Custom mutations
 
 Custom mutations are created in the same way as custom query configuration.
-A `config/graphql/types/Mutation.types.yaml` file will be used as the source for mutation definitions in your schema.
+A `config/graphql/types/Mutation.types.yaml` file is used as the source for mutation definitions in your schema.
 
 ``` yaml
 Mutation:
diff --git a/docs/api/graphql/graphql_queries.md b/docs/api/graphql/graphql_queries.md
index 85b498a4d7..ad37026c93 100644
--- a/docs/api/graphql/graphql_queries.md
+++ b/docs/api/graphql/graphql_queries.md
@@ -766,7 +766,7 @@ You can paginate plural fields using `edges`:
 
 This query returns the first three articles, ordered by their publication date.
 If the current `Connection` (list of results) is not finished yet and there are more items to read,
-`hasNextPage` will be `true`.
+`hasNextPage` is `true`.
 
 For the `children` node, you can use the following pagination method:
 
diff --git a/docs/api/php_api/php_api.md b/docs/api/php_api/php_api.md
index e592793be0..76456ebab7 100644
--- a/docs/api/php_api/php_api.md
+++ b/docs/api/php_api/php_api.md
@@ -11,7 +11,7 @@ You can use it to create, read, update, manage, and delete all objects available
 content and related objects such as Sections, Locations, content types, languages, etc.
 
 The PHP API is built on top of a layered architecture, including a persistence SPI that abstracts storage.
-Using the API ensures that your code will be forward compatible with future releases based on other storage engines.
+Using the API ensures that your code is forward compatible with future releases based on other storage engines.
 
 ## Using API services
 
@@ -102,7 +102,7 @@ When using the PHP API, authentication is performed in three ways:
 ### Back office authentication
 
 When actions are performed through the back office, they're executed as the logged-in User.
-This User's permissions will affect the behavior of the Repository.
+This User's permissions affects the behavior of the Repository.
 The User may, for example, not be allowed to create content, or view a particular Section.
 
 ### Using `sudo()`
diff --git a/docs/api/rest_api/extending_rest_api/adding_custom_media_type.md b/docs/api/rest_api/extending_rest_api/adding_custom_media_type.md
index 2d48c20b1d..b276f35d66 100644
--- a/docs/api/rest_api/extending_rest_api/adding_custom_media_type.md
+++ b/docs/api/rest_api/extending_rest_api/adding_custom_media_type.md
@@ -17,7 +17,7 @@ You need the following elements:
 !!! note
 
     You can change the vendor name (from default `vnd.ibexa.api` to new `app.api` like in this example), or you can create a new media type in the default vendor (like `vnd.ibexa.api.Greeting` in the [Creating a new REST resource](creating_new_rest_resource.md) example).
-    To do so, tag your new ValueObjectVisitor with `ibexa.rest.output.value_object.visitor` to add it to the existing `ValueObjectVisitorDispatcher`, and a new one will not be needed.
+    To do so, tag your new ValueObjectVisitor with `ibexa.rest.output.value_object.visitor` to add it to the existing `ValueObjectVisitorDispatcher`, and a new one isn't needed.
     This way, the `media-type` attribute is also easier to create, because the default `Output\Generator` uses this default vendor.
     This example presents creating a new vendor as a good practice, to highlight that this is custom extensions that isn't available in a regular [[= product_name =]] installation.
 
diff --git a/docs/cdp/cdp.md b/docs/cdp/cdp.md
index 10bc9f69f4..b3510d5b8d 100644
--- a/docs/cdp/cdp.md
+++ b/docs/cdp/cdp.md
@@ -9,8 +9,8 @@ edition: experience
 
 [[= product_name_cdp =]] helps you solve one of the hardest challenges facing business world today:
 building unique experiences for your customers.
-With [[= product_name_cdp =]] you will be able to track and aggregate data of your customers' activity on multiple channels.
-It will allow you to create individual customer profiles that enable you to personalize their experience on your platform.
+With [[= product_name_cdp =]] you are able to track and aggregate data of your customers' activity on multiple channels.
+It allows you to create individual customer profiles that enable you to personalize their experience on your platform.
 
 ![Ibexa CDP control panel](img/cdp_control_panel.png)
 
diff --git a/docs/cdp/cdp_activation/cdp_data_export.md b/docs/cdp/cdp_activation/cdp_data_export.md
index 8910eea823..e4b91907a7 100644
--- a/docs/cdp/cdp_activation/cdp_data_export.md
+++ b/docs/cdp/cdp_activation/cdp_data_export.md
@@ -5,15 +5,15 @@ edition: experience
 
 # Data export
 
-You need to specify a source of the user data that [[= product_name_cdp =]] will connect to.
+You need to specify a source of the user data that [[= product_name_cdp =]] connects to.
 To do so, go to **Data Manager** in **Tools** section and select **Create new dataflow**.
-It will take you to a Dataflow Creator, where in five steps you will set up a data streaming.
+It takes you to a Dataflow Creator, where in five steps you can set up a data streaming.
 
 ## General Information
 
 In the **General Information** section, specify dataflow name,
 choose **Stream File** as a source of user data and **CDP** as a destination,
-where they will be sent for processing.
+where they're sent for processing.
 Currently, only Stream File transport is supported and can be initialized from the configuration. 
 
 ## Download
@@ -48,7 +48,7 @@ The first one is used to send the test user data to the Data Manager.
 If it passes a validation test in the **Activation** section, use the latter one to send a full version.
 
 Next, go back to [[= product_name_cdp =]] and select **Validate & download**.
-If the file passes, you will see a confirmation message.
+If the file passes, you can see a confirmation message.
 Now, you can go to the **File mapping** section.
 
 ## File mapping
@@ -57,7 +57,7 @@ Mapping is completed automatically, the system fills all required information an
 You can change their names if needed or disallow empty fields by checking **Mandatory**.
 If the provided file contains empty values, this option is not available.
 
-If provided file is not recognized, the system will require you to fill in the parsing-options manually or select an appropriate format.
+If provided file is not recognized, the system requires you to fill in the parsing-options manually or select an appropriate format.
 If you make any alterations, select the **Parse File** to generate columns with new data.
 
 ## Transform & Map
@@ -66,7 +66,7 @@ In the **Transform & Map** section you transform data and map it to a schema.
 At this point, you can map **email** to **email** and **id** to **integer**  fields to get custom columns.
 
 Next, select **Create schema based on the downloaded columns**.
-It will move you to Schema Creator.
+It moves you to Schema Creator.
 There, choose **PersonalData** as a parent and name the schema. 
 
 ![Create new schema](cdp_create_new_schema.png)
@@ -75,12 +75,12 @@ Next, select all the columns and set Person Identifier as **userid**.
 
 ![Person Identifier](cdp_person_identifier.png)
 
-If you used PersonData or Catalog type schemas, the system will require
-specifying the Write Mode that will be applied to them.
+If you used PersonData or Catalog type schemas, the system requires
+specifying the Write Mode that is applied to them.
 
 **Append** (default one) allows new data to overwrite the old one but leaves existing entries unaffected.
 All entries are stored in the dataset, unchanged by updating dataflow.
-For example, if a customer unsubscribes a newsletter, their email will remain in the system.
+For example, if a customer unsubscribes a newsletter, their email remains in the system.
 **Overwrite** completely removes the original dataset and replaces it with the new one every time the dataflow runs.
 
 Next, select **userid** from a **Schema columns section** on the right and map it to **id**.
@@ -89,7 +89,7 @@ Next, select **userid** from a **Schema columns section** on the right and map i
 
 ## Activation
 
-In this section you will test the dataflow with provided test user data.
+In this section you can test the dataflow with provided test user data.
 If everything passes, go to your installation and export production data with this command:
 
 ```bash
@@ -101,7 +101,7 @@ Now you can run and activate the dataflow.
 ## Build new Audience/Segment
 
 Go to the **Audience Builder** and select **Build new audience**.
-When naming the audience remember, you will need to find it in a drop-down list during activation.
+When naming the audience remember, you need to find it in a drop-down list during activation.
 There, you can choose conditions from `did`, `did not` or `have`.
 The conditions `did` and `did not` allow you to use events like buy, visit or add to a cart from online tracking.
 - `have` conditions are tied to personal characteristics and can be used to track the sum of all buys or top-visited categories.
@@ -123,7 +123,7 @@ Next, you can fill in **Ibexa information** they must match the ones provided in
 
 - **Client Secret** and **Client ID** - are used to authenticate against Webhook endpoint. In the configuration they're taken from environment variables in `.env` file.
 
-- **Segment Group Identifier** - identifier of the segment group in [[= product_name =]]. It points to a segment group where all the CDP audiences will be stored.
+- **Segment Group Identifier** - identifier of the segment group in [[= product_name =]]. It points to a segment group where all the CDP audiences are stored.
 - **Base URL** - URL of your instance with added `/cdp/webhook` at the end.
 
 ![Ibexa Information - Activation](cdp_activation_ibexa_info.png)
diff --git a/docs/cdp/cdp_installation.md b/docs/cdp/cdp_installation.md
index a87f1136fd..e5c1923588 100644
--- a/docs/cdp/cdp_installation.md
+++ b/docs/cdp/cdp_installation.md
@@ -11,9 +11,9 @@ First, you need to register your [[= product_name_cdp =]] account, then you can
 ## Register in Ibexa CDP dashboard
 
 If you decide to acquire [[= product_name_cdp =]] contact your sales representative,
-they will provide you with a registration link to [[= product_name_cdp =]].
-After registration, you will get access to a separate instance
-where you will find data required for configuring, activating and using this feature.
+they provide you with a registration link to [[= product_name_cdp =]].
+After registration, you get access to a separate instance
+where you can find data required for configuring, activating and using this feature.
 
 ## Install CDP package
 
@@ -25,7 +25,7 @@ To download it run:
 composer require ibexa/cdp
 ```
 
-Flex will install and activate the package.
+Flex installs and activate the package.
 After an installation process is finished, go to `config/packages/security.yaml`
 and uncomment `ibexa_cdp` rule.
 
diff --git a/docs/commerce/checkout/checkout.md b/docs/commerce/checkout/checkout.md
index 50f0a69da9..bf2c21d652 100644
--- a/docs/commerce/checkout/checkout.md
+++ b/docs/commerce/checkout/checkout.md
@@ -42,9 +42,9 @@ As far as shipping details are concerned, checkout can behave differently, depen
 on whether the buyer is a corporate account member, a registered customer, or 
 an individual.
 
-- Corporate account members will see a company's billing address, and several shipping addresses to pick from, as predefined in the company profile.
-- Registered customers will be able see and modify the addresses that they defined at registration
-- Individuals will be able to enter both addresses at checkout
+- Corporate account members can see a company's billing address, and several shipping addresses to pick from, as predefined in the company profile.
+- Registered customers are able see and modify the addresses that they defined at registration
+- Individuals are able to enter both addresses at checkout
 
 For more information about shipping and billing addresses, see [Configure checkout](configure_checkout.md#configure-shipping-and-billing-address-field-format).
 
diff --git a/docs/commerce/checkout/checkout_api.md b/docs/commerce/checkout/checkout_api.md
index 6195384801..e1f037e350 100644
--- a/docs/commerce/checkout/checkout_api.md
+++ b/docs/commerce/checkout/checkout_api.md
@@ -55,7 +55,7 @@ The last update time and status are also stored.
 
 To update the checkout, use the `CheckoutServiceInterface::updateCheckout` method 
 and provide it with the `CheckoutUpdateStruct` struct that contains data collected at each 
-step of the workflow, as well as a transition name to identify what step will follow. 
+step of the workflow, as well as a transition name to identify what step follows. 
 
 All data is placed in session storage.
 
diff --git a/docs/content_management/content_availability.md b/docs/content_management/content_availability.md
index 3d5b9b6026..650665b59d 100644
--- a/docs/content_management/content_availability.md
+++ b/docs/content_management/content_availability.md
@@ -11,10 +11,10 @@ It's automatically applied to any new content item of this Type.
 
 ![Default content availability](availability_flag.png "Default content availability")
 
-A content item with this flag will be available in its main language
+A content item with this flag is available in its main language
 even if it's not translated into the language of the current SiteAccess.
 
-Without the flag, a content item will not be available at all if it does not have a language version
+Without the flag, a content item isn't available at all if it does not have a language version
 corresponding to the current SiteAccess.
 
 !!! note
@@ -33,5 +33,5 @@ For example, you can assign the flag to a Blog content type which is intended to
 in multiple languages. If the Blog is in English only, it would not be visible for readers
 using the Norwegian or German SiteAcceses.
 However, if you set the default availability flag for the Blog content type,
-it will be displayed to them in English (if it's set as a main language) and will enable the users to browse individual
+it's displayed to them in English (if it's set as a main language) and enables the users to browse individual
 posts in other languages.
diff --git a/docs/content_management/content_model.md b/docs/content_management/content_model.md
index f4e93c501d..52c156c17a 100644
--- a/docs/content_management/content_model.md
+++ b/docs/content_management/content_model.md
@@ -27,7 +27,7 @@ The Fields can cover data ranging from single variables and text lines to media
 General information about a content item is stored in a [`ContentInfo`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-ContentInfo.html) object.
 `ContentInfo` does not include Fields. It contains following information:
 
-**`id`** - the unique ID of the Content object. These numbers are not recycled, so if an item is deleted, its ID will not be reused when a new one is created.
+**`id`** - the unique ID of the Content object. These numbers are not recycled, so if an item is deleted, its ID isn't reused when a new one is created.
 
 **`contentTypeId`** - the unique numerical ID of the content type, on which the content item is based.
 
@@ -49,10 +49,10 @@ See [Sections](sections.md) for more information.
 
 **`ownerId`** - ID of the User who initially created the content item.
 It's set by the system the first time the content item is published.
-The ownership of an item cannot be modified and will not change even if the owner is removed from the system.
+The ownership of an item cannot be modified and doesn't change even if the owner is removed from the system.
 
 **`modificationDate`** - date and time when the content item was last modified.
-This is set by the system and cannot be modified manually, but will change every time the item is published again.
+This is set by the system and cannot be modified manually, but changes every time the item is published again.
 
 **`publishedDate`** - date and time when the content item was published for the first time.
 This is set by the system and cannot be modified.
@@ -100,7 +100,7 @@ Aside from the Field Type, the Field definition in a content type provides the f
 
 **Description** – a detailed description of the Field.
 
-**Required** – a flag which indicates if the Field is required for the system to accept the content item. By default, if a Field is flagged as Required, a user will not be able to publish a content item without filling in this Field.
+**Required** – a flag which indicates if the Field is required for the system to accept the content item. By default, if a Field is flagged as Required, a user isn't able to publish a content item without filling in this Field.
 
 !!! note
     You can use the `ContentService::validate()` method to decide whether the required Fields or whole content items are checked for 
@@ -108,7 +108,7 @@ Aside from the Field Type, the Field definition in a content type provides the f
 
     The Required flag is in no way related to Field validation. A Field's value is validated whether the Field is set as required or not.
 
-**[Searchable](search.md)** – a flag which indicates if the value of the Field will be indexed for searching.
+**[Searchable](search.md)** – a flag which indicates if the value of the Field is indexed for searching.
 
 The Searchable flag is not available for some Fields, because some Field Types do not allow searching through their values.
 
diff --git a/docs/content_management/content_relations.md b/docs/content_management/content_relations.md
index c55eed1730..199b50b638 100644
--- a/docs/content_management/content_relations.md
+++ b/docs/content_management/content_relations.md
@@ -17,7 +17,7 @@ There are different types of Relations available in the system.
 Content can have Relations on item or on Field level.
 
 *Relations at Field level* are created using one of two special Field Types: Content relation (single) and Content relations (multiple).
-These Fields allow you to select one or more other content items in the Field value, which will be linked to these Fields.
+These Fields allow you to select one or more other content items in the Field value, which are linked to these Fields.
 
 *Relations at content item level* can be of three different types:
 
diff --git a/docs/content_management/locations.md b/docs/content_management/locations.md
index 54ecd3b266..8b8f08f2ae 100644
--- a/docs/content_management/locations.md
+++ b/docs/content_management/locations.md
@@ -90,7 +90,7 @@ Location visibility allows you to control which parts of the content tree are av
 ![Location visibility](content_management_visibility.png "Location visibility")
 
 Once a content item is published, it cannot be un-published.
-When the Location of a content item is hidden, the system will not display it on the website.
+When the Location of a content item is hidden, the system doesn't display it on the website.
 
 !!! caution "Visibility and permissions"
 
@@ -103,7 +103,7 @@ When the Location of a content item is hidden, the system will not display it on
     Or use other permission-based [**Limitations**](limitations.md).
 
 If a content item is hidden, it's invisible in all its Locations.
-If a Location is hidden, all of its descendants in the tree will be hidden as well.
+If a Location is hidden, all of its descendants in the tree are hidden as well.
 This means that there are three different visibility statuses:
 
 - Visible
@@ -112,7 +112,7 @@ This means that there are three different visibility statuses:
 
 All Locations and content items are visible by default.
 If a Location is made invisible manually, its status is set to Hidden.
-All Locations under it will change status to Hidden by superior.
+All Locations under it change status to Hidden by superior.
 A content item is Hidden by superior only in Locations in which it has a parent Location with the Hidden status.
 
 In the following example, the **Content item 1** is Hidden by superior in the **Location A** while still visible in the **Location B**.
@@ -120,10 +120,10 @@ In the following example, the **Content item 1** is Hidden by superior in the **
 ![Visibility in two locations](locations_visibility.png)
 
 From the visitor's perspective a Location behaves the same whether its status is Hidden or Hidden by superior –
-it will be unavailable on the front page.
+it's unavailable on the front page.
 
 The difference is that a Location Hidden by superior cannot be revealed separately from their parent(s).
-It will only become visible once all of its parent Locations are made visible again.
+It only becomes visible once all of its parent Locations are made visible again.
 
 A Hidden by superior status does not override a Hidden status.
 This means that if a Location is Hidden manually and later one of its ancestors is hidden as well,
@@ -136,24 +136,24 @@ The way visibility works can be illustrated using the following scenarios:
 
 ![Hiding a visible Location](node_visibility_hide.png)
 
-When you hide a Location that was visible before, it will get the status Hidden.
-Its child Locations will be Hidden by superior.
-The visibility status of child Locations that were already Hidden or Hidden by superior will not change.
+When you hide a Location that was visible before, it gets the status Hidden.
+Its child Locations are Hidden by superior.
+The visibility status of child Locations that were already Hidden or Hidden by superior doesn't change.
 
 #### Hiding a Location which is Hidden by superior
 
 ![Hiding a Location which is Hidden by superior](node_visibility_hide_invisible.png)
 
-When you explicitly hide a Location which was Hidden by superior, it will get the status Hidden.
-Since the underlying Locations are already either Hidden or Hidden by superior, their visibility status will not be changed.
+When you explicitly hide a Location which was Hidden by superior, it gets the status Hidden.
+Since the underlying Locations are already either Hidden or Hidden by superior, their visibility status doesn't changed.
 
 #### Revealing a Location with a visible ancestor
 
 ![Revealing a Location with a visible ancestor](node_visibility_unhide1.png)
 
-When you reveal a Location which has a visible ancestor, this Location and its children will become visible.
-However, child Locations that were explicitly hidden by a user will keep their Hidden status
-(and their children will remain Hidden by superior).
+When you reveal a Location which has a visible ancestor, this Location and its children become visible.
+However, child Locations that were explicitly hidden by a user keep their Hidden status
+(and their children remain Hidden by superior).
 
 #### Revealing a Location with a Hidden ancestor
 

From 60a52f82af2954ce948a553f05c865fcd98512f4 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 10 Oct 2024 13:41:34 +0200
Subject: [PATCH 04/77] New fixes

---
 .../extending_thumbnails.md                   |  2 +-
 .../back_office/content_tab_switcher.md       | 16 ++--
 .../back_office/content_type_anchor_menu.md   | 22 ++---
 .../content_organization/content_types.md     |  4 +-
 .../project_organization/architecture.md      |  2 +-
 .../project_organization/bundles.md           | 14 +--
 docs/api/graphql/graphql.md                   |  2 +-
 docs/api/graphql/graphql_custom_ft.md         | 24 ++---
 docs/api/graphql/graphql_queries.md           |  4 +-
 docs/api/php_api/php_api.md                   |  2 +-
 ...ts-Core-FieldType-GatewayBasedStorage.html |  4 +-
 ...Contracts-Core-FieldType-Generic-Type.html |  2 +-
 ...acts-Core-Persistence-Content-Handler.html |  2 +-
 ...-Core-Repository-Values-Content-Field.html |  2 +-
 .../ibexa-contracts-core-fieldtype.html       |  2 +-
 docs/api/rest_api/rest_api_authentication.md  |  4 +-
 .../input/ibexa-content-typegroups.raml       |  2 +-
 .../rest_api_reference/input/ibexa-types.raml |  8 +-
 .../rest_api_reference.html                   | 10 +-
 docs/cdp/cdp_data_customization.md            | 30 +++---
 docs/cdp/cdp_guide.md                         |  6 +-
 docs/commerce/checkout/customize_checkout.md  |  4 +-
 .../content_api/browsing_content.md           |  6 +-
 .../content_api/creating_content.md           | 12 +--
 .../content_api/managing_content.md           | 12 +--
 docs/content_management/content_management.md |  2 +-
 .../content_management_guide.md               | 24 ++---
 docs/content_management/content_model.md      | 18 ++--
 docs/content_management/content_relations.md  |  2 +-
 .../create_custom_field_type_comparison.md    | 14 +--
 .../create_custom_generic_field_type.md       | 32 +++----
 .../customize_field_type_metadata.md          |  8 +-
 .../field_type_reference/addressfield.md      |  8 +-
 .../field_type_reference/authorfield.md       | 16 ++--
 .../field_type_reference/binaryfilefield.md   | 10 +-
 .../field_type_reference/checkboxfield.md     | 10 +-
 .../field_type_reference/contentqueryfield.md |  8 +-
 .../field_type_reference/countryfield.md      | 16 ++--
 .../customergroupfield.md                     |  6 +-
 .../field_type_reference/dateandtimefield.md  | 30 +++---
 .../field_type_reference/datefield.md         | 32 +++----
 .../field_type_reference/emailaddressfield.md | 20 ++--
 .../field_type_reference.md                   | 24 ++---
 .../field_type_reference/floatfield.md        | 22 ++---
 .../field_type_reference/formfield.md         |  4 +-
 .../field_type_reference/imageassetfield.md   | 16 ++--
 .../field_type_reference/imagefield.md        | 26 +++---
 .../field_type_reference/integerfield.md      | 22 ++---
 .../field_type_reference/isbnfield.md         | 14 +--
 .../field_type_reference/keywordfield.md      | 10 +-
 .../field_type_reference/maplocationfield.md  | 10 +-
 .../field_type_reference/matrixfield.md       | 24 ++---
 .../field_type_reference/measurementfield.md  | 10 +-
 .../field_type_reference/mediafield.md        | 18 ++--
 .../field_type_reference/nullfield.md         | 16 ++--
 .../field_type_reference/pagefield.md         | 12 +--
 .../field_type_reference/relationfield.md     | 14 +--
 .../field_type_reference/relationlistfield.md | 16 ++--
 .../field_type_reference/richtextfield.md     | 20 ++--
 .../field_type_reference/selectionfield.md    | 16 ++--
 .../field_type_reference/sesexternaldata.md   |  6 +-
 .../field_type_reference/sesprofiledata.md    |  2 +-
 .../field_type_reference/sesselection.md      | 10 +-
 .../specificationstype.md                     |  2 +-
 .../taxonomyentryassignmentfield.md           | 10 +-
 .../taxonomyentryfield.md                     |  8 +-
 .../field_type_reference/textblockfield.md    | 14 +--
 .../field_type_reference/textlinefield.md     | 16 ++--
 .../field_type_reference/timefield.md         | 20 ++--
 .../field_type_reference/urlfield.md          | 16 ++--
 .../field_type_reference/userfield.md         |  6 +-
 .../field_types/field_type_search.md          | 38 ++++----
 .../field_types/field_type_storage.md         | 58 ++++++------
 .../field_types/field_type_validation.md      |  4 +-
 .../field_types/field_types.md                | 28 +++---
 .../field_types/form_and_template.md          | 22 ++---
 .../field_types/type_and_value.md             | 78 ++++++++--------
 .../file_management/file_management.md        |  2 +-
 .../forms/create_form_attribute.md            |  2 +-
 docs/content_management/images/fastly_io.md   |  4 +-
 docs/content_management/images/images.md      | 16 ++--
 docs/content_management/locations.md          |  4 +-
 .../rich_text/extend_online_editor.md         |  8 +-
 docs/content_management/taxonomy/taxonomy.md  |  2 +-
 .../url_management/url_api.md                 |  2 +-
 .../user_generated_content.md                 |  2 +-
 docs/customer_management/cp_applications.md   |  4 +-
 docs/customer_management/cp_configuration.md  |  4 +-
 docs/customer_management/cp_page_builder.md   |  8 +-
 .../create_user_registration_form.md          |  2 +-
 docs/getting_started/first_steps.md           | 16 ++--
 docs/getting_started/install_ibexa_dxp.md     | 18 ++--
 .../install_on_mac_os_and_windows.md          |  4 +-
 docs/getting_started/requirements.md          |  8 +-
 docs/getting_started/troubleshooting.md       |  2 +-
 docs/ibexa_products/ibexa_headless.md         |  2 +-
 .../cache/http_cache/content_aware_cache.md   | 38 ++++----
 .../cache/http_cache/context_aware_cache.md   |  6 +-
 .../http_cache/http_cache_configuration.md    |  2 +-
 .../cache/http_cache/reverse_proxy.md         |  4 +-
 .../cache/persistence_cache.md                | 14 +--
 .../clustering/clustering.md                  | 14 +--
 .../clustering/clustering_with_aws_s3.md      |  3 +-
 .../databases.md                              |  4 +-
 docs/infrastructure_and_maintenance/devops.md |  8 +-
 .../performance.md                            | 21 ++---
 .../security/development_security.md          |  4 +-
 .../security/reporting_issues.md              | 12 +--
 .../security/security_checklist.md            | 10 +-
 .../sessions.md                               |  4 +-
 .../support_and_maintenance_faq.md            |  8 +-
 .../languages/back_office_translations.md     | 10 +-
 docs/multisite/languages/languages.md         | 18 ++--
 docs/multisite/site_factory/site_factory.md   |  2 +-
 .../siteaccess_aware_configuration.md         |  4 +-
 docs/permissions/limitation_reference.md      |  2 +-
 docs/permissions/permission_overview.md       |  6 +-
 .../api_reference/tracking_api.md             |  8 +-
 .../personalization/api_reference/user_api.md |  2 +-
 .../legacy_recommendation_api.md              | 20 ++--
 docs/personalization/tracking_integration.md  |  2 +-
 docs/pim/create_custom_catalog_filter.md      |  2 +-
 docs/pim/pim_configuration.md                 |  2 +-
 docs/release_notes/ez_platform_v1.10.0.md     |  4 +-
 docs/release_notes/ez_platform_v1.11.0.md     |  4 +-
 docs/release_notes/ez_platform_v1.12.0.md     |  2 +-
 docs/release_notes/ez_platform_v1.13.0_lts.md |  4 +-
 docs/release_notes/ez_platform_v1.7.0_lts.md  | 10 +-
 docs/release_notes/ez_platform_v1.9.0.md      |  6 +-
 docs/release_notes/ez_platform_v2.1.0.md      |  8 +-
 docs/release_notes/ez_platform_v2.2.0.md      | 10 +-
 docs/release_notes/ez_platform_v2.3.md        |  6 +-
 docs/release_notes/ez_platform_v2.4.md        | 10 +-
 docs/release_notes/ez_platform_v2.5.md        | 14 +--
 docs/release_notes/ez_platform_v3.0.md        | 26 +++---
 .../ez_platform_v3.0_deprecations.md          | 26 +++---
 docs/release_notes/ibexa_dxp_v3.3.md          |  2 +-
 docs/release_notes/ibexa_dxp_v4.1.md          |  6 +-
 docs/release_notes/ibexa_dxp_v4.2.md          | 13 ++-
 docs/release_notes/ibexa_dxp_v4.4.md          |  5 +-
 docs/release_notes/ibexa_dxp_v4.5.md          |  2 +-
 .../contributing/contribute_translations.md   |  2 +-
 .../contributing/report_and_follow_issues.md  |  2 +-
 docs/resources/new_in_doc.md                  |  8 +-
 docs/resources/phpstorm_plugin.md             | 10 +-
 .../criteria_reference/field_criterion.md     |  2 +-
 .../criteria_reference/fulltext_criterion.md  |  4 +-
 .../isfieldempty_criterion.md                 |  2 +-
 .../criteria_reference/matchall_criterion.md  |  2 +-
 .../criteria_reference/matchnone_criterion.md |  2 +-
 .../search_criteria_reference.md              |  2 +-
 .../visibility_criterion.md                   |  2 +-
 .../create_custom_aggregation.md              |  2 +-
 docs/search/search_api.md                     | 10 +-
 .../search_criteria_and_sort_clauses.md       | 10 +-
 .../configure_elastic_search.md               |  4 +-
 .../elastic_search/install_elastic_search.md  |  2 +-
 .../solr_search_engine/configure_solr.md      | 12 +--
 .../solr_search_engine/install_solr.md        |  6 +-
 .../solr_search_engine/solr_overview.md       |  2 +-
 .../ismainlocation_sort_clause.md             |  2 +-
 .../visibility_sort_clause.md                 |  2 +-
 .../matchall_url_criterion.md                 |  2 +-
 .../matchnone_url_criterion.md                |  2 +-
 docs/snippets/page_block_cache_clear.md       |  2 +-
 docs/snippets/update/merge_composer.md        |  2 +-
 docs/snippets/update/notify_support.md        |  2 +-
 .../design_engine/add_new_design.md           |  2 +-
 .../render_content/render_content.md          |  2 +-
 .../field_twig_functions.md                   |  6 +-
 .../urls_and_routes/custom_breadcrumbs.md     |  2 +-
 .../beginner_tutorial/1_get_ready.md          |  4 +-
 .../2_create_the_content_model.md             | 14 +--
 .../3_customize_the_front_page.md             | 12 +--
 .../4_display_single_content_item.md          |  2 +-
 .../5_display_a_list_of_content_items.md      | 18 ++--
 .../6_improve_configuration.md                |  4 +-
 .../beginner_tutorial/7_embed_content.md      |  6 +-
 .../8_enable_account_registration.md          | 12 +--
 .../beginner_tutorial/beginner_tutorial.md    | 14 +--
 .../1_implement_the_point2d_value_class.md    | 12 +--
 .../2_define_point2d_field_type.md            | 12 +--
 .../3_create_form_for_point2d.md              | 14 +--
 .../4_introduce_a_template.md                 | 10 +-
 .../generic_field_type/5_add_a_field.md       |  6 +-
 .../generic_field_type/6_settings.md          | 18 ++--
 .../generic_field_type/7_add_a_validation.md  |  2 +-
 .../generic_field_type/8_data_migration.md    | 10 +-
 .../creating_a_point2d_field_type.md          | 32 +++----
 .../1_get_a_starter_website.md                | 12 +--
 .../2_prepare_the_landing_page.md             |  8 +-
 .../3_use_existing_blocks.md                  | 22 ++---
 .../4_create_a_custom_block.md                | 12 +--
 .../5_create_newsletter_form.md               |  2 +-
 .../page_and_form_tutorial.md                 | 22 ++---
 .../from_1.x_2.x/update_app_to_2.5.md         |  2 +-
 .../from_1.x_2.x/update_db_to_2.5.md          | 18 ++--
 .../from_2.5/adapt_code_to_v3.md              |  4 +-
 docs/update_and_migration/from_2.5/to_3.3.md  |  4 +-
 .../update_code/3_update_field_types.md       |  8 +-
 .../update_code/5_update_online_editor.md     |  2 +-
 docs/update_and_migration/from_3.3/to_4.0.md  |  2 +-
 .../from_4.2/update_from_4.2.md               |  4 +-
 .../from_4.3/update_from_4.3_new_commerce.md  | 12 +--
 .../from_4.3/update_from_4.3_old_commerce.md  |  2 +-
 .../from_4.5/update_from_4.5.md               |  2 +-
 .../migrate_to_ibexa_dxp/common_issues.md     | 12 +--
 .../migrating_from_ez_publish.md              |  8 +-
 .../migrating_from_ez_publish_platform.md     | 80 ++++++++--------
 docs/users/invitations.md                     |  4 +-
 docs/users/login_methods.md                   |  2 +-
 docs/users/oauth_client.md                    |  2 +-
 docs/users/passwords.md                       |  4 +-
 docs/users/user_authentication.md             |  2 +-
 mkdocs.yml                                    | 92 +++++++++----------
 tests/features/EnterpriseTutorial.feature     |  6 +-
 .../Context/TutorialContentTypeContext.php    |  2 +-
 217 files changed, 1123 insertions(+), 1127 deletions(-)

diff --git a/docs/administration/back_office/back_office_elements/extending_thumbnails.md b/docs/administration/back_office/back_office_elements/extending_thumbnails.md
index 7b262a74b7..5f908d9746 100644
--- a/docs/administration/back_office/back_office_elements/extending_thumbnails.md
+++ b/docs/administration/back_office/back_office_elements/extending_thumbnails.md
@@ -62,7 +62,7 @@ At this point you can go to the back office and check the results.
 
 ## Other Fields as thumbnails
 
-Any Field Type can generate a thumbnail, e.g.:
+Any field type can generate a thumbnail, e.g.:
 
 - DateAndTime (`ezdatetime`) - you can add a mini calendar thumbnail for Appointment content type and on the day of the appointment a clock thumbnail with a specific time when it takes place
 - TextBlock (`eztext`) -  you can add a first letter of the text block that is inside
diff --git a/docs/administration/back_office/content_tab_switcher.md b/docs/administration/back_office/content_tab_switcher.md
index d6a6428170..9fdd52c483 100644
--- a/docs/administration/back_office/content_tab_switcher.md
+++ b/docs/administration/back_office/content_tab_switcher.md
@@ -1,13 +1,13 @@
 # Tab switcher in content edit page
 
-Tabs switcher allows separating the default Field Types in the content type from the Field Types that enhance the content with new functionalities.
-The best example of such Field Types are SEO or Taxonomy, as these are not typical Field Types but a Field Types that handle functionalities for the whole content object.
+Tabs switcher allows separating the default field types in the content type from the field types that enhance the content with new functionalities.
+The best example of such field types are SEO or Taxonomy, as these are not typical field types but a field types that handle functionalities for the whole content object.
 
-The following example shows how to add a Meta tab with automatically assigned Taxonomy Field Type.
+The following example shows how to add a Meta tab with automatically assigned Taxonomy field type.
 
 ## Add Meta tab
 
-Before you start adding the Meta tab, make sure the content type you want to edit has [Taxonomy Entry Assignment Field Type]([[= user_doc =]]/taxonomy/#assign-tag-to-content-from-taxonomy-tree).
+Before you start adding the Meta tab, make sure the content type you want to edit has [Taxonomy Entry Assignment field type]([[= user_doc =]]/taxonomy/#assign-tag-to-content-from-taxonomy-tree).
 
 Next, provide the semantic configuration under the `ibexa.system.<scope>.admin_ui_forms` [configuration key](configuration.md#configuration-files):
 
@@ -23,9 +23,9 @@ ibexa:
 
 ```
 
-`ibexa_taxonomy_entry_assignment` - identifier for the Field Type
+`ibexa_taxonomy_entry_assignment` - identifier for the field type
 
-`meta` - when set to `true`, puts the declared Field Type in the Meta tab
+`meta` - when set to `true`, puts the declared field type in the Meta tab
 
 ![Meta tab](tab_switcher.png)
 
@@ -33,8 +33,8 @@ ibexa:
 ### Configure Field groups for Meta tab
 
 The default configuration makes the `ibexa_taxonomy_entry_assignment` Field always visible in the Meta tab in the content form. 
-With this new feature, you can indicate what Field types, previously set in the back office content type, are shown in the Meta tab section in the content form. 
-You can automatically move all Field types from Metadata group to the Meta tab in the content form.
+With this new feature, you can indicate what field types, previously set in the back office content type, are shown in the Meta tab section in the content form. 
+You can automatically move all field types from Metadata group to the Meta tab in the content form.
 To do it, use the following configuration:
 
 ```yaml
diff --git a/docs/administration/back_office/content_type_anchor_menu.md b/docs/administration/back_office/content_type_anchor_menu.md
index 4f7330d556..f0c3c72805 100644
--- a/docs/administration/back_office/content_type_anchor_menu.md
+++ b/docs/administration/back_office/content_type_anchor_menu.md
@@ -1,20 +1,20 @@
 ---
-description: Add anchor menu to the content type configuration screen, to make Field Type settings of your choice more prominent.
+description: Add anchor menu to the content type configuration screen, to make field type settings of your choice more prominent.
 ---
 
 # Add anchor menu to content type edit screen
 
-With the anchor menu you can increase visibility of certain [Field Types](field_types.md), which provide more complex functionality, 
+With the anchor menu you can increase visibility of certain [field types](field_types.md), which provide more complex functionality, 
 by separating them from the [Field definitions](content_types.md#field-definitions) section in [content type](content_types.md) configuration screen. 
-One example of such Field Type would be [SEO]([[= user_doc =]]/search_engine_optimization/work_with_seo/), 
+One example of such field type would be [SEO]([[= user_doc =]]/search_engine_optimization/work_with_seo/), 
 because it handles functionality that applies to all content items of the content type.
-You can use the anchor menu feature with other Field Types, including [custom ones](create_custom_generic_field_type.md).
+You can use the anchor menu feature with other field types, including [custom ones](create_custom_generic_field_type.md).
 
-See the following example to learn how you can add a Field Type as an anchor menu.
+See the following example to learn how you can add a field type as an anchor menu.
 
 ## Modify YAML configuration
 
-Modify the Field Type visibility under the `ibexa.system.<scope>.admin_ui_forms.content_type_edit.field_types` [configuration key](configuration.md#configuration-files):
+Modify the field type visibility under the `ibexa.system.<scope>.admin_ui_forms.content_type_edit.field_types` [configuration key](configuration.md#configuration-files):
 
 ```yaml
 ibexa:
@@ -31,11 +31,11 @@ ibexa:
 
 Where keys have the following meaning:
 
-- `field_type_identifier` - replace this key with an identifier of the Field Type that you want to make more prominent. In case of SEO, this key is `ibexa_seo`. 
-- `meta` - when this flag is set to `true`, it separates the Field Type from the **Field definitions** section and puts it in an anchor menu
-- `position` - decides about the Field Type's position on the content type edit screen and in the content item, in relation to other Field Types
+- `field_type_identifier` - replace this key with an identifier of the field type that you want to make more prominent. In case of SEO, this key is `ibexa_seo`. 
+- `meta` - when this flag is set to `true`, it separates the field type from the **Field definitions** section and puts it in an anchor menu
+- `position` - decides about the field type's position on the content type edit screen and in the content item, in relation to other field types
 
-Additionally, setting `meta` to `true` adds a toggle for enabling or disabling the Field Type. 
+Additionally, setting `meta` to `true` adds a toggle for enabling or disabling the field type. 
 In case of SEO, it adds the **Enable SEO for this content type** toggle.
 Enable the toggle to display the SEO section on the content item edit page. 
 
@@ -43,4 +43,4 @@ Enable the toggle to display the SEO section on the content item edit page.
 
 !!! note
 
-    If you add multiple Field Types as anchor menus, they're automatically displayed as separate sections. 
+    If you add multiple field types as anchor menus, they're automatically displayed as separate sections. 
diff --git a/docs/administration/content_organization/content_types.md b/docs/administration/content_organization/content_types.md
index 0fb56f429d..6e5b82a5a2 100644
--- a/docs/administration/content_organization/content_types.md
+++ b/docs/administration/content_organization/content_types.md
@@ -63,7 +63,7 @@ Each content type is characterized by a set of metadata which define the general
 ## Field definitions
 
 Aside from the metadata, a content type may contain any number of Field definitions (but has to contain at least one).
-They determine what Fields of what Field Types are included in all content items based on this content type.
+They determine what Fields of what field types are included in all content items based on this content type.
 
 ![Field definitions](admin_panel_field_definitions.png)
 
@@ -75,7 +75,7 @@ They determine what Fields of what Field Types are included in all content items
 
 !!! caution
 
-    In case of content types containing many Field Types you should be aware of possible memory-related issues with publishing/editing.
+    In case of content types containing many field types you should be aware of possible memory-related issues with publishing/editing.
     they're caused by the limitation of how many `$_POST` input variables can be accepted.
 
     The easiest way to fix them is by increasing the `max_input_vars` value in the `php.ini` configuration file.
diff --git a/docs/administration/project_organization/architecture.md b/docs/administration/project_organization/architecture.md
index 4b74756500..b1c675abcb 100644
--- a/docs/administration/project_organization/architecture.md
+++ b/docs/administration/project_organization/architecture.md
@@ -24,7 +24,7 @@ The architecture of [[= product_name =]] is layered and uses clearly defined API
 | [GraphQL](graphql.md)                               | GraphQL for [[= product_name =]] exposes the domain model using the Repository, based on content type groups, content types and Field definitions.                                             |
 | [Public PHP API](php_api.md)                        | Public PHP API exposes the Repository which enables you to create, read, update, manage and delete all objects available in [[= product_name =]].                                              |
 | Business Logic                                      | The business logic is defined in the kernel. This business logic is exposed to applications via an API. It is used to organize development of the user interface layer.                        |
-| SPI                                                 | Service Provider Interface which defines contracts for implementing various parts of the system, including persistence layer (`SPI\Persistence`), custom Field Types, custom limitations, etc. |
+| SPI                                                 | Service Provider Interface which defines contracts for implementing various parts of the system, including persistence layer (`SPI\Persistence`), custom field types, custom limitations, etc. |
 | [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](legacy_search_overview.md)     | Legacy search engine is SQL-based and uses Doctrine's database connection.                                                                                                                     |
diff --git a/docs/administration/project_organization/bundles.md b/docs/administration/project_organization/bundles.md
index 73fb4d479c..41ee7989f8 100644
--- a/docs/administration/project_organization/bundles.md
+++ b/docs/administration/project_organization/bundles.md
@@ -54,9 +54,9 @@ see the [How to Remove a Bundle]([[= symfony_doc =]]/bundles/remove.html) instru
 |[ibexa/cron](https://github.com/ibexa/cron)|Cron package for use with the `ibexa:cron:run` command|
 |[ibexa/design-engine](https://github.com/ibexa/design-engine)|[Design fallback system](design_engine.md)|
 |[ibexa/doctrine-schema](https://github.com/ibexa/doctrine-schema)| Basic abstraction layer for cross-DBMS schema import|
-|[ibexa/fieldtype-matrix](https://github.com/ibexa/fieldtype-matrix)|[Matrix Field Type](matrixfield.md)|
-|[ibexa/fieldtype-query](https://github.com/ibexa/fieldtype-query)|[Query Field Type](contentqueryfield.md)|
-|[ibexa/fieldtype-richtext](https://github.com/ibexa/fieldtype-richtext)|Field Type for supporting rich-formatted text stored in a structured XML format|
+|[ibexa/fieldtype-matrix](https://github.com/ibexa/fieldtype-matrix)|[Matrix field type](matrixfield.md)|
+|[ibexa/fieldtype-query](https://github.com/ibexa/fieldtype-query)|[Query field type](contentqueryfield.md)|
+|[ibexa/fieldtype-richtext](https://github.com/ibexa/fieldtype-richtext)|field type for supporting rich-formatted text stored in a structured XML format|
 |[ibexa/graphql](https://github.com/ibexa/graphql)|GraphQL server for [[= product_name =]]|
 |[ibexa/http-cache](https://github.com/ibexa/http-cache)|[HTTP cache handling](http_cache.md), using multi tagging|
 |[ibexa/i18n](https://github.com/ibexa/i18n)|Centralized translations to ease synchronization with Crowdin|
@@ -82,7 +82,7 @@ see the [How to Remove a Bundle]([[= symfony_doc =]]/bundles/remove.html) instru
 |ibexa/icons|Icon set for the back office|
 |ibexa/image-editor|[Image Editor](configure_image_editor.md)|
 |ibexa/installer|Provides the `ibexa:install` command|
-|ibexa/measurement|Measurement Field Type and measurement product catalog attribute|
+|ibexa/measurement|Measurement field type and measurement product catalog attribute|
 |ibexa/migrations|[Migration of Repository data](data_migration.md)|
 |[ibexa/oauth2-client](oauth_client.md)|Authenticate user through a third-party OAuth 2 server, integration with [`knpuniversity/oauth2-client-bundle`](https://github.com/knpuniversity/oauth2-client-bundle)|
 |[ibexa/oauth2-server](oauth_server.md)|Allow resource access to OAuth 2 client|
@@ -97,7 +97,7 @@ see the [How to Remove a Bundle]([[= symfony_doc =]]/bundles/remove.html) instru
 |ibexa/recommendation-client|Client for connecting with the personalization engine **deprecated**|
 |ibexa/commerce-base-design|Standard design and theme for the shop **deprecated** |
 |ibexa/commerce-checkout|Shop checkout functionality **deprecated** |
-|ibexa/commerce-fieldtypes|Shop-specific Field Types **deprecated** |
+|ibexa/commerce-fieldtypes|Shop-specific field types **deprecated** |
 |ibexa/commerce-price-engine|Engine for handling prices **deprecated** |
 |ibexa/commerce-shop-ui|UI for the shop front page **deprecated** |
 |ibexa/commerce-shop|Main shop functionalities **deprecated** |
@@ -108,10 +108,10 @@ see the [How to Remove a Bundle]([[= symfony_doc =]]/bundles/remove.html) instru
 |---------|-----------|
 |ibexa/headless|Metapackage for Symfony Flex-based [[= product_name =]] Headless installation|
 |ibexa/corporate-account|Customer portal and corporate accounts|
-|ibexa/fieldtype-address|Address handling Field Type|
+|ibexa/fieldtype-address|Address handling field type|
 |ibexa/form-builder|Enables creating Form content items with multiple form fields|
 |ibexa/page-builder|Page editor|
-|ibexa/fieldtype-page|Page handling Field Type|
+|ibexa/fieldtype-page|Page handling field type|
 |ibexa/permissions|Additional permission functionalities|
 |ibexa/segmentation|Segment functionality for profiling the content displayed to specific users|
 |ibexa/site-factory|Enables configuration of sites from UI|
diff --git a/docs/api/graphql/graphql.md b/docs/api/graphql/graphql.md
index 0fc1813a5f..c93216a247 100644
--- a/docs/api/graphql/graphql.md
+++ b/docs/api/graphql/graphql.md
@@ -30,7 +30,7 @@ for example names that start with a digit.
 
 This concerns image variations, content types, content type groups, product types, and Field definition identifiers.
 
-it's recommended to rename the relevant identifiers. Failure to generate schema is registered in logs.
+It's recommended to rename the relevant identifiers. Failure to generate schema is registered in logs.
 To find identifiers that are not included in the schema, look for "Skipped schema generation" log messages, for example:
 `Skipped schema generation for Image Variation`.
 
diff --git a/docs/api/graphql/graphql_custom_ft.md b/docs/api/graphql/graphql_custom_ft.md
index 3d74957360..ff317f4da5 100644
--- a/docs/api/graphql/graphql_custom_ft.md
+++ b/docs/api/graphql/graphql_custom_ft.md
@@ -1,10 +1,10 @@
 ---
-description: Add GraphQL support to custom Field Types.
+description: Add GraphQL support to custom field types.
 ---
 
-# Add GraphQL support to custom Field Types
+# Add GraphQL support to custom field types
 
-If you want to use custom Field Types in GraphQL, you need to map them.
+If you want to use custom field types in GraphQL, you need to map them.
 Their values and field definition structure, need to be defined, to interact with them using GraphQL.
 For example:
 
@@ -13,15 +13,15 @@ For example:
 | Text Line     | string | default | `TextLineFieldDefinition`    |
 | Relation List | `Item` `ArticleItem` `ImageItem` | customized | `RelationListFieldDefinitio` |
 
-## Map a custom Field Type
+## Map a custom field type
 
-There are two ways of mapping a custom Field Type:
+There are two ways of mapping a custom field type:
 
 - configuration
 - custom `FieldDefinitionMapper`
 
 You need to write a custom `FieldDefinitionMapper` if the field definition settings and constraints impact how it's mapped to GraphQL.
-For example, the selection Field Type has a "multiple" option. 
+For example, the selection field type has a "multiple" option. 
 If set to false, it accepts and returns a single value, 
 but if set to true, it accepts and returns an array of values.
 
@@ -29,9 +29,9 @@ If your field definition doesn't require additional clarifications, you can map
 
 ### Map with configuration
 
-To map a custom Field Type with configuration use a compiler pass to modify a container parameter, `ibexa.graphql.schema.content.mapping.field_definition_type`.
+To map a custom field type with configuration use a compiler pass to modify a container parameter, `ibexa.graphql.schema.content.mapping.field_definition_type`.
 
-it's a hash that maps a Field Type identifier (`ezstring`) to the following entries:
+It's a hash that maps a field type identifier (`ezstring`) to the following entries:
 
 - `value_type` - the GraphQL type values of the custom field. It can be a native type (string, int), or a custom type. If none is specified, string is used.
 - `value_resolver` - how values of this field are resolved and passed to the defined value type. If not specified, it receives the `Field` object for the field type: `field`.
@@ -59,7 +59,7 @@ services:
 
 The `$innerMapper` argument passes the decorated mapper to the constructor.
 You can use the `DecoratingFieldDefinitionMapper` from the `graphql` package.
-It requires that you implement the `getFieldTypeIdentifier` method to tell which Field Type is covered by the mapper.
+It requires that you implement the `getFieldTypeIdentifier` method to tell which field type is covered by the mapper.
 
 Add `MyCustomFieldDefinitionMapper.php` mapper to `src/GraphQL/Schema`:
 
@@ -84,7 +84,7 @@ To do that, you need to replace `mapXXX` by the method it's in:
          }
 ```
 
-it's required for every implemented method, so that other mappers are called for the other Field Types.
+It's required for every implemented method, so that other mappers are called for the other field types.
 
 The [`RelationFieldDefinitionMapper`](https://github.com/ibexa/graphql/blob/main/src/lib/Schema/Domain/Content/Mapper/FieldDefinition/RelationFieldDefinitionMapper.php) example:
 
@@ -144,10 +144,10 @@ The cardinality (single or collection) depends on the selection limit setting:
 
 #### Field input mapping
 
-The `mapToFieldValueInputType` method is used to document what input type is expected by Field Types that require a more complex input value.
+The `mapToFieldValueInputType` method is used to document what input type is expected by field types that require a more complex input value.
 For example, `ezmatrix` generates its own input types depending on the configured columns.
 
-Example of a `MyCustomFieldDefinitionMapper` mapper for a complex Field Type:
+Example of a `MyCustomFieldDefinitionMapper` mapper for a complex field type:
 
 ```php
 class MyFieldDefinitionMapper extends DecoratingFieldDefinitionMapper implements FieldDefinitionMapper
diff --git a/docs/api/graphql/graphql_queries.md b/docs/api/graphql/graphql_queries.md
index ad37026c93..6dad846102 100644
--- a/docs/api/graphql/graphql_queries.md
+++ b/docs/api/graphql/graphql_queries.md
@@ -830,6 +830,6 @@ To request a specific page, provide the `cursor` as an argument to `children`:
 children(first: 3, after: "YXJyYXljb25uZWN0aW9uOjM=")
 ```
 
-### Get Matrix Field Type
+### Get Matrix field type
 
-To get a Matrix Field Type with GraphQL, see [Matrix Field Type reference](matrixfield.md).
+To get a Matrix field type with GraphQL, see [Matrix field type reference](matrixfield.md).
diff --git a/docs/api/php_api/php_api.md b/docs/api/php_api/php_api.md
index 76456ebab7..695b748706 100644
--- a/docs/api/php_api/php_api.md
+++ b/docs/api/php_api/php_api.md
@@ -182,7 +182,7 @@ try {
 
 Symfony service container uses service tags to dedicate services to a specific purpose. they're usually used for extension points.
 
-[[= product_name =]] exposes multiple features using service tags. For example, Field Types are tagged `ibexa.field_type`.
+[[= product_name =]] exposes multiple features using service tags. For example, field types are tagged `ibexa.field_type`.
 
 !!! tip
 
diff --git a/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-FieldType-GatewayBasedStorage.html b/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-FieldType-GatewayBasedStorage.html
index 0628572d28..6dfaffffff 100644
--- a/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-FieldType-GatewayBasedStorage.html
+++ b/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-FieldType-GatewayBasedStorage.html
@@ -36099,7 +36099,7 @@ <h1 id="GatewayBasedStorage">
                                     <a href="classes/Ibexa-Contracts-Core-FieldType-FieldStorage.html"><abbr title="\Ibexa\Contracts\Core\FieldType\FieldStorage">FieldStorage</abbr></a>                            </div>
         
                 </div>
-        <p>Field Type External Storage gateway base class.</p>
+        <p>field type External Storage gateway base class.</p>
 
 
 
@@ -36133,7 +36133,7 @@ <h3 id="property_gateway">
                 <img src="./images/copy.svg" title="Copy path" />
     </div>
         </div>
-    <p>Field Type External Storage Gateway.</p>
+    <p>field type External Storage Gateway.</p>
 
 <div class="highlight">
     <table class="highlighttable">
diff --git a/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-FieldType-Generic-Type.html b/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-FieldType-Generic-Type.html
index 90ce9d877b..47e41ebf69 100644
--- a/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-FieldType-Generic-Type.html
+++ b/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-FieldType-Generic-Type.html
@@ -38246,7 +38246,7 @@ <h3 id="method_getValueClass">
                 <img src="./images/copy.svg" title="Copy path" />
     </div>
         </div>
-    <p>Returns FQN of class representing Field Type Value.</p>
+    <p>Returns FQN of class representing field type Value.</p>
 
 <div class="highlight">
     <table class="highlighttable">
diff --git a/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Persistence-Content-Handler.html b/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Persistence-Content-Handler.html
index 2fc0b8f731..7e8cfba090 100644
--- a/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Persistence-Content-Handler.html
+++ b/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Persistence-Content-Handler.html
@@ -37520,7 +37520,7 @@ <h3 id="method_loadContentList">
 <p>If items are missing but for other reasons then not being found, for instance exceptions during loading field
 data. Then the exception will be logged as warning or error depending on severity.
 The most common case of possible exceptions during loading of Content data is migration,
-where either custom Field Type configuration or implementation might not be aligned with new
+where either custom field type configuration or implementation might not be aligned with new
 version of the system.</p>
 <p>NOTE!!: If you want to take always available flag into account, append main language
 to the list of languages(unless caller is asking for all languages). In some edge cases you'll end up with a
diff --git a/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Field.html b/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Field.html
index d185b4de6e..7979699222 100644
--- a/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Field.html
+++ b/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Field.html
@@ -36195,7 +36195,7 @@ <h3 id="property_fieldTypeIdentifier">
     </table>
 </div>
     <section class="phpdocumentor-description">
-        <p>field type identifier</p>
+        <p>Field type identifier</p>
 
     </section>
 
diff --git a/docs/api/php_api/php_api_reference/namespaces/ibexa-contracts-core-fieldtype.html b/docs/api/php_api/php_api_reference/namespaces/ibexa-contracts-core-fieldtype.html
index 1304162570..7cb32a0b73 100644
--- a/docs/api/php_api/php_api_reference/namespaces/ibexa-contracts-core-fieldtype.html
+++ b/docs/api/php_api/php_api_reference/namespaces/ibexa-contracts-core-fieldtype.html
@@ -36199,7 +36199,7 @@ <h2 id="interfaces">
                     <a href="classes/Ibexa-Contracts-Core-FieldType-GatewayBasedStorage.html">
                         GatewayBasedStorage
                     </a>
-                </span><p>Field Type External Storage gateway base class.</p></li>
+                </span><p>field type External Storage gateway base class.</p></li>
                     <li>
                 <span>
                     <img src="./images/arrow-right.svg" class="arrow" />
diff --git a/docs/api/rest_api/rest_api_authentication.md b/docs/api/rest_api/rest_api_authentication.md
index f0886a8faf..c85cffd57e 100644
--- a/docs/api/rest_api/rest_api_authentication.md
+++ b/docs/api/rest_api/rest_api_authentication.md
@@ -23,7 +23,7 @@ For other security related subjects, see:
 This authentication method requires a session cookie to be sent with each request.
 
 If you use this authentication method with a web browser, this session cookie is automatically available as soon as your visitor logs in.
-Add it as a cookie to your REST requests, and the user will be authenticated.
+Add it as a cookie to your REST requests, and the user can be authenticated.
 
 Sessions are created to re-authenticate the user only (and perform authorization), not to hold session state in the service.
 Because of that, you can use this method as supporting AJAX-based applications even if it violates the principles of RESTful services.
@@ -232,7 +232,7 @@ If an unsafe request is missing the CSRF token, or the token has incorrect value
 ##### Rich client application security concerns
 
 The purpose of CSRF protection is to prevent users from accidentally running harmful operations by being tricked into executing an HTTP(S) request against a web applications they're logged into.
-In browsers this action will be blocked by lack of CSRF token.
+In browsers this action is blocked by lack of CSRF token.
 
 However, if you develop a rich client application (JavaScript, JAVA, iOS, Android, etc.), that is:
 
diff --git a/docs/api/rest_api/rest_api_reference/input/ibexa-content-typegroups.raml b/docs/api/rest_api/rest_api_reference/input/ibexa-content-typegroups.raml
index ccb92a5929..1546ed20d2 100644
--- a/docs/api/rest_api/rest_api_reference/input/ibexa-content-typegroups.raml
+++ b/docs/api/rest_api/rest_api_reference/input/ibexa-content-typegroups.raml
@@ -207,7 +207,7 @@ post:
                         application/vnd.ibexa.api.ContentType+json:
                             type: ContentTypeWrapper
                 400:
-                    description: Error - The input does not match the input schema definition. Validation on a Field definition fails. Validation of the content type fails, e.g. multiple Fields of a same singular Field Type are provided. Publish is set to true and the input is not complete e.g. no Field definitions are provided.
+                    description: Error - The input does not match the input schema definition. Validation on a Field definition fails. Validation of the content type fails, e.g. multiple Fields of a same singular field type are provided. Publish is set to true and the input is not complete e.g. no Field definitions are provided.
                 401:
                     description: Error - The user is not authorized to create this content type.
                 403:
diff --git a/docs/api/rest_api/rest_api_reference/input/ibexa-types.raml b/docs/api/rest_api/rest_api_reference/input/ibexa-types.raml
index 322512ef3d..2ca6a0f767 100644
--- a/docs/api/rest_api/rest_api_reference/input/ibexa-types.raml
+++ b/docs/api/rest_api/rest_api_reference/input/ibexa-types.raml
@@ -983,11 +983,11 @@ Field:
             type: string
             required: false
         fieldTypeIdentifier:
-            description: 'Field Type identifier.'
+            description: 'Field type identifier.'
             type: string
             required: false
         fieldValue:
-            description: 'A Field Type value or a value type which can be converted by the corresponding field type.'
+            description: 'A field type value or a value type which can be converted by the corresponding field type.'
             type: any
 
 FieldDefinitionsWrapper:
@@ -1147,10 +1147,10 @@ FieldDefinitionUpdateStruct:
             description: 'If set the information collector flag is set to this value.'
             type: boolean
         validatorConfiguration:
-            description: 'If set this validator configuration supported by the Field Type replaces the existing one.'
+            description: 'If set this validator configuration supported by the field type replaces the existing one.'
             type: any
         fieldSettings:
-            description: 'If set this settings supported by the Field Type replaces the existing ones.'
+            description: 'If set this settings supported by the field type replaces the existing ones.'
             type: any
         defaultValue:
             description: 'If set the default value for this field is changed to the given value.'
diff --git a/docs/api/rest_api/rest_api_reference/rest_api_reference.html b/docs/api/rest_api/rest_api_reference/rest_api_reference.html
index 697d84f8a2..073d1b8ca0 100644
--- a/docs/api/rest_api/rest_api_reference/rest_api_reference.html
+++ b/docs/api/rest_api/rest_api_reference/rest_api_reference.html
@@ -32998,7 +32998,7 @@ <h6 class="heading text-gray border-bottom pb-2">Possible responses</h6>
                                                             400
                                                     </td>
                         <td>
-                            <p>Error - The input does not match the input schema definition. Validation on a Field definition fails. Validation of the content type fails, e.g. multiple Fields of a same singular Field Type are provided. Publish is set to true and the input is not complete e.g. no Field definitions are provided.</p>
+                            <p>Error - The input does not match the input schema definition. Validation on a Field definition fails. Validation of the content type fails, e.g. multiple Fields of a same singular field type are provided. Publish is set to true and the input is not complete e.g. no Field definitions are provided.</p>
                         </td>
                     </tr>
                                     <tr>
@@ -134702,7 +134702,7 @@ <h6 class="heading text-gray border-bottom pb-2">Types</h6>
 (<span class="font-italic">string</span>)
  - 
 <span>
-    Field Type identifier.</span>
+    Field type identifier.</span>
 
 
                 </li>
@@ -134714,7 +134714,7 @@ <h6 class="heading text-gray border-bottom pb-2">Types</h6>
 (<span class="font-italic">any</span>)
  - 
 <span>
-    A Field Type value or a value type which can be converted by the corresponding field type.</span>
+    A field type value or a value type which can be converted by the corresponding field type.</span>
 
 
                 </li>
@@ -135503,7 +135503,7 @@ <h6 class="heading text-gray border-bottom pb-2">Types</h6>
 (<span class="font-italic">any</span>)
  - 
 <span>
-    If set this validator configuration supported by the Field Type replaces the existing one.</span>
+    If set this validator configuration supported by the field type replaces the existing one.</span>
 
 
                 </li>
@@ -135515,7 +135515,7 @@ <h6 class="heading text-gray border-bottom pb-2">Types</h6>
 (<span class="font-italic">any</span>)
  - 
 <span>
-    If set this settings supported by the Field Type replaces the existing ones.</span>
+    If set this settings supported by the field type replaces the existing ones.</span>
 
 
                 </li>
diff --git a/docs/cdp/cdp_data_customization.md b/docs/cdp/cdp_data_customization.md
index 2d3c76ce4d..e2a371c484 100644
--- a/docs/cdp/cdp_data_customization.md
+++ b/docs/cdp/cdp_data_customization.md
@@ -5,13 +5,13 @@ edition: experience
 
 # Data customization
 ​
-You can customize Content and Product data exported to CDP and you can control what Field Type information you want to export.
-By default, custom Field Types have basic export functionality.
+You can customize Content and Product data exported to CDP and you can control what field type information you want to export.
+By default, custom field types have basic export functionality.
 It casts their `Value` object to string, thanks to `\Stringable` implementation.
 ​
-## Export Field Types
+## Export field types
 ​
-Field Types are exported with metadata, for example, ID, Field Definition name, type, value. 
+Field types are exported with metadata, for example, ID, Field Definition name, type, value. 
 You can also provide your own `\Ibexa\Contracts\Cdp\Export\Content\FieldProcessorInterface` instance to extend metadata. 
 The provided implementation has to be defined as a service and tagged with `ibexa.cdp.export.content.field_processor`. 
 Additionally, you can specify `priority` to override the default behavior. 
@@ -22,7 +22,7 @@ The interface is plain and has two methods that you need to provide:
 - **supports** - decides whether your `FieldProcessor` can work with the `Field` instance.
 - **process** - takes `Field` instance and then returns a flat array of scalar values that are combined with the payload data.
 ​
-A common Field Type is serialized to:
+A common field type is serialized to:
 ​
 ```json
 {
@@ -43,14 +43,14 @@ A common Field Type is serialized to:
 Field identifier is a prefix that is automatically added to each key.
 You can only use scalar values.
 ​
-### Built in Field Processors for custom Field Types
+### Built in Field Processors for custom field types
 ​
 You can provide your own CDP export functionality by using one of the system Field Processors:
 
 #### `\Ibexa\Cdp\Export\Content\FieldProcessor\SkippingFieldProcessor`.
 ​
-It results in the Field Type being excluded from the exported payload.
-To avoid adding the Field Type data to the payload, register a new service as follows:
+It results in the field type being excluded from the exported payload.
+To avoid adding the field type data to the payload, register a new service as follows:
 ​
 ```yaml
 custom_fieldtype.cdp.export.field_processor:
@@ -62,30 +62,30 @@ custom_fieldtype.cdp.export.field_processor:
         - { name: 'ibexa.cdp.export.content.field_processor', priority: 0 }
 ```
 ​
-## Export Field Type values
+## Export field type values
 ​
-To customize export of Field Type values, provide your own `\Ibexa\Contracts\Cdp\Export\Content\FieldValueProcessorInterface` instance.
+To customize export of field type values, provide your own `\Ibexa\Contracts\Cdp\Export\Content\FieldValueProcessorInterface` instance.
 New implementation has to be registered as a service manually or by using autoconfiguration. 
 The service has to use the tag `ibexa.cdp.export.content.field_value_processor`.
 You can also provide `priority` property to override other Field Value Processors.
 ​
 * `FieldValueProcessorInterface::process` - takes `Field` instance and returns an `array` with scalar values that are applied to export data payload.
-If the Field Type returns a single value, provides a `value` key in the array.
+If the field type returns a single value, provides a `value` key in the array.
 You can return multiple values.
 
 * `FieldValueProcessorInterface::supports` - decides whether `FieldValueProcessor` can work with the `Field`.
 ​
-### Built in Field Value Processors for custom Field Types
+### Built in Field Value Processors for custom field types
 ​
-Several system Field Value Processors either work by default or can be registered for custom Field Types:
+Several system Field Value Processors either work by default or can be registered for custom field types:
 ​
 #### `\Ibexa\Cdp\Export\Content\FieldValueProcessor\CastToStringFieldValueProcessor`
 ​
-This Processor is a default one, as long as no other Processor with higher priority is registered. It makes `\Stringable` implementation of the Field Type `\Ibexa\Core\FieldType\Value` object to use it as a value in the final payload.
+This Processor is a default one, as long as no other Processor with higher priority is registered. It makes `\Stringable` implementation of the field type `\Ibexa\Core\FieldType\Value` object to use it as a value in the final payload.
 ​
 #### `\Ibexa\Cdp\Export\Content\FieldValueProcessor\JsonHashFieldValueProcessor`
 ​
-This Processor generates JSON data from hash representation of the Field Type (it uses `\Ibexa\Contracts\Core\FieldType\FieldType::toHash` method).
+This Processor generates JSON data from hash representation of the field type (it uses `\Ibexa\Contracts\Core\FieldType\FieldType::toHash` method).
 
 !!! warning
 
diff --git a/docs/cdp/cdp_guide.md b/docs/cdp/cdp_guide.md
index f1f0fad684..b3241fa1b5 100644
--- a/docs/cdp/cdp_guide.md
+++ b/docs/cdp/cdp_guide.md
@@ -72,8 +72,8 @@ For more information, see [CDP data export](https://doc.ibexa.co/en/latest/cdp/c
 
 ### Data customization
 
-​You can customize Content and Product data exported to [[= product_name_cdp =]] and control what Field Type information you want to export.
-With [[= product_name_cdp =]], you can export Field Types and Field Type values. they're exported with metadata and attributes, for example, ID, Field Definition name, type, value.
+​You can customize Content and Product data exported to [[= product_name_cdp =]] and control what field type information you want to export.
+With [[= product_name_cdp =]], you can export field types and field type values. they're exported with metadata and attributes, for example, ID, Field Definition name, type, value.
 
 For more information, see [data customization](https://doc.ibexa.co/en/latest/cdp/cdp_data_customization/#data-customization) documentation in Developer Documentation.
 
@@ -116,7 +116,7 @@ Analyze customer data, track campaigns, and discover the most effective strategi
 
 ### Data customization
 
-Customize data to control what Field Type information you want to export.
+Customize data to control what field type information you want to export.
 
 ### Real-time action
 
diff --git a/docs/commerce/checkout/customize_checkout.md b/docs/commerce/checkout/customize_checkout.md
index 6610e1ef06..5b6fe3fa5e 100644
--- a/docs/commerce/checkout/customize_checkout.md
+++ b/docs/commerce/checkout/customize_checkout.md
@@ -277,9 +277,9 @@ When you have multiple checkout workflows, you can specify which one to use by p
 With this setup, you can specify which workflow to use by clicking the button or link that starts the checkout. 
 The argument passed determines which workflow is used, providing flexibility in workflow selection.
 
-## Define custom Address Field Type formats 
+## Define custom Address field type formats 
 
-To create custom Address Field Type formats to be used in checkout, make the following changes in the project configuration files. 
+To create custom Address field type formats to be used in checkout, make the following changes in the project configuration files. 
 
 First, define custom format configuration keys for `billing_address_format` and `shipping_address_format`:
 
diff --git a/docs/content_management/content_api/browsing_content.md b/docs/content_management/content_api/browsing_content.md
index 22f40d7c83..d3ce0981a3 100644
--- a/docs/content_management/content_api/browsing_content.md
+++ b/docs/content_management/content_api/browsing_content.md
@@ -226,9 +226,9 @@ $output->writeln("Parent Location: " . $mainLocation->getParentLocation()->pathS
 When dealing with Location objects (and Trash objects), you can get access to content item directly using `$location->getContent`.
 In Twig this can also be accessed by `location.content`.
 
-This is a lazy property. It will trigger loading of content when first used.
+This is a lazy property. It triggers loading of content when first used.
 In case of bulk of Locations coming from Search or Location Service,
-the Content will also be loaded in bulk for the whole Location result set.
+the content is also loaded in bulk for the whole Location result set.
 
 ## Comparing content versions
 
@@ -244,7 +244,7 @@ $versionTo = $this->contentService->loadVersionInfo($contentInfo, $versionToId);
 $nameComparison = $this->comparisonService->compare($versionFrom, $versionTo)->getFieldValueDiffByIdentifier('name')->getComparisonResult();
 ```
 
-`getComparisonResult` returns a `ComparisonResult` object, which depends on the Field Type being compared.
+`getComparisonResult` returns a `ComparisonResult` object, which depends on the field type being compared.
 In the example of a Text Line (ezstring) Field, it's an array of `StringDiff` objects.
 
 Each diff contains a section of the Field to compare (e.g. a part of a text line)
diff --git a/docs/content_management/content_api/creating_content.md b/docs/content_management/content_api/creating_content.md
index 825096fe11..403ce8978c 100644
--- a/docs/content_management/content_api/creating_content.md
+++ b/docs/content_management/content_api/creating_content.md
@@ -6,7 +6,7 @@ description: Create, publish, update and translate content items by using the PH
 
 !!! note
 
-    Creating most objects will be impossible for an anonymous user.
+    Creating most objects is impossible for an anonymous user.
     Make sure to [authenticate](php_api.md#setting-the-repository-user) as a user with sufficient permissions.
 
 !!! tip "Content REST API"
@@ -33,19 +33,19 @@ For information about translating a content item into other languages, see [Tran
 
 [`ContentStruct::setField`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-ContentStruct.html#method_setField) (line 3) enables you to define the Field values.
 When the Field accepts a simple value, you can provide it directly, as in the example above.
-For some Field Types, for example [images](#creating-an-image), you need to provide an instance of a Value type.
+For some field types, for example [images](#creating-an-image), you need to provide an instance of a Value type.
 
 ### Creating an image
 
-Image Field Type requires an instance of its Value type, which you must provide to the [`ContentStruct::setField`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-ContentStruct.html#method_setField) method.
-Therefore, when creating a content item of the Image type (or any other content type with an `image` Field Type),
+Image field type requires an instance of its Value type, which you must provide to the [`ContentStruct::setField`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-ContentStruct.html#method_setField) method.
+Therefore, when creating a content item of the Image type (or any other content type with an `image` field type),
 the `ContentCreateStruct` is slightly more complex than in the previous example:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/CreateImageCommand.php', 56, 69) =]]
 ```
 
-Value of the Image Field Type contains the path to the image file, as well as other basic information
+Value of the Image field type contains the path to the image file, as well as other basic information
 based on the input file.
 
 ### Creating content with RichText
@@ -58,7 +58,7 @@ For example, to add a simple RichText paragraph, provide the following as input:
 ```
 
 To learn more about the format and how it represents different elements of rich text, see
-[RichText Field Type reference](richtextfield.md#custom-docbook-format).
+[RichText field type reference](richtextfield.md#custom-docbook-format).
 
 ## Publishing a draft
 
diff --git a/docs/content_management/content_api/managing_content.md b/docs/content_management/content_api/managing_content.md
index 9313e4c484..28c96b97a3 100644
--- a/docs/content_management/content_api/managing_content.md
+++ b/docs/content_management/content_api/managing_content.md
@@ -34,7 +34,7 @@ and pass it to the [`LocationService::createLocation`](../../api/php_api/php_api
 `LocationCreateStruct` must receive the parent Location ID.
 It sets the `parentLocationId` property of the new Location.
 
-You can also provide other properties for the Location, otherwise they will be set to their defaults:
+You can also provide other properties for the Location, otherwise they are set to their defaults:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/AddLocationToContentCommand.php', 52, 54) =]]
@@ -71,10 +71,10 @@ You can remove a Location either by deleting it, or sending it to Trash.
 Deleting makes use of [`LocationService::deleteLocation()`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-LocationService.html#method_deleteLocation).
 It permanently deletes the Location, together with its whole subtree.
 
-Content which has only this one Location will be permanently deleted as well.
-Content which has more Locations will be still available in its other Locations.
+Content which has only this one Location is permanently deleted as well.
+Content which has more Locations is still available in its other Locations.
 If you delete the [main Location](#changing-the-main-location) of a content item that has more Locations,
-another Location will become the main one.
+another Location becomes the main one.
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/DeleteContentCommand.php', 44, 45) =]]
@@ -126,7 +126,7 @@ Trash Location is identical to the origin Location of the object.
 [[= include_file('code_samples/api/public_php_api/src/Command/TrashContentCommand.php', 64, 65) =]]
 ```
 
-The content item will be restored under its previous Location.
+The content item is restored under its previous Location.
 You can also provide a different Location to restore in as a second argument:
 
 ``` php
@@ -170,7 +170,7 @@ To copy a content type, use [`ContentTypeService::copyContentType`](../../api/ph
 [[= include_file('code_samples/api/public_php_api/src/Command/CreateContentTypeCommand.php', 89, 90) =]]
 ```
 
-The copy will automatically be given an identifier based on the original content type identifier
+The copy is automatically getting an identifier based on the original content type identifier
 and the copy's ID, for example: `copy_of_folder_21`.
 
 To change the identifier of the copy, use a [`ContentTypeUpdateStruct`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-ContentType-ContentTypeUpdateStruct.html):
diff --git a/docs/content_management/content_management.md b/docs/content_management/content_management.md
index eddb961b85..86909c5451 100644
--- a/docs/content_management/content_management.md
+++ b/docs/content_management/content_management.md
@@ -1,5 +1,5 @@
 ---
-description: Manage content in Ibexa DXP by learning about the content model, Field Types, pages, forms, workflows, and so on.
+description: Manage content in Ibexa DXP by learning about the content model, field types, pages, forms, workflows, and so on.
 page_type: landing_page
 ---
 
diff --git a/docs/content_management/content_management_guide.md b/docs/content_management/content_management_guide.md
index 2e3837d491..bf4141fd2f 100644
--- a/docs/content_management/content_management_guide.md
+++ b/docs/content_management/content_management_guide.md
@@ -48,19 +48,19 @@ which allows you to build complex architectures with multiple locales and output
 ## Content model
 
 A structure of elements that *store* content information is referred to as the **content model**. 
-[[= product_name =]] comes with a predefined content model that includes a broad set of various Field Types and several content types.
+[[= product_name =]] comes with a predefined content model that includes a broad set of various field types and several content types.
 
 You can customize and adapt the content model to your organization's needs and the type of output channel that you use. 
-If need be, development teams can [create new Field Types](creating_a_point2d_field_type.md), to enhance editor and visitor experiences. 
-Content managers or even editors can then apply such Field Types when they modify existing or create new content types. 
+If need be, development teams can [create new field types](creating_a_point2d_field_type.md), to enhance editor and visitor experiences. 
+Content managers or even editors can then apply such field types when they modify existing or create new content types. 
 The editing interface lets all users, including those with no coding experience, create or modify certain areas of the content model.
 
 For technical details, see [a Content model](content_model.md#content-model).
 
-### Field Types
+### Field types
 
-[Field Types](field_types.md) are the smallest elements of the content model’s structure. 
-[[= product_name =]] comes with many built-in Field Types that cover most common needs, 
+[Field types](field_types.md) are the smallest elements of the content model’s structure. 
+[[= product_name =]] comes with many built-in field types that cover most common needs, 
 for example, Text line, RichText, Integer, Measurement, Map location, etc.
 
 Their role is to:
@@ -68,18 +68,18 @@ Their role is to:
 - store data
 - validate input data
 - make the data searchable
-- display Fields of a given Field Type
+- display Fields of a given field type
 
-For a complete list of available Field Types, see [Field Type reference](field_type_reference.md).
+For a complete list of available field types, see [field type reference](field_type_reference.md).
 
-![Field Types and Fields](img/field_types.png)
+![Field types and fields](img/field_types.png)
 
 ### Fields
 
-Once you use a Field Type to design and build a content type definition, and define its settings, it becomes a Field.
+Once you use a field type to design and build a content type definition, and define its settings, it becomes a Field.
 
-Fields can be as simple as Name, based on a Text line Field Type, or as complex as Page, 
-based on a Landing Page Field Type, with multiple options to set and choose from:
+Fields can be as simple as Name, based on a Text line field type, or as complex as Page, 
+based on a Landing Page field type, with multiple options to set and choose from:
 
 ![Landing Page Field settings](img/fields.png)
 
diff --git a/docs/content_management/content_model.md b/docs/content_management/content_model.md
index 52c156c17a..eec0d29e4f 100644
--- a/docs/content_management/content_model.md
+++ b/docs/content_management/content_model.md
@@ -80,19 +80,19 @@ The Fields of a content item are defined by the content type to which the conten
 s
 ## Fields
 
-A Field is the smallest unit of storage in the content model and the building block of all content items. Every Field belongs to a Field Type.
+A Field is the smallest unit of storage in the content model and the building block of all content items. Every Field belongs to a field type.
 
-Beyond the built-in set of Field Types, you can [create your own](create_custom_generic_field_type.md).
+Beyond the built-in set of field types, you can [create your own](create_custom_generic_field_type.md).
 
 ### Field value validation
 
-The values entered in a Field may undergo validation, which means the system makes sure that they're correct for the chosen Field Type and can be used without a problem.
+The values entered in a Field may undergo validation, which means the system makes sure that they're correct for the chosen field type and can be used without a problem.
 
-Validation depends on the settings of a particular Field Type. It cannot be turned off for a Field if its Field Type supports it.
+Validation depends on the settings of a particular field type. It cannot be turned off for a Field if its field type supports it.
 
 ### Field details
 
-Aside from the Field Type, the Field definition in a content type provides the following information:
+Aside from the field type, the Field definition in a content type provides the following information:
 
 **Name** – a user-friendly name that describes the Field. This name is used in the interface, but not internally by the system. It can consist of letters, digits, spaces and special characters; the maximum length is 255 characters. If no name is provided, a unique one is automatically generated.
 
@@ -110,17 +110,17 @@ Aside from the Field Type, the Field definition in a content type provides the f
 
 **[Searchable](search.md)** – a flag which indicates if the value of the Field is indexed for searching.
 
-The Searchable flag is not available for some Fields, because some Field Types do not allow searching through their values.
+The Searchable flag is not available for some Fields, because some field types do not allow searching through their values.
 
-**[Translatable](languages.md)** – a flag which indicates if the value of the Field can be translated. This is independent of the Field Type, which means that even Fields such as "Float" or "Image" can be set as translatable.
+**[Translatable](languages.md)** – a flag which indicates if the value of the Field can be translated. This is independent of the field type, which means that even Fields such as "Float" or "Image" can be set as translatable.
 
-Depending on the Field Type, there may also be other, specific information to fill in. For example, the "Country" Field Type allows you to select the default country, as well as to allow selecting multiple countries at the same time.
+Depending on the field type, there may also be other, specific information to fill in. For example, the "Country" field type allows you to select the default country, as well as to allow selecting multiple countries at the same time.
 
 ![Diagram of content model](content_model_diagram.png)
 
 !!! tip
 
-    You can disable the possibility to edit specific Field details per Field Type by [adding custom service definition for `ModifyFieldDefinitionsCollectionTypeExtension`](customize_field_type_metadata.md).
+    You can disable the possibility to edit specific Field details per field type by [adding custom service definition for `ModifyFieldDefinitionsCollectionTypeExtension`](customize_field_type_metadata.md).
 
 ## Content versions
 
diff --git a/docs/content_management/content_relations.md b/docs/content_management/content_relations.md
index 199b50b638..38f7316c61 100644
--- a/docs/content_management/content_relations.md
+++ b/docs/content_management/content_relations.md
@@ -16,7 +16,7 @@ Instead of using a fixed set of image attributes, the images are stored as separ
 There are different types of Relations available in the system.
 Content can have Relations on item or on Field level.
 
-*Relations at Field level* are created using one of two special Field Types: Content relation (single) and Content relations (multiple).
+*Relations at Field level* are created using one of two special field types: Content relation (single) and Content relations (multiple).
 These Fields allow you to select one or more other content items in the Field value, which are linked to these Fields.
 
 *Relations at content item level* can be of three different types:
diff --git a/docs/content_management/field_types/create_custom_field_type_comparison.md b/docs/content_management/field_types/create_custom_field_type_comparison.md
index 4816a11174..30585b91c0 100644
--- a/docs/content_management/field_types/create_custom_field_type_comparison.md
+++ b/docs/content_management/field_types/create_custom_field_type_comparison.md
@@ -1,18 +1,18 @@
 ---
-description: Enable comparison of content Fields based on a custom Field Type.
+description: Enable comparison of content Fields based on a custom field type.
 ---
 
-# Create custom Field Type comparison
+# Create custom field type comparison
 
 In the back office, you can compare the contents of Fields.
 Comparing is possible only between two versions of the same Field that are in the same language.
 
-You can add the possibility to compare custom and other unsupported Field Types.
+You can add the possibility to compare custom and other unsupported field types.
 
 !!! note
 
-    The following task uses the [custom "Hello World" Field Type](create_custom_generic_field_type.md).
-    The configuration is based on the comparison mechanism created for the `ezstring` Field Type.
+    The following task uses the [custom "Hello World" field type](create_custom_generic_field_type.md).
+    The configuration is based on the comparison mechanism created for the `ezstring` field type.
 
 ## Create Comparable class
 
@@ -43,9 +43,9 @@ Next, create a `src/FieldType/HelloWorld/Comparison/Value.php` file that holds t
 ## Create comparison engine
 
 The comparison engine handles the operations required for comparing the contents of Fields.
-Each Field Type requires a separate comparison engine, which implements the `Ibexa\Contracts\VersionComparison\Engine\FieldTypeComparisonEngine` interface.
+Each field type requires a separate comparison engine, which implements the `Ibexa\Contracts\VersionComparison\Engine\FieldTypeComparisonEngine` interface.
 
-For the "Hello World" Field Type, create the following comparison engine based on the engine for the TextLine Field Type.
+For the "Hello World" field type, create the following comparison engine based on the engine for the TextLine field type.
 Place it in `src/FieldType/HelloWorld/Comparison/HelloWorldComparisonEngine.php`:
 
 ``` php
diff --git a/docs/content_management/field_types/create_custom_generic_field_type.md b/docs/content_management/field_types/create_custom_generic_field_type.md
index 35a211a778..54a507bd1f 100644
--- a/docs/content_management/field_types/create_custom_generic_field_type.md
+++ b/docs/content_management/field_types/create_custom_generic_field_type.md
@@ -1,25 +1,25 @@
 ---
-description: Create a new Field Type based on the Generic Field Type.
+description: Create a new field type based on the Generic field type.
 ---
 
-# Create custom generic Field Type
+# Create custom generic field type
 
-The Generic Field Type is an abstract implementation of Field Types holding structured data for example, address.
-You can use it as a base for custom Field Types.
-The Generic Field Type comes with the implementation of basic methods,
+The Generic field type is an abstract implementation of field types holding structured data for example, address.
+You can use it as a base for custom field types.
+The Generic field type comes with the implementation of basic methods,
 reduces the number of classes which must be created, and simplifies the tagging process. 
 
 !!! tip
 
-    You should not use the Generic Field Type when you need a very specific implementation or complete control over the way data is stored.
+    You should not use the Generic field type when you need a very specific implementation or complete control over the way data is stored.
 
 [[= include_file('docs/snippets/simple_hash_value_caution.md') =]]
 
 ## Define value object
 
 First, create `Value.php` in the `src/FieldType/HelloWorld` directory.
-The Value class of a Field Type contains only the basic logic of a Field Type, the rest of it's handled by the `Type` class.
-For more information about Field Type Value see [Value handling](type_and_value.md#value-handling).
+The Value class of a field type contains only the basic logic of a field type, the rest of it's handled by the `Type` class.
+For more information about field type Value see [Value handling](type_and_value.md#value-handling).
 
 The `HelloWorld` Value class should contain:
 
@@ -32,8 +32,8 @@ The `HelloWorld` Value class should contain:
 
 ## Define fields and configuration
 
-Next, implement a definition of a Field Type extending the Generic Field Type in the `src/FieldType/HelloWorld/Type.php` class.
-It provides settings for the Field Type and an implementation of the `Ibexa\Contracts\Core\FieldType\FieldType` abstract class.
+Next, implement a definition of a field type extending the Generic field type in the `src/FieldType/HelloWorld/Type.php` class.
+It provides settings for the field type and an implementation of the `Ibexa\Contracts\Core\FieldType\FieldType` abstract class.
 
 ```php
 [[= include_file('code_samples/field_types/generic_ft/src/FieldType/HelloWorld/Type.php', 0, 6) =]][[= include_file('code_samples/field_types/generic_ft/src/FieldType/HelloWorld/Type.php', 9, 16) =]]}
@@ -41,9 +41,9 @@ It provides settings for the Field Type and an implementation of the `Ibexa\Cont
 
 !!! tip
 
-    For more information about the Type class of a Field Type, see [Type class](type_and_value.md#type-class).
+    For more information about the Type class of a field type, see [Type class](type_and_value.md#type-class).
 
-Next, register the Field Type as a service and tag it with `ibexa.field_type`:
+Next, register the field type as a service and tag it with `ibexa.field_type`:
 
 ```yaml
 [[= include_file('code_samples/field_types/generic_ft/config/custom_services.yaml', 0, 5) =]]
@@ -52,7 +52,7 @@ Next, register the Field Type as a service and tag it with `ibexa.field_type`:
 ## Define form for value object
 
 Create a `src/Form/Type/HelloWorldType.php` form.
-It enables you to edit the new Field Type.
+It enables you to edit the new field type.
 
 ```php
 [[= include_file('code_samples/field_types/generic_ft/src/Form/Type/HelloWorldType.php') =]]
@@ -68,7 +68,7 @@ and the required `use` statements to `src/FieldType/HelloWorld/Type.php`:
 
 !!! tip
 
-    For more information about the FormMappers see [Field Type form and template](form_and_template.md).
+    For more information about the FormMappers see [field type form and template](form_and_template.md).
 
 Next, add the `ibexa.admin_ui.field_type.form.mapper.value` tag to the service definition:
 
@@ -80,7 +80,7 @@ Next, add the `ibexa.admin_ui.field_type.form.mapper.value` tag to the service d
 
 ### Create a template
 
-Create a template for the new Field Type. It defines the default rendering of the `HelloWorld` field.
+Create a template for the new field type. It defines the default rendering of the `HelloWorld` field.
 In the `templates/themes/standard/field_types` directory create a `field_type.html.twig` file:
 
 ```html+twig
@@ -110,4 +110,4 @@ After saving, your **Hello World** content type should be available under **Cont
 
 ![Creating Hello World](extending_field_type_hello_world.png)
 
-For more detailed tutorial on Generic Field Type follow [Creating a Point 2D Field Type](creating_a_point2d_field_type.md).
+For more detailed tutorial on Generic field type follow [Creating a Point 2D field type](creating_a_point2d_field_type.md).
diff --git a/docs/content_management/field_types/customize_field_type_metadata.md b/docs/content_management/field_types/customize_field_type_metadata.md
index d39a03f897..d237f54cd0 100644
--- a/docs/content_management/field_types/customize_field_type_metadata.md
+++ b/docs/content_management/field_types/customize_field_type_metadata.md
@@ -1,13 +1,13 @@
 ---
-description: You can customize which Field Type metadata should be disabled in the back office.
+description: You can customize which field type metadata should be disabled in the back office.
 ---
 
-# Customize Field Type metadata
+# Customize field type metadata
 
 When creating a content type definition, you add Fields and configure their metadata,
 such as whether they're required, translatable, and so on.
 
-If needed, you can customize that some of those options are disabled in the back office for specific Field Types.
+If needed, you can customize that some of those options are disabled in the back office for specific field types.
 To do this, add custom service definition for `ModifyFieldDefinitionsCollectionTypeExtension` 
 
 For example, this configuration means that no Image Field can be set as required in the definition of a content type:
@@ -24,7 +24,7 @@ services:
             - form.type_extension
 ```
 
-`fieldTypeIdentifier` refers to the identifier of the Field Type, in this case `ezimage`.
+`fieldTypeIdentifier` refers to the identifier of the field type, in this case `ezimage`.
 
 `modifiedOptions` lists the changes you want to make. The following options are available:
 
diff --git a/docs/content_management/field_types/field_type_reference/addressfield.md b/docs/content_management/field_types/field_type_reference/addressfield.md
index a0d7665a08..604cb4c6c6 100644
--- a/docs/content_management/field_types/field_type_reference/addressfield.md
+++ b/docs/content_management/field_types/field_type_reference/addressfield.md
@@ -1,4 +1,4 @@
-# Address Field Type
+# Address field type
 
 This Field represents and handles address fields.
 It allows you to customize address Fields per country.
@@ -7,10 +7,10 @@ It allows you to customize address Fields per country.
 |-----------|-----------------|-----------------------------|
 | `Address` | `ibexa_address` | `string`, `string`, `array` |
 
-The Address Field Type is available via the Address Bundle
+The Address field type is available via the Address Bundle
 provided by the `ibexa/fieldtype-address` package.
 
-## PHP API Field Type
+## PHP API field type
 
 ### Inputs:
 
@@ -36,7 +36,7 @@ new FieldType\Value(
 
 ### Validation
 
-This Field Type validates whether `Country` and `Name` fields have been filled out.
+This field type validates whether `Country` and `Name` fields have been filled out.
 
 ### Value Object
 
diff --git a/docs/content_management/field_types/field_type_reference/authorfield.md b/docs/content_management/field_types/field_type_reference/authorfield.md
index 9ccd66ca08..08c49198f1 100644
--- a/docs/content_management/field_types/field_type_reference/authorfield.md
+++ b/docs/content_management/field_types/field_type_reference/authorfield.md
@@ -1,12 +1,12 @@
-# Author Field Type
+# Author field type
 
-This Field Type allows the storage and retrieval of one or more authors. For each author, it can handle a name and an email address. It's typically used to store information about additional authors who have written/created different parts of a content item.
+This field type allows the storage and retrieval of one or more authors. For each author, it can handle a name and an email address. It's typically used to store information about additional authors who have written/created different parts of a content item.
 
 | Name     | Internal name | Expected input | Output   |
 |----------|---------------|----------------|----------|
 | `Author` | `ezauthor`    | mixed        | `string` |
 
-## PHP API Field Type
+## PHP API field type
 
 ### Value Object
 
@@ -62,11 +62,11 @@ Example: `John Doe john@doe.com`
 
 ### Validation
 
-This Field Type does not perform any special validation of the input value.
+This field type does not perform any special validation of the input value.
 
 ### Settings
 
-The Field definition of this Field Type can be configured with a single option:
+The Field definition of this field type can be configured with a single option:
 
 |Name|Type|Default value|Description|
 |------|------|------|------|
@@ -76,11 +76,11 @@ Following `defaultAuthor` default value options are available as constants in
 
 |Constant|Description|
 |------|------|
-|`DEFAULT_VALUE_EMPTY`|Default value will be empty.|
-|`DEFAULT_CURRENT_USER`|Default value will use currently logged user.|
+|`DEFAULT_VALUE_EMPTY`|Default value is empty.|
+|`DEFAULT_CURRENT_USER`|Default value uses currently logged user.|
 
 ``` php
-// Author Field Type example settings
+// Author field type example settings
 
 use Ibexa\Core\FieldType\Author\Type;
 
diff --git a/docs/content_management/field_types/field_type_reference/binaryfilefield.md b/docs/content_management/field_types/field_type_reference/binaryfilefield.md
index d8bc4d2035..c19d0cc9d6 100644
--- a/docs/content_management/field_types/field_type_reference/binaryfilefield.md
+++ b/docs/content_management/field_types/field_type_reference/binaryfilefield.md
@@ -1,6 +1,6 @@
-# BinaryFile Field Type
+# BinaryFile field type
 
-This Field Type represents and handles a single binary file. It also counts the number of times the file has been downloaded from the `content/download` module.
+This field type represents and handles a single binary file. It also counts the number of times the file has been downloaded from the `content/download` module.
 
 It's capable of handling virtually any file type and is typically used for storing legacy document types such as PDF files, Word documents, spreadsheets, etc. The maximum allowed file size is determined by the "Max file size" class attribute edit parameter and the `upload_max_filesize` directive in the main PHP configuration file (`php.ini`).
 
@@ -8,13 +8,13 @@ It's capable of handling virtually any file type and is typically used for stori
 |--------------|----------------|----------------|---------|
 | `BinaryFile` | `ezbinaryfile` | mixed        | mixed |
 
-## PHP API Field Type
+## PHP API field type
 
 ### Value Object
 
 #### Properties
 
-Note that both `BinaryFile` and `Media` Value and Type inherit from the `BinaryBase` abstract Field Type, and share common properties.
+Note that both `BinaryFile` and `Media` Value and Type inherit from the `BinaryBase` abstract field type, and share common properties.
 
 `Ibexa\Core\FieldType\BinaryFile\Value` offers the following properties:
 
@@ -59,7 +59,7 @@ To use a remote file, you have to download it locally first, then remove it afte
 
 ## REST API specifics
 
-Used in the REST API, a BinaryFile Field will mostly serialize the hash described above. However there are a couple specifics worth mentioning.
+Used in the REST API, a BinaryFile Field mostly serializes the hash described above. However there are a couple specifics worth mentioning.
 
 ### Reading content: `url` property
 
diff --git a/docs/content_management/field_types/field_type_reference/checkboxfield.md b/docs/content_management/field_types/field_type_reference/checkboxfield.md
index 034baafb14..ea136b31c8 100644
--- a/docs/content_management/field_types/field_type_reference/checkboxfield.md
+++ b/docs/content_management/field_types/field_type_reference/checkboxfield.md
@@ -1,18 +1,18 @@
-# Checkbox Field Type
+# Checkbox field type
 
-The Checkbox Field Type stores the current status for a checkbox input, checked or unchecked, by storing a boolean value.
+The Checkbox field type stores the current status for a checkbox input, checked or unchecked, by storing a boolean value.
 
 | Name       | Internal name | Expected input type |
 |------------|---------------|---------------------|
 | `Checkbox` | `ezboolean`   | `boolean`           |
 
-## PHP API Field Type 
+## PHP API field type 
 
 ### Value object
 
 ##### Properties
 
-The Value class of this Field Type contains the following properties:
+The Value class of this field type contains the following properties:
 
 | Property | Type      | Default value | Description|
 |----------|-----------|---------------|------------|
@@ -46,4 +46,4 @@ $checkboxValue = new Checkbox\Value( true );
 
 ##### String representation
 
-As this Field Type is not a string but a boolean, it will return "1" (true) or "0" (false) in cases where it's cast to string, and it's never considered empty.
+As this field type is not a string but a boolean, it returns "1" (true) or "0" (false) in cases where it's cast to string, and it's never considered empty.
diff --git a/docs/content_management/field_types/field_type_reference/contentqueryfield.md b/docs/content_management/field_types/field_type_reference/contentqueryfield.md
index a590ed9a3e..fc281e7ccb 100644
--- a/docs/content_management/field_types/field_type_reference/contentqueryfield.md
+++ b/docs/content_management/field_types/field_type_reference/contentqueryfield.md
@@ -1,12 +1,12 @@
-# Content query Field Type
+# Content query field type
 
-This Field Type maps an executable Repository query to a Field.
+This field type maps an executable Repository query to a Field.
 
 | Name      | Internal name | Expected input |
 |-----------|---------------|----------------|
 | `Content query` | `ezcontentquery`   | `string`        |
 
-The Content query Field Type is available via the Query Field Type Bundle
+The Content query field type is available via the Query field type Bundle
 provided by the [fieldtype-query](https://github.com/ibexa/fieldtype-query) package.
 
-For information about the Field Type's usage, see [Content queries](content_queries.md#content-query-field).
+For information about the field type's usage, see [Content queries](content_queries.md#content-query-field).
diff --git a/docs/content_management/field_types/field_type_reference/countryfield.md b/docs/content_management/field_types/field_type_reference/countryfield.md
index 23f65b35c3..099b42ecdb 100644
--- a/docs/content_management/field_types/field_type_reference/countryfield.md
+++ b/docs/content_management/field_types/field_type_reference/countryfield.md
@@ -1,12 +1,12 @@
-# Country Field Type
+# Country field type
 
-This Field Type represents one or multiple countries.
+This field type represents one or multiple countries.
 
 | Name      | Internal name | Expected input |
 |-----------|---------------|----------------|
 | `Country` | `ezcountry`   | `array`        |
 
-## PHP API Field Type 
+## PHP API field type 
 
 ### Input expectations
 
@@ -23,15 +23,15 @@ Example array:
 ];
 ```
 
-When you set an array directly on a Content Field you don't need to provide all this information, the Field Type will assume it's a hash and in this case will accept a simplified structure described below under [Hash format](#hash-format).
+When you set an array directly on a Content Field you don't need to provide all this information, the field type assumes it's a hash and in this case accepts a simplified structure described below under [Hash format](#hash-format).
 
 ### Validation
 
-This Field Type validates whether multiple countries are allowed by the Field definition, and whether the [Alpha2](https://www.iso.org/iso-3166-country-codes.html) is valid according to the countries configured in [[= product_name =]].
+This field type validates whether multiple countries are allowed by the Field definition, and whether the [Alpha2](https://www.iso.org/iso-3166-country-codes.html) is valid according to the countries configured in [[= product_name =]].
 
 ### Settings
 
-The Field definition of this Field Type can be configured with one option:
+The Field definition of this field type can be configured with one option:
 
 | Name         | Type      | Default value | Description|
 |--------------|-----------|---------------|------------|
@@ -59,7 +59,7 @@ The format used by the toHash method is the Alpha2 value, however the input is c
 
 ##### Properties
 
-The Value class of this Field Type contains the following properties:
+The Value class of this field type contains the following properties:
 
 | Property     | Type      | Description|
 |--------------|-----------|------------|
@@ -79,7 +79,7 @@ $value->countries = [
 
 ##### Constructor
 
-The `Country\Value` constructor will initialize a new Value object with the value provided. It expects an array as input.
+The `Country\Value` constructor initializes a new Value object with the value provided. It expects an array as input.
 
 ``` php
 // Constructor example
diff --git a/docs/content_management/field_types/field_type_reference/customergroupfield.md b/docs/content_management/field_types/field_type_reference/customergroupfield.md
index 6c0ee986c4..ba6e694690 100644
--- a/docs/content_management/field_types/field_type_reference/customergroupfield.md
+++ b/docs/content_management/field_types/field_type_reference/customergroupfield.md
@@ -1,18 +1,18 @@
 # Customer group Field
 
-This Field Type represents a customer group that a user belongs to.
+This field type represents a customer group that a user belongs to.
 
 | Name   | Internal name | Expected input type |
 |--------|---------------|---------------------|
 | `Customer group` | `ibexa_customer_group`  | `int` or null |
 
-## PHP API Field Type
+## PHP API field type
 
 ### Value object
 
 ##### Properties
 
-The Value class of this Field Type contains the following properties:
+The Value class of this field type contains the following properties:
 
 | Property | Type     | Description|
 |----------|----------|------------|
diff --git a/docs/content_management/field_types/field_type_reference/dateandtimefield.md b/docs/content_management/field_types/field_type_reference/dateandtimefield.md
index d36bed6605..4535563975 100644
--- a/docs/content_management/field_types/field_type_reference/dateandtimefield.md
+++ b/docs/content_management/field_types/field_type_reference/dateandtimefield.md
@@ -1,16 +1,16 @@
-# DateAndTime Field Type
+# DateAndTime field type
 
-This Field Type represents a full date and time information.
+This field type represents a full date and time information.
 
 | Name          | Internal name | Expected input type |
 |---------------|---------------|---------------------|
 | `DateAndTime` | `ezdatetime`  | mixed             |
 
-## PHP API Field Type 
+## PHP API field type 
 
 ### Input expectations
 
-If input value is of type `string` or `integer`, it will be passed directly to the [PHP's built-in `\DateTime` class constructor](https://www.php.net/manual/en/datetime.construct.php), therefore the same input format expectations apply.
+If input value is of type `string` or `integer`, it's passed directly to the [PHP's built-in `\DateTime` class constructor](https://www.php.net/manual/en/datetime.construct.php), therefore the same input format expectations apply.
 
 It's also possible to directly pass an instance of `\DateTime`.
 
@@ -24,7 +24,7 @@ It's also possible to directly pass an instance of `\DateTime`.
 
 ##### Properties
 
-The Value class of this Field Type contains the following properties:
+The Value class of this field type contains the following properties:
 
 | Property | Type        | Description|
 |----------|-------------|------------|
@@ -32,11 +32,11 @@ The Value class of this Field Type contains the following properties:
 
 ##### Constructor
 
-The constructor for this value object will initialize a new Value object with the value provided. It accepts an instance of PHP's built-in `\DateTime` class.
+The constructor for this value object initializes a new Value object with the value provided. It accepts an instance of PHP's built-in `\DateTime` class.
 
 ##### String representation
 
-String representation of the date value will generate the date string in the format `D Y-d-m H:i:s` as accepted by [PHP's built-in `date()` function](https://www.php.net/manual/en/function.date.php).
+String representation of the date value generates the date string in the format `D Y-d-m H:i:s` as accepted by [PHP's built-in `date()` function](https://www.php.net/manual/en/function.date.php).
 
 |Character|Description|Example|
 |---------|----------|--------|
@@ -52,12 +52,12 @@ Example: `Wed 2016-22-05 12:19:18`
 
 ### Hash format
 
-Hash value of this Field Type is an array with two keys:
+Hash value of this field type is an array with two keys:
 
 |Key|Type| Description                                                                                                                                             |Example|
 |------|------|---------------------------------------------------------------------------------------------------------------------------------------------------------|------|
 |`timestamp`|`integer`| Time information in [Unix format timestamp](https://en.wikipedia.org/wiki/Unix_time).                                                                   |`1400856992`|
-|`rfc850`|`string`| Time information as a string in [RFC 850 date format](https://datatracker.ietf.org/doc/html/rfc850). As input, this will have precedence over the timestamp value. |`"Friday, 23-May-14 14:56:14 GMT+0000"`|
+|`rfc850`|`string`| Time information as a string in [RFC 850 date format](https://datatracker.ietf.org/doc/html/rfc850). As input, this has precedence over the timestamp value. |`"Friday, 23-May-14 14:56:14 GMT+0000"`|
 
 ``` php
 $hash = [
@@ -68,25 +68,25 @@ $hash = [
 
 ### Validation
 
-This Field Type does not perform any special validation of the input value.
+This field type does not perform any special validation of the input value.
 
 ### Settings
 
-The Field definition of this Field Type can be configured with several options:
+The Field definition of this field type can be configured with several options:
 
 |Name|Type|Default value|Description|
 |------|------|------|------|
 |`useSeconds`|`boolean`|`false`|Used to control displaying of seconds in the output.|
 |`defaultType`|`mixed`|`Type::DEFAULT_EMPTY`|One of the `DEFAULT_*` constants, used by the administration interface for setting the default Field value. See below for more details.|
-|`dateInterval`|`null|\DateInterval`|`null`|This setting complements `defaultType` setting and can be used only when the latter is set to `Type::DEFAULT_CURRENT_DATE_ADJUSTED`. In that case the default input value when using administration interface will be adjusted by the given `\DateInterval`.|
+|`dateInterval`|`null|\DateInterval`|`null`|This setting complements `defaultType` setting and can be used only when the latter is set to `Type::DEFAULT_CURRENT_DATE_ADJUSTED`. In that case the default input value when using administration interface is adjusted by the given `\DateInterval`.|
 
 Following `defaultType` default value options are available as constants in the `Ibexa\Core\FieldType\DateAndTime\Type` class:
 
 |Constant|Description|
 |------|------|
-|`DEFAULT_EMPTY`|Default value will be empty.|
-|`DEFAULT_CURRENT_DATE`|Default value will use current date.|
-|`DEFAULT_CURRENT_DATE_ADJUSTED`|Default value will use current date, adjusted by the interval defined in `dateInterval` setting.|
+|`DEFAULT_EMPTY`|Default value is empty.|
+|`DEFAULT_CURRENT_DATE`|Default value uses current date.|
+|`DEFAULT_CURRENT_DATE_ADJUSTED`|Default value uses current date, adjusted by the interval defined in `dateInterval` setting.|
 
 ``` php
 // DateAndTime FieldType example settings
diff --git a/docs/content_management/field_types/field_type_reference/datefield.md b/docs/content_management/field_types/field_type_reference/datefield.md
index e645a6e6a6..8d25bd3e7f 100644
--- a/docs/content_management/field_types/field_type_reference/datefield.md
+++ b/docs/content_management/field_types/field_type_reference/datefield.md
@@ -1,16 +1,16 @@
-# Date Field Type
+# Date field type
 
-This Field Type represents a date without time information.
+This field type represents a date without time information.
 
 | Name   | Internal name | Expected input type |
 |--------|---------------|---------------------|
 | `Date` | `ezdate`      | mixed             |
 
-#### PHP API Field Type 
+#### PHP API field type 
 
 ### Input expectations
 
-If input value is in `string` or `integer` format, it will be passed directly to [PHP's built-in `\DateTime` class constructor](https://www.php.net/manual/en/datetime.construct.php), therefore the same input format expectations apply.
+If input value is in `string` or `integer` format, it's' passed directly to [PHP's built-in `\DateTime` class constructor](https://www.php.net/manual/en/datetime.construct.php), therefore the same input format expectations apply.
 
 It's also possible to directly pass an instance of `\DateTime`.
 
@@ -22,21 +22,21 @@ It's also possible to directly pass an instance of `\DateTime`.
 
 Time information is **not stored**.
 
-Before storing, the provided input value will be set to the beginning of the day in the given or the environment timezone.
+Before storing, the provided input value is set to the beginning of the day in the given or the environment timezone.
 
 ### Value object
 
 ##### Properties
 
-The Value class of this Field Type contains the following properties:
+The Value class of this field type contains the following properties:
 
 | Property | Type        | Description|
 |----------|-------------|------------|
-| `$date`  | `\DateTime` | This property will be used for the text content. |
+| `$date`  | `\DateTime` | This property is used for the text content. |
 
 ##### String representation
 
-String representation of the date value will generate the date string in the format "l d F Y" as accepted by [PHP's built-in `date()` function](https://www.php.net/manual/en/function.date.php).
+String representation of the date value generates the date string in the format "l d F Y" as accepted by [PHP's built-in `date()` function](https://www.php.net/manual/en/function.date.php).
 
 |Character|Description|Example|
 |---------|----------|--------|
@@ -49,16 +49,16 @@ Example: `Wednesday 22 May 2016`
 
 ##### Constructor
 
-The constructor for this value object will initialize a new Value object with the value provided. It accepts an instance of [PHP's built-in `\DateTime` class](https://www.php.net/manual/en/datetime.construct.php).
+The constructor for this value object initializes a new Value object with the value provided. It accepts an instance of [PHP's built-in `\DateTime` class](https://www.php.net/manual/en/datetime.construct.php).
 
 ### Hash format
 
-Hash value of this Field Type is an array with two keys:
+Hash value of this field type is an array with two keys:
 
 |Key|Type| Description                                                                                                                                                    |Example|
 |------|------|----------------------------------------------------------------------------------------------------------------------------------------------------------------|------|
 |`timestamp`|`integer`| Time information in [unix format timestamp](https://en.wikipedia.org/wiki/Unix_time).                                                                          |`1400856992`|
-|`rfc850`|`string`| Time information as a string in [RFC 850 date format](https://datatracker.ietf.org/doc/html/rfc850). As input, this will have higher precedence over the timestamp value. |`"Friday, 23-May-14 14:56:14 GMT+0000"`|
+|`rfc850`|`string`| Time information as a string in [RFC 850 date format](https://datatracker.ietf.org/doc/html/rfc850). As input, this has higher precedence over the timestamp value. |`"Friday, 23-May-14 14:56:14 GMT+0000"`|
 
 ``` php
 // Example of the hash value in PHP
@@ -70,11 +70,11 @@ $hash = [
 
 ### Validation
 
-This Field Type does not perform any special validation of the input value.
+This field type does not perform any special validation of the input value.
 
 ### Settings
 
-The Field definition of this Field Type can be configured with a single option:
+The Field definition of this field type can be configured with a single option:
 
 |Name|Type|Default value|Description|
 |------|------|------|------|
@@ -84,11 +84,11 @@ Following `defaultType` default value options are available as constants in th
 
 |Constant|Description|
 |------|------|
-|`DEFAULT_EMPTY`|Default value will be empty.|
-|`DEFAULT_CURRENT_DATE`|Default value will use current date.|
+|`DEFAULT_EMPTY`|Default value is empty.|
+|`DEFAULT_CURRENT_DATE`|Default value uses current date.|
 
 ``` php
-// Date Field Type example settings
+// Date field type example settings
 
 use Ibexa\Core\FieldType\Date\Type;
 
diff --git a/docs/content_management/field_types/field_type_reference/emailaddressfield.md b/docs/content_management/field_types/field_type_reference/emailaddressfield.md
index 9bea73c042..3f013b87d0 100644
--- a/docs/content_management/field_types/field_type_reference/emailaddressfield.md
+++ b/docs/content_management/field_types/field_type_reference/emailaddressfield.md
@@ -1,22 +1,22 @@
-# EmailAddress Field Type
+# EmailAddress field type
 
-The EmailAddress Field Type represents an email address, in the form of a string.
+The EmailAddress field type represents an email address, in the form of a string.
 
 | Name           | Internal name | Expected input type |
 |----------------|---------------|---------------------|
 | `EmailAddress` | `ezemail`     | `string`            |
 
-## PHP API Field Type 
+## PHP API field type 
 
 ### Value object
 
 ##### Properties
 
-The `Value` class of this Field Type contains the following properties:
+The `Value` class of this field type contains the following properties:
 
 | Property | Type     | Description|
 |----------|----------|------------|
-| `$email` | `string` | This property will be used for the input string provided as email address. |
+| `$email` | `string` | This property is used for the input string provided as email address. |
 
 ``` php
 // Value object content example
@@ -32,7 +32,7 @@ $emailaddressValue->email = "someuser@example.com";
 
 ##### Constructor
 
-The `EmailAddress\Value` constructor will initialize a new Value object with the value provided. It accepts a string as input.
+The `EmailAddress\Value` constructor initializes a new Value object with the value provided. It accepts a string as input.
 
 ``` php
 // Constructor example
@@ -45,21 +45,21 @@ $emailaddressValue = new Type\Value( "someuser@example.com" );
 
 ##### String representation
 
-String representation of the Field Type's Value object is the email address contained in it.
+String representation of the field type's Value object is the email address contained in it.
 
 Example: `someuser@example.com`
 
 ### Hash format
 
-Hash value for this Field Type's Value is simply the email address as a string.
+Hash value for this field type's Value is simply the email address as a string.
 
 Example: `someuser@example.com`
 
 ### Validation
 
-This Field Type uses the `EmailAddressValidator` validator as a resource which will test the string supplied as input against a pattern, to make sure that a valid email address has been provided.
+This field type uses the `EmailAddressValidator` validator as a resource which tests the string supplied as input against a pattern, to make sure that a valid email address has been provided.
 If the validations fail, a `ValidationError` is thrown, specifying the error message.
 
 ### Settings
 
-This Field Type does not support settings.
+This field type does not support settings.
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
index a950ac5561..00a0fa0362 100644
--- 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
@@ -1,24 +1,24 @@
 ---
-description: Ibexa DXP offers a range of built-in Field Types that cover most common needs when creating content.
+description: Ibexa DXP offers a range of built-in field types that cover most common needs when creating content.
 page_type: reference
 ---
 
-# Field Type reference
+# Field type reference
 
-A Field Type is the underlying building block of the content model. It consists of two entities: Field value and Field definition. Field value is determined by values entered into the Content Field. Field definition is provided by the content type, and holds any user defined rules used by Field Type to determine how a Field Value is validated, stored, retrieved, formatted and so on.
+A field type is the underlying building block of the content model. It consists of two entities: Field value and Field definition. Field value is determined by values entered into the Content Field. Field definition is provided by the content type, and holds any user defined rules used by field type to determine how a Field Value is validated, stored, retrieved, formatted and so on.
 
-[[= product_name =]] comes with a collection of Field Types that can be used to build powerful and complex content structures. In addition, it's possible to extend the system by creating custom types for special needs.
+[[= product_name =]] comes with a collection of field types that can be used to build powerful and complex content structures. In addition, it's possible to extend the system by creating custom types for special needs.
 
 !!! tip
 
-    For general Field Type documentation, see [Field Type](field_types.md).
+    For general field type documentation, see [field type](field_types.md).
 
-Custom Field Types have to be programmed in PHP. However, the built-in Field Types are usually sufficient enough for typical scenarios. The following table gives an overview of the supported Field Types that come with [[= product_name =]].
+Custom field types have to be programmed in PHP. However, the built-in field types are usually sufficient enough for typical scenarios. The following table gives an overview of the supported field types that come with [[= product_name =]].
 
 
-## Available Field Types
+## Available field types
 
-| Field Type | Description | Searchable in Legacy Storage engine | Searchable with Solr/Elasticsearch |
+| Field type | Description | Searchable in Legacy Storage engine | Searchable with Solr/Elasticsearch |
 |------------|-------------|-------------------------------------|----------------------|
 | [Author](authorfield.md) | Stores a list of authors, each consisting of author name and author email. | No | Yes |
 | [BinaryFile](binaryfilefield.md) | Stores a file.| Yes | Yes |
@@ -40,7 +40,7 @@ Custom Field Types have to be programmed in PHP. However, the built-in Field Ty
 | [Matrix](matrixfield.md) | Represents and handles a table of rows and columns of data. | No | No |
 | [Measurement](measurementfield.md) | Validates and stores a unit of measure, and either a single measurement value, or top and bottom values of a measurement range. | Yes | Yes |
 | [Media](mediafield.md) | Validates and stores a media file. | No | Yes |
-| [Null](nullfield.md) | Used as fallback for missing Field Types and for testing purposes. | N/A | N/A |
+| [Null](nullfield.md) | Used as fallback for missing field types and for testing purposes. | N/A | N/A |
 | [Page](pagefield.md) | Stores a Page with a layout consisting of multiple zones. | N/A | N/A |
 | [Relation](relationfield.md) | Validates and stores a relation to a content item. | Yes, with both [`Field`](fieldrelation_criterion.md) Criteria | Yes |
 | [RelationList](relationlistfield.md) | Validates and stores a list of relations to content items. | Yes, with [`FieldRelation` Criterion](fieldrelation_criterion.md) | Yes |
@@ -61,7 +61,7 @@ Custom Field Types have to be programmed in PHP. However, the built-in Field Ty
 <a id="1-note-on-legacy-search-engine"></a>**^[1]^ Note on Legacy Search Engine**
 
 Legacy Search/Storage Engine index is limited to 255 characters in database design,
-so formatted and unformatted text blocks will only index the first part.
-In case of multiple selection Field Types like Keyword, Selection, Country, etc.,
+so formatted and unformatted text blocks only index the first part.
+In case of multiple selection field types like Keyword, Selection, Country, etc.,
 only the first choices are indexed. they're indexed only as a text blob separated by string separator.
-Proper indexing of these Field Types is done with [Solr Search engine](solr_overview.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_reference/floatfield.md b/docs/content_management/field_types/field_type_reference/floatfield.md
index 8711bb0606..38a6971f45 100644
--- a/docs/content_management/field_types/field_type_reference/floatfield.md
+++ b/docs/content_management/field_types/field_type_reference/floatfield.md
@@ -1,16 +1,16 @@
-# Float Field Type
+# Float field type
 
-This Field Type stores numeric values which are provided as floats.
+This field type stores numeric values which are provided as floats.
 
 | Name    | Internal name | Expected input |
 |---------|---------------|----------------|
 | `Float` | `ezfloat`     | `float`        |
 
-## PHP API Field Type 
+## PHP API field type 
 
 ### Input expectations
 
-The Field Type expects a number as input. Both decimal and integer numbers are accepted.
+The field type expects a number as input. Both decimal and integer numbers are accepted.
 
 |Type|Example|
 |------|------|
@@ -21,11 +21,11 @@ The Field Type expects a number as input. Both decimal and integer numbers are a
 
 ##### Properties
 
-The Value class of this Field Type contains the following properties:
+The Value class of this field type contains the following properties:
 
 | Property | Type    | Description|
 |----------|---------|------------|
-| `$value` | `float` | This property will be used to store the value provided as a float. |
+| `$value` | `float` | This property is used to store the value provided as a float. |
 
 ``` php
 // Value object content example
@@ -40,7 +40,7 @@ $float->value = 284.773
 
 ##### Constructor
 
-The `Float\Value` constructor will initialize a new Value object with the value provided. It expects a numeric value with or without decimals.
+The `Float\Value` constructor initializes a new Value object with the value provided. It expects a numeric value with or without decimals.
 
 ``` php
 // Constructor example
@@ -53,12 +53,12 @@ $floatValue = new Type\Value( 284.773 );
 
 ### Validation
 
-This Field Type supports `FloatValueValidator`, defining maximum and minimum float value:
+This field type supports `FloatValueValidator`, defining maximum and minimum float value:
 
 |Name|Type|Default value|Description|
 |------|------|------|------|
-|`minFloatValue`|`float`|`null|This setting defines the minimum value this Field Type will allow as input.|
-|`maxFloatValue`|`float`|`null|This setting defines the maximum value this Field Type will allow as input.|
+|`minFloatValue`|`float`|`null|This setting defines the minimum value this field type which is allowed as input.|
+|`maxFloatValue`|`float`|`null|This setting defines the maximum value this field type which is allowed as input.|
 
 ``` php
 // Validator configuration example in PHP
@@ -79,4 +79,4 @@ $floatFieldCreateStruct->validatorConfiguration = [
 
 ### Settings
 
-This Field Type does not support settings.
+This field type does not support settings.
diff --git a/docs/content_management/field_types/field_type_reference/formfield.md b/docs/content_management/field_types/field_type_reference/formfield.md
index 4670ffe463..ab5ae4e867 100644
--- a/docs/content_management/field_types/field_type_reference/formfield.md
+++ b/docs/content_management/field_types/field_type_reference/formfield.md
@@ -2,9 +2,9 @@
 edition: experience
 ---
 
-# Form Field Type
+# Form field type
 
-The Form Field Type stores a Form consisting of one or more form fields.
+The Form field type stores a Form consisting of one or more form fields.
 
 | Name   | Internal name |
 |--------|---------------|
diff --git a/docs/content_management/field_types/field_type_reference/imageassetfield.md b/docs/content_management/field_types/field_type_reference/imageassetfield.md
index 11608ca015..95489e175d 100644
--- a/docs/content_management/field_types/field_type_reference/imageassetfield.md
+++ b/docs/content_management/field_types/field_type_reference/imageassetfield.md
@@ -1,6 +1,6 @@
-# ImageAsset Field Type
+# ImageAsset field type
 
-ImageAsset Field Type enables storing images in independent content items of a generic Image content type, in the media library. It makes them reusable across system.
+ImageAsset field type enables storing images in independent content items of a generic Image content type, in the media library. It makes them reusable across system.
 
 ### Input expectations
 
@@ -8,7 +8,7 @@ Example array:
 
 |Type|Description|Example|
 |------|------|------|
-|`Ibexa\Core\FieldType\ImageAsset\Value`|ImageAsset Field Type value object.|See below.|
+|`Ibexa\Core\FieldType\ImageAsset\Value`|ImageAsset field type value object.|See below.|
 |`Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo`|ContentInfo instance of the Asset content item. |n/a|
 |`string`| ID of the Asset content item. |`"150"`|
 |`integer`| ID of the Asset content item. | `150`|
@@ -33,7 +33,7 @@ $imageAssetValue->alternativeText = "Picture of an apple.";
 
 ##### Constructor
 
-The `ImageAsset\Value` constructor will initialize a new value object with the value provided. It expects an ID of a content item representing asset and the alternative text.
+The `ImageAsset\Value` constructor initializes a new value object with the value provided. It expects an ID of a content item representing asset and the alternative text.
 
 ``` php
 // Constructor example
@@ -44,13 +44,13 @@ $imageAssetValue  = new ImageAsset\Value($contentInfo->id, "Picture of an apple.
 
 ### Validation
 
-This Field Type validates if:
+This field type validates if:
 
 - `destinationContentId` points to a content item which has correct content type
 
 ### Configuration
 
-ImageAsset Field Type allows configuring the following options:
+ImageAsset field type allows configuring the following options:
 
 |Name|Description|Default value|
 |----|-----------|-------------|
@@ -73,7 +73,7 @@ ibexa:
                     parent_location_id: 106
 ```
 
-## Customizing ImageAsset Field Type rendering
+## Customizing ImageAsset field type rendering
 
 Internally the Image Asset Type is rendered via subrequest (similar to other relation types). Rendering customization is possible by configuring view type `asset_image`:
 
@@ -90,4 +90,4 @@ ibexa:
 
 ## Generating image variation from the Image Asset
 
-Thanks to the `Ibexa\Bundle\Core\Imagine\ImageAsset` decorator you can work with `Ibexa\Contracts\Core\Variation` in the same way as with [Image Field Type](imagefield.md).
+Thanks to the `Ibexa\Bundle\Core\Imagine\ImageAsset` decorator you can work with `Ibexa\Contracts\Core\Variation` in the same way as with [Image field type](imagefield.md).
diff --git a/docs/content_management/field_types/field_type_reference/imagefield.md b/docs/content_management/field_types/field_type_reference/imagefield.md
index fcac2a8f17..0f2c65c352 100644
--- a/docs/content_management/field_types/field_type_reference/imagefield.md
+++ b/docs/content_management/field_types/field_type_reference/imagefield.md
@@ -1,6 +1,6 @@
-# Image Field Type
+# Image field type
 
-The Image Field Type allows you to store an image file.
+The Image field type allows you to store an image file.
 
 | Name    | Internal name |
 |---------|---------------|
@@ -8,7 +8,7 @@ The Image Field Type allows you to store an image file.
 
 A **variation service** handles the conversion of the original image into different formats and sizes through a set of preconfigured named variations: large, small, medium, black and white thumbnail, etc.
 
-## PHP API Field Type
+## PHP API field type
 
 ### Value object
 
@@ -36,7 +36,7 @@ The `value` property of an Image Field returns an `Ibexa\Core\FieldType\Image\V
 
 ### Settings
 
-This Field Type does not support settings.
+This field type does not support settings.
 
 ### Image Variations
 
@@ -47,7 +47,7 @@ Using the variation Service, variations of the original image can be obtained. t
 | `width`*       | int      | `null`    | The variation's width in pixels. For more details see Caution note below.|
 | `height`*      | int      | `null`    | The variation's height in pixels. For more details see Caution note below.|
 | `name`         | string   | `medium` | The variation's identifier, name of the image alias.|
-| `info`         | mixed    |n/a| Extra information about the image, depending on the image type, such as EXIF data. If there is no information, the `info` value will be `null`.|
+| `info`         | mixed    |n/a| Extra information about the image, depending on the image type, such as EXIF data. If there is no information, the `info` value is `null`.|
 | `fileSize`     | int      |`31010` |Size (in byte) of current variation.|
 | `mimeType`     | string   |`image/png`|The MIME type.|
 | `fileName`     | string   |`my_image.png`|The name of the file.|
@@ -63,7 +63,7 @@ Using the variation Service, variations of the original image can be obtained. t
 
 ### Field Definition options
 
-The Image Field Type supports one `FieldDefinition` option: the maximum size for the file.
+The Image field type supports one `FieldDefinition` option: the maximum size for the file.
 
 !!!note
 
@@ -71,7 +71,7 @@ The Image Field Type supports one `FieldDefinition` option: the maximum size for
 
 !!! note
 
-    As the default value for maximum size is set to 10MB, we recommend setting the `upload_max_filesize` key in the `php.ini` configuration file to a value equal to or higher than that. It will prevent validation errors while editing content types.
+    As the default value for maximum size is set to 10MB, we recommend setting the `upload_max_filesize` key in the `php.ini` configuration file to a value equal to or higher than that. It prevents validation errors while editing content types.
 
 ## Using an Image Field
 
@@ -79,7 +79,7 @@ To read more about handling images and image variations, see the [Images documen
 
 ### Template Rendering
 
-When displayed using `ibexa_render_field`, an Image Field will output this type of HTML:
+When displayed using `ibexa_render_field`, an Image Field outputs this type of HTML:
 
 ``` html+twig
 <img src="var/ezdemo_site/storage/images/0/8/4/1/1480-1-eng-GB/image_medium.png" width="844" height="430" alt="Alternative text" />
@@ -114,7 +114,7 @@ The variation's properties can be used to generate the required output:
 
 ### With the REST API
 
-Image Fields within REST are exposed by the `application/vnd.ibexa.api.Content` media-type. An Image Field will look like this:
+Image Fields within REST are exposed by the `application/vnd.ibexa.api.Content` media-type. An Image Field looks like this:
 
 ``` xml
 <field>
@@ -140,7 +140,7 @@ Image Fields within REST are exposed by the `application/vnd.ibexa.api.Content`
 </field>
 ```
 
-Children of the `fieldValue` node will list the general properties of the Field's original image (`fileSize`, `fileName`, `inputUri`, etc.), as well as variations. For each variation, a URI is provided. Requested through REST, this resource will generate the variation if it doesn't exist yet, and list the variation details:
+Children of the `fieldValue` node list the general properties of the Field's original image (`fileSize`, `fileName`, `inputUri`, etc.), as well as variations. For each variation, a URI is provided. Requested through REST, this resource generates the variation if it doesn't exist yet, and list the variation details:
 
 ``` xml
 <ContentImageVariation media-type="application/vnd.ibexa.api.ContentImageVariation+xml" href="/api/ibexa/v2/content/binary/images/240-1480/variations/tiny">
@@ -170,7 +170,7 @@ echo $variation->uri;
 
 ### From PHP
 
-As for any Field Type, there are several ways to input content to a Field. For an Image, the quickest is to call `setField()` on the ContentStruct:
+As for any field type, there are several ways to input content to a Field. For an Image, the quickest is to call `setField()` on the ContentStruct:
 
 ``` php
 $createStruct = $contentService->newContentCreateStruct(
@@ -277,11 +277,11 @@ With the following values:
 - `VersionNumber` = `1`
 - `LanguageCode` = `eng-GB`
 
-Images will be stored in `web/var/ezdemo_site/storage/images/0/8/4/1/1480-1-eng-GB`.
+Images are stored in `web/var/ezdemo_site/storage/images/0/8/4/1/1480-1-eng-GB`.
 
 Using the Field ID digits in reverse order as the folder structure maximizes sharding of files through multiple folders on the filesystem.
 
-Within this folder, images will be named like the uploaded file, suffixed with an underscore and the variation name:
+Within this folder, images are named like the uploaded file, suffixed with an underscore and the variation name:
 
 - `MyImage.png`
 - `MyImage_large.png`
diff --git a/docs/content_management/field_types/field_type_reference/integerfield.md b/docs/content_management/field_types/field_type_reference/integerfield.md
index 3ecf391eff..0eed6f2712 100644
--- a/docs/content_management/field_types/field_type_reference/integerfield.md
+++ b/docs/content_management/field_types/field_type_reference/integerfield.md
@@ -1,12 +1,12 @@
-# Integer Field Type
+# Integer field type
 
-This Field Type represents an integer value.
+This field type represents an integer value.
 
 | Name      | Internal name | Expected input |
 |-----------|---------------|----------------|
 | `Integer` | `ezinteger`   | `integer`      |
 
-## PHP API Field Type 
+## PHP API field type 
 
 ### Input expectations
 
@@ -18,7 +18,7 @@ This Field Type represents an integer value.
 
 ##### Properties
 
-The Value class of this Field Type contains the following properties:
+The Value class of this field type contains the following properties:
 
 | Property | Type  | Description|
 |----------|-------|------------|
@@ -31,7 +31,7 @@ $integer->value = 8
 
 ##### Constructor
 
-The `Integer\Value` constructor will initialize a new Value object with the value provided. It expects a numeric, integer value.
+The `Integer\Value` constructor initializes a new Value object with the value provided. It expects a numeric, integer value.
 
 ``` php
 // Constructor example
@@ -43,24 +43,24 @@ $integerValue = new Integer\Value( 8 );
 
 ### Hash format
 
-Hash value of this Field Type is an integer value as a string.
+Hash value of this field type is an integer value as a string.
 
 Example: `"8"`
 
 ### String representation
 
-String representation of the Field Type's value will return the integer value as a string.
+String representation of the field type's value returns the integer value as a string.
 
 Example: `"8"`
 
 ### Validation
 
-This Field Type supports `IntegerValueValidator`, defining maximum and minimum float value:
+This field type supports `IntegerValueValidator`, defining maximum and minimum float value:
 
 |Name|Type|Default value|Description|
 |------|------|------|------|
-|`minIntegerValue`|`int`|`0`|This setting defines the minimum value this Field Type will allow as input.|
-|`maxIntegerValue`|`int`|`null`|This setting defines the maximum value this Field Type will allow as input.|
+|`minIntegerValue`|`int`|`0`|This setting defines the minimum value this field type which is allowed as input.|
+|`maxIntegerValue`|`int`|`null`|This setting defines the maximum value this field type which is allowed as input.|
 
 ``` php
 // Example of validator configuration in PHP
@@ -72,4 +72,4 @@ $validatorConfiguration = [
 
 ### Settings
 
-This Field Type does not support settings.
+This field type does not support settings.
diff --git a/docs/content_management/field_types/field_type_reference/isbnfield.md b/docs/content_management/field_types/field_type_reference/isbnfield.md
index 4ce1cca247..6a8673d9fc 100644
--- a/docs/content_management/field_types/field_type_reference/isbnfield.md
+++ b/docs/content_management/field_types/field_type_reference/isbnfield.md
@@ -1,22 +1,22 @@
-# ISBN Field Type
+# ISBN field type
 
-This Field Type represents an ISBN string either an ISBN-10 or ISBN-13 format.
+This field type represents an ISBN string either an ISBN-10 or ISBN-13 format.
 
 | Name   | Internal name | Expected input type |
 |--------|---------------|---------------------|
 | `ISBN` | `ezisbn`      | `string`            |
 
-## PHP API Field Type 
+## PHP API field type 
 
 ### Value object
 
 ##### Properties
 
-The Value class of this Field Type contains the following properties:
+The Value class of this field type contains the following properties:
 
 | Property | Type     | Description|
 |----------|----------|------------|
-| `$isbn`  | `string` | This property will be used for the ISBN string. |
+| `$isbn`  | `string` | This property is used for the ISBN string. |
 
 ##### String representation
 
@@ -24,11 +24,11 @@ An ISBN's string representation is the `$isbn` property's value, as a string.
 
 ##### Constructor
 
-The constructor for this value object will initialize a new Value object with the value provided. It accepts a string as argument and will set it to the `isbn` attribute.
+The constructor for this value object initializes a new Value object with the value provided. It accepts a string as argument and sets it to the `isbn` attribute.
 
 ### Validation
 
-The input passed into this Field Type is subject of ISBN validation depending on the Field settings in its FieldDefinition stored in the content type. An example of this Field setting is shown below and will control if input is validated as ISBN-13 or ISBN-10:
+The input passed into this field type is subject of ISBN validation depending on the Field settings in its FieldDefinition stored in the content type. An example of this Field setting is shown below and controls if input is validated as ISBN-13 or ISBN-10:
 
 ``` php
 Array
diff --git a/docs/content_management/field_types/field_type_reference/keywordfield.md b/docs/content_management/field_types/field_type_reference/keywordfield.md
index 2d9d67f8c1..2d324acbf3 100644
--- a/docs/content_management/field_types/field_type_reference/keywordfield.md
+++ b/docs/content_management/field_types/field_type_reference/keywordfield.md
@@ -1,12 +1,12 @@
-# Keyword Field Type
+# Keyword field type
 
-This Field Type stores one or several comma-separated keywords as a string or array of strings.
+This field type stores one or several comma-separated keywords as a string or array of strings.
 
 | Name      | Internal name | Expected input|
 |-----------|---------------|---------------|
 | `Keyword` | `ezkeyword`   | `string[]|string` |
 
-## PHP API Field Type 
+## PHP API field type 
 
 ### Input expectations
 
@@ -20,7 +20,7 @@ This Field Type stores one or several comma-separated keywords as a string or ar
 
 ##### Properties
 
-The Value class of this Field Type contains the following properties:
+The Value class of this field type contains the following properties:
 
 | Property | Type       | Description|
 |----------|------------|------------|
@@ -39,7 +39,7 @@ $keyword->value = [ "php", "css3", "html5", "Ibexa Platform" ];
 
 #### Constructor
 
-The `Keyword\Value` constructor will initialize a new Value object with the value provided.
+The `Keyword\Value` constructor initializes a new Value object with the value provided.
 
 It expects a list of keywords, either comma-separated in a string or as an array of strings.
 
diff --git a/docs/content_management/field_types/field_type_reference/maplocationfield.md b/docs/content_management/field_types/field_type_reference/maplocationfield.md
index 1a60107f9b..fda73e5a7a 100644
--- a/docs/content_management/field_types/field_type_reference/maplocationfield.md
+++ b/docs/content_management/field_types/field_type_reference/maplocationfield.md
@@ -1,6 +1,6 @@
-# MapLocation Field Type
+# MapLocation field type
 
-This Field Type represents a geographical location.
+This field type represents a geographical location.
 
 As input it expects three values:
 
@@ -11,7 +11,7 @@ As input it expects three values:
 |---------------|------------------|----------------|
 | `MapLocation` | `ezgmaplocation` | `mixed`        |
 
-## PHP API Field Type 
+## PHP API field type 
 
 ### Input expectations
 
@@ -23,7 +23,7 @@ As input it expects three values:
 
 ##### Properties
 
-The Value class of this Field Type contains the following properties:
+The Value class of this field type contains the following properties:
 
 |Property|Type|Description|
 |------|------|------|
@@ -33,7 +33,7 @@ The Value class of this Field Type contains the following properties:
 
 ##### Constructor
 
-The `MapLocation\Value` constructor will initialize a new Value object with values provided as hash. Accepted keys are `latitude` (`float`), `longitude` (`float`), `address` (`string`).
+The `MapLocation\Value` constructor initializes a new Value object with values provided as hash. Accepted keys are `latitude` (`float`), `longitude` (`float`), `address` (`string`).
 
 ``` php
 // Constructor example
diff --git a/docs/content_management/field_types/field_type_reference/matrixfield.md b/docs/content_management/field_types/field_type_reference/matrixfield.md
index 7bede9a995..6cb775b5a8 100644
--- a/docs/content_management/field_types/field_type_reference/matrixfield.md
+++ b/docs/content_management/field_types/field_type_reference/matrixfield.md
@@ -1,4 +1,4 @@
-# Matrix Field Type
+# Matrix field type
 
 This Field represents and handles a table of rows and columns of data.
 
@@ -6,10 +6,10 @@ This Field represents and handles a table of rows and columns of data.
 |----------|---------------|----------------|
 | `Matrix` | `ezmatrix`    | `array`        |
 
-The Matrix Field Type is available via the Matrix Bundle
+The Matrix field type is available via the Matrix Bundle
 provided by the [ibexa/fieldtype-matrix](https://github.com/ibexa/fieldtype-matrix) package.
 
-## PHP API Field Type
+## PHP API field type
 
 ### Input expectations
 
@@ -41,9 +41,9 @@ The minimum number of rows is set on content type level for each Field.
 
 Validation checks for empty rows. A row is considered empty if it contains only empty cells (or cells containing only spaces). Empty rows are removed.
 
-If, after removing empty rows, the number of rows does not fulfill the configured `Minimum number of rows`, the Field will not validate.
+If, after removing empty rows, the number of rows does not fulfill the configured `Minimum number of rows`, the Field doesn't validate.
 
-For example, the following input will not validate if `Minimum number of rows` is set to 3, because the second row is empty:
+For example, the following input doesn't validate if `Minimum number of rows` is set to 3, because the second row is empty:
 
 ```php
 new FieldType\Value([
@@ -53,9 +53,9 @@ new FieldType\Value([
 ]);
 ```
 
-## GraphQL Field Type operations
+## GraphQL field type operations
 
-To get a Field of the Matrix Field Type with GraphQL, you will need to specify a Content ID, a content type, and a Field Type.
+To get a Field of the Matrix field type with GraphQL, you need to specify a Content ID, a content type, and a field type.
 
 The types that are returned are named after the Type and the Field:
 
@@ -104,7 +104,7 @@ The Type returned for the Matrix Field exposes columns defined in the Field defi
 }
 ```
 
-### Query for the Field Type and Field definition's details
+### Query for the field type and Field definition's details
 
 With this query you can inspect details of specific content type. In case of a Matrix Field, you can ask for the list of columns, their names and identifiers.
 
@@ -128,7 +128,7 @@ With this query you can inspect details of specific content type. In case of a M
 }
 ```
 
-The response will list the exposed Field Type settings:
+The response lists the exposed field type settings:
 
 - minimumRows
 - columns
@@ -167,12 +167,12 @@ Example response:
 
 ### Mutation
 
-To create a Matrix Field Type you need to define Field Type and Field definition identifiers.
+To create a Matrix field type you need to define field type and Field definition identifiers.
 The types that are used for input are named after the Type and the Field:
 
 - `{TypeIdentifier}{FieldIdentifier}RowInput` e.g. `dish.nutritionFacts`, `event.agenda`: `DishNutritionFactsRowInput`, `EventAgendaRowInput`
 
-The example below shows how to create a Recipe content item (belonging to a content type with a Matrix Field Type added) that has two Fields:
+The example below shows how to create a Recipe content item (belonging to a content type with a Matrix field type added) that has two Fields:
 
 - `name`: `"Cake Ingredient List"`
 - `ingredients`: `ezmatrix` with two columns: `ingredient` and `quantity`
@@ -195,7 +195,7 @@ The example below shows how to create a Recipe content item (belonging to a cont
 }
 ```
 
-The response will confirm creation of the new Recipe Field:
+The response confirms creation of the new Recipe Field:
 
 ```
 {
diff --git a/docs/content_management/field_types/field_type_reference/measurementfield.md b/docs/content_management/field_types/field_type_reference/measurementfield.md
index dce99b79aa..2ae2a15d0a 100644
--- a/docs/content_management/field_types/field_type_reference/measurementfield.md
+++ b/docs/content_management/field_types/field_type_reference/measurementfield.md
@@ -1,6 +1,6 @@
-# Measurement Field Type
+# Measurement field type
 
-The Measurement Field Type represents measurement information. 
+The Measurement field type represents measurement information. 
 It stores the unit of measure, and either a single measurement value, 
 or a pair of values that defines a range.
 
@@ -8,7 +8,7 @@ or a pair of values that defines a range.
 |---------------|---------------------|----------------------------------------------------|
 | `Measurement` | `ibexa_measurement` | `Ibexa\Contracts\Measurement\Value\ValueInterface` |
 
-## PHP API Field Type
+## PHP API field type
 
 ### Input expectations
 
@@ -31,7 +31,7 @@ examples are as follows:
 
 ##### Properties
 
-The Value class of this Field Type contains the following properties:
+The Value class of this field type contains the following properties:
 
 | Property | Type                                             | Description                                                                                                          |
 |----------|--------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
@@ -78,7 +78,7 @@ $measurementValue = new Measurement\Value(
 
 ### Validation
 
-The Measurement Field Type validates measurement types and units passed within 
+The Measurement field type validates measurement types and units passed within 
 the value object against a list of the ones that the system supports, which can 
 be found in the `vendor/ibexa/measurement/src/bundle/Resources/config/builtin_units.yaml` file.
 
diff --git a/docs/content_management/field_types/field_type_reference/mediafield.md b/docs/content_management/field_types/field_type_reference/mediafield.md
index 7f7903deea..a37d738a1e 100644
--- a/docs/content_management/field_types/field_type_reference/mediafield.md
+++ b/docs/content_management/field_types/field_type_reference/mediafield.md
@@ -1,6 +1,6 @@
-# Media Field Type
+# Media field type
 
-This Field Type represents and handles a media (audio/video) binary file.
+This field type represents and handles a media (audio/video) binary file.
 
 It's capable of handling the following types of files:
 
@@ -16,14 +16,14 @@ It's capable of handling the following types of files:
 |---------|---------------|----------------|
 | `Media` | `ezmedia`     | mixed        |
 
-## PHP API Field Type 
+## PHP API field type 
 
 ### Input expectations
 
 | Type | Description | Example|
 |------|-------------|--------|
 | `string` | Path to the media file.| `/Users/jane/butterflies.mp4`     |
-| `Ibexa\Core\FieldType\Media\Value` | Media Field Type Value Object with path to the media file as the value of `id` property. | See below. |
+| `Ibexa\Core\FieldType\Media\Value` | Media field type Value Object with path to the media file as the value of `id` property. | See below. |
 
 ### Value object
 
@@ -31,7 +31,7 @@ It's capable of handling the following types of files:
 
 `Ibexa\Core\FieldType\Media\Value` offers the following properties.
 
-Note that both `Media` and `BinaryFile` Value and Type inherit from the `BinaryBase` abstract Field Type and share common properties.
+Note that both `Media` and `BinaryFile` Value and Type inherit from the `BinaryBase` abstract field type and share common properties.
 
 |Property|Type|Description|Example|
 |------|------|------|------|
@@ -65,14 +65,14 @@ The hash format mostly matches the value object. It has the following keys:
 
 ### Validation
 
-The Field Type supports `FileSizeValidator`, defining maximum size of media file in bytes:
+The field type supports `FileSizeValidator`, defining maximum size of media file in bytes:
 
 |Name|Type|Default value|Description|
 |------|------|------|------|
 |`maxFileSize`|`int`|`false`|Maximum size of the file in bytes.|
 
 ``` php
-// Example of using Media Field Type validator in PHP
+// Example of using Media field type validator in PHP
 
 use Ibexa\Core\FieldType\Media\Type;
 
@@ -89,7 +89,7 @@ $mediaFieldCreateStruct->validatorConfiguration = [
 
 ### Settings
 
-The Field Type supports the `mediaType` setting, defining how the media file should be handled in output.
+The field type supports the `mediaType` setting, defining how the media file should be handled in output.
 
 |Name|Type|Default value|Description|
 |------|------|------|------|
@@ -108,7 +108,7 @@ List of all available `mediaType` constants is defined in the `Ibexa\Core\Fiel
 |`TYPE_HTML5_AUDIO`|HTML5 Audio|
 
 ``` php
-// Example of using Media Field Type settings in PHP
+// Example of using Media field type settings in PHP
 
 use Ibexa\Core\FieldType\Media\Type;
  
diff --git a/docs/content_management/field_types/field_type_reference/nullfield.md b/docs/content_management/field_types/field_type_reference/nullfield.md
index 5052056255..b7ae1217a5 100644
--- a/docs/content_management/field_types/field_type_reference/nullfield.md
+++ b/docs/content_management/field_types/field_type_reference/nullfield.md
@@ -1,6 +1,6 @@
-# Null Field Type
+# Null field type
 
-This Field Type is used as fallback for migration scenarios, and for testing purposes.
+This field type is used as fallback for migration scenarios, and for testing purposes.
 
 | Name   | Internal name | Expected input type |
 |--------|---------------|---------------------|
@@ -8,18 +8,18 @@ This Field Type is used as fallback for migration scenarios, and for testing pur
 
 ## Description
 
-The Null Field Type serves as an aid when migrating from eZ Publish Platform and earlier legacy versions. It's a dummy for legacy Field Types that are not implemented in [[= product_name =]].
+The Null field type serves as an aid when migrating from eZ Publish Platform and earlier legacy versions. It's a dummy for legacy field types that are not implemented in [[= product_name =]].
 
-Null Field Type will accept anything provided as a value and is usually combined with:
+Null field type accepts anything provided as a value and is usually combined with:
 
-- NullConverter: Makes it not store anything to the legacy storage engine (database), nor will it read any data.
+- NullConverter: Makes it not store anything to the legacy storage engine (database), nor it reads any data.
 - Unindexed: Indexable class making sure nothing is indexed to configured search engine.
 
-This Field Type does not have its own fixed internal name. Its identifier is instead configured as needed by passing it as an argument to the constructor.
+This field type does not have its own fixed internal name. Its identifier is instead configured as needed by passing it as an argument to the constructor.
 
-### Example for usage of Null Field Type
+### Example for usage of Null field type
 
-The following example shows how an `example` Field Type could be configured as a Null Field Type:
+The following example shows how an `example` field type could be configured as a Null field type:
 
 ``` yaml
 # Null Fieldtype example configuration
diff --git a/docs/content_management/field_types/field_type_reference/pagefield.md b/docs/content_management/field_types/field_type_reference/pagefield.md
index 6f6e171da8..213becba7b 100644
--- a/docs/content_management/field_types/field_type_reference/pagefield.md
+++ b/docs/content_management/field_types/field_type_reference/pagefield.md
@@ -2,11 +2,11 @@
 edition: experience
 ---
 
-# Page Field Type
+# Page field type
 
-Page Field Type represents a Page with a layout consisting of multiple zones. Each zone can in turn contain blocks.
+Page field type represents a Page with a layout consisting of multiple zones. Each zone can in turn contain blocks.
 
-Page Field Type is only used in the Page content type that is included in [[= product_name_exp =]].
+Page field type is only used in the Page content type that is included in [[= product_name_exp =]].
 
 | Name           | Internal name   | Expected input  |
 |----------------|-----------------|-----------------|
@@ -14,9 +14,9 @@ Page Field Type is only used in the Page content type that is included in [[= pr
 
 !!! caution "Page Builder"
 
-    If you create content type with both `ezlandingpage` and `ezuser` Field Types,
-    you will not be redirected to Page Builder after selecting `Edit` or `Create`.
-    This is caused by `ezuser` Field Type which requires separate handling. You will be redirected to the standard back office edit or create mode.
+    If you create content type with both `ezlandingpage` and `ezuser` field types,
+    you aren't redirected to Page Builder after selecting `Edit` or `Create`.
+    This is caused by `ezuser` field type which requires separate handling. You are redirected to the standard back office edit or create mode.
 
 ## Layout and zones
 
diff --git a/docs/content_management/field_types/field_type_reference/relationfield.md b/docs/content_management/field_types/field_type_reference/relationfield.md
index 8521f48a97..3eecb4a313 100644
--- a/docs/content_management/field_types/field_type_reference/relationfield.md
+++ b/docs/content_management/field_types/field_type_reference/relationfield.md
@@ -1,12 +1,12 @@
-# Relation Field Type
+# Relation field type
 
-This Field Type makes it possible to store and retrieve the value of a relation to another content item.
+This field type makes it possible to store and retrieve the value of a relation to another content item.
 
 | Name       | Internal name      | Expected input |
 |------------|--------------------|----------------|
 | `Relation` | `ezobjectrelation` | mixed        |
 
-## PHP API Field Type
+## PHP API field type
 
 ### Input expectations
 
@@ -19,7 +19,7 @@ This Field Type makes it possible to store and retrieve the value of a relation
 
 ##### Properties
 
-The Value class of this Field Type contains the following properties:
+The Value class of this field type contains the following properties:
 
 | Property|Type| Description|
 |---------|-----|-----------|
@@ -33,7 +33,7 @@ $relation->destinationContentId = $contentInfo->id;
 
 ##### Constructor
 
-The `Relation\Value` constructor will initialize a new Value object with the value provided. It expects a mixed value.
+The `Relation\Value` constructor initializes a new Value object with the value provided. It expects a mixed value.
 
 ``` php
 // Constructor example
@@ -44,11 +44,11 @@ $relationValue = new Relation\Value( $contentInfo->id );
 
 ### Validation
 
-This Field Type validates whether the provided relation exists, but before that it will check that the value is either a string or an int.
+This field type validates whether the provided relation exists, but before that it checks that the value is either a string or an int.
 
 ### Settings
 
-The Field definition of this Field Type can be configured with three options:
+The Field definition of this field type can be configured with three options:
 
 |Name|Type|Default value|Description|
 |------|------|------|------|
diff --git a/docs/content_management/field_types/field_type_reference/relationlistfield.md b/docs/content_management/field_types/field_type_reference/relationlistfield.md
index 44638a8393..7523d55720 100644
--- a/docs/content_management/field_types/field_type_reference/relationlistfield.md
+++ b/docs/content_management/field_types/field_type_reference/relationlistfield.md
@@ -1,12 +1,12 @@
-# RelationList Field Type
+# RelationList field type
 
-This Field Type makes it possible to store and retrieve values of a relation to other content items.
+This field type makes it possible to store and retrieve values of a relation to other content items.
 
 | Name           | Internal name          | Expected input |
 |----------------|------------------------|----------------|
 | `RelationList` | `ezobjectrelationlist` | `mixed`        |
 
-## PHP API Field Type 
+## PHP API field type 
 
 ### Input expectations
 
@@ -15,7 +15,7 @@ This Field Type makes it possible to store and retrieve values of a relation to
 |`int|string`|ID of the related content item|`42`|
 |`array`|An array of related Content IDs|`[ 24, 42 ]`|
 |`Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo`|ContentInfo instance of the related Content|n/a|
-|`Ibexa\Core\FieldType\RelationList\Value`|RelationList Field Type Value Object|See below.|
+|`Ibexa\Core\FieldType\RelationList\Value`|RelationList field type Value Object|See below.|
 
 ### Value Object
 
@@ -38,7 +38,7 @@ $relationList->destinationContentId = [
 
 ##### Constructor
 
-The `RelationList\Value` constructor will initialize a new Value object with the value provided. It expects a mixed array as value.
+The `RelationList\Value` constructor initializes a new Value object with the value provided. It expects a mixed array as value.
 
 ``` php
 //Constructor example
@@ -55,7 +55,7 @@ $relationListValue = new RelationList\Value(
 
 ### Validation
 
-This Field Type validates if:
+This field type validates if:
 
 - the `selectionMethod` specified is `\Ibexa\Core\FieldType\RelationList\Type::SELECTION_BROWSE` or `\Ibexa\Core\FieldType\RelationList\Type::SELECTION_DROPDOWN`. A validation error is thrown if the value does not match.
 - the `selectionDefaultLocation` specified is `null`, `string` or `integer`. If the type validation fails a validation error is thrown.
@@ -68,7 +68,7 @@ This Field Type validates if:
 
 ### Settings
 
-The Field definition of this Field Type can be configured with the following options:
+The Field definition of this field type can be configured with the following options:
 
 |Name|Type|Default value|Description|
 |------|------|------|------|
@@ -80,7 +80,7 @@ Following selection methods are available:
 
 | Name| Description|
 |-----|------------|
-| `SELECTION_BROWSE` | Selection will use browse mode.|
+| `SELECTION_BROWSE` | Selection uses browse mode.|
 | `SELECTION_DROPDOWN` | *Not implemented yet* |
 
 ### Validators
diff --git a/docs/content_management/field_types/field_type_reference/richtextfield.md b/docs/content_management/field_types/field_type_reference/richtextfield.md
index 81f1b363d5..39bac8c214 100644
--- a/docs/content_management/field_types/field_type_reference/richtextfield.md
+++ b/docs/content_management/field_types/field_type_reference/richtextfield.md
@@ -1,14 +1,14 @@
-# RichText Field Type
+# RichText field type
 
-The RichText Field Type is available via the RichText Field Type Bundle provided by the [ibexa/fieldtype-richtext](https://github.com/ibexa/fieldtype-richtext) package.
+The RichText field type is available via the RichText field type Bundle provided by the [ibexa/fieldtype-richtext](https://github.com/ibexa/fieldtype-richtext) package.
 
-This Field Type validates and stores structured rich text, and exposes it in several formats.
+This field type validates and stores structured rich text, and exposes it in several formats.
 
 |Name|Internal name|Expected input|
 |------|------|------|
 |`RichText`|`ezrichtext`|mixed|
 
-## PHP API Field Type 
+## PHP API field type 
 
 ### Value object
 
@@ -22,19 +22,19 @@ This Field Type validates and stores structured rich text, and exposes it in sev
 
 |Type|Description|
 |------|------|
-|`string`|XML document in one of the Field Type's input formats as a string.|
-|`DOMDocument`|XML document in one of the Field Type's input formats as a `DOMDocument` object.|
-|`Ibexa\FieldTypeRichText\FieldType\RichText\Value`|An instance of the Field Type's `Value` object.|
+|`string`|XML document in one of the field type's input formats as a string.|
+|`DOMDocument`|XML document in one of the field type's input formats as a `DOMDocument` object.|
+|`Ibexa\FieldTypeRichText\FieldType\RichText\Value`|An instance of the field type's `Value` object.|
 
 ##### Input formats
 
-The Field Type expects an XML value as input, in the form of a string, `DOMDocument` object, or Field Type's `Value` object.
-The Field Type's `Value` object must hold the value in the Field Type's [internal format](#internal-format).
+The field type expects an XML value as input, in the form of a string, `DOMDocument` object, or field type's `Value` object.
+The field type's `Value` object must hold the value in the field type's [internal format](#internal-format).
 For a string of a `DOMDocument` object, if the input does not conform to this format, it's converted into it.
 
 ##### Internal format
 
-As its internal format, the RichText Field Type uses a [custom flavor of the DocBook format](#custom-docbook-format).
+As its internal format, the RichText field type uses a [custom flavor of the DocBook format](#custom-docbook-format).
 
 ``` xml
 <?xml version="1.0" encoding="UTF-8"?>
diff --git a/docs/content_management/field_types/field_type_reference/selectionfield.md b/docs/content_management/field_types/field_type_reference/selectionfield.md
index 1cb30bb086..88852b4749 100644
--- a/docs/content_management/field_types/field_type_reference/selectionfield.md
+++ b/docs/content_management/field_types/field_type_reference/selectionfield.md
@@ -1,12 +1,12 @@
-# Selection Field Type
+# Selection field type
 
-The Selection Field Type stores single selections or multiple choices from a list of options, by populating a hash with the list of selected values.
+The Selection field type stores single selections or multiple choices from a list of options, by populating a hash with the list of selected values.
 
 | Name        | Internal name | Expected input type |
 |-------------|---------------|---------------------|
 | `Selection` | `ezselection` | mixed             |
 
-## PHP API Field Type
+## PHP API field type
 
 ### Input expectations
 
@@ -18,7 +18,7 @@ The Selection Field Type stores single selections or multiple choices from a
 
 ##### Properties
 
-The Value class of this Field Type contains the following properties:
+The Value class of this field type contains the following properties:
 
 | Property     | Type    | Description|
 |--------------|---------|------------|
@@ -47,13 +47,13 @@ $selectionValue = new Selection\Value( [ 1, 2 ] );
 
 ##### String representation
 
-String representation of this Field Type is its list of selections as a string, concatenated with a comma.
+String representation of this field type is its list of selections as a string, concatenated with a comma.
 
 Example: `"1,2,24,42"`
 
 ### Hash format
 
-Hash format of this Field Type is the same as Value object's `selection` property.
+Hash format of this field type is the same as Value object's `selection` property.
 
 ``` php
 // Example of value in hash format
@@ -63,7 +63,7 @@ $hash = [ 1, 2 ];
 
 ### Validation
 
-This Field Type validates the input, verifying if all selected options exist in the Field definition and checks if multiple selections are allowed in the Field definition.
+This field type validates the input, verifying if all selected options exist in the Field definition and checks if multiple selections are allowed in the Field definition.
 If any of these validations fail, a `ValidationError` is thrown, specifying the error message. When option validation fails, a list with the invalid options is also presented.
 
 ### Settings
@@ -74,7 +74,7 @@ If any of these validations fail, a `ValidationError` is thrown, specifying the
 | `options`    | `hash`    | `[]`     | Stores the list of options defined in the Field definition.    |
 
 ``` php
-// Selection Field Type example settings
+// Selection field type example settings
 
 use Ibexa\Core\FieldType\Selection\Type;
 
diff --git a/docs/content_management/field_types/field_type_reference/sesexternaldata.md b/docs/content_management/field_types/field_type_reference/sesexternaldata.md
index 70e2ce64ba..78af38f8f9 100644
--- a/docs/content_management/field_types/field_type_reference/sesexternaldata.md
+++ b/docs/content_management/field_types/field_type_reference/sesexternaldata.md
@@ -1,6 +1,6 @@
 # SesExternalData
 
-Field Type `sesexternaldatatype` uses external storage to store data.
+Field type `sesexternaldatatype` uses external storage to store data.
 The data is stored in the `ses_externaldata` table with the following structure:
 
 |Field|Type|Description|
@@ -13,7 +13,7 @@ The data is stored in the `ses_externaldata` table with the following structure:
 
 ## Storing data in `ses_externaldata`
 
-Data that is stored in the `ses_externaldata` table must be either a simple datatype: int, float, bool or a Field Type.
+Data that is stored in the `ses_externaldata` table must be either a simple datatype: int, float, bool or a field type.
 
-Field Type data is stored in the database in serialized form by using the `toHash()` method.
+Field type data is stored in the database in serialized form by using the `toHash()` method.
 Simple data types (int, float, bool) are stored in serialized form.
diff --git a/docs/content_management/field_types/field_type_reference/sesprofiledata.md b/docs/content_management/field_types/field_type_reference/sesprofiledata.md
index a131242953..fd6fe85102 100644
--- a/docs/content_management/field_types/field_type_reference/sesprofiledata.md
+++ b/docs/content_management/field_types/field_type_reference/sesprofiledata.md
@@ -1,6 +1,6 @@
 # SesProfileData
 
-This Field Type stores [`CustomerProfileData`] in the User content type.
+This field type stores [`CustomerProfileData`] in the User content type.
 
 `CustomerProfileData` must be stored as a serialized string in base64 format,
 because it's impossible to store special HTML characters (`<`,`>`, `""`,`''`, `&`) in a text or text area field.
diff --git a/docs/content_management/field_types/field_type_reference/sesselection.md b/docs/content_management/field_types/field_type_reference/sesselection.md
index 5c8690751c..857c262f56 100644
--- a/docs/content_management/field_types/field_type_reference/sesselection.md
+++ b/docs/content_management/field_types/field_type_reference/sesselection.md
@@ -1,12 +1,12 @@
 # SesSelection
 
-This Field Type stores a single selection choice. 
+This field type stores a single selection choice. 
 
-The SesSelection Field Type is configured in a YAML file,
-unlike the [Selection Field Type](selectionfield.md).
-This way, you can set up SiteAccess-specific selection Field Types.
+The SesSelection field type is configured in a YAML file,
+unlike the [Selection field type](selectionfield.md).
+This way, you can set up SiteAccess-specific selection field types.
 
-The Field Type must be configured per attribute:
+The field type must be configured per attribute:
 
 ``` yaml
 ibexa.commerce.site_access.config.core.default.sesselection.news_type:
diff --git a/docs/content_management/field_types/field_type_reference/specificationstype.md b/docs/content_management/field_types/field_type_reference/specificationstype.md
index 291d126dea..27358f9436 100644
--- a/docs/content_management/field_types/field_type_reference/specificationstype.md
+++ b/docs/content_management/field_types/field_type_reference/specificationstype.md
@@ -1,6 +1,6 @@
 # SpecificationsType
 
-This Field Type stores a structured list of attributes for products.
+This field type stores a structured list of attributes for products.
 
 !!! caution "Field naming"
 
diff --git a/docs/content_management/field_types/field_type_reference/taxonomyentryassignmentfield.md b/docs/content_management/field_types/field_type_reference/taxonomyentryassignmentfield.md
index d8bc3e71fc..900e915f72 100644
--- a/docs/content_management/field_types/field_type_reference/taxonomyentryassignmentfield.md
+++ b/docs/content_management/field_types/field_type_reference/taxonomyentryassignmentfield.md
@@ -1,8 +1,8 @@
-# TaxonomyEntryAssignment Field Type
+# TaxonomyEntryAssignment field type
 
 `TaxonomyEntryAssignment` Field is used to integrate content with the Taxonomy module. 
 It allows you to select tags or categories and assign them to content. 
-This Field Type assigns tags to the content in the data action, so then you can use `TaxonomyService` on this content item. 
+This field type assigns tags to the content in the data action, so then you can use `TaxonomyService` on this content item. 
 
 !!! caution "Duplicate taxonomy fields"
 
@@ -15,7 +15,7 @@ To be able to assign tags to the content, first, you need to add a `TaxonomyEntr
 |--------------------------|----------------------------------|----------------|
 | `TaxonomyEntryAssignment`| `ibexa_taxonomy_entry_assignment`| array with `taxonomyEntries` and `taxonomy` keys|
 
-## PHP API Field Type 
+## PHP API field type 
 
 ### Input expectations
 
@@ -52,7 +52,7 @@ Example using array:
 |Property|Type|Description|
 |--------|----|-----------|
 |`taxonomyEntry`|array of `Ibexa\Contracts\Taxonomy\Value\TaxonomyEntry`|Stores selected taxonomy entry.|
-|`taxonomy`|`string`|Stores the taxonomy identifier, all `taxonomyEntries` have to be assigned to this taxonomy and the identifier has to match the settings of the Field Type in content type configuration.|
+|`taxonomy`|`string`|Stores the taxonomy identifier, all `taxonomyEntries` have to be assigned to this taxonomy and the identifier has to match the settings of the field type in content type configuration.|
 
 #### Constructor
 
@@ -72,7 +72,7 @@ An array of:
 
 #### Validation
 
-The Field Type validates if all Taxonomy Entries from the value are assigned to the configured taxonomy.
+The field type validates if all Taxonomy Entries from the value are assigned to the configured taxonomy.
 
 #### Settings
 
diff --git a/docs/content_management/field_types/field_type_reference/taxonomyentryfield.md b/docs/content_management/field_types/field_type_reference/taxonomyentryfield.md
index 93c480c924..28937db563 100644
--- a/docs/content_management/field_types/field_type_reference/taxonomyentryfield.md
+++ b/docs/content_management/field_types/field_type_reference/taxonomyentryfield.md
@@ -1,13 +1,13 @@
-# TaxonomyEntry Field Type
+# TaxonomyEntry field type
 
-`TaxonomyEntry` is a general purpose Field Type that can store only one taxonomy entry (for example, tag or product category). 
+`TaxonomyEntry` is a general purpose field type that can store only one taxonomy entry (for example, tag or product category). 
 It's used as a parent for a tag or category.
 
 | Name           | Internal name         | Expected input |
 |----------------|-----------------------|----------------|
 | `TaxonomyEntry`| `ibexa_taxonomy_entry`| `array`|
 
-## PHP API Field Type 
+## PHP API field type 
 
 ### Input expectations
 
@@ -69,7 +69,7 @@ No validation.
 
 #### Settings
 
-The Field definition of this Field Type can be configured with the following options:
+The Field definition of this field type can be configured with the following options:
 
 |Name|Type|Default value|Description|
 |------|------|------|------|
diff --git a/docs/content_management/field_types/field_type_reference/textblockfield.md b/docs/content_management/field_types/field_type_reference/textblockfield.md
index 6516c3f6d8..478f8f6a11 100644
--- a/docs/content_management/field_types/field_type_reference/textblockfield.md
+++ b/docs/content_management/field_types/field_type_reference/textblockfield.md
@@ -1,12 +1,12 @@
-# TextBlock Field Type
+# TextBlock field type
 
-The Field Type handles a block of multiple lines of unformatted text. It's capable of handling up to 16,777,216 characters.
+The field type handles a block of multiple lines of unformatted text. It's capable of handling up to 16,777,216 characters.
 
 | Name        | Internal name | Expected input type |
 |-------------|---------------|---------------------|
 | `TextBlock` | `eztext`      | `string`            |
 
-## PHP API Field Type
+## PHP API field type
 
 ### Input expectations
 
@@ -18,11 +18,11 @@ The Field Type handles a block of multiple lines of unformatted text. It's capa
 
 ##### Properties
 
-The Value class of this Field Type contains the following properties:
+The Value class of this field type contains the following properties:
 
 |Property|Type|Description|
 |--------|----|-----------|
-|`$text`|`string`|This property will be used for the text content.|
+|`$text`|`string`|This property is used for the text content.|
 
 ##### String representation
 
@@ -30,11 +30,11 @@ A TextBlock's string representation is the `$text` property's value, as a string
 
 ##### Constructor
 
-The constructor for this Value object will initialize a new Value object with the value provided. It accepts a string as argument and will import it to the `$text` attribute.
+The constructor for this Value object initializes a new Value object with the value provided. It accepts a string as argument and imports it to the `$text` attribute.
 
 ### Validation
 
-This Field Type does not perform any special validation of the input value.
+This field type does not perform any special validation of the input value.
 
 ### Settings
 
diff --git a/docs/content_management/field_types/field_type_reference/textlinefield.md b/docs/content_management/field_types/field_type_reference/textlinefield.md
index 6483ab8dec..84dba9b9bd 100644
--- a/docs/content_management/field_types/field_type_reference/textlinefield.md
+++ b/docs/content_management/field_types/field_type_reference/textlinefield.md
@@ -1,22 +1,22 @@
-# TextLine Field Type
+# TextLine field type
 
-This Field Type makes possible to store and retrieve a single line of unformatted text. It's capable of handling up to 255 characters.
+This field type makes possible to store and retrieve a single line of unformatted text. It's capable of handling up to 255 characters.
 
 | Name       | Internal name | Expected input type |
 |------------|---------------|---------------------|
 | `TextLine` | `ezstring`    | `string`            |
 
-## PHP API Field Type
+## PHP API field type
 
 ### Value object
 
 ##### Properties
 
-The Value class of this Field Type contains the following properties:
+The Value class of this field type contains the following properties:
 
 | Property | Type     | Description|
 |----------|----------|------------|
-| `$text`  | `string` | This property will be used for the text content. |
+| `$text`  | `string` | This property is used for the text content. |
 
 ##### String representation
 
@@ -24,12 +24,12 @@ A TextLine's string representation is the `$text` property's value, as a string.
 
 ##### Constructor
 
-The constructor for this Value object will initialize a new Value object with the value provided. It accepts a string as argument and will import it to the `$text` attribute.
+The constructor for this Value object ]initializes a new Value object with the value provided. It accepts a string as argument and imports it to the `$text` attribute.
 
 ### Validation
 
-The input passed into this Field Type is subject to validation by the `StringLengthValidator`. The length of the string provided must be between the minimum length defined in `minStringLength` and the maximum defined in `maxStringLength`. The default value for both properties is 0, which means that the validation is disabled by default.
-To set the validation properties, the `validateValidatorConfiguration()` method needs to be inspected, which will receive an array with `minStringLength` and `maxStringLength` like in the following representation:
+The input passed into this field type is subject to validation by the `StringLengthValidator`. The length of the string provided must be between the minimum length defined in `minStringLength` and the maximum defined in `maxStringLength`. The default value for both properties is 0, which means that the validation is disabled by default.
+To set the validation properties, the `validateValidatorConfiguration()` method needs to be inspected, which receives an array with `minStringLength` and `maxStringLength` like in the following representation:
 
 ```
 Array
diff --git a/docs/content_management/field_types/field_type_reference/timefield.md b/docs/content_management/field_types/field_type_reference/timefield.md
index db85d97210..4cf65dbde3 100644
--- a/docs/content_management/field_types/field_type_reference/timefield.md
+++ b/docs/content_management/field_types/field_type_reference/timefield.md
@@ -1,6 +1,6 @@
-# Time Field Type
+# Time field type
 
-This Field Type represents time information.
+This field type represents time information.
 
 Date information is **not stored**.
 
@@ -10,11 +10,11 @@ What is stored is the number of seconds, calculated from the beginning of the da
 |--------|---------------|---------------------|
 | `Time` | `eztime`      | mixed             |
 
-## PHP API Field Type
+## PHP API field type
 
 ### Input expectations
 
-If input value is of type `string` or `integer`, it will be passed directly to the [PHP's built-in `\DateTime` class](https://www.php.net/manual/en/datetime.construct.php) constructor, therefore the same input format expectations apply.
+If input value is of type `string` or `integer`, it's passed directly to the [PHP's built-in `\DateTime` class](https://www.php.net/manual/en/datetime.construct.php) constructor, therefore the same input format expectations apply.
 
 It's also possible to directly pass an instance of `\DateTime`.
 
@@ -28,7 +28,7 @@ It's also possible to directly pass an instance of `\DateTime`.
 
 ##### Properties
 
-The Value class of this Field Type contains the following properties:
+The Value class of this field type contains the following properties:
 
 | Property | Type           | Description|
 |----------|----------------|------------|
@@ -36,11 +36,11 @@ The Value class of this Field Type contains the following properties:
 
 ##### Constructor
 
-The constructor for this Value object will initialize a new Value object with the value provided. It accepts an integer representing the number of seconds since the beginning of the day.
+The constructor for this Value object initializes a new Value object with the value provided. It accepts an integer representing the number of seconds since the beginning of the day.
 
 ##### String representation
 
-String representation of the date value will generate the date string in the format "H:i:s" as accepted by [PHP's built-in `date()` function](https://www.php.net/manual/en/function.date.php).
+String representation of the date value generates the date string in the format "H:i:s" as accepted by [PHP's built-in `date()` function](https://www.php.net/manual/en/function.date.php).
 
 |Character|Description|Example|
 |---------|----------|--------|
@@ -58,11 +58,11 @@ Example: `36000`
 
 ### Validation
 
-This Field Type does not perform validation of the input value.
+This field type does not perform validation of the input value.
 
 ### Settings
 
-The Field definition of this Field Type can be configured with several options:
+The Field definition of this field type can be configured with several options:
 
 |Name|Type|Default value|Description|
 |------|------|------|------|
@@ -70,7 +70,7 @@ The Field definition of this Field Type can be configured with several options:
 |`defaultType`|`Type::DEFAULT_EMPTY Type::DEFAULT_CURRENT_TIME`|`Type::DEFAULT_EMPTY`|The constant used here defines default input value when using back-end interface.|
 
 ``` php
-// Time Field Type example settings
+// Time field type example settings
 use Ibexa\Core\FieldType\Time\Type;
 
 $settings = [
diff --git a/docs/content_management/field_types/field_type_reference/urlfield.md b/docs/content_management/field_types/field_type_reference/urlfield.md
index d38e13923e..133272c47a 100644
--- a/docs/content_management/field_types/field_type_reference/urlfield.md
+++ b/docs/content_management/field_types/field_type_reference/urlfield.md
@@ -1,12 +1,12 @@
-# URL Field Type
+# URL field type
 
-This Field Type makes it possible to store and retrieve a URL. It's formed by the combination of a link and the respective text.
+This field type makes it possible to store and retrieve a URL. It's formed by the combination of a link and the respective text.
 
 | Name  | Internal name | Expected input |
 |-------|---------------|----------------|
 | `Url` | `ezurl`       | `string`       |
 
-## PHP API Field Type
+## PHP API field type
 
 ### Input expectations
 
@@ -19,12 +19,12 @@ This Field Type makes it possible to store and retrieve a URL. It's formed by th
 
 ##### Properties
 
-The Value class of this Field Type contains the following properties:
+The Value class of this field type contains the following properties:
 
 | Property | Type     | Description|
 |----------|----------|------------|
-| `$link`  | `string` | This property stores the link provided to the value of this Field Type.                              |
-| `$text`  | `string` | This property stores the text to represent the stored link provided to the value of this Field Type. |
+| `$link`  | `string` | This property stores the link provided to the value of this field type.                              |
+| `$text`  | `string` | This property stores the text to represent the stored link provided to the value of this field type. |
 
 ``` php
 // Value object content example
@@ -61,8 +61,8 @@ $hash = [
 
 ### Validation
 
-This Field Type does not perform validation.
+This field type does not perform validation.
 
 ### Settings
 
-This Field Type does not have settings.
+This field type does not have settings.
diff --git a/docs/content_management/field_types/field_type_reference/userfield.md b/docs/content_management/field_types/field_type_reference/userfield.md
index eb338db903..e57ea3768c 100644
--- a/docs/content_management/field_types/field_type_reference/userfield.md
+++ b/docs/content_management/field_types/field_type_reference/userfield.md
@@ -1,12 +1,12 @@
-# User Field Type
+# User field type
 
-This Field Type validates and stores information about a user.
+This field type validates and stores information about a user.
 
 | Name   | Internal name | Expected input |
 |--------|---------------|----------------|
 | `User` | `ezuser`      | ignored        |
 
-## PHP API Field Type
+## PHP API field type
 
 ### Value Object
 
diff --git a/docs/content_management/field_types/field_type_search.md b/docs/content_management/field_types/field_type_search.md
index b97df7c355..6090ed9ab8 100644
--- a/docs/content_management/field_types/field_type_search.md
+++ b/docs/content_management/field_types/field_type_search.md
@@ -1,15 +1,15 @@
 ---
-description: To be searchable, a Field Type must implement the Indexable interface.
+description: To be searchable, a field type must implement the Indexable interface.
 ---
 
-# Field Type searching
+# Field type searching
 
-Fields, or a custom Field Type, might contain or maintain data relevant for user searches.
-To make the search engine aware of the data in your Field Type you need to implement an additional interface and register the implementation.
+Fields, or a custom field type, might contain or maintain data relevant for user searches.
+To make the search engine aware of the data in your field type you need to implement an additional interface and register the implementation.
 
 ## `Indexable` interface
 
-The `Ibexa\Contracts\Core\FieldType\Indexable` interface defines the methods below which are required if the Field Type provides data relevant to search engines.
+The `Ibexa\Contracts\Core\FieldType\Indexable` interface defines the methods below which are required if the field type provides data relevant to search engines.
 
 ### `getIndexData(Field $field, FieldDefinition $fieldDefinition)`
 
@@ -17,7 +17,7 @@ This method returns the actual index data for the provided `Ibexa\Contracts\Core
 
 ### `getIndexDefinition()`
 
-To be able to query data properly an indexable Field Type also is required to return search specification. You must return an associative array of `Ibexa\Contracts\Core\Search\FieldType` instances from this method, which could look like:
+To be able to query data properly an indexable field type also is required to return search specification. You must return an associative array of `Ibexa\Contracts\Core\Search\FieldType` instances from this method, which could look like:
 
 ```
 [
@@ -26,15 +26,15 @@ To be able to query data properly an indexable Field Type also is required to re
 ]
 ```
 
-This example from the `Url` Field Type shows that the Field Type will always return two indexable values, both strings. They have the names `url` and `text` respectively.
+This example from the `Url` field type shows that the field type always returns two indexable values, both strings. They have the names `url` and `text` respectively.
 
 ### `getDefaultMatchField()`
 
-This method retrieves the name of the default Field to be used for matching. As Field Types can index multiple Fields (see [MapLocation](maplocationfield.md) Field Type's implementation of this interface), this method is used to define the default field for matching. The default Field is typically used by the [`Field` Search Criterion](field_criterion.md).
+This method retrieves the name of the default Field to be used for matching. As field types can index multiple Fields (see [MapLocation](maplocationfield.md) field type's implementation of this interface), this method is used to define the default field for matching. The default Field is typically used by the [`Field` Search Criterion](field_criterion.md).
 
 ### `getDefaultSortField()`
 
-This method gets name of the default Field to be used for sorting. As Field Types can index multiple Fields (see [MapLocation](maplocationfield.md) Field Type's implementation of this interface), this method is used to define default field for sorting. Default Field is typically used by the [`Field` Sort Clause](field_sort_clause.md).
+This method gets name of the default Field to be used for sorting. As field types can index multiple Fields (see [MapLocation](maplocationfield.md) field type's implementation of this interface), this method is used to define default field for sorting. Default Field is typically used by the [`Field` Sort Clause](field_sort_clause.md).
 
 ## Register `Indexable` implementations
 
@@ -47,7 +47,7 @@ Ibexa\Core\FieldType\Keyword\SearchField:
         - {name: ibexa.field_type.indexable, alias: ezkeyword}
 ```
 
-Note that `alias` should be the same as Field Type ID.
+Note that `alias` should be the same as field type ID.
 
 ## Search Field values
 
@@ -59,37 +59,37 @@ The search Field values returned by the `getIndexData` method are simple value o
 |`$value`|The value of the field|
 |`$type`|An `Ibexa\Contracts\Core\Search\FieldType` instance, describing the type information of the Field.|
 
-## Search Field Types
+## Search field types
 
-There are many available search Field Types which are handled by search backend configuration. When using them, there is no need to adapt, for example, the Solr configuration in any way. You can always use custom Field Types, but these might require re-configuration of the search backend. For Solr this would mean adapting the `schema.xml` file.
+There are many available search field types which are handled by search backend configuration. When using them, there is no need to adapt, for example, the Solr configuration in any way. You can always use custom field types, but these might require re-configuration of the search backend. For Solr this would mean adapting the `schema.xml` file.
 
-The default available search Field Types that can be found in the `Ibexa\Contracts\Core\Search\FieldType` namespace are:
+The default available search field types that can be found in the `Ibexa\Contracts\Core\Search\FieldType` namespace are:
 
-|Field Type|Description|
+|Field type|Description|
 |--------|-----------|
 |`BooleanField`|Boolean values.|
-|`CustomField`|Custom Field, for custom search data types. Will probably require additional configuration in the search backend.|
+|`CustomField`|Custom Field, for custom search data types. Probably requires additional configuration in the search backend.|
 |`DateField`|Date field. Can be used for date range queries.|
 |`DocumentField`|Document field|
 |`FloatField`|Field for floating point numbers.|
 |`FullTextField`|Represents full text searchable value of the Field which can be indexed by the legacy search engine. Some full text Fields are stored as an array of strings.|
 |`GeoLocationField`|Field used for Geo Location.|
-|`IdentifierField`|Field used for IDs. Basically acts like the string Field, but will not be queried by fulltext searches|
+|`IdentifierField`|Field used for IDs. Basically acts like the string Field, but it's not queried by fulltext searches|
 |`IntegerField`|Field for integer numbers.|
 |`MultipleBooleanField`|Multiple boolean values.|
 |`MultipleIdentifierField`|Multiple IDs values.|
 |`MultipleIntegerField`|Multiple integer numbers.|
 |`MultipleStringField`|Multiple string values.|
 |`PriceField`|Field for price values. Currency conversion might be applied by the search backends. Might require careful configuration.|
-|`StringField`|Standard string values. Will also be queries by full text searches.|
-|`TextField`|Standard text values. Will be queried by full text searches. Configured text normalizations in the search backend apply.|
+|`StringField`|Standard string values. It's also queried by full text searches.|
+|`TextField`|Standard text values. It's queried by full text searches. Configured text normalizations in the search backend apply.|
 
 ## Configuring Solr
 
 As mentioned before, if you use the standard type definitions, there is no need to configure the search backend in any way.
 The Field definitions are handled using `dynamicField` definitions in Solr, for example.
 
-If you want to configure the handling of your Field, you can always add a special Field definition to the Solr `schema.xml`. For Fields, the Field Type names used by the Solr search backend look like this: `<content_type_identifier>/<field_identifier>/<search_field_name>_<type>`.
+If you want to configure the handling of your Field, you can always add a special Field definition to the Solr `schema.xml`. For Fields, the field type names used by the Solr search backend look like this: `<content_type_identifier>/<field_identifier>/<search_field_name>_<type>`.
 You can define custom `dynamicField` definitions to match, for example, on your custom `_<type>` definition.
 
 You could also define a custom Field definition for certain Fields, like for the name Field in an article:
diff --git a/docs/content_management/field_types/field_type_storage.md b/docs/content_management/field_types/field_type_storage.md
index e31bde5921..c845e9c13c 100644
--- a/docs/content_management/field_types/field_type_storage.md
+++ b/docs/content_management/field_types/field_type_storage.md
@@ -1,29 +1,29 @@
 ---
-description: To be able to store the data saved to a Field, you must configure storage conversion for the Field Type.
+description: To be able to store the data saved to a Field, you must configure storage conversion for the field type.
 ---
 
-# Field Type storage
+# Field type storage
 
 ## Storage conversion
 
 If you want to store Field values in regular [[= product_name =]] database tables,
 the `FieldValue` must be converted to the storage-specific format used by the Persistence SPI:
 `Ibexa\Contracts\Core\Persistence\Content\FieldValue`.
-After restoring a Field of the Field Type, you must reverse the conversion.
+After restoring a Field of the field type, you must reverse the conversion.
 
-The following methods of the Field Type are responsible for that:
+The following methods of the field type are responsible for that:
 
 |Method|Description|
 |------|-----------|
-|`toPersistenceValue()`|This method receives the value of a Field of the Field Type and returns an SPI `FieldValue`, which can be stored.|
+|`toPersistenceValue()`|This method receives the value of a Field of the field type and returns an SPI `FieldValue`, which can be stored.|
 |`fromPersistenceValue()`|This method receives an SPI `FieldValue` and reconstructs the original value of the Field from it.|
 
-The SPI `FieldValue` struct has properties which the Field Type can use:
+The SPI `FieldValue` struct has properties which the field type can use:
 
 |Property|Description|
 |--------|-----------|
 |`$data`|The data to be stored in the database. This may be a scalar value, an associative array or a simple, serializable object.|
-|`$externalData`|The arbitrary data stored in this field will not be touched by any of the [[= product_name =]] components directly, but will be available for [Storing data externally](#storing-data-externally).|
+|`$externalData`|The arbitrary data stored in this field isn't touched by any of the [[= product_name =]] components directly, but is available for [Storing data externally](#storing-data-externally).|
 |`$sortKey`|A value which can be used to sort content by this Field.|
 
 ### Legacy storage engine
@@ -45,12 +45,12 @@ Each row represents a Field or a Field definition, and offers several free field
 
 Each type is free to use those fields in any way it requires.
 
-The default Legacy storage engine cannot store arbitrary value information as provided by a Field Type.
+The default Legacy storage engine cannot store arbitrary value information as provided by a field type.
 This means that using this storage engine requires a conversion.
-Converters will map a Field's semantic values to the fields described above, for both settings (validation and configuration) and value.
+Converters map a Field's semantic values to the fields described above, for both settings (validation and configuration) and value.
 
 The conversion takes place through the `Ibexa\Core\Persistence\Legacy\Content\FieldValue\Converter` interface,
-which you must implement in your Field Type. The interface contains the following methods:
+which you must implement in your field type. The interface contains the following methods:
 
 |Method|Description|
 |------|-----------|
@@ -79,28 +79,28 @@ The tag has the following attribute:
 
 | Attribute name | Usage |
 |----------------|-------|
-| `alias` | Represents the `fieldTypeIdentifier` (just like for the [Field Type service](type_and_value.md#registration)). |
+| `alias` | Represents the `fieldTypeIdentifier` (just like for the [field type service](type_and_value.md#registration)). |
 
 !!! tip
 
-    Converter configuration for built-in Field Types is located in [`ibexa/core/src/lib/Resources/settings/fieldtype_external_storages.yml`](https://github.com/ibexa/core/blob/main/src/lib/Resources/settings/fieldtype_external_storages.yml).
+    Converter configuration for built-in field types is located in [`ibexa/core/src/lib/Resources/settings/fieldtype_external_storages.yml`](https://github.com/ibexa/core/blob/main/src/lib/Resources/settings/fieldtype_external_storages.yml).
 
 ## Storing data externally
 
-A Field Type may store arbitrary data in external data sources.
+A field type may store arbitrary data in external data sources.
 External storage can be e.g. a web service, a file in the file system, another database
 or even the [[= product_name =]] database itself (in form of a non-standard table).
 
-In order to store data in external storage, the Field Type will interact with the Persistence SPI
+In order to store data in external storage, the field type interacts with the Persistence SPI
 through the `Ibexa\Contracts\Core\FieldType\FieldStorage` interface.
 
-Accessing the internal storage of a content item that includes a Field of the Field Type
+Accessing the internal storage of a content item that includes a Field of the field type
 calls one of the following methods to also access the external data:
 
 |Method|Description|
 |------|-----------|
-|`hasFieldData()`|Returns whether the Field Type stores external data at all.|
-|`storeFieldData()`|Called right before a Field of the Field Type is stored. The method stores `$externalData`. It returns `true` if the call manipulated internal data of the given Field, so that it's updated in the internal database.|
+|`hasFieldData()`|Returns whether the field type stores external data at all.|
+|`storeFieldData()`|Called right before a Field of the field type is stored. The method stores `$externalData`. It returns `true` if the call manipulated internal data of the given Field, so that it's updated in the internal database.|
 |`getFieldData()`|Called after a Field has been restored from the database in order to restore `$externalData`.|
 |`deleteFieldData()`|Must delete external data for the given Field, if exists.|
 |`getIndexData()`|Returns the actual index data for the provided `Ibexa\Contracts\Core\Persistence\Content\Field`. For more information, see [search service](field_type_search.md#search-field-values).|
@@ -110,11 +110,11 @@ To retrieve and store data in the [[= product_name =]] data storage,
 but outside of the normal structures (e.g. a custom table in an SQL database),
 use [Gateway-based storage](#gateway-based-storage) with properly injected Doctrine Connection.
 
-Note that the Field Type must take care on its own for being compliant with different data sources and that third parties can extend the data source support easily.
+Note that the field type must take care on its own for being compliant with different data sources and that third parties can extend the data source support easily.
 
 ### Gateway-based storage
 
-In order to allow the usage of a Field Type that uses external data with different data storages, it's recommended to implement a gateway infrastructure and a registry for the gateways. To make this easier, the Core implementation of Field Types provides corresponding interfaces and base classes. They can also be used for custom Field Types.
+In order to allow the usage of a field type that uses external data with different data storages, it's recommended to implement a gateway infrastructure and a registry for the gateways. To make this easier, the Core implementation of field types provides corresponding interfaces and base classes. They can also be used for custom field types.
 
 The interface `Ibexa\Contracts\Core\FieldType\StorageGateway` is implemented by gateways, in order to be handled correctly by the registry. It has one method:
 
@@ -133,14 +133,14 @@ The registry mechanism is realized as a base class for `FieldStorage` implementa
 
 !!! tip
 
-    Refer to the built-in Keyword, URL and User Field Types for usages of such infrastructure.
+    Refer to the built-in Keyword, URL and User field types for usages of such infrastructure.
 
 ### Registering external storage
 
 To use external storage, you need to define a service implementing the `Ibexa\Contracts\Core\FieldType\FieldStorage` interface
 and tag it as `ibexa.field_type.storage.external.handler` to be recognized by the Repository.
 
-Here is an example for the `myfield` Field Type:
+Here is an example for the `myfield` field type:
 
 ``` yaml
 services:
@@ -156,7 +156,7 @@ services:
 
 The configuration requires providing the `ibexa.field_type.storage.external.handler` tag, with the `alias` attribute being the *fieldTypeIdentifier*. You also have to inject the gateway in `arguments`, [see Gateway-based storage](#gateway-based-storage).
 
-External storage configuration for basic Field Types is located in [`ibexa/core/src/lib/Resources/settings/fieldtype_external_storages.yml`](https://github.com/ibexa/core/blob/main/src/lib/Resources/settings/fieldtype_external_storages.yml).
+External storage configuration for basic field types is located in [`ibexa/core/src/lib/Resources/settings/fieldtype_external_storages.yml`](https://github.com/ibexa/core/blob/main/src/lib/Resources/settings/fieldtype_external_storages.yml).
 
 Using gateway-based storage requires another service implementing `Ibexa\Core\FieldType\StorageGateway` to be injected into the [external storage handler](#storing-data-externally)).
 
@@ -173,25 +173,25 @@ services:
 Note that `ibexa.api.storage_engine.legacy.connection` is of type `Doctrine\DBAL\Connection`. If your gateway still uses an implementation of `eZ\Publish\Core\Persistence\Database\DatabaseHandler` (`eZ\Publish\Core\Persistence\Doctrine\ConnectionHandler`), instead of the `ibexa.api.storage_engine.legacy.connection`, you can pass the `ibexa.api.storage_engine.legacy.dbhandler` service.
 
 
-Also note that there can be several gateways per Field Type (one per storage engine). In this case it's recommended to either create base implementation which each gateway can inherit or create interface which each gateway must implement and reference it instead of specific implementation when type-hinting method arguments.
+Also note that there can be several gateways per field type (one per storage engine). In this case it's recommended to either create base implementation which each gateway can inherit or create interface which each gateway must implement and reference it instead of specific implementation when type-hinting method arguments.
 
 !!! tip
 
-    Gateway configuration for built-in Field Types is located in [`core/src/lib/Resources/settings/storage_engines/`](https://github.com/ibexa/core/tree/main/src/lib/Resources/settings/storage_engines).
+    Gateway configuration for built-in field types is located in [`core/src/lib/Resources/settings/storage_engines/`](https://github.com/ibexa/core/tree/main/src/lib/Resources/settings/storage_engines).
 
-## Storing Field Type settings externally
+## Storing field type settings externally
 
-Just like in the case of data, storing [Field Type settings](type_and_value.md#field-type-settings) 
+Just like in the case of data, storing [field type settings](type_and_value.md#field-type-settings) 
 in content item tables may prove insufficient. 
 It's not a problem if your setting specifies, for example, just the allowed number of characters 
 in a text field. 
-However, the Field Type may represent a more complex object, for example, it may 
+However, the field type may represent a more complex object, for example, it may 
 consist of two or more other fields, such as the name, SKU and price, and there 
 can be a set of default values instead of just one. 
 Once you add validation rules for these field values, then it becomes an issue.
     
 You can overcome this obstacle: 
-When you create a new Field Type, you can move Field Type settings 
+When you create a new field type, you can move field type settings 
 to external storage.
     
 !!! note
@@ -203,7 +203,7 @@ First, create a class that implements the
 `Ibexa\Contracts\Core\FieldType\FieldConstraintsStorage` interface.
     
 Then, register the External Storage as a service and tag it with `ibexa.field_type.external_constraints_storage`. 
-Make sure that the alias you use matches the identifier of the new Field Type:
+Make sure that the alias you use matches the identifier of the new field type:
     
 ``` yaml
 services:
diff --git a/docs/content_management/field_types/field_type_validation.md b/docs/content_management/field_types/field_type_validation.md
index f466b4f645..9496254370 100644
--- a/docs/content_management/field_types/field_type_validation.md
+++ b/docs/content_management/field_types/field_type_validation.md
@@ -1,8 +1,8 @@
 ---
-description: Field Type validation allows you to validate if data entered stored in the Field conforms to the schema.
+description: Field type validation allows you to validate if data entered stored in the Field conforms to the schema.
 ---
 
-# Field Type validation
+# Field type validation
 
 ## Validator schema
 
diff --git a/docs/content_management/field_types/field_types.md b/docs/content_management/field_types/field_types.md
index c7f5d8b17f..96dae5e218 100644
--- a/docs/content_management/field_types/field_types.md
+++ b/docs/content_management/field_types/field_types.md
@@ -1,13 +1,13 @@
 ---
-description: Field Types define the Fields that a content item is built of.
+description: Field types define the Fields that a content item is built of.
 ---
 
-# Field Types
+# Field types
 
-Field Types are the smallest building blocks of content.
-[[= product_name =]] comes with many [built-in Field Types](field_type_reference.md#available-field-types) that cover most common needs e.g. Text line, Email address, Author list, Content relation, Map location, Float, etc.
+Field types are the smallest building blocks of content.
+[[= product_name =]] comes with many [built-in field types](field_type_reference.md#available-field-types) that cover most common needs e.g. Text line, Email address, Author list, Content relation, Map location, Float, etc.
 
-Field Types are responsible for:
+Field types are responsible for:
 
 - Storing data, either using the native storage engine mechanisms or specific means
 - Validating input data
@@ -17,36 +17,36 @@ Field Types are responsible for:
 ## Custom data
 
 [[= product_name =]] can support custom data to be stored in the Fields of a content item.
-To do so, you need to create a custom Field Type.
+To do so, you need to create a custom field type.
 
-A custom Field Type must implement the **FieldType Service Provider Interfaces**
+A custom field type must implement the **FieldType Service Provider Interfaces**
 available in the [`Ibexa\Core\FieldType`](https://github.com/ibexa/core/tree/main/src/lib/FieldType) namespace.
 
 !!! note "Registration"
 
-    Remember that all your custom Field Types must be registered in `config/services.yml`.
+    Remember that all your custom field types must be registered in `config/services.yml`.
     For more information see [Registration](type_and_value.md#registration).
 
-In order to provide custom functionality for a Field Type, the SPI interacts with multiple layers of the [[= product_name =]] architecture:
+In order to provide custom functionality for a field type, the SPI interacts with multiple layers of the [[= product_name =]] architecture:
 
-![Field Type Overview](field_type_overview.png)
+![Field type Overview](field_type_overview.png)
 
-On the top layer, the Field Type needs to provide conversion from and to a simple PHP hash value to support the **REST API**. The generated hash value may only consist of scalar values and hashes. It must not contain objects or arrays with numerical indexes that aren't sequential and/or don't start with zero.
+On the top layer, the field type needs to provide conversion from and to a simple PHP hash value to support the **REST API**. The generated hash value may only consist of scalar values and hashes. It must not contain objects or arrays with numerical indexes that aren't sequential and/or don't start with zero.
 
 [[= include_file('docs/snippets/simple_hash_value_caution.md') =]]
 
-Below that, the Field Type must support the **public PHP API** implementation regarding:
+Below that, the field type must support the **public PHP API** implementation regarding:
 
 - Settings definition for `FieldDefinition`
 - Value creation and validation
 - Communication with the Persistence SPI
 
-On the bottom level, a Field Type can additionally hook into the **Persistence SPI**
+On the bottom level, a field type can additionally hook into the **Persistence SPI**
 in order to store data from a `FieldValue` in an external service.
 Note that all non-standard [[= product_name =]] database tables (e.g. `ezurl`)
 are treated as [external storage](field_type_storage.md#storing-data-externally).
 
-The following sequence diagrams visualize the process of creating and publishing new content across all layers, especially focused on the interaction with a Field Type.
+The following sequence diagrams visualize the process of creating and publishing new content across all layers, especially focused on the interaction with a field type.
 
 ## Creating content
 
diff --git a/docs/content_management/field_types/form_and_template.md b/docs/content_management/field_types/form_and_template.md
index b473bb31fb..b064f1eb94 100644
--- a/docs/content_management/field_types/form_and_template.md
+++ b/docs/content_management/field_types/form_and_template.md
@@ -1,5 +1,5 @@
 ---
-description: Field Type FormMappers allow Field editing, while custom templates ensure the Field can be rendered both in the back office and on site front.
+description: field type FormMappers allow Field editing, while custom templates ensure the Field can be rendered both in the back office and on site front.
 ---
 
 # Form and template
@@ -11,7 +11,7 @@ The FormMapper maps Field definitions into Symfony forms, allowing Field editing
 It can implement two interfaces:
 
 - `Ibexa\Contracts\ContentForms\FieldType\FieldValueFormMapperInterface` to provide editing support
-- `Ibexa\AdminUi\FieldType\FieldDefinitionFormMapperInterface` to provide Field Type definition editing support,
+- `Ibexa\AdminUi\FieldType\FieldDefinitionFormMapperInterface` to provide field type definition editing support,
 when you require non-standard settings
 
 ### FieldValueFormMapperInterface
@@ -56,7 +56,7 @@ Your type has to be called `value`.
 In the example above, `CheckboxFieldType::class` is used, but you can use standard Symfony form type instead.
 
 It's good practice to encapsulate Fields with custom types as it allows easier templating.
-Type has to be compatible with your Field Type's `Ibexa\Core\FieldType` implementation.
+Type has to be compatible with your field type's `Ibexa\Core\FieldType` implementation.
 You can use a [`DataTransformer`]([[= symfony_doc =]]/form/data_transformers.html) to achieve that or just assure correct property and form field names.
 
 ### FieldDefinitionFormMapperInterface
@@ -98,7 +98,7 @@ public function mapFieldDefinitionForm(FormInterface $fieldDefinitionForm, Field
 }
 ```
 
-Use names corresponding to the keys used in Field Type's `Ibexa\Core\FieldType\FieldType::$settingsSchema` implementation.
+Use names corresponding to the keys used in field type's `Ibexa\Core\FieldType\FieldType::$settingsSchema` implementation.
 The special `defaultValue` key allows you to specify a field for setting the default value assigned during content editing.
 
 ### Registering the service
@@ -115,8 +115,8 @@ App\FieldType\Mapper\CustomFieldTypeMapper:
 Tag the mapper according to the support you need to provide:
 
 - Add the `ibexa.admin_ui.field_type.form.mapper.value` tag when providing content editing support (`FieldValueFormMapperInterface` interface).
-- Add the `ibexa.admin_ui.field_type.form.mapper.definition` tag when providing Field Type definition editing support (`FieldDefinitionFormMapperInterface` interface).
-The `fieldType` key has to correspond to the name of your Field Type.
+- Add the `ibexa.admin_ui.field_type.form.mapper.definition` tag when providing field type definition editing support (`FieldDefinitionFormMapperInterface` interface).
+The `fieldType` key has to correspond to the name of your field type.
 
 ## Content view templates
 
@@ -134,7 +134,7 @@ By convention, your block must be named `<fieldTypeIdentifier>_field`.
 
 !!! tip
 
-    Template blocks for built-in Field Types are available in
+    Template blocks for built-in field types are available in
     [`Core/Resources/views/content_fields.html.twig`](https://github.com/ibexa/core/blob/main/src/bundle/Core/Resources/views/content_fields.html.twig).
 
     This template is also exposed as a part of Standard Design, so you can override it with the [design engine](design_engine.md).
@@ -150,13 +150,13 @@ The block can receive the following variables:
 | `field` | `Ibexa\Contracts\Core\Repository\Values\Content\Field` | The field to display |
 | `contentInfo` | `Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo` | The ContentInfo of the content item the Field belongs to |
 | `versionInfo` | `Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo` | The VersionInfo of the content item the Field belongs to |
-| `fieldSettings` | array | Settings of the Field (depends on the Field Type) |
+| `fieldSettings` | array | Settings of the Field (depends on the field type) |
 | `parameters` | hash | Options passed to `ibexa_render_field()` under the `'parameters'` key |
 | `attr` | hash | The attributes to add the generate the HTML markup, passed to ibexa_render_field()` under the `'attr'` key. <br> Contains at least a class entry, containing <fieldtypeidentifier>-field |
 
 ### Reusing blocks
 
-For easier Field Type template development you can take advantage of all defined blocks by using the [`block()` function](https://twig.symfony.com/doc/3.x/functions/block.html).
+For easier field type template development you can take advantage of all defined blocks by using the [`block()` function](https://twig.symfony.com/doc/3.x/functions/block.html).
 
 You can for example use `simple_block_field`, `simple_inline_field` or `field_attributes` blocks provided in [`content_fields.html.twig`](https://github.com/ibexa/core/blob/main/src/bundle/Core/Resources/views/content_fields.html.twig#L486).
 
@@ -166,7 +166,7 @@ You can for example use `simple_block_field`, `simple_inline_field` or `field_at
 
 ### Registering a template
 
-If you don't use the [design engine](design_engine.md) or you want to have separate templates per Field Type and/or SiteAccess,
+If you don't use the [design engine](design_engine.md) or you want to have separate templates per field type and/or SiteAccess,
 you can register a template under the `ibexa.system.<scope>.field_templates` [configuration key](configuration.md#configuration-files):
 
 ``` yaml
@@ -210,7 +210,7 @@ twig:
 ```
 
 We encourage using custom form types for encapsulation as this makes templating easier by providing Twig block name.
-All built-in Field Types are implemented with this approach. In that case overriding form theme can be done with:
+All built-in field types are implemented with this approach. In that case overriding form theme can be done with:
 
 ``` html+twig
 {% block custom_fieldtype_widget %}
diff --git a/docs/content_management/field_types/type_and_value.md b/docs/content_management/field_types/type_and_value.md
index 18e629943e..1bbb20b123 100644
--- a/docs/content_management/field_types/type_and_value.md
+++ b/docs/content_management/field_types/type_and_value.md
@@ -1,15 +1,15 @@
 ---
-description: The basis of all Field Types are their Type and Value classes, containing, respectively, the logic and the data for the Fields.
+description: The basis of all field types are their Type and Value classes, containing, respectively, the logic and the data for the Fields.
 ---
 
 # Type and Value
 
-A Field Type must contain a Type class which contains the logic of the Field Type: validating data, transforming from various formats, describing the validators, etc.
-A Type class must implement `Ibexa\Core\FieldType\FieldType` ("Field Type interface").
-All native Field Types also extend the `Ibexa\Core\FieldType\FieldType` abstract class that implements this interface and provides implementation facilities through a set of abstract methods of its own.
+A field type must contain a Type class which contains the logic of the field type: validating data, transforming from various formats, describing the validators, etc.
+A Type class must implement `Ibexa\Core\FieldType\FieldType` ("field type interface").
+All native field types also extend the `Ibexa\Core\FieldType\FieldType` abstract class that implements this interface and provides implementation facilities through a set of abstract methods of its own.
 
-You should also provide a value object class for storing the custom Field value provided by the Field Type.
-The Value is used to represent an instance of the Field Type within a content item.
+You should also provide a value object class for storing the custom Field value provided by the field type.
+The Value is used to represent an instance of the field type within a content item.
 Each Field presents its data using an instance of the Type's Value class.
 A Value class must implement the `Ibexa\Contracts\Core\FieldType` interface.
 It may also extend the `Ibexa\Core\FieldType\Value` abstract class.
@@ -18,57 +18,57 @@ This class must contain as little logic as possible, because the logic is handle
 
 ## Type class
 
-The Type class of a Field Type provides an implementation of the [`Ibexa\Contracts\Core\FieldType\FieldType`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-FieldType-FieldType.html) interface.
+The Type class of a field type provides an implementation of the [`Ibexa\Contracts\Core\FieldType\FieldType`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-FieldType-FieldType.html) interface.
 
 ### Field Definition handling
 
-A custom Field Type is used in a Field definition of a custom content type.
-You can additionally provide [settings for the Field Type](#field-type-settings) and a [validator configuration](field_type_validation.md).
-Since the public PHP API cannot know anything about these, their handling is delegated to the Field Type itself through the following methods:
+A custom field type is used in a Field definition of a custom content type.
+You can additionally provide [settings for the field type](#field-type-settings) and a [validator configuration](field_type_validation.md).
+Since the public PHP API cannot know anything about these, their handling is delegated to the field type itself through the following methods:
 
 #### `getFieldTypeIdentifier()`
 
-Returns a unique identifier for the custom Field Type which is used to assign the type to a Field definition.
+Returns a unique identifier for the custom field type which is used to assign the type to a Field definition.
 By convention it should be prefixed by a unique vendor shortcut (e.g. `ibexa` for [[= product_name =]]).
 
 #### `getSettingsSchema()`
 
-This method retrieves via public PHP API a schema for the Field Type settings. A typical setting would be e.g. default value. The settings structure defined by this schema is stored in the `FieldDefinition`. Since it's not possible to define a generic format for such a schema, the Field Type is free to return any serializable data structure from this method.
+This method retrieves via public PHP API a schema for the field type settings. A typical setting would be e.g. default value. The settings structure defined by this schema is stored in the `FieldDefinition`. Since it's not possible to define a generic format for such a schema, the field type is free to return any serializable data structure from this method.
 
 #### `getValidatorConfigurationSchema()`
 
-In addition to normal settings, the Field Type should provide schema settings for its validation process. The schema describes what kind of validation can be performed by the Field Type and which settings the user can specify to these validation methods. For example, the `ezstring` type can validate minimum and maximum length of the string. It therefore provides a schema to indicate to the user that they might specify the corresponding restrictions, when creating a `FieldDefinition` with this type. The schema does not underlie any regulations, except for that it must be serializable.
+In addition to normal settings, the field type should provide schema settings for its validation process. The schema describes what kind of validation can be performed by the field type and which settings the user can specify to these validation methods. For example, the `ezstring` type can validate minimum and maximum length of the string. It therefore provides a schema to indicate to the user that they might specify the corresponding restrictions, when creating a `FieldDefinition` with this type. The schema does not underlie any regulations, except for that it must be serializable.
 
 #### `validateFieldSettings()`
 
-The type is asked to validate the settings (provided by the user) before the public PHP API stores those settings for the Field Type in a `FieldDefinition`. As a result, the Field Type must return if the given settings comply to the schema defined by `getSettingsSchema()`.
+The type is asked to validate the settings (provided by the user) before the public PHP API stores those settings for the field type in a `FieldDefinition`. As a result, the field type must return if the given settings comply to the schema defined by `getSettingsSchema()`.
 
 #### `validateValidatorConfiguration()`
 
 As in `validateFieldSettings()`, this method verifies that the given validator configuration complies to the schema provided by `getValidatorConfigurationSchema()`.
 
-It's important to note that the schema definitions of the Field Type can be both of arbitrary and serializable format. It's highly recommended to use a simple hash structure.
+It's important to note that the schema definitions of the field type can be both of arbitrary and serializable format. It's highly recommended to use a simple hash structure.
 
 !!! note
 
-    Since it's not possible to enforce a schema format, the code using a specific Field Type must basically know all Field Types it deals with.
+    Since it's not possible to enforce a schema format, the code using a specific field type must basically know all field types it deals with.
 
-This also applies to all user interfaces and the REST API, which therefore must provide extension points to register handling code for custom Field Type. These extensions are not defined yet.
+This also applies to all user interfaces and the REST API, which therefore must provide extension points to register handling code for custom field type. These extensions are not defined yet.
 
-### Field Type name
+### field type name
 
 The content item name is retrieved by the `Ibexa\Core\FieldType\FieldType::getName` method which must be implemented.
-To generate content item name or URL alias the Field Type name must be a part of a name schema or a URL schema.
+To generate content item name or URL alias the field type name must be a part of a name schema or a URL schema.
 
 ## Value handling
 
-A Field Type needs to deal with the custom value format provided by it. In order for the public PHP API to work properly, it delegates working with such custom Field values to the corresponding Field Type. The `Ibexa\Core\FieldType\FieldType` interface therefore provides the following methods:
+A field type needs to deal with the custom value format provided by it. In order for the public PHP API to work properly, it delegates working with such custom Field values to the corresponding field type. The `Ibexa\Core\FieldType\FieldType` interface therefore provides the following methods:
 
 #### `acceptValue()`
 
 This method is responsible for accepting and converting user input for the Field. It checks the input structure by accepting, building, and returning a different structure holding the data.
 
-For example: a user provides an HTTP link as a string, `acceptValue()` converts the link to a URL Field Type value object. Unlike the `FieldType\Value` constructor, it's possible to make this method aware of multiple input types (object or primitive).
+For example: a user provides an HTTP link as a string, `acceptValue()` converts the link to a URL field type value object. Unlike the `FieldType\Value` constructor, it's possible to make this method aware of multiple input types (object or primitive).
 
 !!! note
 
@@ -76,9 +76,9 @@ For example: a user provides an HTTP link as a string, `acceptValue()` converts
 
 #### `getEmptyValue()`
 
-The Field Type can specify that the user may define a default value for the `Field` of the type through settings. If no default value is provided, the Field Type is asked for an "empty value" as the final fallback.
+The field type can specify that the user may define a default value for the `Field` of the type through settings. If no default value is provided, the field type is asked for an "empty value" as the final fallback.
 
-The value chain for filling a specific Field of the Field Type is as follows:
+The value chain for filling a specific Field of the field type is as follows:
 
 1. Is a value provided by the filling user?
 2. If not, is a default value provided by the`FieldDefinition`?
@@ -87,26 +87,26 @@ The value chain for filling a specific Field of the Field Type is as follows:
 #### `validate()`
 
 In contrast to `acceptValue()` this method validates the plausibility of the given value.
-It's based on the Field Type settings and validator configuration and stored in the corresponding `FieldDefinition`.
+It's based on the field type settings and validator configuration and stored in the corresponding `FieldDefinition`.
 
 ### Serialization
 
-When [REST API](rest_api_usage.md) is used, conversion needs to be done for Field Type values, settings and validator configurations. These are converted to and from a simple hash format that can be encoded in REST payload. As conversion needs to be done both when transmitting and receiving data through REST, Field Type implements the following pairs of methods:
+When [REST API](rest_api_usage.md) is used, conversion needs to be done for field type values, settings and validator configurations. These are converted to and from a simple hash format that can be encoded in REST payload. As conversion needs to be done both when transmitting and receiving data through REST, field type implements the following pairs of methods:
 
 |Method|Description|
 |------|-----------|
-|`toHash()`|Converts Field Type Value into a simple hash format.|
+|`toHash()`|Converts field type Value into a simple hash format.|
 |`fromHash()`|Converts the other way around.|
-|`fieldSettingsToHash()`|Converts Field Type settings to a simple hash format.|
+|`fieldSettingsToHash()`|Converts field type settings to a simple hash format.|
 |`fieldSettingsFromHash()`|Converts the other way around.|
-|`validatorConfigurationToHash()`|Converts Field Type validator configuration to a simple hash format.|
+|`validatorConfigurationToHash()`|Converts field type validator configuration to a simple hash format.|
 |`validatorConfigurationFromHash()`|Converts the other way around.|
 
 [[= include_file('docs/snippets/simple_hash_value_caution.md') =]]
 
 ## Registration
 
-The Field Type must be registered in `config/services.yml`:
+The field type must be registered in `config/services.yml`:
  
 ``` yaml
 services:
@@ -118,29 +118,29 @@ services:
 
 #### `parent`
 
-As described in the [Symfony service container documentation]([[= symfony_doc =]]/components/dependency_injection/parentservices.html), the `parent` config key indicates that you want your service to inherit from the parent's dependencies, including constructor arguments and method calls. This helps avoiding repetition in your Field Type configuration and keeps consistency between all Field Types.
+As described in the [Symfony service container documentation]([[= symfony_doc =]]/components/dependency_injection/parentservices.html), the `parent` config key indicates that you want your service to inherit from the parent's dependencies, including constructor arguments and method calls. This helps avoiding repetition in your field type configuration and keeps consistency between all field types.
 If you need to inject other services into your Type class, skip using the `parent` config key.
 
 #### `tags`
 
-Like most API components, Field Types use the [Symfony service tag mechanism]([[= symfony_doc =]]/service_container/tags.html).
+Like most API components, field types use the [Symfony service tag mechanism]([[= symfony_doc =]]/service_container/tags.html).
 
 A service can be assigned one or several tags, with specific parameters.
 When the [service container](php_api.md#service-container) is compiled into a PHP file, 
 tags are read by `CompilerPass` implementations that add extra handling for tagged services.
 Each service tagged as `ibexa.field_type` is added to a [registry](https://martinfowler.com/eaaCatalog/registry.html) using the `alias` key as its unique `fieldTypeIdentifier` e.g. `ezstring`.
-Each Field Type must also inherit from the abstract `ibexa.field_type` service.
-This ensures that the initialization steps shared by all Field Types are executed.
+Each field type must also inherit from the abstract `ibexa.field_type` service.
+This ensures that the initialization steps shared by all field types are executed.
 
 !!! tip
 
-    The configuration of built-in Field Types is located in [`core/src/lib/Resources/settings/fieldtypes.yml`](https://github.com/ibexa/core/blob/main/src/lib/Resources/settings/fieldtypes.yml).
+    The configuration of built-in field types is located in [`core/src/lib/Resources/settings/fieldtypes.yml`](https://github.com/ibexa/core/blob/main/src/lib/Resources/settings/fieldtypes.yml).
 
 ### Indexing
 
-To make the search engine aware of the data stored in a Field Type, register it as [indexable](field_type_search.md)
+To make the search engine aware of the data stored in a field type, register it as [indexable](field_type_search.md)
 
-## Field Type settings
+## field type settings
 
 It's recommended to use a simple associative array format for the settings schema returned by `Ibexa\Contracts\Core\FieldType\FieldType::getSettingsSchema()`, which follows these rules:
 
@@ -168,12 +168,12 @@ The settings are mapped into Symfony forms via the [FormMapper](form_and_templat
 
 !!! note
 
-    You can store Field Type settings internally, or, when the schema becomes 
+    You can store field type settings internally, or, when the schema becomes 
     too complex, move them to [external storage](field_type_storage.md#storing-field-type-settings-externally).
 
 ## Extensibility points
 
-Some Field Types require additional processing, for example a Field Type storing a binary file, or one having more complex settings or validator configuration. For this purpose specific implementations of an abstract class `Ibexa\Contracts\Rest\FieldTypeProcessor` are used.
+Some field types require additional processing, for example a field type storing a binary file, or one having more complex settings or validator configuration. For this purpose specific implementations of an abstract class `Ibexa\Contracts\Rest\FieldTypeProcessor` are used.
 
 This class provides the following methods:
 
@@ -186,4 +186,4 @@ This class provides the following methods:
 |`preProcessValidatorConfigurationHash()`|Performs manipulations on a received validator configuration hash, so that it conforms to the format expected by the `validatorConfigurationFromHash()` method described above.|
 |`postProcessValidatorConfigurationHash()`|Performs manipulations on a outgoing validator configuration hash, previously generated by the `validatorConfigurationToHash()` method described above.|
 
-Base implementations of these methods simply return the given hash, so you can implement only the methods your Field Type requires. Some built-in Field Types already implement processors and you're encouraged to take a look at them.
+Base implementations of these methods simply return the given hash, so you can implement only the methods your field type requires. Some built-in field types already implement processors and you're encouraged to take a look at them.
diff --git a/docs/content_management/file_management/file_management.md b/docs/content_management/file_management/file_management.md
index cf5f878a59..d110e98c35 100644
--- a/docs/content_management/file_management/file_management.md
+++ b/docs/content_management/file_management/file_management.md
@@ -15,7 +15,7 @@ $fileContent = $this->ioService->getFileContents($file);
 
 ## Handling binary files
 
-[[= product_name =]] supports multiple binary file handling mechanisms by means of an `IOHandler` interface. This feature is used by the [BinaryFile](imagefield.md) Field Types.
+[[= product_name =]] supports multiple binary file handling mechanisms by means of an `IOHandler` interface. This feature is used by the [BinaryFile](imagefield.md) field types.
 
 ### Native IO handler
 
diff --git a/docs/content_management/forms/create_form_attribute.md b/docs/content_management/forms/create_form_attribute.md
index e89fb7194e..4cb7ccbdca 100644
--- a/docs/content_management/forms/create_form_attribute.md
+++ b/docs/content_management/forms/create_form_attribute.md
@@ -8,7 +8,7 @@ edition: experience
 You can create a Form attribute for new Form fields or existing ones.
 To do it, you have to define a new Form attribute in the configuration.
 
-In the following example you will learn how to create the new Form with `richtext_description` attribute that allows you to add formatted
+In the following example you can learn how to create the new Form with `richtext_description` attribute that allows you to add formatted
 description to the Form.
 
 ## Configure Form attribute
diff --git a/docs/content_management/images/fastly_io.md b/docs/content_management/images/fastly_io.md
index 36ed08ce2b..d7ca540d65 100644
--- a/docs/content_management/images/fastly_io.md
+++ b/docs/content_management/images/fastly_io.md
@@ -77,8 +77,8 @@ The built-in image optimizer serves as backup to Fastly IO in case of misconfigu
 so it needs to be able to serve the same image variations.
 
 Fastly IO image filters are not compatible with our built-in filters,
-so you will not be able to reflect your original filters accurately with Fastly.
-The script below will help you find replacement filters within Fastly configuration for the basic filters.
+so you aren't able to reflect your original filters accurately with Fastly.
+The script below helps you find replacement filters within Fastly configuration for the basic filters.
 For more optimization options on Fastly side, see [Fastly IO reference](https://developer.fastly.com/reference/io/).
 
 To generate your original image configuration run:
diff --git a/docs/content_management/images/images.md b/docs/content_management/images/images.md
index baa0675c34..d295d2757f 100644
--- a/docs/content_management/images/images.md
+++ b/docs/content_management/images/images.md
@@ -23,7 +23,7 @@ the system that the installation uses.
 
 You can store images in the media library as independent content items of 
 a generic Image [content type](content_types.md) to reuse them across the system.
-You do this by uploading images to an [ImageAsset](imageassetfield.md) Field Type.
+You do this by uploading images to an [ImageAsset](imageassetfield.md) field type.
 
 For an ImageAsset field to be reused, you must publish it. 
 Only then is notification triggered, which states that an image has been published 
@@ -65,7 +65,7 @@ Image variations are generated with [LiipImagineBundle](https://github.com/liip
 The LiipImagineBundle bundle supports GD (default), Imagick or Gmagick PHP 
 extensions, and enables you to define flexible filters in PHP. 
 Image files are stored by using the `IOService,` and are completely independent 
-from the Image Field Type. 
+from the Image field type. 
 they're generated only once and cleared on demand, for example, on content removal).
 
 LiipImagineBundle only works on image blobs, so no command line tool is needed. 
@@ -115,7 +115,7 @@ You can also pass two additional parameters:
 - `iteration-count` is the number of images to be recreated in a single iteration, 
   to reduce memory use. 
   The default value is `25`.
-- `user` is the identifier of a User with proper permission who will perform 
+- `user` is the identifier of a User with proper permission who performs 
   the operation (`read`, `versionread`, `edit` and `publish`). 
   The default value is `admin`.
 
@@ -156,7 +156,7 @@ with basic information about the original image (see [example 1](#configuration-
 |Option|Default value|Description|Required?|
 |------|-------------|-----------|-|
 |fontpath|n/a|Path to the font file (*.ttf).|Yes|
-|text|"IMAGE PLACEHOLDER %width%x%height%\n(%id%)"|Text which will be displayed in the image placeholder. %width%, %height%, %id% in it will be replaced with width, height and ID of the original image.| |
+|text|"IMAGE PLACEHOLDER %width%x%height%\n(%id%)"|Text which is displayed in the image placeholder. %width%, %height%, %id% in it's replaced with width, height and ID of the original image.| |
 |fontsize|20|Size of the font in the image placeholder.| |
 |foreground|#000000|Foreground color of the placeholder.| |
 |secondary|#CCCCCC|Secondary color of the placeholder.| |
@@ -174,7 +174,7 @@ placeholders from:
 
 |Option|Default value|Description|
 |------|-------------|-----------|
-|url_pattern|''|URL pattern. %width%, %height%, %id% in it will be replaced with width, height and ID of the original image.|
+|url_pattern|''|URL pattern. %width%, %height%, %id% in it's replaced with width, height and ID of the original image.|
 |timeout|5|Period of time before timeout, measured in seconds.|
 
 ### Semantic configuration
@@ -217,8 +217,8 @@ generation is disabled.
 ## Support for SVG images
 
 You cannot store SVG images in [[= product_name =]] by using the Image or 
-ImageAsset Field Type.
-However, you can work things around by relying on the File Field Type and implementing 
+ImageAsset field type.
+However, you can work things around by relying on the File field type and implementing 
 a custom extension that lets you display and download files in your templates.
 
 !!! caution
@@ -293,7 +293,7 @@ content items within the field.
 Content items that are identified as images are rendered in the Rich Text Field 
 by using a dedicated template.
 
-You can determine content types that will be treated as images and rendered.
+You can determine content types that are treated as images and rendered.
 You do this by overriding the `ibexa.content_view.image_embed_content_types_identifiers` parameter, for example:
 
 ``` yaml
diff --git a/docs/content_management/locations.md b/docs/content_management/locations.md
index 8b8f08f2ae..31d79d9d75 100644
--- a/docs/content_management/locations.md
+++ b/docs/content_management/locations.md
@@ -159,8 +159,8 @@ However, child Locations that were explicitly hidden by a user keep their Hidden
 
 ![Revealing a Location with a Hidden ancestor](node_visibility_unhide2.png)
 
-When you reveal a Location that has a Hidden ancestor, it will **not** become Visible itself.
-Because it still has invisible ancestors, its status will change to Hidden by superior.
+When you reveal a Location that has a Hidden ancestor, it **doesn't** become Visible itself.
+Because it still has invisible ancestors, its status changes to Hidden by superior.
 
 !!! tip "In short"
 
diff --git a/docs/content_management/rich_text/extend_online_editor.md b/docs/content_management/rich_text/extend_online_editor.md
index c1885a6c8d..76d6e849b9 100644
--- a/docs/content_management/rich_text/extend_online_editor.md
+++ b/docs/content_management/rich_text/extend_online_editor.md
@@ -58,7 +58,7 @@ Add labels for the new tag by providing translations in `translations/custom_tag
 ```
 
 Now you can use the tag.
-In the back office, create or edit a content item that has a RichText Field Type.
+In the back office, create or edit a content item that has a RichText field type.
 In the Online Editor, click **Add**, and from the list of available tags select the FactBox tag icon.
 
 ![FactBox Tag](custom_tag_factbox.png "FactBox Tag in the Online Editor")
@@ -105,7 +105,7 @@ Add labels for the tag by providing translations in `translations/custom_tags.en
 ```
 
 Now you can use the tag.
-In the back office, create or edit a content item that has a RichText Field Type.
+In the back office, create or edit a content item that has a RichText field type.
 In the Online Editor's toolbar, click **Show more items**, and from the list of available tags select the Link tag icon.
 
 ![Link Tag](custom_tag_link.png "Link Tag in the Online Editor") 
@@ -118,7 +118,7 @@ You can create an inline custom tag that displays a hovering tooltip with an exp
 [[= include_file('code_samples/back_office/online_editor/custom_tags/acronym/config/packages/custom_tags.yaml') =]]
 ```
 
-The `explanation` attribute contains the meaning of the acronym that will be provided
+The `explanation` attribute contains the meaning of the acronym that is provided
 while editing in the Online Editor.
 
 Add labels for the tag by providing translations in `translations/custom_tags.en.yaml`:
@@ -294,7 +294,7 @@ in the Online Editor:
 
     If you override the default templates for `embedInline`, `embed` or `embedImage` 
     elements, for example, `@IbexaCore/default/content/embed.html.twig`,
-    the data attributes and classes will not be rendered automatically.
+    the data attributes and classes aren't rendered automatically.
 
     Instead, you can make use of the `data_attributes` and `class` properties 
     in your templates.
diff --git a/docs/content_management/taxonomy/taxonomy.md b/docs/content_management/taxonomy/taxonomy.md
index 800af018e2..fedafcd2f7 100644
--- a/docs/content_management/taxonomy/taxonomy.md
+++ b/docs/content_management/taxonomy/taxonomy.md
@@ -20,7 +20,7 @@ The associated content type is `tag`.
 * `ibexa_taxonomies` - section responsible for taxonomy structure where you can [configure other taxonomies](#customize-taxonomy-structure)
 * `ibexa_taxonomies.tags.parent_location_remote_id` - Remote ID for Location where new content items representing tags are created
 * `ibexa_taxonomies.tags.content_type` - Content type identifier which stands for the tags
-* `ibexa_taxonomies.tags.field_mappings` - Field Types map of a content type which taxonomy receives information about the tag from. 
+* `ibexa_taxonomies.tags.field_mappings` - field types map of a content type which taxonomy receives information about the tag from. 
 
 Three fields are available: `identifier`, `parent` and `name`.
 The identifiers correspond to Field names defined in the content type. The `name` Field is used to automatically generate an identifier.
diff --git a/docs/content_management/url_management/url_api.md b/docs/content_management/url_management/url_api.md
index 988061f48d..cd85a1b6e3 100644
--- a/docs/content_management/url_management/url_api.md
+++ b/docs/content_management/url_management/url_api.md
@@ -15,7 +15,7 @@ in which you need to specify:
 - query filter e.g. Section
 - Sort Clauses for URL queries
 - offset for search hits, used for paging the results
-- query limit. If value is `0`, search query will not return any search hits
+- query limit. If value is `0`, search query doesn't return any search hits
 
 ```php
 // ...
diff --git a/docs/content_management/user_generated_content.md b/docs/content_management/user_generated_content.md
index c1cf62fb04..6d6157cef8 100644
--- a/docs/content_management/user_generated_content.md
+++ b/docs/content_management/user_generated_content.md
@@ -26,7 +26,7 @@ The `/content/edit/nodraft` route shows a content item creation form for a given
 
 This means that `/content/create/nodraft/folder/eng-GB/2` enables you to create a Folder in English as a child of Location with ID 2.
 
-A limited subset of Field Types is supported:
+A limited subset of field types is supported:
 
 - `TextLine`
 - `TextBlock`
diff --git a/docs/customer_management/cp_applications.md b/docs/customer_management/cp_applications.md
index 603e881364..74e08b496a 100644
--- a/docs/customer_management/cp_applications.md
+++ b/docs/customer_management/cp_applications.md
@@ -69,7 +69,7 @@ add a `verify` status to the [configuration](configuration.md#configuration-file
 ### Create new Form Type
 
 Next, create a new form type in `src/Form/VerifyType.php`.
-It will be displayed in the application review stage.
+It's displayed in the application review stage.
 
 ``` php hl_lines="17-18 25"
 [[= include_file('code_samples/customer_portal/src/Form/VerifyType.php') =]]
@@ -117,7 +117,7 @@ from the created form to the application list `src/Corporate/EventSubscriber/Ver
 In line 46, you can see that it handles changes to verify status.
 The subscriber only informs that the status has been changed (line 72).
 
-Now, if you click the **Verify** button during application review, the application will get **Verify** status.
+Now, if you click the **Verify** button during application review, the application gets **Verify** status.
 
 ![Verify status](img/cp_verify_status.png)
 
diff --git a/docs/customer_management/cp_configuration.md b/docs/customer_management/cp_configuration.md
index 1180136082..cc59bdbef1 100644
--- a/docs/customer_management/cp_configuration.md
+++ b/docs/customer_management/cp_configuration.md
@@ -70,8 +70,8 @@ To do so, [create and configure user registration form](create_user_registration
 
 ## Address
 
-With the Address Field Type, you can customize address Fields and configure them per country.
-To learn more, see [Address Field Type documentation](addressfield.md).
+With the Address field type, you can customize address Fields and configure them per country.
+To learn more, see [Address field type documentation](addressfield.md).
 
 ## Templates
 
diff --git a/docs/customer_management/cp_page_builder.md b/docs/customer_management/cp_page_builder.md
index b67a8a9a40..b76d550905 100644
--- a/docs/customer_management/cp_page_builder.md
+++ b/docs/customer_management/cp_page_builder.md
@@ -5,7 +5,7 @@ edition: experience
 
 # Create Customer Portal
 
-On this page, you will learn how to configure the Customer Portal feature to be editable with Page Builder.
+On this page, you can learn how to configure the Customer Portal feature to be editable with Page Builder.
 If you already configured Customer Portal, you can learn how to build it with a Page Builder in [User Documentation]([[= user_doc =]]/customer_management/build_customer_portal/).
 
 First, you need to decide if you want to create and configure [one portal](#create-and-configure-one-portal) or [multiple portals](#create-and-configure-multiple-portals) setup.
@@ -97,7 +97,7 @@ This setup is recommended for global markets or company specific portals, where
 First, you need to create a root folder for Customer Portals,
 its location ID needs to be later specified in the configuration as [a tree root](multisite_configuration.md#location-tree).
 To do it, go to **Content** -> **Content structure**, and select **Create content**.
-There you will see two possibilities **Customer Portal** and **Customer Portal Page**.
+There you can see two possibilities **Customer Portal** and **Customer Portal Page**.
 
 ![Create content tab](img/cp_portal_vs_page.png)
 
@@ -167,7 +167,7 @@ First, you need to grant the following permissions to company members from the C
 
 ![Customer Portal permissions](img/cp_permissions.png)
 
-If members of the Customer Group don't have sufficient permissions for any Customer Portal assigned to them, they will be redirected to the default Customer Portal view.
+If members of the Customer Group don't have sufficient permissions for any Customer Portal assigned to them, they are redirected to the default Customer Portal view.
 
 !!! note
 
@@ -193,7 +193,7 @@ There, you can specify which Customer Portals should be available to which Custo
 - Customer Group identifier. You can find it in the **Summary** section of the Company.
 - Location remote ID of Customer Portal container or Customer Portal page. You can find it in the **Details** section.
 
-Portals will be displayed to the Customer Group in order specified in the configuration based on company member's permissions.
+Portals are displayed to the Customer Group in order specified in the configuration based on company member's permissions.
 
 #### Custom portal mapping
 
diff --git a/docs/customer_management/create_user_registration_form.md b/docs/customer_management/create_user_registration_form.md
index f5b92ba007..8d997cbe53 100644
--- a/docs/customer_management/create_user_registration_form.md
+++ b/docs/customer_management/create_user_registration_form.md
@@ -42,7 +42,7 @@ ibexa:
                     form: '@ibexadesign/user/registration_form.html.twig'
                     confirmation: '@ibexadesign/user/registration_confirmation.html.twig'
 ```
-This defines which templates will be used for rendering the registration form and confirmation page.
+This defines which templates are used for rendering the registration form and confirmation page.
 
 In the `templates/themes/<theme_name>/user/registration_form.html.twig` create the template for registration form.
 
diff --git a/docs/getting_started/first_steps.md b/docs/getting_started/first_steps.md
index 9a0396119a..0ebaa7ab8a 100644
--- a/docs/getting_started/first_steps.md
+++ b/docs/getting_started/first_steps.md
@@ -106,7 +106,7 @@ Content view templates use the [Twig templating engine](https://twig.symfony.com
 2\. Select a Blog Post content type. Fill in the content item and publish it.
 
 3\. To preview the new content item on the front page, go to `<yourdomain>/<Content-item-name>`.
-For example, if the title of the Blog post is "First blog post", the address will be `<yourdomain>/first-blog-post`.
+For example, if the title of the Blog post is "First blog post", the address is `<yourdomain>/first-blog-post`.
 
 ![Previewing Content](first-steps-preview-content.png)
 
@@ -127,7 +127,7 @@ ibexa:
             site_group: [site, de]
 ```
 
-The SiteAccess will automatically be matched using the last part of the URI.
+The SiteAccess is automatically matched using the last part of the URI.
 
 2\. You can now access the front page through the new SiteAccess: `<yourdomain>/de`.
 
@@ -160,7 +160,7 @@ de:
         - eng-GB
 ```
 
-This means that German will be used as the main language for this SiteAccess, and English as a fallback.
+This means that German is used as the main language for this SiteAccess, and English as a fallback.
 
 2\. Go to the back office and select **Admin** > **Languages**. Add a new language called "German", with the language code `ger-DE`.
 Make sure it's enabled.
@@ -174,7 +174,7 @@ Switch to the **Translations** tab and add a new translation.
 
 4\. Select German and base the new translation on the English version. Edit the content item and publish it.
 
-5\. Go to the front page. The blog post will now display different content, depending on which SiteAccess you enter it from:
+5\. Go to the front page. The blog post now displays different content, depending on which SiteAccess you enter it from:
 `<yourdomain>/<content-name>` or `<yourdomain>/de/<content-name>`.
 
 ![Previewing translated Content](first-steps-translated-content.png)
@@ -207,7 +207,7 @@ ibexa_design_engine:
 4\. Go back to the `content_view` configuration for the blog post. Change the path to the template so that it points to the folder for the correct design:
 `template: '@ibexadesign\full\blog_post.html.twig'`
 
-This means that the app will look for the `blog_post.html.twig` file in a folder relevant for the SiteAccess: `de_design` for the `de` SiteAccess, or `site_design` for other SiteAccesses in `site_group`.
+This means that the app looks for the `blog_post.html.twig` file in a folder relevant for the SiteAccess: `de_design` for the `de` SiteAccess, or `site_design` for other SiteAccesses in `site_group`.
 
 5\. Create a `themes` folder under `templates`, and two folders under it: `de_design` and `site_design`.
 
@@ -233,7 +233,7 @@ Call the group "Bloggers".
 
 3\. Go to **Admin** -> **Roles**. Create a new role called "Blogger".
 
-4\. Add policies that will allow the User to log in:
+4\. Add policies that allow the User to log in:
 
 - `User/Login`
 - `Content/Read`
@@ -241,7 +241,7 @@ Call the group "Bloggers".
 - `Section/View`
 - `Content/Reverserelatedlist`
 
-5\. Now add policies that will allow the User to create and publish content, limited to Blog Posts:
+5\. Now add policies that allow the User to create and publish content, limited to Blog Posts:
 
 - `Content/Create` with Limitation for content type Blog Post
 - `Content/Edit` with Limitation for content type Blog Post
@@ -254,7 +254,7 @@ Call the group "Bloggers".
 ![Assigning a role](first-steps-assign-roles.png)
 
 You can now log out and log in again as the new User.
-You will be able to create Blog Posts only.
+You are able to create Blog Posts only.
 
 !!! tip  "More information"
 
diff --git a/docs/getting_started/install_ibexa_dxp.md b/docs/getting_started/install_ibexa_dxp.md
index 099939d3c7..3ba8810dd8 100644
--- a/docs/getting_started/install_ibexa_dxp.md
+++ b/docs/getting_started/install_ibexa_dxp.md
@@ -67,12 +67,12 @@ Log in to your service portal on [support.ibexa.co](https://support.ibexa.co/),
 ![Authentication token](using_composer_auth_token.png)
 
 1. Select **Create token** (this requires the **Portal administrator** access level).
-2. Fill in a label describing the use of the token. This will allow you to revoke access later.
+2. Fill in a label describing the use of the token. This allows you to revoke access later.
 3. Save the password, **you will not get access to it again**!
 
 !!! tip "Save the authentication token in `auth.json` to avoid re-typing it"
 
-    Composer will ask whether you want to save the token every time you perform an update.
+    Composer asks whether you want to save the token every time you perform an update.
     If you prefer, you can decline and create an `auth.json` file globally
     in [`COMPOSER_HOME`](https://getcomposer.org/doc/03-cli.md#composer-home) directory for machine-wide use:
 
@@ -93,7 +93,7 @@ Log in to your service portal on [support.ibexa.co](https://support.ibexa.co/),
     If you configure several projects on one machine, make sure that
     you set different tokens for each of the projects in their respective `auth.json` files.
 
-After this, when running Composer to get updates, you will be asked for a username and password. Use:
+After this, when running Composer to get updates, you are asked for a username and password. Use:
 
 - as username - your Installation key found on the **Maintenance and Support agreement details** page in the service portal
 - as password - the token password you retrieved in step 3 above.
@@ -104,9 +104,9 @@ After this, when running Composer to get updates, you will be asked for a userna
 
 !!! caution "Support agreement expiry"
 
-    If your Support agreement expires, your authentication token(s) will no longer work.
-    They will become active again if the agreement is renewed, but this process may take up to 24 hours.
-    _(If the agreement is renewed before the expiry date, there will be no disruption of service.)_
+    If your Support agreement expires, your authentication token(s) doesn't longer work.
+    They become active again if the agreement is renewed, but this process may take up to 24 hours.
+    _(If the agreement is renewed before the expiry date, there is no disruption of service.)_
 
 ### Create project
 
@@ -297,7 +297,7 @@ For development you can use the built-in PHP server.
 php -S 127.0.0.1:8000 -t public
 ```
 
-Your PHP web server will be accessible at `http://127.0.0.1:8000`
+Your PHP web server is accessible at `http://127.0.0.1:8000`
 
 You can also use [Symfony CLI](https://symfony.com/download):
 
@@ -339,7 +339,7 @@ chown -R www-data:www-data <your installation directory>
 ```
 
 Directories `var` and `public/var` must be writable by CLI and the web server user.
-Future files and directories created by these two users will need to inherit those permissions.
+Future files and directories created by these two users need to inherit those permissions.
 
 !!! caution
 
@@ -388,7 +388,7 @@ Prepare a [virtual host configuration](https://en.wikipedia.org/wiki/Virtual_hos
 === "nginx"
 
     You can use [this example vhost file](https://raw.githubusercontent.com/ibexa/post-install/main/resources/templates/nginx/vhost.template)
-    and modify it to fit your project. You will also need the `ibexa_params.d` files that should reside in a subdirectory below where the main file is,
+    and modify it to fit your project. You also need the `ibexa_params.d` files that should reside in a subdirectory below where the main file is,
     [as is shown here](https://github.com/ibexa/post-install/tree/main/resources/templates/nginx).
 
 
diff --git a/docs/getting_started/install_on_mac_os_and_windows.md b/docs/getting_started/install_on_mac_os_and_windows.md
index a12b33f5b9..8a21f8b079 100644
--- a/docs/getting_started/install_on_mac_os_and_windows.md
+++ b/docs/getting_started/install_on_mac_os_and_windows.md
@@ -69,7 +69,7 @@ The instructions below assume that you're using Apache.
 
 === "Windows"
 
-    Download and run [Composer-Setup.exe](https://getcomposer.org/Composer-Setup.exe) - it will install the latest Composer version.
+    Download and run [Composer-Setup.exe](https://getcomposer.org/Composer-Setup.exe) - it installs the latest Composer version.
 
 ## Install [[= product_name =]]
 
@@ -88,7 +88,7 @@ Then restart the Apache server.
 ## Set up permissions
 
 Directories `var` and `web/var` need to be writable by CLI and web server user.
-Future files and directories created by these two users will need to inherit those permissions.
+Future files and directories created by these two users need to inherit those permissions.
 
 For more information, see [Setting up or Fixing File Permissions]([[= symfony_doc =]]/setup/file_permissions.html).
 
diff --git a/docs/getting_started/requirements.md b/docs/getting_started/requirements.md
index 8f08fa993b..d9cc70cc4b 100644
--- a/docs/getting_started/requirements.md
+++ b/docs/getting_started/requirements.md
@@ -399,7 +399,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     - Additional time for adaptation and configuration work, and testing by your development team
     - Additional consulting/onboarding time with Platform.sh, Ibexa technical services, and/or one of the many partners with prior experience using Platform.sh with Ibexa DXP
 
-    The cost and effort of this is not included in Ibexa Cloud subscription and will vary depending on the project.
+    The cost and effort of this is not included in Ibexa Cloud subscription and is vary depending on the project.
 
     ### Custom integrations
 
@@ -446,7 +446,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     - Additional time for adaptation and configuration work, and testing by your development team
     - Additional consulting/onboarding time with Platform.sh, Ibexa technical services, and/or one of the many partners with prior experience using Platform.sh with Ibexa DXP
 
-    The cost and effort of this is not included in Ibexa Cloud subscription and will vary depending on the project.
+    The cost and effort of this is not included in Ibexa Cloud subscription and is vary depending on the project.
 
     ### Custom integrations
 
@@ -484,7 +484,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     - Additional time for adaptation and configuration work, and testing by your own team
     - Additional consulting/onboarding time with Platform.sh, Ibexa technical services, and/or one of the many partners with prior experience using Platform.sh with eZ Publish legacy
 
-    The cost and effort of this is not included in eZ Platform Cloud subscription and will vary depending on the project.
+    The cost and effort of this is not included in eZ Platform Cloud subscription and is vary depending on the project.
 
     ### Experimental/custom Platform.sh setups
 
@@ -499,7 +499,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
         If you're in need of setting up your legacy project on Platform.sh for a transitional period,
         eZ can put you in contact with a partner experienced in setting up older projects on Platform.sh.
-        This will save you a lot of time and effort.
+        This saves you a lot of time and effort.
         
     !!! note
 
diff --git a/docs/getting_started/troubleshooting.md b/docs/getting_started/troubleshooting.md
index 63c017fe1a..2bd7f86886 100644
--- a/docs/getting_started/troubleshooting.md
+++ b/docs/getting_started/troubleshooting.md
@@ -32,7 +32,7 @@ The output from `bin2hex` is limited to 0-9 and a-f. This more than doubles the
 If you have problems installing [[= product_name =]] on a system with limited RAM (for example 1GB or 2GB), enable swap.
 It allows your operating system to use the hard disk to supplement RAM when it runs out.
 
-With swap enables you will be able to successfully run `php -d memory_limit=-1 bin/console ibexa:install --env prod ezplatform-clean`.
+With swap enables you are able to successfully run `php -d memory_limit=-1 bin/console ibexa:install --env prod ezplatform-clean`.
 
 When a system runs out of RAM, you may see `Killed` when trying to clear the cache (e.g. `php bin/console --env=prod cache:clear` from your project's root directory).
 
diff --git a/docs/ibexa_products/ibexa_headless.md b/docs/ibexa_products/ibexa_headless.md
index 7bf2b463e8..22dd6df4d2 100644
--- a/docs/ibexa_products/ibexa_headless.md
+++ b/docs/ibexa_products/ibexa_headless.md
@@ -77,7 +77,7 @@ Content modeling and management are the foundation of [[= product_name =]] with
 - An item can have multiple locations in this tree.
 - Content items are typed.
 - Content types are sets of typed data fields, with optional conditions on the possible values.
-- Rich Text Field Type comes with an [online editor](online_editor_guide.md).
+- Rich Text field type comes with an [online editor](online_editor_guide.md).
 - Multilingual, it can store a content in several languages, the content model defines which field must be translated, and which don't vary.
 
 For more information, see [Content management product guide](content_management_guide.md).
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
index eb1c788008..b15d2eb81d 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
@@ -96,7 +96,7 @@ Apache has a [hard](https://github.com/apache/httpd/blob/5f32ea94af5f1e7ea68d6fc
     - (Optional) You can set reduced cache TTL for the given view, to reduce the risk of stale cache on subtree operations affecting the inlined content.
 
 2\. You can opt in to set a max length parameter (in bytes) and corresponding ttl (in seconds) 
-for cases when the limit is reached. The system will log a warning where the limit is reached, and when needed, you can optimize 
+for cases when the limit is reached. The system logs a warning where the limit is reached, and when needed, you can optimize 
 these cases as described above.
 
 ```yaml
@@ -135,7 +135,7 @@ If the given content has several Locations, you can see several `l<location-id>`
 ### ResponseConfigurator
 
 A `ReponseCacheConfigurator` configures an HTTP Response object, makes the response public, adds tags and sets the shared max age. 
-it's provided to `ReponseTaggers` that use it to add the tags to the response.
+It's provided to `ReponseTaggers` that use it to add the tags to the response.
 
 The `ConfigurableResponseCacheConfigurator` (`Ibexa\HttpCache\ResponseConfigurator\ConfigurableResponseCacheConfigurator`) follows the `view_cache` configuration and only enables cache if it's enabled in the configuration.
 
@@ -214,7 +214,7 @@ $response->headers->set('X-Location-Id', '123,212,42');
 
 !!! caution "X-Location-Id use is deprecated"
 
-    `X-Location-Id` is deprecated and will be removed in future.
+    `X-Location-Id` is deprecated and removed in future.
     For rendering content it's advised to refactor to use Content View,
     if not applicable `ContentTagInterface` or lastly manually output tags.
 
@@ -291,14 +291,14 @@ In the event when a new version of `Child` is published, the following keys are
 In summary, HTTP Cache for any location representing `[Child]`, any Content that relates to the Content `[Child]`, the 
 location for `[Child]`, any children of `[Child]`, any Location that relates to the Location `[Child]`, location for
 `[Parent1]`, any children on `[Parent1]`.
-Effectively, in this example HTTP cache for `[Parent1]` and `[Child]` will be cleared.
+Effectively, in this example HTTP cache for `[Parent1]` and `[Child]` is cleared.
 
 
 ### Tags purged on move event
 
 With the same Content structure as above, the `[Child]` location is moved below `[Parent2]`.
 
-The new structure will then be:
+The new structure is then:
 ```
    - [Home] (content-id=52, location-id=2)
      ez-all c52 ct42 l2 pl1 p1 p2
@@ -312,7 +312,7 @@ The new structure will then be:
          ez-all c55 ct1 l22 pl21 p1 p2 p21 p22
 ```
 
-The following keys will be purged during the move:
+The following keys are purged during the move:
 
 - `l20`, because cache for previous parent of `[Child]` should be purged (`[Parent1]`)
 - `pl20`, because cache for children of `[Parent1]` should be purged
@@ -359,15 +359,15 @@ bin/console fos:httpcache:invalidate:tag ez-all
 
 ## Testing and debugging HTTP cache
 
-it's important to test your code in an environment which is as similar as your production environment as possible. That
+It's important to test your code in an environment which is as similar as your production environment as possible. That
 means that if only are testing locally using the default Symfony Reverse proxy when your are going to use Varnish or
 Fastly in production, you're likely ending up some (bad) surprises. Due to the symfony reverse proxy's lack of support for ESIs, it behaves
 quite different from Varnish and Fastly in some aspects.
 If you're going to use Varnish in production, make sure you also test your code with Varnish.
 If you're going to use Fastly in production, testing with Fastly in your developer install is likely not feasible
-(you're local development environment must then be accessible for Fastly). Testing with Varnish instead will in most
-cases do the job. But if you need to change the varnish configuration to make your site work, be aware that Varnish and Fastly uses different dialects, and
-that .vcl code for Varnish V6.x will likely not work as-is on Fastly.
+(you're local development environment must then be accessible for Fastly). Testing with Varnish instead in most
+cases does the job. But if you need to change the varnish configuration to make your site work, be aware that Varnish and Fastly uses different dialects, and
+that .vcl code for Varnish V6.x doesn't likely work as-is on Fastly.
 
 This section describes to how to debug problems related to HTTP cache. 
 	In order to that, you must be able to look both at
@@ -451,11 +451,11 @@ Some notes about each of these parameters:
 - `-IXGET`, one of many ways to tell curl that we want to send a GET request, but we are only interested in outputting the headers
 - `--resolve www.staging.foobar.com.us-2.platformsh.site:443:1.2.3.4`
     - We tell curl not to do a DNS lookup for `www.staging.foobar.com.us-2.platformsh.site`. We do that because in our case
-    that will resolve to the Fastly endpoint, not our origin (nginx)
+    that resolves to the Fastly endpoint, not our origin (nginx)
     - We specify `443` because we are using `https`
     - We provide the IP of the nginx endpoint at platform.sh (`1.2.3.4` in this example)
 - `--header "Surrogate-Capability: abc=ESI/1.0"`, strictly speaking not needed when fetching the user-context-hash, but this tells [[= product_name =]] that client understands ESI tags.
-  it's good practice to always include this header when imitating the HTTP Cache.
+  It's good practice to always include this header when imitating the HTTP Cache.
 - `--header "accept: application/vnd.fos.user-context-hash"` tells [[= product_name =]] that the client wants to receive the user-context-hash
 - `--header "x-fos-original-url: /"` is required by the fos-http-cache bundle in order to deliver the user-context-hash
 - `https://www.staging.foobar.com.us-2.platformsh.site/_fos_user_context_hash` : here we use the hostname we earlier told
@@ -561,7 +561,7 @@ X-Cache-Debug: 1
 Surrogate-Key: ez-all c52 l2
 ```
 
-The headers here look correct and do not indicate that this ESI will not be cached by the HTTP cache
+The headers here look correct and don't indicate that this ESI isn't cached by the HTTP cache
 The second ESI has a similar response.
 
 #### 3rd ESI
@@ -596,15 +596,15 @@ does not return values from any Content in the [[= product_name =]] Repository.
 the corresponding IDs to such objects in that header.
 
 The `Set-Cookie` here may cause the problem. A ESI fragment should never set a cookie because:
-- Clients will only receive the headers set in the "mother" document (the headers in the "/" response in this case).
+- Clients only receive the headers set in the "mother" document (the headers in the "/" response in this case).
 
-- Only the content of ESIs responses will be returned to the client. **No headers set in the ESI response will ever reach the client**. ESI headers are only seen by the HTTP cache.
+- Only the content of ESIs responses is returned to the client. **No headers set in the ESI response will ever reach the client**. ESI headers are only seen by the HTTP cache.
   
-- Symfony reverse proxy does not support ESIs at all, and any ESI calls (`render_esi()`) will implicitly be replaced by
-  sub-requests (`render()`). So any `Set-Cookie` **will** be sent to the client when using Symfony reverse proxy.
+- Symfony reverse proxy doesn't support ESIs at all, and any ESI calls (`render_esi()`) are implicitly replaced by
+  sub-requests (`render()`). So any `Set-Cookie` **is** sent to the client when using Symfony reverse proxy.
   
-- Fastly will flag it resource as "not cachable" because it set a cookie at least once. Even though that endpoint.
-  stops setting cookies, Fastly will still not cache that fragment. Any document referring to that ESI will be a `MISS`.
+- Fastly flags it resource as "not cachable" because it set a cookie at least once. Even though that endpoint.
+  stops setting cookies, Fastly still doesn't cache that fragment. Any document referring to that ESI is a `MISS`.
   Fastly cache needs to be purged (`Purge-all` request) in order to remove this flag.
   
 - It means that it's not recommended to always initiate a session when loading the front page.
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
index f0f1bfa32b..ef9bb70afd 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
@@ -9,7 +9,7 @@ This is called (user) context-aware cache.
 
 It means that HTTP cache is unique per set of user permissions (roles and limitations), 
 and there are variations of cache shared only among users that have the exact same permissions. 
-So if a user browses a list of children Locations, they will only see children Locations 
+So if a user browses a list of children Locations, they only see children Locations 
 they have access to, even if their rendering is served from HTTP cache.
 
 This is accomplished by varying on a header called `X-Context-User-Hash`, which the system populates on the request.
@@ -25,7 +25,7 @@ This expands steps covered in [FOSHttpCacheBundle documentation on user context
 1. The application receives the hash request. An event subscriber (`UserContextSubscriber`) aborts the request immediately after the Symfony firewall is applied.
    The application calculates the hash (`HashGenerator`) and then sends a response with the hash in a custom header (`X-Context-User-Hash`).
 1. The caching proxy receives the hash response, copies the hash header to the client's original request for `/foo` and restarts the modified original request.
-1. If the response to `/foo` should differ per user context, the application sets a `Vary: X-Context-User-Hash` header, which will make Proxy store the variations of this cache varying on the hash value.
+1. If the response to `/foo` should differ per user context, the application sets a `Vary: X-Context-User-Hash` header, which makes Proxy store the variations of this cache varying on the hash value.
 
 The next time a request comes in from the same user, application lookup for the hash (step 3) does not take place,
 as the hash lookup itself is cached by the cache proxy as described below.
@@ -140,7 +140,7 @@ However, **this is strongly discouraged** as it means increasing the amount of c
 stored in proxy for every single cache item, lowering cache hit ratio and increasing memory use.
 
 Instead, you can create your own hash header for use cases where you need it. 
-This way only controllers and views that really vary by your custom logic will vary on it.
+This way only controllers and views that really vary by your custom logic varies on it.
 
 You can do it using several methods, ranging from completely custom VCL logic and dedicated controller to respond with hash 
 to trusted proxy lookups, but this means additional lookups.
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/http_cache_configuration.md b/docs/infrastructure_and_maintenance/cache/http_cache/http_cache_configuration.md
index 917e9f4a4f..eaf1e8e0da 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/http_cache_configuration.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/http_cache_configuration.md
@@ -72,7 +72,7 @@ However, if the given block value has a since or till date,
 it's taken into account for the TTL calculation for both the block and the whole page.
 
 To overload this behavior, listen to [`BlockResponseEvents::BLOCK_RESPONSE`](page_events.md),
-and set priority to `-200` to adapt what Page Field Type does by default.
+and set priority to `-200` to adapt what Page field type does by default.
 
 For example, to disable cache for the block, use `$event->getResponse()->setPrivate()`.
 
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md b/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
index 7bdb4ce903..6e3f81b5e2 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
@@ -270,7 +270,7 @@ You can configure environment variables through [Platform.sh variables](https://
 
 !!! tip
 
-    For HTTP cache, you will most likely only use this for configuring Fastly for production and optionally staging,
+    For HTTP cache, you most likely only use this for configuring Fastly for production and optionally staging,
     allowing `variables:env:` in `.platform.app.yaml` to, for example, specify Varnish or Symfony proxy as default for dev environment.
 
 #### Apache with Varnish
@@ -325,7 +325,7 @@ with the following logic in the out-of-the-box VCL:
 
 Serving grace is not always allowed by default because:
 
-- it's a safe default. Even if just for anonymous users, stale cache can easily be confusing during acceptance testing.
+- It's a safe default. Even if just for anonymous users, stale cache can easily be confusing during acceptance testing.
 - It means REST API, which is used by the back office, would serve stale data, breaking the UI.
 
 !!! tip "Customizing stale cache handling"
diff --git a/docs/infrastructure_and_maintenance/cache/persistence_cache.md b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
index dbedd197f7..8404db8706 100644
--- a/docs/infrastructure_and_maintenance/cache/persistence_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
@@ -93,10 +93,10 @@ Persistence cache layer caches selected objects in-memory for a short time.
 It avoids loading repeatedly the same data from e.g. a remote Redis instance, which can take up to 4-5ms per call due to the network latency and Redis instance load.
 The cache is organized in 2 pools, one for metadata which is not updated frequently, and one for content related objects that is only meant as a short-lived burst cache.
 Limit is organized using a [least frequently used (LFU)](https://en.wikipedia.org/wiki/Least_frequently_used) approach.
-It makes sure repeatedly used objects will stay in-memory until expired, and those seldom used will be bulk evicted from cache every time the maximum number of cache items is reached.
+It makes sure repeatedly used objects stay in-memory until expired, and those seldom used are bulk evicted from cache every time the maximum number of cache items is reached.
 
-This in-memory cache will be purged *(for the current PHP process)* when clearing it using any of the mentioned methods below.
-For other processes, the object will be refreshed when it expires or evicted when it reaches the cache limits.
+This in-memory cache is purged *(for the current PHP process)* when clearing it using any of the mentioned methods below.
+For other processes, the object is refreshed when it expires or evicted when it reaches the cache limits.
 
 In-Memory cache is configured globally, and has the following default settings:
 
@@ -119,7 +119,7 @@ parameters:
 
 !!! caution "In-Memory cache is per-process"
 
-    **TTL and Limit need to have a low value.** Setting limit high will increase memory use.
+    **TTL and Limit need to have a low value.** Setting limit high increases memory use.
     High TTL value also increases exponentially risk for system acting on stale metadata (e.g. content type definitions).
     The only case where it's safe to increase these values is for dev environment with single concurrency on writes.
     In prod environment you should only consider reducing them if you have heavy concurrency writes.
@@ -163,7 +163,7 @@ Out of the box in `config/packages/cache_pool/cache.redis.yaml` you'll find a de
     For Ibexa Cloud/Platform.sh: This is automatically configured in `vendor/ibexa/core/src/bundle/Core/DependencyInjection/IbexaCoreExtension.php` if you have enabled Redis as `rediscache` Platform.sh service.
 
 For anything else, you can enable it with environment variables.
-For instance, if you set the following environment variables `export CACHE_POOL="cache.redis" CACHE_DSN="secret@example.com:1234/13"`, it will result in config like this:
+For instance, if you set the following environment variables `export CACHE_POOL="cache.redis" CACHE_DSN="secret@example.com:1234/13"`, it results in config like this:
 
 ``` yaml
 services:
@@ -241,7 +241,7 @@ Out of the box in `config/packages/cache_pool/cache.memcached.yaml` you'll find
     For Ibexa Cloud/Platform.sh: This is automatically configured in `vendor/ibexa/core/src/bundle/Core/DependencyInjection/IbexaCoreExtension.php` if you have enabled Memcached as `cache` Platform.sh service.
 
 For anything else, you can enable it with environment variables detected automatically by `vendor/ibexa/core/src/bundle/Core/DependencyInjection/IbexaCoreExtension.php`.
-For instance, if you set the following environment variables `export CACHE_POOL="cache.memcached" CACHE_DSN="user:pass@localhost?weight=33"`, it will result in config like this:
+For instance, if you set the following environment variables `export CACHE_POOL="cache.memcached" CACHE_DSN="user:pass@localhost?weight=33"`, it results in config like this:
 
 ``` yaml
 services:
@@ -269,7 +269,7 @@ See `config/default_parameters.yaml` and `config/cache_pool/cache.memcached.yaml
 
 !!! note
 
-    Memcached must not be bound to the local address if clusters are in use, or user logins will fail.
+    Memcached must not be bound to the local address if clusters are in use, or user logins fail.
     To avoid this, in `/etc/memcached.conf` take a look under `# Specify which IP address to listen on. The default is to listen on all IP addresses`
 
     For development environments, change the address below this comment in `/etc/memcached.conf` to `-l 0.0.0.0`
diff --git a/docs/infrastructure_and_maintenance/clustering/clustering.md b/docs/infrastructure_and_maintenance/clustering/clustering.md
index df2f42c662..690ed7e5ec 100644
--- a/docs/infrastructure_and_maintenance/clustering/clustering.md
+++ b/docs/infrastructure_and_maintenance/clustering/clustering.md
@@ -26,7 +26,7 @@ The minimal requirements are:
 
 For further details on requirements, see [Requirements page](requirements.md).
 
-it's also recommended to use:
+It's also recommended to use:
 
 - [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
@@ -62,7 +62,7 @@ They make sure that files are correctly synchronized among the multiple clients
 ## DFS IO handler
 
 The DFS IO handler (`legacy_dfs_cluster`) can be used to store binary files on an NFS server.
-It will use a database to manipulate metadata, making up for the potential inconsistency of network-based filesystems.
+It uses a database to manipulate metadata, making up for the potential inconsistency of network-based filesystems.
 
 ### Configuring the DFS IO handler
 
@@ -77,7 +77,7 @@ As metadata handler, create a DFS one, configured with a Doctrine connection.
 
 !!! tip
 
-    The default database install will now include the dfs table *in the same database*
+    The default database install now includes the dfs table *in the same database*
 
 First, define DFS folder path as a variable in `.env` file:
 
@@ -200,7 +200,7 @@ ibexa:
 
 !!! tip
 
-    If you're looking to [set up S3](clustering_with_aws_s3.md) or other [Flysystem](https://flysystem.thephpleague.com/docs/)/third-party adapters like Google Cloud Storage, this needs to be configured as binary handler. The rest here will still stay the same, the DFS metadata handler will take care of caching the lookups to avoid slow IO lookups.
+    If you're looking to [set up S3](clustering_with_aws_s3.md) or other [Flysystem](https://flysystem.thephpleague.com/docs/)/third-party adapters like Google Cloud Storage, this needs to be configured as binary handler. The rest here still stays the same, the DFS metadata handler takes care of caching the lookups to avoid slow IO lookups.
 
 #### Customizing the storage directory
 
@@ -235,7 +235,7 @@ You can read more about that on [Binary files URL handling](file_url_handling.md
 
 ### Web server rewrite rules
 
-The default [[= product_name =]] rewrite rules will let image requests be served directly from disk.
+The default [[= product_name =]] rewrite rules let image requests be served directly from disk.
 In a cluster setup, files matching `^/var/([^/]+/)?storage/images(-versioned)?/.*` have to be passed through `/public/index.php` instead.
 
 In any case, this specific rewrite rule must be placed before the ones that "ignore" image files and just let the web server serve the files directly.
@@ -277,8 +277,8 @@ You can do the actual migration like this:
 ```
 
 The `--from` and `--to` values must be specified as `<metadata_handler>,<binarydata_handler>`.
-If `--from` is omitted, the default IO configuration will be used.
-If `--to` is omitted, the first non-default IO configuration will be used.
+If `--from` is omitted, the default IO configuration is used.
+If `--to` is omitted, the first non-default IO configuration is used.
 
 !!! tip
 
diff --git a/docs/infrastructure_and_maintenance/clustering/clustering_with_aws_s3.md b/docs/infrastructure_and_maintenance/clustering/clustering_with_aws_s3.md
index 7708d51b99..d4c8f63fdc 100644
--- a/docs/infrastructure_and_maintenance/clustering/clustering_with_aws_s3.md
+++ b/docs/infrastructure_and_maintenance/clustering/clustering_with_aws_s3.md
@@ -4,8 +4,7 @@ description: When you're using a clustering configuration, you can store binary
 
 # Clustering with Amazon AWS S3
 
-When setting up clustering, you can use Amazon AWS S3 as a binary handler,
-meaning AWS S3 will be used to store binary files.
+When setting up clustering, you can use Amazon AWS S3 as a binary handler, meaning AWS S3 is used to store binary files.
 
 !!! tip
 
diff --git a/docs/infrastructure_and_maintenance/databases.md b/docs/infrastructure_and_maintenance/databases.md
index 6e73ac0cbc..644f5329c1 100644
--- a/docs/infrastructure_and_maintenance/databases.md
+++ b/docs/infrastructure_and_maintenance/databases.md
@@ -14,11 +14,11 @@ To use PostgreSQL, you need to have the `pdo_pgsql` PHP extension installed.
 
 ### Provide parameters
 
-When you run `composer install`, you will be asked to [provide installation parameters](install_ibexa_dxp.md#change-installation-parameters).
+When you run `composer install`, you are asked to [provide installation parameters](install_ibexa_dxp.md#change-installation-parameters).
 
 !!! tip
 
-    it's recommended to store the database credentials in your `.env.local` file and not commit it to the Version Control System.
+    It's recommended to store the database credentials in your `.env.local` file and not commit it to the Version Control System.
 
 If you use PostgreSQL, the following parameters need to be set differently in the `.env.local` file than when using MySQL:
 
diff --git a/docs/infrastructure_and_maintenance/devops.md b/docs/infrastructure_and_maintenance/devops.md
index f2dd63cc22..d4696e4f1e 100644
--- a/docs/infrastructure_and_maintenance/devops.md
+++ b/docs/infrastructure_and_maintenance/devops.md
@@ -8,7 +8,7 @@ description: See various tools that can help you debug your Ibexa DXP installati
 
 ### Clearing file cache using the Symfony cache:clear command
 
-Symfony provides a command for clearing cache. It will delete all file-based caches, which mainly consist of a Twig template, a [service container](php_api.md#service-container), and the Symfony route cache, but also everything else stored in the cache folder. Out of the box on a single-server setup this includes Content cache. For further information on the command's use, see its help text:
+Symfony provides a command for clearing cache. It deletes all file-based caches, which mainly consist of a Twig template, a [service container](php_api.md#service-container), and the Symfony route cache, but also everything else stored in the cache folder. Out of the box on a single-server setup this includes Content cache. For further information on the command's use, see its help text:
 
 ``` bash
 php bin/console --env=prod cache:clear -h
@@ -16,7 +16,7 @@ php bin/console --env=prod cache:clear -h
 
 !!! note
 
-    If you do not specify an environment, by default `cache:clear` will clear the cache for the `dev` environment. If you want to clear it for `prod` you need to use the `--env=prod` option.
+    If you do not specify an environment, by default `cache:clear` clears the cache for the `dev` environment. If you want to clear it for `prod` you need to use the `--env=prod` option.
 
 !!! caution "Clustering"
 
@@ -38,7 +38,7 @@ To install it, run the following command:
 composer require symfony/debug-pack
 ```
 
-After you have installed Symfony Web Debug Toolbar, it will be available when running [[= product_name =]] in the `dev` environment. it's extended with some [[= product_name =]]-specific information:
+After you have installed Symfony Web Debug Toolbar, it's available when running [[= product_name =]] in the `dev` environment. it's extended with some [[= product_name =]]-specific information:
 
 ![Ibexa DXP info in Web Debug Toolbar](web_debug_toolbar.png "Ibexa DXP info in Web Debug Toolbar")
 
@@ -78,7 +78,7 @@ parameters:
 
 [[= product_name =]] uses the [Monolog](https://github.com/Seldaek/monolog) component to log errors, and it has a `RotatingFileHandler` that allows for file rotation.
 
-According to [their documentation](https://seldaek.github.io/monolog/doc/02-handlers-formatters-processors.html#log-to-files-and-syslog), it "logs records to a file and creates one logfile per day. It will also delete files older than `$maxFiles`".
+According to [their documentation](https://seldaek.github.io/monolog/doc/02-handlers-formatters-processors.html#log-to-files-and-syslog), it "logs records to a file and creates one logfile per day. It also deletes files older than `$maxFiles`".
 
 Monolog's handler can be configured in `config/packages/<environment>/monolog.yaml`:
 
diff --git a/docs/infrastructure_and_maintenance/performance.md b/docs/infrastructure_and_maintenance/performance.md
index 7ef5ba0539..f6c5f4614b 100644
--- a/docs/infrastructure_and_maintenance/performance.md
+++ b/docs/infrastructure_and_maintenance/performance.md
@@ -5,7 +5,7 @@ description: Ensure that your Ibexa DXP installation performs well by following
 # Performance
 
 [[= product_name =]] can be set up to run efficiently on almost any modern configuration.
-What follows is a list of recommendation that will make your installation perform better.
+What follows is a list of recommendation that make your installation perform better.
 
 !!! note
 
@@ -21,7 +21,7 @@ If you're in a hurry, the most important recommendations on this page are:
 ## Client
 
 - Always use an up-to-date browser and an up-to-date operating system so you have access to latest browser versions
-- If possible, use a fast, stable internet connection, because an unreliable connection will slow down UI
+- If possible, use a fast, stable internet connection, because an unreliable connection slows down UI
 
 ## Server
 
@@ -76,7 +76,7 @@ In production setups:
 
     Check if your cloud provider has native service for Memcached/Redis, as those might be better tuned.
 
-- If you use Redis, make sure to tune it for in-memory cache usage. Its persistence feature is not needed with cache and will severely slow down execution time.
+- If you use Redis, make sure to tune it for in-memory cache usage. Its persistence feature is not needed with cache and severely slows down execution time.
     - [For use with sessions](sessions.md#cluster-setup) however, persistence can be a good fit if you want sessions to survive service interruptions.
     - Further tips for Redis with cache can be found in doc regarding [Redis Clustering](persistence_cache.md#redis-clustering).
 
@@ -111,13 +111,13 @@ To avoid quickly running out of memory while executing such commands you should
     ```
 
 1.  Run PHP without memory limits using: `php -d memory_limit=-1 bin/console <command>`
-1.  Disable `xdebug` *(PHP extension to debug/profile php use)* when running the command, this will cause php to use much more memory.
+1.  Disable `xdebug` *(PHP extension to debug/profile php use)* when running the command, this causes php to use much more memory.
 
-!!! note "Memory will still grow"
+!!! note "Memory still grows"
 
-    Even when everything is configured like described above, memory will grow for each iteration
+    Even when everything is configured like described above, memory grows for each iteration
     of indexing/inserting a content item with at least *1kb* per iteration after the initial first 100 rounds.
-    This is expected behavior; to be able to handle more iterations you will have to do one or several of the following:
+    This is expected behavior; to be able to handle more iterations you have to do one or several of the following:
 
     - Change the import/index script in question to [use process forking](#process-forking-with-symfony) to avoid the issue.
     - Upgrade PHP: *newer versions of PHP are typically more memory-efficient.*
@@ -128,12 +128,11 @@ To avoid quickly running out of memory while executing such commands you should
 The recommended way to completely avoid "memory leaks" in PHP in the first place is to use processes.
 For console scripts this is typically done using process forking which is quite easily achievable with Symfony.
 
-The things you will need to do:
+The things you need to do:
 
 1. Change your command so it supports taking slice parameters, like for instance a batch size and a child-offset parameter.
-    1. *If defined, child-offset parameter denotes if a process is a child,
-    this can be accomplished using two commands as well.*
-    2. *If not defined, it's the master process which will execute the processes until nothing is left to process.*
+    1. *If defined, child-offset parameter denotes if a process is a child, this can be accomplished using two commands as well.*
+    2. *If not defined, it's the master process which executes the processes until nothing is left to process.*
 
 2. Change the command so that the master process takes care of forking child processes in slices.
     1. For execution in-order, [you may look to our platform installer code](https://github.com/ibexa/core/blob/main/src/bundle/RepositoryInstaller/Command/InstallPlatformCommand.php#L220)
diff --git a/docs/infrastructure_and_maintenance/security/development_security.md b/docs/infrastructure_and_maintenance/security/development_security.md
index 04a4e8b11d..4a9d0fdb5e 100644
--- a/docs/infrastructure_and_maintenance/security/development_security.md
+++ b/docs/infrastructure_and_maintenance/security/development_security.md
@@ -77,7 +77,7 @@ By default, Symfony redirects to the [URI configured in `security.yaml` as `defa
 
 #### Remember me
 
-it's possible to use the "Remember me" functionality.
+It's possible to use the "Remember me" functionality.
 Refer to the [Symfony cookbook on this topic]([[= symfony_doc =]]/security/remember_me.html).
 
 If you want to use this feature, you must at least extend the login template in order to add the required checkbox:
@@ -119,7 +119,7 @@ lexik_jwt_authentication:
 ```
 
 You also need a new Symfony firewall configuration for REST and/or GraphQL APIs.
-it's already provided in `config/packages/security.yaml`, you only need to uncomment it:
+It's already provided in `config/packages/security.yaml`, you only need to uncomment it:
 
 ``` yaml
 security:
diff --git a/docs/infrastructure_and_maintenance/security/reporting_issues.md b/docs/infrastructure_and_maintenance/security/reporting_issues.md
index 5cea8dffb5..e7e7decfb5 100644
--- a/docs/infrastructure_and_maintenance/security/reporting_issues.md
+++ b/docs/infrastructure_and_maintenance/security/reporting_issues.md
@@ -11,13 +11,13 @@ No engineering team is perfect though, and if you do discover a security issue i
 
 ## Channels
 
-- If you're a customer or partner, please log in to your Service Portal at <https://support.ibexa.co/>, click "New Ticket", and report the issue as you would report a normal support request. Ibexa Product Support will respond, take care of the report, and keep you informed of the developments.
-- If you're not a customer or partner, please log in to the Ibexa JIRA issue tracker: <https://issues.ibexa.co/>. Create an account if you don't have one, it's free. Click the "Create" button in the top menu to create your report. For "Project", select "Ibexa IBX", or "eZ Publish / Platform", or "eZ Platform Enterprise Edition", depending on which product is affected by the bug. **Important: Select "Security Level": "Security"!** The engineering team will take care of your report.
-- it's also possible to report security issues by email to <security@ibexa.co> - this requires no account.
+- If you're a customer or partner, please log in to your Service Portal at <https://support.ibexa.co/>, click "New Ticket", and report the issue as you would report a normal support request. Ibexa Product Support responds, takes care of the report, and keeps you informed of the developments.
+- If you're not a customer or partner, please log in to the Ibexa JIRA issue tracker: <https://issues.ibexa.co/>. Create an account if you don't have one, it's free. Click the "Create" button in the top menu to create your report. For "Project", select "Ibexa IBX", or "eZ Publish / Platform", or "eZ Platform Enterprise Edition", depending on which product is affected by the bug. **Important: Select "Security Level": "Security"!** The engineering team takes care of your report.
+- It's also possible to report security issues by email to <security@ibexa.co> - this requires no account.
 
 ## Verbosity
 
-Please be verbose when reporting issues. The issue will be solved faster if you include:
+Please be verbose when reporting issues. The issue is solved faster if you include:
 
 - A **title** describing the gist of the issue in one sentence
 - A **description** which includes the steps you take to produce the problem, what you expect the result to be, and what actually happens.
@@ -25,7 +25,7 @@ Please be verbose when reporting issues. The issue will be solved faster if you
 
 ## Dialogue
 
-The engineering team may need your help to clarify certain specifics, so please respond to such inquiries. We will keep you updated about the progress on our end.
+The engineering team may need your help to clarify certain specifics, so please respond to such inquiries. We keep you updated about the progress on our end.
 
 ## Responsible disclosure
 
@@ -33,4 +33,4 @@ Please give the engineering team time to produce and distribute a solution befor
 
 ## Attribution
 
-We will, if you want, include your name and/or the name of your organisation, a link, and short description about you in the security notification we send out with the fix. Thank you!
+If you want, we can include your name and/or the name of your organisation, a link, and short description about you in the security notification we send out with the fix. Thank you!
diff --git a/docs/infrastructure_and_maintenance/security/security_checklist.md b/docs/infrastructure_and_maintenance/security/security_checklist.md
index 335cff8ee1..796b874c7b 100644
--- a/docs/infrastructure_and_maintenance/security/security_checklist.md
+++ b/docs/infrastructure_and_maintenance/security/security_checklist.md
@@ -25,7 +25,7 @@ make sure that your setup is secure.
 
 !!! tip
     
-    The following command will generate a 64-character-long secure random value:
+    The following command generates a 64-character-long secure random value:
     
     `php -r "print bin2hex(random_bytes(32));"`
     
@@ -176,7 +176,7 @@ Use the following checklist to ensure the roles and policies are secure:
 
 The [visibility switcher](https://doc.ibexa.co/en/latest/content_management/locations/#location-visibility) is a convenient feature for withdrawing content from the frontend.
 It acts as a filter in the frontend by default. You can choose to respect it or ignore it in your code.
-it'sn't permission-based, and doesn't restrict read access to content. Hidden content can be read through other means, like the REST API or GraphQL.
+It'sn't permission-based, and doesn't restrict read access to content. Hidden content can be read through other means, like the REST API or GraphQL.
 
 If you need to restrict read access to a given content item, you could create a role that grants read access for a given
 [**Section**](https://doc.ibexa.co/en/latest/administration/content_organization/sections/)
@@ -186,10 +186,10 @@ Or use other permission-based [**Limitations**](https://doc.ibexa.co/en/latest/p
 
 ### Minimize exposure
 
-Security should be a multi-layered exercise. it's wise to minimize what features you make available to the world, even if there are no known or suspected vulnerabilities in those features, and even if your content is properly protected by roles and policies. Reduce your attack surface by exposing only what you must.
+Security should be a multi-layered exercise. It's wise to minimize what features you make available to the world, even if there are no known or suspected vulnerabilities in those features, and even if your content is properly protected by roles and policies. Reduce your attack surface by exposing only what you must.
 
 - If possible, make the back office unavailable on the open internet.
-- [Symfony FOSJsRoutingBundle](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle) is required in those releases where it's included, to expose routes to JavaScript. It exposes only the required routes, nothing more. it's only required in the back office site access though, so you can consider blocking it in other site accesses. You should also go through your own custom routes, and decide for each if you need to expose them or not. See the documentation on [YAML route definitions for exposure](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle/blob/master/Resources/doc/usage.rst#generating-uris).
+- [Symfony FOSJsRoutingBundle](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle) is required in those releases where it's included, to expose routes to JavaScript. It exposes only the required routes, nothing more. It's only required in the back office site access though, so you can consider blocking it in other site accesses. You should also go through your own custom routes, and decide for each if you need to expose them or not. See the documentation on [YAML route definitions for exposure](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle/blob/master/Resources/doc/usage.rst#generating-uris).
 - By default, a [Powered-By header](https://doc.ibexa.co/en/latest/update_and_migration/from_1.x_2.x/update_db_to_2.5/#powered-by-header) is set. It specifies what version of the DXP is running. For example, `x-powered-by: Ibexa Experience v4`. This doesn't expose anything that couldn't be detected through other means. But if you wish to obscure this, you can either omit the version number, or disable the header entirely.
 - Consider whether certain interfaces must be left available on the open internet. For example:
     - The `/search` and `/graphql` endpoints
@@ -225,7 +225,7 @@ Headers must be adapted to the site in question, and in most cases it's site own
 The headers can be set either by the web server, or by a proxy like Varnish. 
 You can also set headers in PHP code by making a Symfony `RequestListener` for the `kernel.response` event and adding the header to the response object headers list.
 
-You will likely need to vary the security headers based on the SiteAccess in question and site implementation details, such as frontend code and libraries used.
+You most likely need to vary the security headers based on the SiteAccess in question and site implementation details, such as frontend code and libraries used.
 
 - `Strict-Transport-Security` - ensures that all requests are sent over HTTPS, with no fallback to HTTP. 
 All production sites should use HTTPS and this header unless they have very particular needs. 
diff --git a/docs/infrastructure_and_maintenance/sessions.md b/docs/infrastructure_and_maintenance/sessions.md
index f8c520e726..234dfd0417 100644
--- a/docs/infrastructure_and_maintenance/sessions.md
+++ b/docs/infrastructure_and_maintenance/sessions.md
@@ -5,7 +5,7 @@ description: Ibexa DXP uses Symfony to handle user sessions, with support for Si
 # Sessions
 
 Sessions are handled by the Symfony framework, specifically API and underlying session handlers provided by the HttpFoundation component.
-it's further enhanced in [[= product_name =]] with support for SiteAccess-aware session cookie configuration.
+It's further enhanced in [[= product_name =]] with support for SiteAccess-aware session cookie configuration.
 
 !!! note
 
@@ -126,7 +126,7 @@ If you're on `php-redis` v4.2.0 and higher, you can optionally tweak [`php-redis
 Ideally keep [persistence cache](persistence_cache.md) and session data separated:
 
 - Sessions can't risk getting [randomly evicted](https://redis.io/docs/reference/eviction/#eviction-policies) when you run out of memory for cache.
-- You can't completely disable eviction either, as Redis will then start to refuse new entries once full, including new sessions.
+- You can't completely disable eviction either, as Redis then starts to refuse new entries once full, including new sessions.
     - Either way, you should monitor your Redis instances and make sure you have enough memory set aside for active sessions/cache items.
 
 If you want to make sure sessions survive Redis or server restarts, consider using a [persistent Redis](https://redis.io/docs/management/persistence/) instance for sessions.
diff --git a/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md b/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md
index 5190443baf..9682427a07 100644
--- a/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md
+++ b/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md
@@ -36,7 +36,7 @@ The language of the back office is based on the browser language.
 In order to change it you should install the proper package for your language (see [language packages list](https://github.com/ezplatform-i18n)).
 Once you have language packages installed, you can switch the language of the back office in the User Settings menu.
 
-If you do not have a language defined in the browser, it will be selected based on the `parameters.locale_fallback` parameter located in `config/packages/ibexa.yaml`.
+If you do not have a language defined in the browser, it's selected based on the `parameters.locale_fallback` parameter located in `config/packages/ibexa.yaml`.
 
 To read more about language managing in [[= product_name =]], see the following doc pages:
 
@@ -51,12 +51,12 @@ Remember to clear the cache afterwards.
 As an alternative to manually applying the patch, you can use [composer-patches](https://github.com/cweagans/composer-patches).
 You can apply patches received from the Support, community or the others by using your `composer.json` file.
 For checking the versions you're on, refer to your `composer.lock`.
-All you need is to specify which package will receive patches and give the path/URL to the actual file.
+All you need is to specify which package receives patches and give the path/URL to the actual file.
 This should be done inside the `extra` section. Packages which should receive patches
-will be removed during `composer update` or `composer require` so they can be re-installed and re-patched.
+are removed during `composer update` or `composer require` so they can be re-installed and re-patched.
 
 When updating to the release that already contains specified patches,
-Composer will throw an error alongside a message that they cannot be applied and will be skipped
+Composer throws an error alongside a message that they cannot be applied and are skipped
 ([this is configurable with 1.x](https://github.com/cweagans/composer-patches/tree/1.x#error-handling)).
 They can be manually removed from `composer.json` now.
 
diff --git a/docs/multisite/languages/back_office_translations.md b/docs/multisite/languages/back_office_translations.md
index 0dd9df1dca..7a829e1819 100644
--- a/docs/multisite/languages/back_office_translations.md
+++ b/docs/multisite/languages/back_office_translations.md
@@ -16,7 +16,7 @@ ibexa:
 ```
 
 Then clear the cache. Now you can reload your [[= product_name =]] back office.
-If your browser language is set to French, the back office will be displayed in French.
+If your browser language is set to French, the back office is displayed in French.
 
 !!! tip "Checking browser language"
 
@@ -41,14 +41,14 @@ To learn how to contribute to a translation, see [Contributing translations](con
 Once you have language packages enabled, you can switch the language of the back office
 in the User Settings menu.
 
-Otherwise, the language will be selected based on the browser language.
-If you do not have a language defined in the browser, the language will be selected
+Otherwise, the language is selected based on the browser language.
+If you do not have a language defined in the browser, the language is selected
 based on `parameters.locale_fallback` in `config/packages/ibexa.yaml`.
 
 ## Custom string translations
 
 When you extend the back office you often need to provide labels for new elements.
-it's good practice to provide your labels in translations files, instead of literally,
+It's good practice to provide your labels in translations files, instead of literally,
 so they can be reused and translated into other languages.
 
 To provide label strings, make use of the `Symfony\Component\Translation\TranslatorInterface`
@@ -116,7 +116,7 @@ For example, in `custom_extension.de.xliff`:
 </trans-unit>
 ```
 
-The language to display will then be selected automatically based on [user preferences or browser setup](#selecting-back-office-language).
+The language to display is then selected automatically based on [user preferences or browser setup](#selecting-back-office-language).
 
 !!! note
 
diff --git a/docs/multisite/languages/languages.md b/docs/multisite/languages/languages.md
index 376e3e1ed0..66e5339251 100644
--- a/docs/multisite/languages/languages.md
+++ b/docs/multisite/languages/languages.md
@@ -15,7 +15,7 @@ Different translations of the same content item can be edited separately. This m
 
 Each version, including a draft, contains all the existing translations.
 However, even if work on a draft takes time and other translations are updated in the meantime,
-publishing the draft will not overwrite later modifications.
+publishing the draft doesn't overwrite later modifications.
 
 ### Adding available languages
 
@@ -32,9 +32,9 @@ yarn encore <environment>
 
 Language versions consist of translated values of the content item's Fields. In the content type definition every Field is set to be Translatable or not.
 
-[[= product_name =]] does not decide by itself which Fields can be translated and which cannot. For some Field values the need for a translation can be obvious, for example for the body of an article. In other cases, for instance images without text, integer numbers or e-mail addresses, translation is usually unnecessary. Despite that, [[= product_name =]] gives you the possibility to mark any Field as translatable regardless of its Field Type. it's only your decision to exclude the translation possibility for those Fields where it makes no sense.
+[[= product_name =]] does not decide by itself which Fields can be translated and which cannot. For some Field values the need for a translation can be obvious, for example for the body of an article. In other cases, for instance images without text, integer numbers or e-mail addresses, translation is usually unnecessary. Despite that, [[= product_name =]] gives you the possibility to mark any Field as translatable regardless of its field type. It's only your decision to exclude the translation possibility for those Fields where it makes no sense.
 
-When a Field is not flagged as Translatable, its value will be copied from the initial/main translation when a new language version is created. This copied value cannot be modified. When a Field is Translatable, you will have to enter its value in a new language version manually.
+When a Field is not flagged as Translatable, its value is copied from the initial/main translation when a new language version is created. This copied value cannot be modified. When a Field is Translatable, you have to enter its value in a new language version manually.
 
 For example, let's say that you need to store information about marathon contestants and their results. You build a "contestant" content type using the following Fields: name, photo, age, nationality, finish time. Allowing the translation of anything other than nationality would be pointless, since the values stored by the other Fields are the same regardless of the language used to describe the contestant. In other words, the name, photo, age and finish time would be the same in, for example, both English and Norwegian.
 
@@ -48,8 +48,8 @@ In addition, you can also control the access to the global translation list by u
 
 If you want to have completely separate versions of the website, each with content in its own language,
 you can [use SiteAccesses](#using-siteaccesses-for-handling-translations).
-Depending on the URI used to access the website, a different site will open, with a language set in configuration settings.
-All content items will then be displayed in this language.
+Depending on the URI used to access the website, a different site opens, with a language set in configuration settings.
+All content items are then displayed in this language.
 
 For details, see [Multi-language SiteAccesses](set_up_translation_siteaccess.md).
 
@@ -169,15 +169,15 @@ ibexa:
 
 ### Using implicit *related SiteAccesses*
 
-If the `translation_siteaccesses` setting is not provided, implicit *related SiteAccesses* will be used instead. SiteAccesses are considered *related* if they share:
+If the `translation_siteaccesses` setting is not provided, implicit *related SiteAccesses* is used instead. SiteAccesses are considered *related* if they share:
 
 - The same Repository
 - The same root `location_id` (see [Multisite](multisite.md))
 
 ### Fallback languages and missing translations
 
-When setting up SiteAccesses with different language versions, you can specify a list of preset languages for each SiteAccess. When this SiteAccess is used, the system will go through this list. If a content item is unavailable in the first (prioritized) language, it will attempt to use the next language in the list, and so on. Thanks to this you can have a fallback in case of a lacking translation.
+When setting up SiteAccesses with different language versions, you can specify a list of preset languages for each SiteAccess. When this SiteAccess is used, the system goes through this list. If a content item is unavailable in the first (prioritized) language, it attempts to use the next language in the list, and so on. Thanks to this you can have a fallback in case of a lacking translation.
 
-You can also assign a Default content availability flag to content types (available in the Admin Panel). When this flag is assigned, content items of this type will be available even when they do not have a language version in any of the languages configured for the current SiteAccess.
+You can also assign a Default content availability flag to content types (available in the Admin Panel). When this flag is assigned, content items of this type are available even when they do not have a language version in any of the languages configured for the current SiteAccess.
 
-Note that if a language is not provided in the list of prioritized languages and it's not the content item's first language, the URL alias for this content in this language will not be generated.
+Note that if a language is not provided in the list of prioritized languages and it's not the content item's first language, the URL alias for this content in this language isn't generated.
diff --git a/docs/multisite/site_factory/site_factory.md b/docs/multisite/site_factory/site_factory.md
index 19a6236083..30df58fa4e 100644
--- a/docs/multisite/site_factory/site_factory.md
+++ b/docs/multisite/site_factory/site_factory.md
@@ -111,7 +111,7 @@ To be able to see your site online, you need to define a domain for it.
 !!! caution "Define domain for production environment"
 
     These steps are for `dev` environment only.
-    If you want to define domains in production environment, you will need to configure Apache or Nginx by yourself.
+    If you want to define domains in production environment, you need to configure Apache or Nginx by yourself.
 
 In the `.env` file change line 2 to: `COMPOSE_FILE=doc/docker/base-dev.yml:doc/docker/multihost.yml`
 
diff --git a/docs/multisite/siteaccess/siteaccess_aware_configuration.md b/docs/multisite/siteaccess/siteaccess_aware_configuration.md
index 2dab3bb7d4..9d22fc215e 100644
--- a/docs/multisite/siteaccess/siteaccess_aware_configuration.md
+++ b/docs/multisite/siteaccess/siteaccess_aware_configuration.md
@@ -130,7 +130,7 @@ class AcmeExampleExtension extends Extension
         $processor->mapConfig(
             $config,
             // Any kind of callable can be used here.
-            // it's called for each declared scope/SiteAccess.
+            // It's called for each declared scope/SiteAccess.
             static function ($scopeSettings, $currentScope, ContextualizerInterface $contextualizer) {
                 // Maps the "name" setting to "acme_example.<$currentScope>.name" container parameter
                 // it's then possible to retrieve this parameter through ConfigResolver in the application code:
@@ -140,7 +140,7 @@ class AcmeExampleExtension extends Extension
         );
 
         // Now map "custom_setting" and ensure the key defined for "my_siteaccess" overrides the one for "my_siteaccess_group"
-        // it's done outside the closure as it's needed only once.
+        // It's done outside the closure as it's needed only once.
         $processor->mapConfigArray('custom_setting', $config);
     }
 }
diff --git a/docs/permissions/limitation_reference.md b/docs/permissions/limitation_reference.md
index d2acc7523a..245b28bcfd 100644
--- a/docs/permissions/limitation_reference.md
+++ b/docs/permissions/limitation_reference.md
@@ -10,7 +10,7 @@ page_type: reference
 A generic limitation type to use when no other limitation has been implemented.
 Without any Limitation assigned, a `LimitationNotFoundException` is thrown.
 
-it's called "blocking" because it always informs the permissions system that 
+It's called "blocking" because it always informs the permissions system that 
 the User does not have access to any policy the limitation is assigned to, making 
 the permissions system move on to the next policy.
 
diff --git a/docs/permissions/permission_overview.md b/docs/permissions/permission_overview.md
index 243cff6fbe..707beb03e1 100644
--- a/docs/permissions/permission_overview.md
+++ b/docs/permissions/permission_overview.md
@@ -11,8 +11,8 @@ Each role can contain one or more **Policies**. A policy is a rule that gives ac
 For example, a `section/assign` Policy allows the User to assign content to Sections.
 
 When you add a policy to a role, you can also restrict it using one or more **Limitations**.
-A policy with a limitation will only apply when the condition in the limitation is fulfilled.
-For example, a `content/publish` policy with a `ContentType` limitation on the "Blog Post" content type will allow the User to publish only Blog Posts, and not other content.
+A policy with a limitation only applies when the condition in the limitation is fulfilled.
+For example, a `content/publish` policy with a `ContentType` limitation on the "Blog Post" content type allows the User to publish only Blog Posts, and not other content.
 
 A limitation, like a policy, specifies what a User *can* do, not what they *can't do*.
 A `Section` limitation, for example, *gives* the User access to the selected Section, not *prohibits* it.
@@ -28,7 +28,7 @@ it's best practice to avoid assigning roles to users directly.
 Instead, try to organize your content so that it can be covered with general roles assigned to user groups.
 
 Using Groups is easier to manage and more secure. It also improves system performance.
-The more role assignments and complex policies you add for a given User, the more complex the search/load queries will be, because they always take permissions into account.
+The more role assignments and complex policies you add for a given User, the more complex the search/load queries are, because they always take permissions into account.
 
 ## Permissions for custom controllers
 
diff --git a/docs/personalization/api_reference/tracking_api.md b/docs/personalization/api_reference/tracking_api.md
index 66e7734e97..5eb8d4f231 100644
--- a/docs/personalization/api_reference/tracking_api.md
+++ b/docs/personalization/api_reference/tracking_api.md
@@ -99,7 +99,7 @@ After logout, the anonymous user ID can be used again.
 
 The Personalization server internally creates a hash of every user ID.
 The original ID is not saved.
-it's still possible that the original ID appears in the log files for the debugging
+It's still possible that the original ID appears in the log files for the debugging
 purposes but log files are purged regularly.
 The user ID is case sensitive.
 
@@ -261,7 +261,7 @@ For more information, see [Content API](content_api.md).
 
 The currency is stored with the price and normalized only when statistic information
 is requested.
-it's often a good choice to select a base currency and convert prices before
+It's often a good choice to select a base currency and convert prices before
 sending the buy event.
 The price attached to a buy event never overwrites the price which was defined
 in an item import.
@@ -300,7 +300,7 @@ Some optional request parameters can be set over query string parameters (GET pa
     For eCommerce stores, this event is not required but can be used in custom implementations.
 
 The event is sent when the end user stays on the page for a predefined period of time.
-it's then assumed that the user consumed the item (read an article or watched a video).
+It's then assumed that the user consumed the item (read an article or watched a video).
 
 The URL has the following format:
 
@@ -503,7 +503,7 @@ The URL for a Rendered event has the following format:
 
 For a detailed description of embedded parameters, see [event parameters](#event-parameters).
 
-it's common that recommendations are rendered as a block with multiple items.
+It's common that recommendations are rendered as a block with multiple items.
 To save traffic and speed up the process, you can bundle multiple recommendations in one request.
 Several item IDs must be comma-separated.
 
diff --git a/docs/personalization/api_reference/user_api.md b/docs/personalization/api_reference/user_api.md
index 564d1ead59..d7fed95279 100644
--- a/docs/personalization/api_reference/user_api.md
+++ b/docs/personalization/api_reference/user_api.md
@@ -53,7 +53,7 @@ The `source` parameter defines the system that stores the specified user's metad
 If you have multiple source systems for updating user attributes, 
 for example, a registration service, where users define their gender and age, 
 or an application that integrates with Facebook to source the brands the user "liked" in your shop, 
-every new upload of attributes will replace the attribute set that already exists 
+every new upload of attributes replaces the attribute set that already exists 
 for the same user/source pair.
 
 If you need to get all the available attributes for all sources, apply the `allSources` query string parameter, for example:
diff --git a/docs/personalization/legacy_recommendation_api.md b/docs/personalization/legacy_recommendation_api.md
index 5c1413bab7..1a945ede94 100644
--- a/docs/personalization/legacy_recommendation_api.md
+++ b/docs/personalization/legacy_recommendation_api.md
@@ -7,7 +7,7 @@ description: An old method of fetching recommendations from the system using rec
 !!! caution
 
     This is a page describing the old version of the recommendation API. 
-    it's available for reference purposes only.
+    It's available for reference purposes only.
 
     Use the new [Recommendation API](recommendation_api.md) instead.
 
@@ -46,7 +46,7 @@ The embedded parameters `solutionid`, `clientid` and `userid` are the same as us
 
 | Parameter Name | Description | Values |
 |-----|-----|------|
-| `scenarioid` | The ID of the scenario used for providing recommendations. it's configured or predefined in the Administration GUI. | alphanumeric |
+| `scenarioid` | The ID of the scenario used for providing recommendations. It's configured or predefined in the Administration GUI. | alphanumeric |
 | `extension` | The format the server generates the response in. There are three formats supported: JSON, XML and JSONP. See the chapter [Response Handling](#response-handling) below for more information | json, xml or jsonp |
 
 ## Basic Request Parameters
@@ -59,7 +59,7 @@ Using additional query string parameters one can customize the recommendation re
 |`contextitems` (required for context based recommendations)|Comma-separated list of items that the user is currently viewing on the webpage. All items must be from the same type. The type is defined in the scenario configuration.|comma separated list of item IDs (1 to 2147483647)|
 |`itemid` (deprecated)|A single item to be used as a source for creating recommendations. This parameter is deprecated. Use `contextitems` instead.|1 to 2147483647|
 |`outputtypeid` (required, if the scenario defined multiple output item types, otherwise it's optional)|Item type of the requested recommendations. This can differ from the input item type, for example, if you want to get recommendations for pictures based on an article the item type for pictures has to be used here. For a web shop this is probably not needed as only one type of items is tracked. Multiple item types are available only for advanced license.|numeric|
-|`categorypath`|Base category path for providing recommendations. The format is the same as the category path for the event tracking. it's possible to add this parameter multiple times. The order of recommendations from the different categories is defined by the calculated relevance.|alphanumeric[/alphanumeric]*|
+|`categorypath`|Base category path for providing recommendations. The format is the same as the category path for the event tracking. It's possible to add this parameter multiple times. The order of recommendations from the different categories is defined by the calculated relevance.|alphanumeric[/alphanumeric]*|
 |`jsonpcallback` (used only for JSONP request)|Function or method name for a JSONP request. It can be a function ("callme"), or a method ("obj.callme").|valid JavaScript function call (by default "jsonpCallback")|
 
 An example of the recommendation request: 
@@ -170,7 +170,7 @@ Legacy Recommendation API and [Submodel configuration]([[= user_doc =]]/personal
 
 ###### `usecontextcategorypath`
 
-If set to true, the category path of the contextitem(s) will be resolved by the recommender engine from the internal store and used as base category path.
+If set to true, the category path of the contextitem(s) is resolved by the recommender engine from the internal store and used as base category path.
 If more than one category is returned, all categories are used for providing recommendations.
 Avoid setting this parameter to true to minimize the response time.
 Use the parameter categorypath to provide the category to the recommender engine during the request.
@@ -179,7 +179,7 @@ Use the parameter categorypath to provide the category to the recommender engine
 
 ###### `recommendCategory` (to be used only in the eZ Recommendation extension)
 
-If passed in combination with a "categorypath" value, the "closest" category the recommended items linked with will be delivered in the response as additional field "category".
+If passed in combination with a "categorypath" value, the "closest" category the recommended items linked with is delivered in the response as additional field "category".
 
 ```
 recommendationResponseList: [ {
@@ -219,7 +219,7 @@ The last modification timestamp indicates a change that could influence the reco
 | Bestselling products last 7 days | no context | 24 hours | The model with the 7 days scope is usually built once a day. It can be easily cached for 24 hours. It has no context and can therefore be cached globally for all the users of a customer. |
 | Also bought products in the last month | current product | 24 hours | The model with the 30 days scope is usually built once a day. The context is always the same. It can be cached for every product. The same result can be used for all users of a customer. |
 | Also consumed read articles in the last hour | current article | 30 minutes | Models with a short scope are usually built several times a day or even per hour. In this case the expiration time is set to the half of the model build frequency/period. |
-| Personalized recommendation based on the user's statistic | customers click history | now | Although the statistic model is not updated within minutes, it's very likely that the context will be changed shortly (customer clicks another product and therefore the click is added to his history). The expiration time should not be much longer than the user activity on the web page. |
+| Personalized recommendation based on the user's statistic | customers click history | now | Although the statistic model is not updated within minutes, it's very likely that the context is changed shortly (customer clicks another product and therefore the click is added to his history). The expiration time should not be much longer than the user activity on the web page. |
 
 In most cases you do not need to calculate the expiration time manually. The table above is provided for the orientation, how the Expires header of the HTTP response is calculated by the recommendation engine and already provided to your caching system. You just need to make sure that the Expires header is used in the configuration of your caching system instead of a static value out of your configuration.
 
@@ -236,23 +236,23 @@ If the network is overloaded or the Recommendation Engine is not available it ca
 #### Loading in the bottom
 
 You can place the code that loads the data from the eZ Recommender at the bottom of the generated document and flush the output buffer to the client just before requesting recommendations.
-The browser will get a whole page to render and can display it even if the very end of the page is still loading.
+The browser gets a whole page to render and can display it even if the very end of the page is still loading.
 Then the JavaScript code with the recommendation information loaded at the bottom of the page must fill the gaps on the page with recommendation as soon as it's completely loaded.
 
 #### Non-blocking loading in the background
 
 If the website is implemented in a language which supports multithreading or non-blocking I/O, it's possible to start the recommendation request just after the browser request is received.
-The page generation and the recommendation requests will be accomplished in parallel.
+The page generation and the recommendation requests are accomplished in parallel.
 By combining this idea with the previous solution and placing the recommendation results at the bottom of the page you can avoid any interruption in the processing.
 
 #### Loading from JavaScript using JSONP
 
-it's not possible to request the recommendation controller server directly from the JavaScript (over AJAX library or directly over XMLHttpRequest) because of the cross-domain restriction in most browsers.
+It's not possible to request the recommendation controller server directly from the JavaScript (over AJAX library or directly over XMLHttpRequest) because of the cross-domain restriction in most browsers.
 One of the possible technique to work around this limitation is [JSONP](https://en.wikipedia.org/wiki/JSONP).
 
 #### Loading over proxy
 
-A better solution in comparison with JSONP is to provide the proxy on the server side, which will forward script requests to the Recommender system.
+A better solution in comparison with JSONP is to provide the proxy on the server side, which forwards script requests to the Recommender system.
 It can be implemented as a very simple proxy using the [mod\_proxy module](https://httpd.apache.org/docs/2.2/mod/mod_proxy.html) of Apache Webserver.
 It just transfers the data and the JavaScript renders the response into HTML itself.
 
diff --git a/docs/personalization/tracking_integration.md b/docs/personalization/tracking_integration.md
index 2a1b233907..a94bb2d9b1 100644
--- a/docs/personalization/tracking_integration.md
+++ b/docs/personalization/tracking_integration.md
@@ -57,7 +57,7 @@ Another solution is to provide a proxy on the server side, which forwards
 script requests to the Personalization server. 
 In this model, the requests are triggered from the client, when the page is already 
 loaded and rendered. 
-it's impossible to request the recommendation controller server directly from JavaScript 
+It's impossible to request the recommendation controller server directly from JavaScript 
 (either through the AJAX library or directly over XMLHttpRequest) because of the 
 cross-domain restriction in most browsers. 
 One possible work around this limitation is [JSONP](https://www.w3schools.com/js/js_json_jsonp.asp).
diff --git a/docs/pim/create_custom_catalog_filter.md b/docs/pim/create_custom_catalog_filter.md
index 11faf95c5a..21e63cb6a0 100644
--- a/docs/pim/create_custom_catalog_filter.md
+++ b/docs/pim/create_custom_catalog_filter.md
@@ -65,7 +65,7 @@ First, add a `form_field_override.html.twig` template to `templates/themes/admin
 ```
 
 Here, you use the same built-in template that is used for example for the product code filter.
-it's placed in a template block corresponding to your custom filter, `catalog_criteria_product_name_values`.
+It's placed in a template block corresponding to your custom filter, `catalog_criteria_product_name_values`.
 
 To ensure the template is used as a back office form theme, add the following configuration:
 
diff --git a/docs/pim/pim_configuration.md b/docs/pim/pim_configuration.md
index c6b274ecf0..fed97c7198 100644
--- a/docs/pim/pim_configuration.md
+++ b/docs/pim/pim_configuration.md
@@ -64,7 +64,7 @@ ibexa:
 ```
 
 VAT rates configuration accepts additional flags under the `extras` key.
-it's an extension point that you can build upon to add custom functionalities. 
+It's an extension point that you can build upon to add custom functionalities. 
 You can use it, for example, to pass additional information to the UI or define region-specific exclusions when calculating the tax values.
 
 For each VAT category value, setting a value to "null" (~) is equal to making the following setting:
diff --git a/docs/release_notes/ez_platform_v1.10.0.md b/docs/release_notes/ez_platform_v1.10.0.md
index 67675cddef..6ebd636b9f 100644
--- a/docs/release_notes/ez_platform_v1.10.0.md
+++ b/docs/release_notes/ez_platform_v1.10.0.md
@@ -23,7 +23,7 @@ This is a first step. We aim to provide more in terms of table support in the ed
 
 #### New Design Engine
 
-This is a new way to handle design, theming and design overrides, similar to what we had in eZ Publish. It enables you to define different Themes which are collections of assets and templates. You can then assemble Themes (that can override each other) to define Designs, and eventually, assign a Design to a SiteAccess. This is a powerful concept that we will aim to use in our out-of-the-box templates and demo sites. It comes especially handy when using eZ Platform for a multisite installation and willing to reuse design parts. Further info can be found in the [Bundle documentation](https://github.com/ezsystems/ezplatform-design-engine/tree/master/doc).
+This is a new way to handle design, theming and design overrides, similar to what we had in eZ Publish. It enables you to define different Themes which are collections of assets and templates. You can then assemble Themes (that can override each other) to define Designs, and eventually, assign a Design to a SiteAccess. This is a powerful concept that we aim to use in our out-of-the-box templates and demo sites. It comes especially handy when using eZ Platform for a multisite installation and willing to reuse design parts. Further info can be found in the [Bundle documentation](https://github.com/ezsystems/ezplatform-design-engine/tree/master/doc).
 
 ![](newdesigntable.png)
 
@@ -91,7 +91,7 @@ Starting with 1.10, a new command `ezplatform:io:migrate-files` has been added
 
 ### eZ Platform Enterprise Edition - Studio Demo
 
--   [DEMO-102](https://issues.ibexa.co/browse/DEMO-102): [NovaeZSEOBundle](https://github.com/Novactive/NovaeZSEOBundle/) is now included in Studio Demo. NovaeZSEOBundle includes a new Field Type that lets you manage your SEO strategy in very advanced and powerful ways.
+-   [DEMO-102](https://issues.ibexa.co/browse/DEMO-102): [NovaeZSEOBundle](https://github.com/Novactive/NovaeZSEOBundle/) is now included in Studio Demo. NovaeZSEOBundle includes a new field type that lets you manage your SEO strategy in very advanced and powerful ways.
 -   [DEMO-100](https://issues.ibexa.co/browse/DEMO-100): We also improved the way we provide personalization in the site using a profiling block and letting the end user manage their preferences by themselves. In this new version, the end user, once logged on the site, can access a page where they can define their content preferences. See [here](https://ez.no/Blog/Personalization-Does-Not-Have-to-Be-that-Complex) for more information.
 
 ## Full list of new features, improvements and bug fixes since v1.9.0
diff --git a/docs/release_notes/ez_platform_v1.11.0.md b/docs/release_notes/ez_platform_v1.11.0.md
index 65d449ae64..db7752f8ec 100644
--- a/docs/release_notes/ez_platform_v1.11.0.md
+++ b/docs/release_notes/ez_platform_v1.11.0.md
@@ -10,10 +10,10 @@ If you're looking for the Long Term Support (LTS) release, see [https://ezplatfo
 
 ### eZ Platform
 
-#### Improved way of writing Field Type gateways
+#### Improved way of writing field type gateways
 
 [EZP-26885](https://issues.ibexa.co/browse/EZP-26885): you now have access to the Doctrine connection instead of
-the Zeta Components Database connection-like object which has been exposed to Field Types until now.
+the Zeta Components Database connection-like object which has been exposed to field types until now.
 Note that the former way will be removed in a future major version.
 
 #### Content type limitation for Relation (single) field
diff --git a/docs/release_notes/ez_platform_v1.12.0.md b/docs/release_notes/ez_platform_v1.12.0.md
index 5c5ae2ceaf..45b5133d86 100644
--- a/docs/release_notes/ez_platform_v1.12.0.md
+++ b/docs/release_notes/ez_platform_v1.12.0.md
@@ -88,7 +88,7 @@ To update to this version, follow the [updating guide](https://doc.ibexa.co/en/
 
     #### How to still use the old VCL and the old X-Location-Id headers
 
-    In all 1.x releases you will still be able to revert this and use the old deprecated system if you need to. To do that:
+    In all 1.x releases you are still able to revert this and use the old deprecated system if you need to. To do that:
     - Keep using the VCL for BAN
     - Disable _(comment out)_ `EzSystemsPlatformHttpCacheBundle` in `app/AppKernel.php`
     - Change `app/AppCache.php` back to extend `eZ\Bundle\EzPublishCoreBundle\HttpCache`
diff --git a/docs/release_notes/ez_platform_v1.13.0_lts.md b/docs/release_notes/ez_platform_v1.13.0_lts.md
index 832ce2a22d..1b2e320c3e 100644
--- a/docs/release_notes/ez_platform_v1.13.0_lts.md
+++ b/docs/release_notes/ez_platform_v1.13.0_lts.md
@@ -15,7 +15,7 @@
 
 The new Link manager enables you to manage all links to external websites that are embedded in the whole site,
 whether in Rich Text or in URL Field.
-You can edit a link in the manager and it will be updated automatically in all content items.
+You can edit a link in the manager and it's updated automatically in all content items.
 
 ![Link Manager](link_manager.png)
 
@@ -30,7 +30,7 @@ The maximum number of content items that can be copied this way can be set in co
 ### REST API improvements
 
 - [EZP-27752](https://issues.ibexa.co/browse/EZP-27752) adds a REST endpoint for deleting a translation from all versions of a content item.
-- [EZP-28253](https://issues.ibexa.co/browse/EZP-28253) adds a `fieldTypeIdentifier` field to the REST response for Version, which provides the Field Type.
+- [EZP-28253](https://issues.ibexa.co/browse/EZP-28253) adds a `fieldTypeIdentifier` field to the REST response for Version, which provides the field type.
 
 ### ezplatform-http-cache extensibility
 
diff --git a/docs/release_notes/ez_platform_v1.7.0_lts.md b/docs/release_notes/ez_platform_v1.7.0_lts.md
index b8a1b86e73..75eb67cf9b 100644
--- a/docs/release_notes/ez_platform_v1.7.0_lts.md
+++ b/docs/release_notes/ez_platform_v1.7.0_lts.md
@@ -9,7 +9,7 @@
 
 LTS Info
 
-eZ Platform Enterprise Edition v1.7.0 is the first version of the 2017 Long Term Support ("LTS") release which will be maintained and supported until December 2019.
+eZ Platform Enterprise Edition v1.7.0 is the first version of the 2017 Long Term Support ("LTS") release which is maintained and supported until December 2019.
 
 As of v1.7.0, PHP requirements have been updated to remove PHP 5.5, leaving PHP 5.6 and 7.0 as supported PHP versions.
 
@@ -20,7 +20,7 @@ With the LTS release, the [new product naming](http://ez.no/Blog/eZ-Announces-Na
 
 ### eZ Platform (Open Source)
 
--   **i18n! Internationalization of the eZ Platform** User Interface is now possible. The new system selects the language to use based on the browser settings of the end user. The system makes it possible to create translations for eZ Platform UI. Studio internationalization, as well as translations ready to use will be shipped in further releases. Community members are more than welcome to contribute to the translation process.
+-   **i18n! Internationalization of the eZ Platform** User Interface is now possible. The new system selects the language to use based on the browser settings of the end user. The system makes it possible to create translations for eZ Platform UI. Studio internationalization, as well as translations ready to use are shipped in further releases. Community members are more than welcome to contribute to the translation process.
     ![](i18n.png)
 
 <!-- -->
@@ -65,11 +65,11 @@ With the LTS release, the [new product naming](http://ez.no/Blog/eZ-Announces-Na
 
 ### eZ Platform Enterprise Edition (with Studio)
 
--   You can now use our eZ Personalization service to create highly personalized landing pages. The Studio **Personalization Block** available out of the box lets the editor simply create a block that will render a list of content items personalized to each and every visitor. The interface lets the editor decide which of the Personalization scenarios configured in the eZ Personalization back end should be used, as well as the template to be used for rendering.
+-   You can now use our eZ Personalization service to create highly personalized landing pages. The Studio **Personalization Block** available out of the box lets the editor simply create a block that renders a list of content items personalized to each and every visitor. The interface lets the editor decide which of the Personalization scenarios configured in the eZ Personalization back end should be used, as well as the template to be used for rendering.
 
 ![](personalizationblock.png)
 
--   You can now take advantage of the **Date-Based Publishing** feature – when editing a draft, instead of publishing the content immediately you can select the date and time at which it will be automatically published. All your content scheduled to be published are accessible in a dedicated widget on the dashboard.
+-   You can now take advantage of the **Date-Based Publishing** feature – when editing a draft, instead of publishing the content immediately you can select the date and time at which it's automatically published. All your content scheduled to be published are accessible in a dedicated widget on the dashboard.
 
 ![](future_publication_window.png)
 
@@ -77,7 +77,7 @@ With the LTS release, the [new product naming](http://ez.no/Blog/eZ-Announces-Na
 
 ![](form-builder-1.png)
 
-Submitted results can be previewed in the UI or downloaded in a CSV file, and a designated person will be notified of submissions by email.
+Submitted results can be previewed in the UI or downloaded in a CSV file, and a designated person is notified of submissions by email.
 
 ### Updated Demo Sites
 
diff --git a/docs/release_notes/ez_platform_v1.9.0.md b/docs/release_notes/ez_platform_v1.9.0.md
index e26543dcb4..7a6b366e13 100644
--- a/docs/release_notes/ez_platform_v1.9.0.md
+++ b/docs/release_notes/ez_platform_v1.9.0.md
@@ -14,7 +14,7 @@ If you're looking for the Long Term Support (LTS) release, see[ https://ezplatf
 
 #### Multifile upload
 
-You can now create collections of content quickly: upload multiple files in bulk and they will be imported directly into the content repository. The files will automatically be imported as content using the content type that matches their MIME type. Go to the content view, drag and drop or select multiple files in the sub-items area and you will get direct access for further editing. As ever, this solution can be customized so that you create your own matching rules.
+You can now create collections of content quickly: upload multiple files in bulk and they are imported directly into the content repository. The files are automatically imported as content using the content type that matches their MIME type. Go to the content view, drag and drop or select multiple files in the sub-items area and you get direct access for further editing. As ever, this solution can be customized so that you create your own matching rules.
 
 ![](catsfromtheMET.gif)
 
@@ -35,12 +35,12 @@ In version 1.8 we introduced a new Content Browser in the Universal Discovery Wi
 ![Sub-items table with Edit button and sorting](sub-items-improved.png "Sub-items table with Edit button and sorting")
 
 -   You can now restore from Trash content whose original Location has been deleted.
--   Pasted thead/tfood tags are now kept in RichText Field Type, and its Online Editor
+-   Pasted thead/tfood tags are now kept in RichText field type, and its Online Editor
 -   Solr 6 is now supported in [Solr Bundle](https://doc.ibexa.co/en/latest/guide/search/solr)
 
 ### eZ Platform Enterprise Edition - Studio
 
--   it's now possible to configure Landing Page blocks used by the Landing Page editor in a simpler way. The configuration is done in a YAML file (see <https://issues.ibexa.co/browse/EZEE-1421>)
+-   It's now possible to configure Landing Page blocks used by the Landing Page editor in a simpler way. The configuration is done in a YAML file (see <https://issues.ibexa.co/browse/EZEE-1421>)
 -   *..lots of other bug fixes and smaller improvements..*
 
 ### eZ Platform Enterprise Edition - Studio Demo
diff --git a/docs/release_notes/ez_platform_v2.1.0.md b/docs/release_notes/ez_platform_v2.1.0.md
index 304dab354b..71d10ccfa5 100644
--- a/docs/release_notes/ez_platform_v2.1.0.md
+++ b/docs/release_notes/ez_platform_v2.1.0.md
@@ -50,7 +50,7 @@ You can now change your password, or request a new one if you forgot it.
 
 !!! caution
 
-    The reaction time when requesting a reset of the password will vary depending on whether an account with the provided email exists in the database or not.
+    The reaction time when requesting a reset of the password is vary depending on whether an account with the provided email exists in the database or not.
     This could be misused to confirm existing email addresses.
     To avoid this, set Swift Mailer to `spool` mode.
 
@@ -66,9 +66,9 @@ You can now perform REST search via `POST /views` using custom `FieldCriterion`.
 
 ### Other UI improvements
 
-- When accessing the back office from a link to a specific content item, after logging in you will now be redirected to the proper content view.
-- In edit mode you can now preview content as it will look in any SiteAccess it's available in.
-- When you start editing a content item that already has an open draft, you will see a draft conflict screen:
+- When accessing the back office from a link to a specific content item, after logging in you are now redirected to the proper content view.
+- In edit mode you can now preview content as it looks in any SiteAccess it's available in.
+- When you start editing a content item that already has an open draft, you can see a draft conflict screen:
 
 ![Draft conflict window](draft_conflict.png)
 
diff --git a/docs/release_notes/ez_platform_v2.2.0.md b/docs/release_notes/ez_platform_v2.2.0.md
index 24c4da765a..16dada0406 100644
--- a/docs/release_notes/ez_platform_v2.2.0.md
+++ b/docs/release_notes/ez_platform_v2.2.0.md
@@ -27,7 +27,7 @@ This version introduces the **Page Builder** which replaces the Landing Page edi
 
 #### Modifying the Page content type
 
-You can edit the new Page content type by adding Fields, as well as create new content types with the Page Field Type.
+You can edit the new Page content type by adding Fields, as well as create new content types with the Page field type.
 
 ![Editing Fields in Page Builder](2.2_page_builder_edit_fields.png)
 
@@ -41,11 +41,11 @@ In the Page block config you can now specify the CSS class with its own style fo
 
     Refer to [Updating eZ Platform](https://doc.ibexa.co/en/2.5/updating/5_update_2.2) for a database update script.
 
-    To update to 2.2 with existing Content you will need a [dedicated script for converting the Landing Page into the new Page](https://doc.ibexa.co/en/2.5/updating/5_update_2.2/#migrate-landing-pages).
+    To update to 2.2 with existing Content you need a [dedicated script for converting the Landing Page into the new Page](https://doc.ibexa.co/en/2.5/updating/5_update_2.2/#migrate-landing-pages).
 
 ### Bookmarks
 
-Bookmark service allows you to create bookmarks for Locations by selecting a star located next to the content type name as shown in the screenshot below. Each Location can only be bookmarked once, multiple bookmarks on one Location will cause an error.
+Bookmark service allows you to create bookmarks for Locations by selecting a star located next to the content type name as shown in the screenshot below. Each Location can only be bookmarked once, multiple bookmarks on one Location cause an error.
 
 ![Bookmark](bookmark.png)
 
@@ -85,14 +85,14 @@ Database charset is changed from UTF8 to UTF8MB4, in order to support 4-byte cha
 
 ### URL generation pattern
 
-You can now select the pattern that will be used to generate URL patterns.
+You can now select the pattern that is used to generate URL patterns.
 
 See [URL alias patterns](https://doc.ibexa.co/en/2.5/guide/url_management/#url-alias-patterns) for more information about the available settings.
 
 !!! caution "Default URL generation pattern"
 
     The default URL generation pattern changes from `urlalias` to `urlalias_lowercase`.
-    This change will only apply to new Content.
+    This change only applies to new Content.
     Pay attention to the new `url_alias.slug_converter.transformation` setting in the meta-repository when updating your installation.
 
 ### Choosing installation types
diff --git a/docs/release_notes/ez_platform_v2.3.md b/docs/release_notes/ez_platform_v2.3.md
index acedbc1bab..40e0236e43 100644
--- a/docs/release_notes/ez_platform_v2.3.md
+++ b/docs/release_notes/ez_platform_v2.3.md
@@ -55,11 +55,11 @@
 
         You can also check user documentation on [forms](https://doc.ibexa.co/projects/userguide/en/2.5/creating_content_advanced/#forms)
 
-### ImageAsset Field Type
+### ImageAsset field type
 
 You can now create a single source media library with images that can be reused across the system.
 
-See [Reusing images](https://doc.ibexa.co/en/2.5/guide/images/#reusing-images) and [ImageAsset Field Type reference](https://doc.ibexa.co/en/2.5/api/field_types_reference/imageassetfield) for more information.
+See [Reusing images](https://doc.ibexa.co/en/2.5/guide/images/#reusing-images) and [ImageAsset field type reference](https://doc.ibexa.co/en/2.5/api/field_types_reference/imageassetfield) for more information.
 
 ![Set up multiple relations with image](2.3_image_asset.png)
 
@@ -76,7 +76,7 @@ You can now access and set user preferences in the user menu.
 
 ![User preferences screen with time zone settings](2.3_user_preferences.png)
 
-it's covered by the `user/preferences` policy.
+It's covered by the `user/preferences` policy.
 
 ### Dates in preferred timezone
 
diff --git a/docs/release_notes/ez_platform_v2.4.md b/docs/release_notes/ez_platform_v2.4.md
index 7c70ded955..218c5e7bfb 100644
--- a/docs/release_notes/ez_platform_v2.4.md
+++ b/docs/release_notes/ez_platform_v2.4.md
@@ -28,14 +28,14 @@
 
 ### RichText
 
-#### RichText Field Type
+#### RichText field type
 
-RichText Field Type has been extracted to a separate bundle, [ezsystems/ezplatform-richtext](https://github.com/ezsystems/ezplatform-richtext). Relying on any class from the `eZ\Publish\Core\FieldType\RichText` namespace is deprecated.
+RichText field type has been extracted to a separate bundle, [ezsystems/ezplatform-richtext](https://github.com/ezsystems/ezplatform-richtext). Relying on any class from the `eZ\Publish\Core\FieldType\RichText` namespace is deprecated.
 
 If you're implementing any interface or extending any base class from the old namespace, refer to its PHPDoc to see what to implement or extend instead.
 Make sure to enable the new eZ Platform RichTextBundle.
 
-See [RichText Field Type Reference](https://doc.ibexa.co/en/2.5/api/field_types_reference/richtextfield).
+See [RichText field type Reference](https://doc.ibexa.co/en/2.5/api/field_types_reference/richtextfield).
 
 #### RichText block
 
@@ -80,7 +80,7 @@ This possibility is available automatically when you have the target language co
 
 ![Content type with existing translations](2.4_content_type_translations.png "Available translation of a content type")
 
-When you translate Content of this type, the content type information will be displayed in the new language.
+When you translate Content of this type, the content type information is displayed in the new language.
 
 ![Editing a content translation with translated Field names](2.4_translated_ct.png)
 
@@ -146,7 +146,7 @@ The outdated Policy labels are now updated:
 
 This release introduces a few simplifications to API use for content types:
 
-- Exposes `content->getContentType()` for easier use, including from Twig as `content.contentType`. When iterating over the result set of content/Locations these will effectively be loaded all at once.
+- Exposes `content->getContentType()` for easier use, including from Twig as `content.contentType`. When iterating over the result set of content/Locations these are effectively loaded all at once.
 - Adds possibility to load several content types in bulk using `ContentTypeService->loadContentTypeList()`.
 - `UserService` now exposes `isUser()` and `isUserGroup()`. They do not need to do a lookup to the database in order to tell if a content item is of type user or user group.
 
diff --git a/docs/release_notes/ez_platform_v2.5.md b/docs/release_notes/ez_platform_v2.5.md
index 130805ae35..8a27b84898 100644
--- a/docs/release_notes/ez_platform_v2.5.md
+++ b/docs/release_notes/ez_platform_v2.5.md
@@ -16,7 +16,7 @@ description: eZ Platform v2.5 is the last Long Term Support release in the v2 li
 ### Content tree
 
 You can now navigate through your website with a content tree.
-It will allow you to easily browse your content in the back office.
+It allows you to easily browse your content in the back office.
 Each content item has a unique icon that helps you identify it without opening.
 
 ![Content tree in the menu](left_menu_tree.png "Content tree in the menu")
@@ -46,12 +46,12 @@ It uses a domain schema based on your content model.
 
 See [GraphQL documentation](https://graphql.org/) for more information about GraphQL in general.
 
-### Matrix Field Type
+### Matrix field type
 
-The new [Matrix Field Type](https://doc.ibexa.co/en/2.5/api/field_types_reference/matrixfield) enables you to store a table of data.
+The new [Matrix field type](https://doc.ibexa.co/en/2.5/api/field_types_reference/matrixfield) enables you to store a table of data.
 Columns in the matrix are defined in the Field definition.
 
-![Configuring a Matrix Field Type](2.5_matrix_ft.png)
+![Configuring a Matrix field type](2.5_matrix_ft.png)
 
 #### Migration of legacy XML format
 
@@ -95,7 +95,7 @@ You can now easily use [custom CK Editor plugins](https://doc.ibexa.co/en/2.5/gu
 ### Hiding and revealing content
 
 You can now hide and reveal content items from the back office.
-Hidden content will be unavailable on the front page regardless of permissions or [Location visibility](https://doc.ibexa.co/en/2.5/guide/content_management/#location-visibility).
+Hidden content is unavailable on the front page regardless of permissions or [Location visibility](https://doc.ibexa.co/en/2.5/guide/content_management/#location-visibility).
 
 ![Icon for hiding content](2.5_hide_content_icon.png)
 
@@ -132,7 +132,7 @@ This release introduced several back office improvements to facilitate editorial
 #### Content/Create policy for Users
 
 You can now define a 'Content/Create' policy for a User or a user group.
-It will enable or disable (if not set) the **Create** button in your dashboard.
+It enables or disables (if not set) the **Create** button in your dashboard.
 
 #### Universal Discovery Widget
 
@@ -202,7 +202,7 @@ It enables you to set up a cluster of Solr servers for highly available and faul
 
 #### Custom attributes
 
-it's now possible to add [custom data attributes and CSS classes](https://doc.ibexa.co/en/2.5/guide/extending/extending_online_editor/#custom-data-attributes-and-classes) to elements in the Online Editor.
+It's now possible to add [custom data attributes and CSS classes](https://doc.ibexa.co/en/2.5/guide/extending/extending_online_editor/#custom-data-attributes-and-classes) to elements in the Online Editor.
 
 #### Translatable custom tag choice attributes
 
diff --git a/docs/release_notes/ez_platform_v3.0.md b/docs/release_notes/ez_platform_v3.0.md
index e176f0de0e..e019113b01 100644
--- a/docs/release_notes/ez_platform_v3.0.md
+++ b/docs/release_notes/ez_platform_v3.0.md
@@ -117,20 +117,20 @@ New functionalities and changes include:
 
 For full list of changes, see [Backwards compatibility doc](https://doc.ibexa.co/en/latest/releases/ez_platform_v3.0_deprecations/#universal-discovery-widget) and [Configuration](https://doc.ibexa.co/en/latest/extending/extending_udw/#configuration).
 
-### Field Types
+### Field types
 
-#### Content query Field Type
+#### Content query field type
 
-The new [Content query Field Type](https://doc.ibexa.co/en/latest/api/field_types_reference/contentqueryfield)
-enables you to configure a Content query that will use parameters from a Field definition.
+The new [Content query field type](https://doc.ibexa.co/en/latest/api/field_types_reference/contentqueryfield)
+enables you to configure a Content query that uses parameters from a Field definition.
 
-#### Field Type creation
+#### Field type creation
 
-You can now use [Generic Field Type](https://doc.ibexa.co/en/latest/extending/extending_field_type) as a template for your custom Field Types.
+You can now use [Generic field type](https://doc.ibexa.co/en/latest/extending/extending_field_type) as a template for your custom field types.
 
-#### Keyword Field Type
+#### Keyword field type
 
-The `keyword` Field Type can now recognize versions of a content item.
+The `keyword` field type can now recognize versions of a content item.
 
 ### Login and password options
 
@@ -237,14 +237,14 @@ For a full list of changes this entails, see [Backwards compatibility doc](https
 
 New helper method `window.eZ.helpers.contentType.getContentTypeName` replaces deprecated `ContentTypeNames`.
 
-### User Field Type
+### User field type
 
 User data is now treated as an external storage.
 
 ### SiteAccess-aware Repository
 
 The Repository now uses the SiteAccess-aware layer by default.
-This means that Repository objects will now be loaded in the translation corresponding to the SiteAccess.
+This means that Repository objects are now loaded in the translation corresponding to the SiteAccess.
 
 ### REST API
 
@@ -273,11 +273,11 @@ For full list of deprecations and removals, see  [eZ Platform v3.0 deprecations
 SignalSlots are removed from the application.
 Use [Event Listeners](https://symfony.com/doc/5.0/event_dispatcher.html) in your code instead.
 
-### Deprecated Field Types
+### Deprecated field types
 
-The deprecated `ezprice` and `ezpage` Field Types have been removed.
+The deprecated `ezprice` and `ezpage` field types have been removed.
 Nameable field type interface has been removed and replaced by `eZ\Publish\SPI\FieldType\FieldType::getName`.
-For a full list of changes on Field Types, see [Backwards compatibility doc](https://doc.ibexa.co/en/latest/releases/ez_platform_v3.0_deprecations/#field-types).
+For a full list of changes on field types, see [Backwards compatibility doc](https://doc.ibexa.co/en/latest/releases/ez_platform_v3.0_deprecations/#field-types).
 
 ### Elastic Search
 
diff --git a/docs/release_notes/ez_platform_v3.0_deprecations.md b/docs/release_notes/ez_platform_v3.0_deprecations.md
index c2ceee29e8..d37251e092 100644
--- a/docs/release_notes/ez_platform_v3.0_deprecations.md
+++ b/docs/release_notes/ez_platform_v3.0_deprecations.md
@@ -42,9 +42,9 @@ Following the upgrade to Symfony 5, the DFS IO handler must be configured in a d
 
 For more information, see the Doctrine connection configuration example in the [Clustering](https://doc.ibexa.co/en/latest/guide/clustering/#configuring-the-dfs-io-handler) article.
 
-## Field Types
+## Field types
 
-The following tags used to register Field Type features in the [service container](https://doc.ibexa.co/en/latest/api/public_php_api/#service-container) have been renamed:
+The following tags used to register field type features in the [service container](https://doc.ibexa.co/en/latest/api/public_php_api/#service-container) have been renamed:
 
 |Former name|New name|
 |-----------|--------|
@@ -69,7 +69,7 @@ The following classes and namespaces have been deprecated and dropped:
 - `eZ\Publish\SPI\FieldType\Event`
 - `eZ\Publish\SPI\FieldType\Events\**`
 
-Deprecated `ezprice` and `ezpage` Field Types have been removed.
+Deprecated `ezprice` and `ezpage` field types have been removed.
 
 ## Configuration through `ezplatform`
 
@@ -495,15 +495,15 @@ Use:
 Experimental, deprecated and unsupported code for Elastic Search 1.4.2 has been dropped from kernel,
 to be replaced with a dedicated bundle for the latest Elastic version in the future.
 
-### Field Types
+### Field types
 
 #### Star Rating
 
-The unused `ezsrrating` Field Type has been removed along with the related database storage and clean installation entries.
+The unused `ezsrrating` field type has been removed along with the related database storage and clean installation entries.
 
 #### RichText
 
-The `ezrichtext` Field Type has been removed from `ezplatform-kernel`.
+The `ezrichtext` field type has been removed from `ezplatform-kernel`.
 Use [`ezplatform-richtext`](https://github.com/ezsystems/ezplatform-richtext) instead.
 
 Following this change:
@@ -549,7 +549,7 @@ The following deprecated (since v6.11) Legacy Storage Gateways have been removed
 - `eZ\Publish\Core\FieldType\User\UserStorage\Gateway\LegacyStorage`
 
 Use `DoctrineStorage` Gateways from the same namespace instead.
-The removed classes refer to External Storage for core Field Types only.
+The removed classes refer to External Storage for core field types only.
 
 ### REST server
 
@@ -561,7 +561,7 @@ Transfer of REST code from kernel to a separate package results in the following
 ### SiteAccess-aware Repository
 
 The Repository now uses the SiteAccess-aware layer by default.
-This means Repository objects will now be loaded in the translation corresponding to the SiteAccess.
+This means Repository objects are now loaded in the translation corresponding to the SiteAccess.
 To load an object with all its translations, explicitly pass `eZ\Publish\API\Repository\Values\Content\Language::ALL`
 as the prioritized languages list.
 
@@ -759,7 +759,7 @@ Insecure password hash types deprecated since v1.13 have been removed:
 - `PASSWORD_HASH_MD5_SITE`
 - `PASSWORD_HASH_PLAINTEXT`
 
-Login with the removed hashes will no longer work.
+Login with the removed hashes doesn't longer work.
 Users can request a new, valid password using the "Forgot password" feature.
 
 ### Strict types for PHP API
@@ -787,9 +787,9 @@ public function handle(CriteriaConverter $converter, QueryBuilder $query, Criter
 have been removed.
 Inject `\Doctrine\DBAL\Connection` via `ezpublish.persistence.connection` instead.
 
-#### Field Type External Storage Handlers
+#### Field type External Storage Handlers
 
-The Field Type External Storage Handlers `$context` arrays no longer have the "connection" key.
+The field type External Storage Handlers `$context` arrays no longer have the "connection" key.
 You should rely on injected Connection instead.
 
 The `$context` array of `\eZ\Publish\SPI\FieldType\FieldStorage` methods (`storeFieldData`,
@@ -844,7 +844,7 @@ For details, see [code cleanup in kernel](#code-cleanup-in-ez-platform-kernel).
 
 ### Input and output converters
 
-Following the removal of the `ezrichtext` Field Type from kernel, the following deprecated converter tags have been changed:
+Following the removal of the `ezrichtext` field type from kernel, the following deprecated converter tags have been changed:
 
 |Formerly|Currently|
 |--------|---------|
@@ -940,7 +940,7 @@ The following locations have been changed:
 
 Forms for content creation have been moved to a new `ezplatform-content-forms` package.
 
-`repository-forms` remains as an additional layer ensuring that your custom implementations that use the package will still work.
+`repository-forms` remains as an additional layer ensuring that your custom implementations that use the package still work.
 To use this repository, you have to add the package manually to your `composer.json`.
 
 ## eZ Platform v3.0.2
diff --git a/docs/release_notes/ibexa_dxp_v3.3.md b/docs/release_notes/ibexa_dxp_v3.3.md
index 819ec3dade..33ae9b648e 100644
--- a/docs/release_notes/ibexa_dxp_v3.3.md
+++ b/docs/release_notes/ibexa_dxp_v3.3.md
@@ -65,7 +65,7 @@ You can now use the following new PHP API methods:
 
 ### Query Field Location handling
 
-The [Query Field Type](https://doc.ibexa.co/en/3.3/guide/content_rendering/queries_and_controllers/content_queries/#content-query-field) now enables getting results for the current Location of a content item.
+The [Query field type](https://doc.ibexa.co/en/3.3/guide/content_rendering/queries_and_controllers/content_queries/#content-query-field) now enables getting results for the current Location of a content item.
 
 ## Deprecations
 
diff --git a/docs/release_notes/ibexa_dxp_v4.1.md b/docs/release_notes/ibexa_dxp_v4.1.md
index 60a61fc807..bf7956c4dc 100644
--- a/docs/release_notes/ibexa_dxp_v4.1.md
+++ b/docs/release_notes/ibexa_dxp_v4.1.md
@@ -1,5 +1,5 @@
 ---
-description: Ibexa DXP v4.1 enhances the PIM capabilities, adds a Measurement Field Type and attribute and a Dynamic Targeting block for the Page Builder.
+description: Ibexa DXP v4.1 enhances the PIM capabilities, adds a Measurement field type and attribute and a Dynamic Targeting block for the Page Builder.
 ---
 <!-- vale VariablesVersion = NO -->
 
@@ -26,9 +26,9 @@ A new Color attribute enables adding a product attribute that uses the color pic
 
 The product catalog is now fully integrated with the transactional system integration, enabling a full purchasing process.
   
-### Measurement Field Type and attribute
+### Measurement field type and attribute
 
-With the new Measurement Field Type users can now add a Measurement Field, with different pre-built units, to content:
+With the new Measurement field type users can now add a Measurement Field, with different pre-built units, to content:
 
 ![Adding a Measurement Field to content type definition](4.1_measurement_ft.png)
 
diff --git a/docs/release_notes/ibexa_dxp_v4.2.md b/docs/release_notes/ibexa_dxp_v4.2.md
index 69dc273bc7..105b6fdc2b 100644
--- a/docs/release_notes/ibexa_dxp_v4.2.md
+++ b/docs/release_notes/ibexa_dxp_v4.2.md
@@ -100,16 +100,16 @@ For more information, see [Product categories](https://doc.ibexa.co/projects/use
 If a recommendation scenario has more than one content type configured, with cross-content type (CCT) parameter in the request,
 you can now get recommendations for all these content types.
 
-### Taxonomy Field Type
+### Taxonomy field type
 
-Taxonomy is now [configured with a Field Type](https://doc.ibexa.co/projects/userguide/en/latest/taxonomy/#add-tag),
+Taxonomy is now [configured with a field type](https://doc.ibexa.co/projects/userguide/en/latest/taxonomy/#add-tag),
 so you can use many Fields to add different taxonomy categories, for example, tags and product categories in the same content type.
 
-### Address Field Type
+### Address field type
 
-With the [new Address Field Type](https://doc.ibexa.co/en/latest/content_management/field_types/field_type_reference/addressfield), you can now customize address Fields and configure them per country.
+With the [new Address field type](https://doc.ibexa.co/en/latest/content_management/field_types/field_type_reference/addressfield), you can now customize address Fields and configure them per country.
 
-![Address Field Type](4.2_address_field_type.png)
+![Address field type](4.2_address_field_type.png)
 
 ### Repeatable migration steps
 
@@ -228,8 +228,7 @@ a `SegmentGroup` and `Segment` objects respectively, instead of numerical IDs.
 ### Ibexa CDP
 
 [[= product_name_base =]] Customer Data Center allows you to collect, connect and organize customer data from multiple sources.
-You can use them to build segments that will allow you to create personalized customer
-experience for your brand.
+You can use them to build segments that allow you to create personalized customer experience for your brand.
 
 This is a standalone package that you can install along every product edition (Content, Experience, Commerce).
 [[= product_name_cdp =]] is also compatible with [[= product_name_base =]] v3.3.
diff --git a/docs/release_notes/ibexa_dxp_v4.4.md b/docs/release_notes/ibexa_dxp_v4.4.md
index 9a1b036127..56efb3d45e 100644
--- a/docs/release_notes/ibexa_dxp_v4.4.md
+++ b/docs/release_notes/ibexa_dxp_v4.4.md
@@ -43,7 +43,7 @@ For more information, see [Commerce](https://doc.ibexa.co/en/4.4/commerce/commer
 
 Another addition is the Storefront package that provides a starting kit 
 for the developers.
-it's a working set of components, which you can use to test the new capabilities, 
+It's a working set of components, which you can use to test the new capabilities, 
 and then customize and extend to create your own implementation of a web store.
 
 For more information, see [Storefront](https://doc.ibexa.co/en/4.4/commerce/storefront/storefront).
@@ -109,8 +109,7 @@ The Flysystem Adapter implementation now supports dynamic paths
 described by complex settings resolvable for the SiteAccess context.
 For more information, see [Configuring the DFS IO handler](https://doc.ibexa.co/en/4.4/infrastructure_and_maintenance/clustering/clustering/#configuring-the-dfs-io-handler).
 
-If your custom project relies directly on a Flysystem features instead of using our IO abstraction,
-it will require an upgrade as well,
+If your custom project relies directly on a Flysystem features instead of using our IO abstraction, it requires an upgrade as well,
 using [these instructions](https://flysystem.thephpleague.com/docs/upgrade-from-1.x/).
 
 ### Dedicated migration type for Corporate Accounts
diff --git a/docs/release_notes/ibexa_dxp_v4.5.md b/docs/release_notes/ibexa_dxp_v4.5.md
index ce61836d76..358f352969 100644
--- a/docs/release_notes/ibexa_dxp_v4.5.md
+++ b/docs/release_notes/ibexa_dxp_v4.5.md
@@ -88,7 +88,7 @@ For more information, see [Translation comparison](https://doc.ibexa.co/projects
 
 ### Page Builder for B2B portals [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
-With this release, you will be able to use Page Builder to create custom Customer Portals for your clients.
+With this release, you are able to use Page Builder to create custom Customer Portals for your clients.
 With new Sales rep page block and using all available blocks from the original Page Builder, you can create a unique experience for each customer group.
 Additionally, you can assign each customer group to a specific Customer Portal or create an availability hierarchy based on rules and configuration.
 
diff --git a/docs/resources/contributing/contribute_translations.md b/docs/resources/contributing/contribute_translations.md
index 16d1b4a6d8..569e5191fe 100644
--- a/docs/resources/contributing/contribute_translations.md
+++ b/docs/resources/contributing/contribute_translations.md
@@ -14,7 +14,7 @@ You can use an XLIFF editor of your choice to contribute strings in your languag
 If you wish to contribute to an existing translation of back office or start a new one you can
 use the Crowdin website.
 
-Visit [[[= product_name =]]'s Crowdin page](https://crowdin.com/project/ibexa-dxp), choose a language, and you will see a list of files containing strings. Here you can suggest your translations.
+Visit [[[= product_name =]]'s Crowdin page](https://crowdin.com/project/ibexa-dxp), choose a language, and you can see a list of files containing strings. Here you can suggest your translations.
 
 If the language you want to translate to is not available, you can ask for it to be added in the [Crowdin discussion forum for [[= product_name =]]](https://crowdin.com/project/ibexa-dxp/discussions).
 
diff --git a/docs/resources/contributing/report_and_follow_issues.md b/docs/resources/contributing/report_and_follow_issues.md
index 750315e5ea..f6bc88de66 100644
--- a/docs/resources/contributing/report_and_follow_issues.md
+++ b/docs/resources/contributing/report_and_follow_issues.md
@@ -30,7 +30,7 @@ Click **Create** at the top of the bugtracker window and fill in the following f
 |**Issue type**|Choose **Bug** or **Improvement** depending on what you're reporting, do not use other issue types (they're for internal use only).|
 |**Summary**|Write a short sentence describing what you're reporting.|
 |**Priority**|Select the priority you consider the issue to be. Please try to keep a cool head while selecting it. A 1 pixel alignment bug is not a "blocker".|
-|**Component/s**|This is important, as it will make your issue appear on the radar (dashboards, filters) of people dealing with various parts of Ibexa projects.|
+|**Component/s**|This is important, as it makes your issue appear on the radar (dashboards, filters) of people dealing with various parts of Ibexa projects.|
 |**Affect version/s**|Add the versions of the application you experienced the issue on.|
 |**Assignee**|Leave blank, unless you're willing to work on the issue yourself.|
 |**Reporter**|Leave as is (yourself).|
diff --git a/docs/resources/new_in_doc.md b/docs/resources/new_in_doc.md
index 4c39a6bb0b..6d0093ab8b 100644
--- a/docs/resources/new_in_doc.md
+++ b/docs/resources/new_in_doc.md
@@ -120,7 +120,7 @@ This page contains recent highlights and notable changes in [[= product_name =]]
 
 ### Content management
 
-- Updated [BinaryFile Field Type](https://doc.ibexa.co/en/master/content_management/field_types/field_type_reference/binaryfilefield/) description
+- Updated [BinaryFile field type](https://doc.ibexa.co/en/master/content_management/field_types/field_type_reference/binaryfilefield/) description
 
 ### Commerce
 
@@ -530,8 +530,8 @@ and [shipping method PHP API](https://doc.ibexa.co/en/master/commerce/shipping_m
 - [Order management API](https://doc.ibexa.co/en/master/commerce/order_management/order_management_api/)
 - [Customizing checkout](https://doc.ibexa.co/en/master/commerce/checkout/customize_checkout/)
 - Extended [table reusable component documentation](https://doc.ibexa.co/en/master/administration/back_office/back_office_elements/reusable_components/#tables)
-- How to [add GraphQL support to custom Field Types](https://doc.ibexa.co/en/master/api/graphql/graphql_custom_ft/)
-- How to [customize Field Type metadata](https://doc.ibexa.co/en/master/content_management/field_types/customize_field_type_metadata/)
+- How to [add GraphQL support to custom field types](https://doc.ibexa.co/en/master/api/graphql/graphql_custom_ft/)
+- How to [customize field type metadata](https://doc.ibexa.co/en/master/content_management/field_types/customize_field_type_metadata/)
 
 ## February 2023
 
@@ -567,4 +567,4 @@ as well as [checkout-related Twig functions](https://doc.ibexa.co/en/master/temp
 ### Other
 
 - [Fastly Image Optimizer](https://doc.ibexa.co/en/master/content_management/images/fastly_io/)
-- [Storing Field Type settings externally](https://doc.ibexa.co/en/master/content_management/field_types/field_type_storage/#storing-field-type-settings-externally)
+- [Storing field type settings externally](https://doc.ibexa.co/en/master/content_management/field_types/field_type_storage/#storing-field-type-settings-externally)
diff --git a/docs/resources/phpstorm_plugin.md b/docs/resources/phpstorm_plugin.md
index 8ca61e4caa..840297dc7d 100644
--- a/docs/resources/phpstorm_plugin.md
+++ b/docs/resources/phpstorm_plugin.md
@@ -88,11 +88,11 @@ The plugin provides the following built-in file templates:
 | Command | Symfony command that uses content repository |
 | Composite Criterion | Criterion class based on `\Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\CompositeCriterion` |
 | Field definition form mapper | Class implementing `Ibexa\AdminUi\FieldType\FieldDefinitionFormMapperInterface` |
-| Field Type | Field Type class based on `Ibexa\Contracts\Core\FieldType\Generic\Type` |
-| Field Type Comparable | Class implementing `Ibexa\Contracts\VersionComparison\FieldType\Comparable` |
-| Field Type Indexable | Class implementing `Ibexa\Contracts\Core\FieldType\Indexable` |
+| Field type | Field type class based on `Ibexa\Contracts\Core\FieldType\Generic\Type` |
+| Field type Comparable | Class implementing `Ibexa\Contracts\VersionComparison\FieldType\Comparable` |
+| Field type Indexable | Class implementing `Ibexa\Contracts\Core\FieldType\Indexable` |
 | Field value form mapper | Class implementing `Ibexa\Contracts\ContentForms\FieldType\FieldValueFormMapperInterface` |
-| Field value object | Field Type value class |
+| Field value object | Field type value class |
 | Installer Provisioner | Class implementing `\Ibexa\Installer\Provisioner\ProvisionerInterface`  |
 | Menu configuration event subscriber | Event subscriber for `Ibexa\AdminUi\Menu\Event\ConfigureMenuEvent::MAIN_MENU`  |
 | Policy provider | Class implementing `Ibexa\Bundle\Core\DependencyInjection\Security\PolicyProvider\PolicyProviderInterface` |
@@ -244,7 +244,7 @@ For example, when plugin detects deprecated configuration key usage, it marks th
 
 ## Known issues
 
-it's not possible to create new project with Docker as PHP remote interpreter.
+It's not possible to create new project with Docker as PHP remote interpreter.
 See [related JetBrains issue](https://youtrack.jetbrains.com/issue/WI-61330) for more details.
 
 ## Feedback
diff --git a/docs/search/criteria_reference/field_criterion.md b/docs/search/criteria_reference/field_criterion.md
index 3ab4817708..bf4e91a61b 100644
--- a/docs/search/criteria_reference/field_criterion.md
+++ b/docs/search/criteria_reference/field_criterion.md
@@ -11,7 +11,7 @@ searches for content based on the content of one of its Fields.
 
 The `LIKE` operator works together with wildcards (`*`). Without a wildcards its results are the same as for the `EQ` operator.
 
-The `CONTAINS` operator works with collection Fields like the Country Field Type,
+The `CONTAINS` operator works with collection Fields like the Country field type,
 enabling you to retrieve results when the query value is one of the values of the collection.
 Querying for a collection with the `EQ` operator returns result only when the whole collection equals the query values.
 
diff --git a/docs/search/criteria_reference/fulltext_criterion.md b/docs/search/criteria_reference/fulltext_criterion.md
index 49d9afc181..89565586c0 100644
--- a/docs/search/criteria_reference/fulltext_criterion.md
+++ b/docs/search/criteria_reference/fulltext_criterion.md
@@ -83,7 +83,7 @@ Assume the following search query:
 $query->query = new Criterion\FullText('(cup AND ba*ball) "breaking news"');
 ```
 
-It will return content containing phrases such as "Breaking news", "Baseball world cup", "Basketball cup",
+It returns content containing phrases such as "Breaking news", "Baseball world cup", "Basketball cup",
 or "Breaking news: Baseball world cup victory".
 
-It will not return content with phrases such as "Football world cup" or "Breaking sports news".
+It doesn't return content with phrases such as "Football world cup" or "Breaking sports news".
diff --git a/docs/search/criteria_reference/isfieldempty_criterion.md b/docs/search/criteria_reference/isfieldempty_criterion.md
index fe78949a9e..2f3c82456a 100644
--- a/docs/search/criteria_reference/isfieldempty_criterion.md
+++ b/docs/search/criteria_reference/isfieldempty_criterion.md
@@ -13,7 +13,7 @@ or non-empty Fields (`false`)
 
 The `IsFieldEmpty` Criterion is not available in [Repository filtering](search_api.md#repository-filtering).
 
-The Richtext Field Type (`ezrichtext`) is not searchable in the Legacy search engine.
+The Richtext field type (`ezrichtext`) is not searchable in the Legacy search engine.
 
 ## Example
 
diff --git a/docs/search/criteria_reference/matchall_criterion.md b/docs/search/criteria_reference/matchall_criterion.md
index 1c65cbbf5f..39bebd7092 100644
--- a/docs/search/criteria_reference/matchall_criterion.md
+++ b/docs/search/criteria_reference/matchall_criterion.md
@@ -2,6 +2,6 @@
 
 The [`MatchAll` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-MatchAll.html)
 is an auxiliary Criterion that returns all search results.
-it's used internally when no filter or query is provided on a Query object.
+It's used internally when no filter or query is provided on a Query object.
 
 The Criterion takes no arguments.
diff --git a/docs/search/criteria_reference/matchnone_criterion.md b/docs/search/criteria_reference/matchnone_criterion.md
index 350ccc09a2..5af5e069d6 100644
--- a/docs/search/criteria_reference/matchnone_criterion.md
+++ b/docs/search/criteria_reference/matchnone_criterion.md
@@ -2,6 +2,6 @@
 
 The [`MatchNone` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-MatchNone.html)
 is an auxiliary Criterion that returns no search results.
-it's used internally when no filter or query is provided on a Query object.
+It's used internally when no filter or query is provided on a Query object.
 
 The Criterion takes no arguments.
diff --git a/docs/search/criteria_reference/search_criteria_reference.md b/docs/search/criteria_reference/search_criteria_reference.md
index 86e38fa9e4..be07642c2b 100644
--- a/docs/search/criteria_reference/search_criteria_reference.md
+++ b/docs/search/criteria_reference/search_criteria_reference.md
@@ -17,7 +17,7 @@ Criteria can take some of the following arguments:
 Support and capabilities of individual Criteria can depend on the search engine.
 
 In the Legacy search engine, the field index/sort key column is limited to 255 characters by design.
-Due to this storage limitation, searching content using the Country Field Type or Keyword when there are multiple values selected may not return all the expected results.
+Due to this storage limitation, searching content using the Country field type or Keyword when there are multiple values selected may not return all the expected results.
 
 ## Search Criteria
 
diff --git a/docs/search/criteria_reference/visibility_criterion.md b/docs/search/criteria_reference/visibility_criterion.md
index 9d64656a48..9fe2765dec 100644
--- a/docs/search/criteria_reference/visibility_criterion.md
+++ b/docs/search/criteria_reference/visibility_criterion.md
@@ -6,7 +6,7 @@ searches for content based on whether it's visible or not.
 This Criterion takes into account both hiding content and hiding Locations.
 
 When used with Content Search, the Criterion takes into account all assigned Locations.
-This means that hidden content will be returned if it has at least one visible Location.
+This means that hidden content is returned if it has at least one visible Location.
 Use Location Search to avoid this.
 
 ## Arguments
diff --git a/docs/search/extensibility/create_custom_aggregation.md b/docs/search/extensibility/create_custom_aggregation.md
index 83202e3087..158ab68f94 100644
--- a/docs/search/extensibility/create_custom_aggregation.md
+++ b/docs/search/extensibility/create_custom_aggregation.md
@@ -44,7 +44,7 @@ An aggregation can also implement one of the following interfaces:
     An aggregation definition must contain at least the name of an aggregation 
     and optional aggregation parameters, such as, for example, the path (string) 
     that is used to limit aggregation results to a specific subtree, Content 
-    Type identifier, or Field definition identifier, which will be mapped 
+    Type identifier, or Field definition identifier, which is mapped 
     to the search index field name.
     
     Aggregation definition must be independent of the search engine used.
diff --git a/docs/search/search_api.md b/docs/search/search_api.md
index e090f06d97..13b8c6e722 100644
--- a/docs/search/search_api.md
+++ b/docs/search/search_api.md
@@ -71,7 +71,7 @@ It affects default sorting if no Sort Clause is used.
 As such, `query` is recommended when the search is based on user input.
 
 The difference between `query` and `filter` is only relevant when using Solr or Elasticsearch search engine.
-With the Legacy search engine both properties will give identical results.
+With the Legacy search engine both properties give identical results.
 
 #### Processing large result sets
 
@@ -183,7 +183,7 @@ $filter
 !!! tip
 
     it's recommended to use an IDE that can recognize type hints when working with Repository Filtering.
-    If you try to use an unsupported Criterion or Sort Clause, the IDE will indicate an issue.
+    If you try to use an unsupported Criterion or Sort Clause, the IDE indicates an issue.
 
 ## Searching in a controller
 
@@ -285,7 +285,7 @@ $query->filter = new Criterion\LogicalAnd([
 The query searches for Location B using the [`LocationId` Criterion](locationid_criterion.md),
 and for visible content using the [`Visibility` Criterion](visibility_criterion.md).
 
-Even though the Location B is hidden, the query will find the content because both conditions are satisfied:
+Even though the Location B is hidden, the query finds the content because both conditions are satisfied:
 
 - the content item has Location B
 - the content item is visible (it has the visible Location A)
@@ -324,7 +324,7 @@ For a list of supported Criteria and Sort Clauses, see [Search in trash referenc
 !!! caution
 
     Make sure that you set the Criterion on the `filter` property.
-    it's impossible to use the `query` property, because the search in trash operation filters the database instead of querying.
+    It's impossible to use the `query` property, because the search in trash operation filters the database instead of querying.
 
 ## Aggregation
 
@@ -387,7 +387,7 @@ $query->aggregations[] = new IntegerRangeAggregation('range', 'person', 'age',
 !!! note
 
     The beginning of the range is included and the end is excluded,
-    so a range between 1 and 30 will include value `1`, but not `30`.
+    so a range between 1 and 30 includes value `1`, but not `30`.
     
     `null` means that a range does not have an end.
     In the example all values above (and including) 60 are included in the last range.
diff --git a/docs/search/search_criteria_and_sort_clauses.md b/docs/search/search_criteria_and_sort_clauses.md
index 428ef1b899..55bd4c5a3a 100644
--- a/docs/search/search_criteria_and_sort_clauses.md
+++ b/docs/search/search_criteria_and_sort_clauses.md
@@ -13,14 +13,14 @@ For an example of how to use and combine Criteria and Sort Clauses, refer to [Se
 
 As Search Criteria and Sort Clauses are value objects which are used to define the query from API perspective, they're common for all storage engines.
 Each storage engine needs to implement its own handlers for the corresponding Criterion and Sort Clause value object,
-which will be used to translate the value object into a storage-specific search query.
+which are used to translate the value object into a storage-specific search query.
 
 As an example take a look at the [`ContentId` Criterion handler](https://github.com/ibexa/core/blob/main/src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/ContentId.php) in Legacy search engine
 or [`ContentId` Criterion handler](https://github.com/ibexa/solr/blob/main/src/lib/Query/Common/CriterionVisitor/ContentIdIn.php) in Solr search engine.
 
 ## Custom Criteria and Sort Clauses
 
-Sometimes you will find that standard Search Criteria and Sort Clauses provided with [[= product_name =]] are not sufficient for your needs. Most often this will be the case if you have a custom Field Type using external storage which cannot be searched using the standard Field Criterion.
+Sometimes you can find that standard Search Criteria and Sort Clauses provided with [[= product_name =]] are not sufficient for your needs. Most often this is the case if you have a custom field type using external storage which cannot be searched using the standard Field Criterion.
 
 !!!note
 
@@ -47,7 +47,7 @@ Each type has dedicated methods in the Search Service:
 | Content        | `findSingle()`           |
 | Location       | `findLocations()`        |
 
-All Criteria and Sort Clauses will be accepted with Location Search, but not all of them can be used with Content Search.
+All Criteria and Sort Clauses are accepted with Location Search, but not all of them can be used with Content Search.
 The reason for this is that while one Location always has exactly one content item, one content item can have multiple Locations.
 In this context some Criteria and Sort Clauses would produce ambiguous queries that would not be accepted by Content Search.
 
@@ -58,7 +58,7 @@ Content Search explicitly refuses to accept Criteria and Sort Clauses implementi
 
 ### Configuring custom Criterion and Sort Clause handlers
 
-After you have implemented your Criterion / Sort Clause and its handler, you will need to configure the handler for the [service container](php_api.md#service-container) by using dedicated service tags for each type of search. Doing so will automatically register it and handle your Criterion / Search Clause when it's given as a parameter to one of the Search Service methods.
+After you have implemented your Criterion / Sort Clause and its handler, you need to configure the handler for the [service container](php_api.md#service-container) by using dedicated service tags for each type of search. Doing so automatically registers it and handle your Criterion / Search Clause when it's given as a parameter to one of the Search Service methods.
 
 Available tags for Criterion handlers in Legacy Storage Engine are:
 
@@ -72,7 +72,7 @@ Available tags for Sort Clause handlers in Legacy Storage Engine are:
 
 !!! note
 
-    You will find all the native handlers and the tags for the Legacy Storage Engine in files located in `core/src/lib/Resources/settings/storage_engines/`.
+    You can find all the native handlers and the tags for the Legacy Storage Engine in files located in `core/src/lib/Resources/settings/storage_engines/`.
 
 !!! tip
 
diff --git a/docs/search/search_engines/elastic_search/configure_elastic_search.md b/docs/search/search_engines/elastic_search/configure_elastic_search.md
index ae4fc839e6..395457fe38 100644
--- a/docs/search/search_engines/elastic_search/configure_elastic_search.md
+++ b/docs/search/search_engines/elastic_search/configure_elastic_search.md
@@ -332,12 +332,12 @@ By default, debugging is disabled. To enable debugging, you can toggle either of
 
     Make sure that you disable debugging in a production environment.
 
-## Define Field Type mapping templates
+## Define field type mapping templates
 
 Before you can re-index the [[= product_name =]] data, so that Elasticsearch can search through its contents, you must define an index template.
 Templates instruct Elasticsearch to recognize [[= product_name =]] Fields as specific data types, based on, for example, a field name.
 They help you prevent Elasticsearch from using the dynamic field mapping feature to create type mappings automatically.
-You can create several Field Type mapping templates for each index, for example, to define settings that are specific for different languages.
+You can create several field type mapping templates for each index, for example, to define settings that are specific for different languages.
 When you establish a relationship between a field mapping template and a connection, you can apply several templates, too.
 
 ### Define a template
diff --git a/docs/search/search_engines/elastic_search/install_elastic_search.md b/docs/search/search_engines/elastic_search/install_elastic_search.md
index afb27ba794..9d31f97254 100644
--- a/docs/search/search_engines/elastic_search/install_elastic_search.md
+++ b/docs/search/search_engines/elastic_search/install_elastic_search.md
@@ -66,7 +66,7 @@ All configuration is made in the `/config/packages/ibexa_elasticsearch.yaml` fil
 First, decide how [[= product_name =]] connects to Elasticsearch and configure other connection settings.
 For more information, see [Configuring connections](configure_elastic_search.md#configure-connections).
 
-Then, define a Field Type mappings template that instructs Elasticsearch to interpret [[= product_name =]] fields as specific types. For more information, see [Configuring Field Type mappings](configure_elastic_search.md#define-field-type-mapping-templates).
+Then, define a field type mappings template that instructs Elasticsearch to interpret [[= product_name =]] fields as specific types. For more information, see [Configuring field type mappings](configure_elastic_search.md#define-field-type-mapping-templates).
 
 ## Push the templates
 
diff --git a/docs/search/search_engines/solr_search_engine/configure_solr.md b/docs/search/search_engines/solr_search_engine/configure_solr.md
index e79f4f99d2..668fb6a88e 100644
--- a/docs/search/search_engines/solr_search_engine/configure_solr.md
+++ b/docs/search/search_engines/solr_search_engine/configure_solr.md
@@ -13,13 +13,13 @@ description: Configure Solr search engine to use it with Ibexa DXP.
 
 !!! tip "How boosting interacts with Search API"
 
-    Boosting of fields or documents will affect the score (relevance) of your search result hits
+    Boosting of fields or documents affects the score (relevance) of your search result hits
     when using Search API for any Criteria you specify on `$query->query`, or in REST by using `Query` element.
-    When you don't specify anything to sort on, the result will be sorted by this relevance.
-    Anything set on `$query->filter`, or in REST using `Filter` element, will *not* affect scoring and only works
+    When you don't specify anything to sort on, the result is sorted by this relevance.
+    Anything set on `$query->filter`, or in REST using `Filter` element, *doesn't* affect scoring and only works
     as a pure filter for the result. Thus make sure to place Criteria you want to affect scoring on `query`.
 
-Boosting currently happens when indexing, so if you change your configuration you will need to re-index.
+Boosting currently happens when indexing, so if you change your configuration you need to re-index.
 
 Boosting tells the search engine which parts of the content model have more importance when searching, and is an important part of tuning your search results relevance. Importance is defined using a numeric value, where `1.0` is default, values higher than that are more important, and values lower (down to `0.0`) are less important.
 
@@ -41,7 +41,7 @@ ibexa_solr:
                         text: 5.0
 ```
 
-The configuration above will result in the following boosting (content type / Field):
+The configuration above results in the following boosting (content type / Field):
 
 - `article/title: 2.0`
 - `news/description: 1.0` (default)
@@ -118,7 +118,7 @@ The configuration above will result in the following boosting (content type / Fi
 
     Remember to clear the cache and perform search engine reindex afterwords.
 
-    The above configuration will result in the following boosting (content type / Field):
+    The above configuration results in the following boosting (content type / Field):
     
     - `folder/name: 20.0`
     - `folder/description: 10.0`
diff --git a/docs/search/search_engines/solr_search_engine/install_solr.md b/docs/search/search_engines/solr_search_engine/install_solr.md
index f707f9977f..d077865d90 100644
--- a/docs/search/search_engines/solr_search_engine/install_solr.md
+++ b/docs/search/search_engines/solr_search_engine/install_solr.md
@@ -139,7 +139,7 @@ If full language analysis features are preferred, then each language can be conf
 
 !!! note
 
-    Make sure to test this setup against a single-core setup, as it might perform worse than single-core if your project uses a lot of language fallbacks per SiteAccess, as queries will then be performed across several cores at once.
+    Make sure to test this setup against a single-core setup, as it might perform worse than single-core if your project uses a lot of language fallbacks per SiteAccess, as queries are then performed across several cores at once.
 
 ``` yaml
 ibexa_solr:
@@ -282,8 +282,8 @@ Here are the most common issues you may encounter:
 - Exception if Binary files in database have an invalid path prefix
     - Make sure `var_dir` is configured properly in `ibexa.yaml` configuration.
     - If your database is inconsistent in regards to file paths, try to update entries to be correct *(make sure to make a backup first)*.
-- Exception on unsupported Field Types
-    - Make sure to implement all Field Types in your installation, or to configure missing ones as [NullType](nullfield.md) if implementation is not needed.
+- Exception on unsupported field types
+    - Make sure to implement all field types in your installation, or to configure missing ones as [NullType](nullfield.md) if implementation is not needed.
 - Content is not immediately available 
     - Solr Bundle on purpose does not commit changes directly on Repository updates *(on indexing)*, but lets you control this using Solr configuration. Adjust Solr's `autoSoftCommit` (visibility of changes to search index) and/or `autoCommit` (hard commit, for durability and replication) to balance performance and load on your Solr instance against needs you have for "[NRT](https://cwiki.apache.org/confluence/display/solr/Near+Real+Time+Searching)".
 - Running out of memory during indexing
diff --git a/docs/search/search_engines/solr_search_engine/solr_overview.md b/docs/search/search_engines/solr_search_engine/solr_overview.md
index f808f42a0f..760aacc3f3 100644
--- a/docs/search/search_engines/solr_search_engine/solr_overview.md
+++ b/docs/search/search_engines/solr_search_engine/solr_overview.md
@@ -6,7 +6,7 @@ description: Solr search engine overview.
 
 [Solr search engine](https://github.com/ibexa/solr) allows you to use advanced search features: filtering, query, fulltext search and aggregations.
 
-When you enable Solr and re-index your content, all your existing Search queries using `SearchService` will be powered by Solr automatically. 
+When you enable Solr and re-index your content, all your existing Search queries using `SearchService` are powered by Solr automatically. 
 This allows you to scale up your [[= product_name =]] installation and be able to continue development locally against SQL engine, and have a test infrastructure, Staging and Prod powered by Solr. 
 By this, it also removes considerable load from your database. 
 
diff --git a/docs/search/sort_clause_reference/ismainlocation_sort_clause.md b/docs/search/sort_clause_reference/ismainlocation_sort_clause.md
index ee7c321d9b..5f026e2621 100644
--- a/docs/search/sort_clause_reference/ismainlocation_sort_clause.md
+++ b/docs/search/sort_clause_reference/ismainlocation_sort_clause.md
@@ -3,7 +3,7 @@
 The [`Location\IsMainLocation` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-IsMainLocation.html)
 sorts search results by whether their Location is the main Location of the content item.
 
-Locations that are not main Locations are ranked as lower values (e.g. with ascending order they will be returned first).
+Locations that are not main Locations are ranked as lower values (e.g. with ascending order they are returned first).
 
 ## Arguments
 
diff --git a/docs/search/sort_clause_reference/visibility_sort_clause.md b/docs/search/sort_clause_reference/visibility_sort_clause.md
index 4ae6917672..5f4e0e19be 100644
--- a/docs/search/sort_clause_reference/visibility_sort_clause.md
+++ b/docs/search/sort_clause_reference/visibility_sort_clause.md
@@ -3,7 +3,7 @@
 The [`Location\Visibility` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-Visibility.html)
 sorts search results by whether the Location is visible or not.
 
-Locations that are not visible are ranked as higher values (e.g. with ascending order they will be returned last).
+Locations that are not visible are ranked as higher values (e.g. with ascending order they're returned last).
 
 ## Arguments
 
diff --git a/docs/search/url_search_reference/matchall_url_criterion.md b/docs/search/url_search_reference/matchall_url_criterion.md
index 65ae5fdb6a..a0f4276b5c 100644
--- a/docs/search/url_search_reference/matchall_url_criterion.md
+++ b/docs/search/url_search_reference/matchall_url_criterion.md
@@ -2,6 +2,6 @@
 
 The [`MatchAll` URL Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-Criterion-MatchAll.html)
 is an auxiliary Criterion that returns all search results.
-it's used internally when no filter or query is provided on a Query object.
+It's used internally when no filter or query is provided on a Query object.
 
 The Criterion takes no arguments.
diff --git a/docs/search/url_search_reference/matchnone_url_criterion.md b/docs/search/url_search_reference/matchnone_url_criterion.md
index 5e047ac4b9..93a858ae86 100644
--- a/docs/search/url_search_reference/matchnone_url_criterion.md
+++ b/docs/search/url_search_reference/matchnone_url_criterion.md
@@ -2,6 +2,6 @@
 
 The [`MatchNone` URL Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-Criterion-MatchNone.html)
 is an auxiliary Criterion that returns no search results.
-it's used internally when no filter or query is provided on a Query object.
+It's used internally when no filter or query is provided on a Query object.
 
 The Criterion takes no arguments.
diff --git a/docs/snippets/page_block_cache_clear.md b/docs/snippets/page_block_cache_clear.md
index 4d846eacda..47d227a8db 100644
--- a/docs/snippets/page_block_cache_clear.md
+++ b/docs/snippets/page_block_cache_clear.md
@@ -6,4 +6,4 @@
     The default cache-pool is named `cache.tagaware.filesystem`. The default cache-pool when running redis is named `cache.redis`. If you have customized the [persistence cache configuration](https://doc.ibexa.co/en/latest/infrastructure_and_maintenance/cache/persistence_cache/#what-is-cached), the name of your cache pool might be different.
 
     In prod mode, you also need to clear the symfony cache by running `./bin/console c:c`.
-    In dev mode, the Symfony cache will be rebuilt automatically.
\ No newline at end of file
+    In dev mode, the Symfony cache is rebuilt automatically.
\ No newline at end of file
diff --git a/docs/snippets/update/merge_composer.md b/docs/snippets/update/merge_composer.md
index c84d28252f..7b60320efd 100644
--- a/docs/snippets/update/merge_composer.md
+++ b/docs/snippets/update/merge_composer.md
@@ -6,7 +6,7 @@ or from [ezplatform.com](https://ezplatform.com), you may have incomplete histor
 To load the full history, run `git fetch upstream --unshallow` from the `update-[[= target_version =]]` branch, and run the merge again.
 
 Ignore the conflicts in `composer.lock`, because this file is regenerated when you execute `composer update` later.
-it's easiest to check out the version of `composer.lock` from the tag and add it to the changes:
+It's easiest to check out the version of `composer.lock` from the tag and add it to the changes:
 
 ``` bash
 git checkout --theirs composer.lock && git add composer.lock
diff --git a/docs/snippets/update/notify_support.md b/docs/snippets/update/notify_support.md
index 73cda8e0e6..b5127a87f5 100644
--- a/docs/snippets/update/notify_support.md
+++ b/docs/snippets/update/notify_support.md
@@ -1,5 +1,5 @@
 ## Notify support
 
-Please tell support that you have updated your installation. They will update your support portal to match the new version.
+Please tell support that you have updated your installation. They update your support portal to match the new version.
 This ensures that you receive notifications about new maintenance releases and security advisories for the correct version.
 You can contact support at support@ibexa.co or through your [Support portal](https://support.ibexa.co).
diff --git a/docs/templating/design_engine/add_new_design.md b/docs/templating/design_engine/add_new_design.md
index 87e2656e37..e884cf8aa6 100644
--- a/docs/templating/design_engine/add_new_design.md
+++ b/docs/templating/design_engine/add_new_design.md
@@ -45,7 +45,7 @@ Next, configure a new `summersale` design for this theme, also named `summersale
 [[= include_file('code_samples/front/add_design/config/packages/views.yaml', 0, 3) =]]
 ```
 
-Notice that the `standard` theme will be automatically added at the end of the `summersale` design's theme list.
+Notice that the `standard` theme is automatically added at the end of the `summersale` design's theme list.
 
 Ensure that the `campaign` site uses this design (while the default `site` uses the default `standard` design)
 
diff --git a/docs/templating/render_content/render_content.md b/docs/templating/render_content/render_content.md
index 9fd43d3c0a..0e1f69a743 100644
--- a/docs/templating/render_content/render_content.md
+++ b/docs/templating/render_content/render_content.md
@@ -90,7 +90,7 @@ for example `templates/themes/my_theme/fields`.
 [[= include_file('code_samples/front/render_content/templates/themes/my_theme/fields/author.html.twig') =]]
 ```
 
-The Field template must be placed in a block that corresponds to the Field Type identifier,
+The Field template must be placed in a block that corresponds to the field type identifier,
 in this case `{% block ezauthor_field %}`.
 
 !!! tip "Template blocks"
diff --git a/docs/templating/twig_function_reference/field_twig_functions.md b/docs/templating/twig_function_reference/field_twig_functions.md
index 2256f377f4..b941a71846 100644
--- a/docs/templating/twig_function_reference/field_twig_functions.md
+++ b/docs/templating/twig_function_reference/field_twig_functions.md
@@ -57,7 +57,7 @@ You can pass the following parameters to `ibexa_render_field()`:
 - `template` - Field template to use
 - `attr` - hash of HTML attributes to add to the tag
 - parameters - arbitrary parameters to pass to the template block.
-Some Field Types, like the [MapLocation Field Type](maplocationfield.md), expect specific parameters.
+Some field types, like the [MapLocation field type](maplocationfield.md), expect specific parameters.
 
 #### Examples
 
@@ -93,7 +93,7 @@ the function returns the value in the main language.
 ### `ibexa_field()`
 
 `ibexa_field()` returns the Field object.
-The Field gives you access to the Field value, as well as the Field's definition identifier and Field Type identifier.
+The Field gives you access to the Field value, as well as the Field's definition identifier and field type identifier.
 If the content item does not have a translation in the prioritized or passed language,
 the function returns the Field object in the main language.
 
@@ -106,7 +106,7 @@ the function returns the Field object in the main language.
 You can access the Field's value by using `(ibexa_field(content, 'my_field').value)`,
 but it's recommended to use the dedicated [`ibexa_field_value()`](#ibexa_field_value) function for this.
 
-You can use `ibexa_field()` to access the Field Type identifier:
+You can use `ibexa_field()` to access the field type identifier:
 
 ``` html+twig
 {{ ibexa_field(content, 'my_field').fieldTypeIdentifier }}
diff --git a/docs/templating/urls_and_routes/custom_breadcrumbs.md b/docs/templating/urls_and_routes/custom_breadcrumbs.md
index d75141957a..795b96e0fb 100644
--- a/docs/templating/urls_and_routes/custom_breadcrumbs.md
+++ b/docs/templating/urls_and_routes/custom_breadcrumbs.md
@@ -22,7 +22,7 @@ Both `breadcrumb_path` and `breadcrumb_names` must be configured for the breadcr
 |Option|Description|
 |--- |--- |
 |`breadcrumb_path`|Valid route identifier which exists in at least one of the routing YAML files.|
-|`breadcrumb_names`|Name for the breadcrumb element. If the translation is not set, there will be a fallback to route translation.</br>In the example above if the `Blog List` key has no translation, the fallback key is `custom_blog_index|breadcrumb`.|
+|`breadcrumb_names`|Name for the breadcrumb element. If the translation is not set, there is a fallback to route translation.</br>In the example above if the `Blog List` key has no translation, the fallback key is `custom_blog_index|breadcrumb`.|
 
 ### Multi-part routes
 
diff --git a/docs/tutorials/beginner_tutorial/1_get_ready.md b/docs/tutorials/beginner_tutorial/1_get_ready.md
index 232da492ff..cc906da90b 100644
--- a/docs/tutorials/beginner_tutorial/1_get_ready.md
+++ b/docs/tutorials/beginner_tutorial/1_get_ready.md
@@ -7,13 +7,13 @@ description: Start the tutorial by getting a clean installation of Ibexa DXP.
 To begin the tutorial, you need a clean installation of [[= product_name =]].
 
 Get it by following the [install Ibexa DXP](install_ibexa_dxp.md) guide.
-You will need a web server, a relational database and PHP.
+You need a web server, a relational database and PHP.
 
 The clean installation contains only a root content item which displays a welcome page.
 
 ![Front page after clean installation](bike_tutorial_homepage_install_clean.png)
 
-You will replace the welcome page with your own in step 3.
+You can replace the welcome page with your own in step 3.
 
 To remove it for now, go to `config/packages/` and delete the `ibexa_welcome_page.yaml` file.
 
diff --git a/docs/tutorials/beginner_tutorial/2_create_the_content_model.md b/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
index f9a725346c..fa6337ab76 100644
--- a/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
+++ b/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
@@ -16,14 +16,14 @@ The [[= product_name =]] content Repository is centered around **content items**
 Every content item is an instance of a content type. Content types define what **Fields** are included in each content item.
 For example, an article could include Fields such as *title*, *image*, *abstract*, *article's body*, *publication date* and *list of authors*.
 
-Fields can belong to one of the installed **Field Types**, about 30 in the default distribution.
-Each Field Type is built to represent a specific type of data: a text line, a block of rich text, an image, a collection of relations to content items, etc.
-You can find a complete list in the [Field Types reference](field_type_reference.md) section.
-Every Field Type may have its own options, and comes with its own editing and viewing interfaces.
+Fields can belong to one of the installed **field types**, about 30 in the default distribution.
+Each field type is built to represent a specific type of data: a text line, a block of rich text, an image, a collection of relations to content items, etc.
+You can find a complete list in the [field types reference](field_type_reference.md) section.
+Every field type may have its own options, and comes with its own editing and viewing interfaces.
 
 ## Add a content type
 
-The site will use two content types: **Ride** and **Landmark**.
+The site use two content types: **Ride** and **Landmark**.
 A Ride is a route of a bike trip. It can include one or more Landmarks - interesting places you can see along the way.
 More than one Ride can visit the same Landmark, so it's similar to an N-N relationship model in a database.
 
@@ -35,7 +35,7 @@ In the upper-right corner, click the avatar icon to unfold the drop-down menu an
 
 In the main menu, go to **Content** -> **Content types**.
 
-You will see a list of **Content type groups**. they're used to group content types in a logical way.
+You can see a list of **Content type groups**. they're used to group content types in a logical way.
 
 Select **Content** and then click the **Create** button. 
 
@@ -48,7 +48,7 @@ Fill the form with this basic info: 
 
 Then create all Fields with the following information: 
 
-| Field Type   | Name             | Identifier       |  Required | Searchable | Translatable |
+| Field type   | Name             | Identifier       |  Required | Searchable | Translatable |
 | ------------ | ---------------- | ---------------- | --------- | ---------- | ------------ |
 | Text line    | Name             | `name`           | yes       | yes        | yes          |
 | Image Asset  | Photo            | `photo`          | no        | no         | no           |
diff --git a/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md b/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md
index c306b0ef18..00c7a03572 100644
--- a/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md
+++ b/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md
@@ -4,10 +4,10 @@ description: Try customizing the front page by using custom templates and adding
 
 # Step 3 — Customize the front page
 
-In this step you will create the global layout of your site, and display content using custom templates.
+In this step you can create the global layout of your site, and display content using custom templates.
 
 First, go to the root of the site (`<yourdomain>`). You should now see the home page of the clean install, without any kind of layout.
-You will customize this step by instructing the platform to use a custom template to render this content item.
+You can customize this step by instructing the platform to use a custom template to render this content item.
 
 ## Content rendering configuration
 
@@ -65,7 +65,7 @@ Create a `home_page.html.twig` file in `templates/full/`:
 </div>
 ```
 
-Refresh the page and you will see a simple, unstyled version of the message.
+Refresh the page and you can see a simple, unstyled version of the message.
 
 !!! note
 
@@ -74,7 +74,7 @@ Refresh the page and you will see a simple, unstyled version of the message.
 ### Add the site's main layout
 
 Most sites have a general layout which includes things like header with a logo or footer.
-it's displayed on every page, and the content of the page is placed inside it.
+It's displayed on every page, and the content of the page is placed inside it.
 
 To add a template like this to your site, create a `main_layout.html.twig` file in `templates/` and paste the following code into it:
 
@@ -174,7 +174,7 @@ To add a template like this to your site, create a `main_layout.html.twig` file
 ```
 
 Note that in the highlighted lines (12 and 89) the template takes advantage of [Symfony Webpack Encore]([[= symfony_doc =]]/frontend.html#webpack-encore).
-This tutorial will lead you through configuring Webpack, but first you need assets.
+This tutorial leads you through configuring Webpack, but first you need assets.
 
 ### Adding assets
 
@@ -240,7 +240,7 @@ Templates can contain named blocks. Any template can extend other templates, and
 
 The code above points to `main_layout.html.twig` in line 1. It also wraps your "Hello world" message in a `content` block.
 If you look back at the main layout template, you can see an empty `{% block content %}{% endblock %}` section (lines 52-53).
-This is where the `home_page.html.twig` will be rendered.
+This is where the `home_page.html.twig` is rendered.
 
 Clear the cache and regenerate the assets by running the following commands:
 
diff --git a/docs/tutorials/beginner_tutorial/4_display_single_content_item.md b/docs/tutorials/beginner_tutorial/4_display_single_content_item.md
index 41b6887aa3..f7048b30e3 100644
--- a/docs/tutorials/beginner_tutorial/4_display_single_content_item.md
+++ b/docs/tutorials/beginner_tutorial/4_display_single_content_item.md
@@ -95,7 +95,7 @@ But you still can see how the template works in two ways:
 
 #### Preview in the back office
 
-You can use the [preview]([[= user_doc =]]/content_management/preview_content_items/) while editing in the back office to see how the content will be rendered in full view.
+You can use the [preview]([[= user_doc =]]/content_management/preview_content_items/) while editing in the back office to see how the content is rendered in full view.
 
 ![Full ride preview in admin](bike_tutorial_preview_full_ride.png)
 
diff --git a/docs/tutorials/beginner_tutorial/5_display_a_list_of_content_items.md b/docs/tutorials/beginner_tutorial/5_display_a_list_of_content_items.md
index ff4b7c7182..15deaca6ca 100644
--- a/docs/tutorials/beginner_tutorial/5_display_a_list_of_content_items.md
+++ b/docs/tutorials/beginner_tutorial/5_display_a_list_of_content_items.md
@@ -6,11 +6,11 @@ description: Learn how to query for content and render it in a list.
 
 Now that you know how to display a single content item, you can take care of rendering a list of content items.
 
-In this step you will display a table of all Rides on the front page.
+In this step you can display a table of all Rides on the front page.
 
 ## Customize the homepage template
 
-In `templates/full/home_page.html.twig` replace the "Hello world" with a table that will display the list of all existing Rides:
+In `templates/full/home_page.html.twig` replace the "Hello world" with a table that displays the list of all existing Rides:
 
 ``` html+twig hl_lines="15 16"
 {% extends "main_layout.html.twig" %}
@@ -44,7 +44,7 @@ In `templates/full/home_page.html.twig` replace the "Hello world" with a table t
 ```
 
 The `rides` variable you use in line 15 above needs to contain a list of all Rides.
-To get this list, you will use a Query Type.
+To get this list, you use a Query Type.
 
 ## Create a QueryType for the home page
 
@@ -88,14 +88,14 @@ class RideQueryType implements QueryType
 }
 ```
 
-This Query Type will find all visible content items that belong to the `ride` content type (lines 21-22).
+This Query Type finds all visible content items that belong to the `ride` content type (lines 21-22).
 
-Now you need to indicate that this Query Type will be used in your configuration.
+Now you need to indicate that this Query Type is used in your configuration.
 
 ## Add Query Type to configuration
 
 Edit `config/packages/ibexa.yaml`.
-In the view configuration for the home page indicate that this view will use the Query Type:
+In the view configuration for the home page indicate that this view uses the Query Type:
 
 ``` yaml hl_lines="6 10 11 12 13 14 15"
 site:
@@ -147,7 +147,7 @@ system:
 
 Create the `templates/line/rides.html.twig` template.
 
-Because this template will be rendered inside a table, it starts with a `<tr>` tag.
+Because this template is rendered inside a table, it starts with a `<tr>` tag.
 
 ``` html+twig
 <tr>
@@ -185,6 +185,6 @@ Edit the **Content/Read** policy line to add the `Media` section to **Limitation
 
 ![Policies for the Anonymous Role with Media section](step5_admin_anonymous_policies_with_media_section.png)
 
-Now go to the homepage of your website and you will see the list of Rides.
+Now go to the homepage of your website and you can see the list of Rides.
 However, the Ride photos are too large and stretch the table.
-In the next step you will ensure they're displayed in proper size.
+In the next step you can ensure they're displayed in proper size.
diff --git a/docs/tutorials/beginner_tutorial/6_improve_configuration.md b/docs/tutorials/beginner_tutorial/6_improve_configuration.md
index c0d09ad737..c313794015 100644
--- a/docs/tutorials/beginner_tutorial/6_improve_configuration.md
+++ b/docs/tutorials/beginner_tutorial/6_improve_configuration.md
@@ -9,7 +9,7 @@ description: See how you can manage Ibexa DXP configuration files.
 Image variations are different versions of the same image. You can use them to scale images, crop them, add effects, etc.
 
 So far the images in the ride list are fitted to the templates automatically, and the result does not look good.
-Now you will create a variation to specify how you want the images to look in detail.
+Now you can create a variation to specify how you want the images to look in detail.
 
 Create a new `config/packages/image_variations.yaml` file containing:
 
@@ -38,7 +38,7 @@ In `templates/line/rides.html.twig` add the `'alias': 'ride_list'` parameter in
 {% endif %}
 ```
 
-This ensures that the photo displayed next to each Ride in the list will be scaled down properly with proportions retained.
+This ensures that the photo displayed next to each Ride in the list is scaled down properly with proportions retained.
 
 Clear cache and refresh the front page. Photos should now have a regular size and fit in the table.
 
diff --git a/docs/tutorials/beginner_tutorial/7_embed_content.md b/docs/tutorials/beginner_tutorial/7_embed_content.md
index 28bc8806c8..a3c3edfab1 100644
--- a/docs/tutorials/beginner_tutorial/7_embed_content.md
+++ b/docs/tutorials/beginner_tutorial/7_embed_content.md
@@ -5,7 +5,7 @@ description: Learn how to embed related content in another content item's templa
 # Step 7 — Embed content
 
 Creating lists and detailed views of content types and their respective items often involves loading related resources.
-In this step, you add a related object, a Landmark, which will be displayed on Ride pages.
+In this step, you add a related object, a Landmark, which is displayed on Ride pages.
 
 You can add as many or as little related resources as you like.
 
@@ -22,7 +22,7 @@ A Landmark is an interesting place that Rides go through. Each Ride may be relat
 
 Then add all Fields with the following information: 
 
-| Field Type   | Name             | Identifier       |  Required | Searchable | Translatable |
+| Field type   | Name             | Identifier       |  Required | Searchable | Translatable |
 | ------------ | ---------------- | ---------------- | --------- | ---------- | ------------ |
 | Text line    | Name             | `name`           | yes       | yes        | yes          |
 | Rich text    | Description      | `description`    | no        | yes        | yes          |
@@ -32,7 +32,7 @@ Then add all Fields with the following information: 
 Confirm the creation of the content type by selecting **Create**.
 
 Create a *Landmarks* Folder and add some Landmarks to it.
-Note that you will need pictures (for the Photo Field) to represent them.
+Note that you need pictures (for the Photo Field) to represent them.
 
 ## Add Landmarks to Ride content type definition
 
diff --git a/docs/tutorials/beginner_tutorial/8_enable_account_registration.md b/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
index 40d8d2a3b6..9cc7a62a7b 100644
--- a/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
+++ b/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
@@ -4,7 +4,7 @@ description: See how you can enable external users to register and contribute to
 
 # Step 8 — Enable account registration
 
-In this step you will enable other users to create accounts on your site, access the back office and create content.
+In this step you enable other users to create accounts on your site, access the back office and create content.
 
 ## Enable registration
 
@@ -12,7 +12,7 @@ In the main menu, go to **Admin** (gear icon) -> **Roles**, and click the **Anon
 
 ![Available roles](step_8_role_mgmt_screen.png)
 
-Add the `User/Register` policy to the Anonymous User. This will allow any visitor to the website to access the registration form.
+Add the `User/Register` policy to the Anonymous User. This allows any visitor to the website to access the registration form.
 
 ![Policies for the Anonymous Role](step8_admin_anonymous_policies.png)
 
@@ -32,7 +32,7 @@ ibexa:
                     form: user/registration_form.html.twig
 ```
 
-This indicates which template will be used to render the registration form.
+This indicates which template is used to render the registration form.
 
 Create the file `templates/user/registration_form.html.twig`:
 
@@ -60,7 +60,7 @@ Create the file `templates/user/registration_form.html.twig`:
 ```
 
 In line 10 you can see that another file is imported: `registration_content_form.html.twig`.
-The second template will render the actual fields of the registration form. Create this file as well (as `templates/user/registration_content_form.html.twig`):
+The second template renders the actual fields of the registration form. Create this file as well (as `templates/user/registration_content_form.html.twig`):
 
 ``` html+twig
 {% macro display_form(form) %}
@@ -166,7 +166,7 @@ Fill in the form and register a user.
 ## Set up Permissions
 
 Users created through the registration form are placed in the _Guest accounts_ user group.
-The User you have just created will have the roles assigned to this group.
+The User you have just created has the roles assigned to this group.
 
 !!! tip
 
@@ -184,7 +184,7 @@ In the back office, go to **Admin** -> **Users**, click the **Create content** b
 ### Create a Folder for contributed Rides
 
 Go to the `All Rides` Folder and create inside it a new Folder named `Member Rides`.
-Go Bike Members will only be able to create Content in this Folder.
+Go Bike Members are only able to create Content in this Folder.
 
 ### Set permissions for Go Bike Members
 
diff --git a/docs/tutorials/beginner_tutorial/beginner_tutorial.md b/docs/tutorials/beginner_tutorial/beginner_tutorial.md
index 214293f29e..a1beb6883a 100644
--- a/docs/tutorials/beginner_tutorial/beginner_tutorial.md
+++ b/docs/tutorials/beginner_tutorial/beginner_tutorial.md
@@ -19,20 +19,20 @@ To follow it, you should:
 
 ## Learning outcomes
 
-After finishing this tutorial, you will:
+After finishing this tutorial, you:
 
-- Know how to construct the content model of a website.
-- Be able to use templates to display your content according to your needs.
-- Know how to manage users and permissions.
+- know how to construct the content model of a website.
+- are able to use templates to display your content according to your needs.
+- know how to manage users and permissions.
 
 ## Scenario
 
-In the course of this tutorial you will build a website for storing and sharing bike rides.
-It will enable the user to add information and photos of their routes and indicate what interesting points can be visited during the trip.
+In the course of this tutorial you can build a website for storing and sharing bike rides.
+It enables the user to add information and photos of their routes and indicate what interesting points can be visited during the trip.
 
 ## Steps
 
-In this tutorial you will go through the following steps:
+In this tutorial you go through the following steps:
 
 1. [Get ready](1_get_ready.md)
 1. [Create the content model](2_create_the_content_model.md)
diff --git a/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md b/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md
index 9341ccad63..99dd03a5c9 100644
--- a/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md
+++ b/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md
@@ -12,18 +12,18 @@ Follow the guide for your system to [install Ibexa DXP](install_ibexa_dxp.md),
 and [start the web server](install_ibexa_dxp.md#use-phps-built-in-server).
 Remember to install using the `dev` environment.
 
-Open your project with a clean installation and create the base directory for a new Point 2D Field Type in `src/FieldType/Point2D`.
+Open your project with a clean installation and create the base directory for a new Point 2D field type in `src/FieldType/Point2D`.
 
 ## The Value class
 
-The Value class of a Field Type is by design very simple.
-it's used to represent an instance of the Field Type within a content item.
+The Value class of a field type is by design very simple.
+It's used to represent an instance of the field type within a content item.
 Each Field presents its data using an instance of the Type's Value class.
-For more information about Field Type Value, see [Value handling](type_and_value.md#value-handling).
+For more information about field type Value, see [Value handling](type_and_value.md#value-handling).
 
 !!! tip
 
-    According to the convention, the class representing Field Type Value should be named `Value` and should be placed in the same namespace as the Type definition.
+    According to the convention, the class representing field type Value should be named `Value` and should be placed in the same namespace as the Type definition.
 
 [[= include_file('docs/snippets/simple_hash_value_caution.md') =]]
 
@@ -39,7 +39,7 @@ The Point 2D is going to store two elements (coordinates for point 2D):
 - `x` value
 - `y` value
 
-At this point, it does not matter where they're stored. You want to focus on what the Field Type exposes as an API.
+At this point, it does not matter where they're stored. You want to focus on what the field type exposes as an API.
 
 `src/FieldType/Point2D/Value.php` should have the following properties:
 
diff --git a/docs/tutorials/generic_field_type/2_define_point2d_field_type.md b/docs/tutorials/generic_field_type/2_define_point2d_field_type.md
index db998e9aa1..3c58e7b09e 100644
--- a/docs/tutorials/generic_field_type/2_define_point2d_field_type.md
+++ b/docs/tutorials/generic_field_type/2_define_point2d_field_type.md
@@ -2,18 +2,18 @@
 description: Learn how to create the Type class which contains the logic for the Field.
 ---
 
-# Step 2 - Define the Point 2D Field Type
+# Step 2 - Define the Point 2D field type
 
 ## The Type class
 
-The Type contains logic of the Field Type: validating data, transforming from various formats, describing the validators, etc.
-In this example Point 2D Field Type will extend the `Ibexa\Contracts\Core\FieldType\Generic\Type` class.
-For more information about the Type class of a Field Type, see [Type class](type_and_value.md#type-class).
+The Type contains logic of the field type: validating data, transforming from various formats, describing the validators, etc.
+In this example Point 2D field type extends the `Ibexa\Contracts\Core\FieldType\Generic\Type` class.
+For more information about the Type class of a field type, see [Type class](type_and_value.md#type-class).
 
-## Field Type identifier
+## Field type identifier
 
 First, create `src/FieldType/Point2D/Type.php`.
-Add a `getFieldTypeIdentifier()` method to it. The new method will return the string that **uniquely** identifies your Field Type, in this case `point2d`:
+Add a `getFieldTypeIdentifier()` method to it. The new method returns the string that **uniquely** identifies your field type, in this case `point2d`:
 
 ```php
 [[= include_file('code_samples/field_types/2dpoint_ft/steps/step_2/Type.php') =]]
diff --git a/docs/tutorials/generic_field_type/3_create_form_for_point2d.md b/docs/tutorials/generic_field_type/3_create_form_for_point2d.md
index 2e97eb2f1b..a794996c79 100644
--- a/docs/tutorials/generic_field_type/3_create_form_for_point2d.md
+++ b/docs/tutorials/generic_field_type/3_create_form_for_point2d.md
@@ -2,11 +2,11 @@
 description: Learn how to create a form used for editing a custom Field definition.
 ---
 
-# Step 3 - Create a form for editing Field Type
+# Step 3 - Create a form for editing field type
 
 ## Create a form
 
-To edit your new Field Type, create a `Point2DType.php` form in the `src/Form/Type` directory.
+To edit your new field type, create a `Point2DType.php` form in the `src/Form/Type` directory.
 Next, add a `Point2DType` class that extends the `AbstractType` and implements the `buildForm()` method.
 This method adds fields for `x` and `y` coordinates.
 
@@ -18,14 +18,14 @@ This method adds fields for `x` and `y` coordinates.
 ## Add a Form Mapper Interface
 
 The FormMapper adds the Field definitions into Symfony forms using the `add()` method. 
-The `FieldValueFormMapperInterface` provides an edit form for your Field Type in the administration interface.
-For more information about the FormMappers, see [Field Type form and template](form_and_template.md).
+The `FieldValueFormMapperInterface` provides an edit form for your field type in the administration interface.
+For more information about the FormMappers, see [field type form and template](form_and_template.md).
 
-First, implement a `FieldValueFormMapperInterface` interface (`Ibexa\Contracts\ContentForms\FieldType\FieldValueFormMapperInterface`) to Field Type definition in the `src/FieldType/Point2D/Type.php`.
+First, implement a `FieldValueFormMapperInterface` interface (`Ibexa\Contracts\ContentForms\FieldType\FieldValueFormMapperInterface`) to field type definition in the `src/FieldType/Point2D/Type.php`.
 
 Next, implement a `mapFieldValueForm()` method and invoke `FormInterface::add` method with the following arguments (highlighted lines):
 
-- Name of the property the Field value will map to: `value`
+- Name of the property the Field value maps to: `value`
 - Type of the Field: `Point2DType::class`
 - Custom options: `required` and `label`
 
@@ -36,7 +36,7 @@ Final version of the Type class should have the following statements and functio
 ```
 
 Finally, add a `configureOptions` method and set default value of `data_class` to `Value::class` in `src/Form/Type/Point2DType.php`.
-It will allow your form to work on this object.
+It allows your form to work on this object.
 
 ```php hl_lines="19 20 21 22 23 24"
 [[= include_file('code_samples/field_types/2dpoint_ft/src/Form/Type/Point2DType.php') =]]
diff --git a/docs/tutorials/generic_field_type/4_introduce_a_template.md b/docs/tutorials/generic_field_type/4_introduce_a_template.md
index 5ec0786043..a8164fc77e 100644
--- a/docs/tutorials/generic_field_type/4_introduce_a_template.md
+++ b/docs/tutorials/generic_field_type/4_introduce_a_template.md
@@ -6,16 +6,16 @@ description: Learn how to add a template for rendering the custom Field on the s
 
 ## Point 2D template
 
-In order to display data from the Field Type, you need to create and register a template for it.
-Each Field Type template receives a set of variables that can be used to achieve the desired goal.
+In order to display data from the field type, you need to create and register a template for it.
+Each field type template receives a set of variables that can be used to achieve the desired goal.
 In this case the most important variable is the `field`, an instance of `Ibexa\Contracts\Core\Repository\Values\Content\Field`.
 In addition to its own metadata (`id`, `fieldDefIdentifier`, etc.), it exposes the Field Value through the `value` property.
 
-Remember that Field Type templates can be overridden in order to tweak what is displayed and how.
-For more information, see the documentation about [Field Type templates](form_and_template.md#content-view-templates).
+Remember that field type templates can be overridden in order to tweak what is displayed and how.
+For more information, see the documentation about [field type templates](form_and_template.md#content-view-templates).
 
 First, create a `point2d_field.html.twig` template in the `templates` directory.
-It will define the default display of a Point 2D.
+It defines the default display of a Point 2D.
 Your basic template for Point 2D should look like this:
 
 ```html+twig
diff --git a/docs/tutorials/generic_field_type/5_add_a_field.md b/docs/tutorials/generic_field_type/5_add_a_field.md
index 7b24dba7f9..539028721d 100644
--- a/docs/tutorials/generic_field_type/5_add_a_field.md
+++ b/docs/tutorials/generic_field_type/5_add_a_field.md
@@ -1,5 +1,5 @@
 ---
-description: Learn how to use your custom Field Type by adding a Field to a content type and creating an instance.
+description: Learn how to use your custom field type by adding a Field to a content type and creating an instance.
 ---
 
 # Step 5 - Add a new Point 2D Field
@@ -24,7 +24,7 @@ New content type should have the following settings:
 
 Next, define **point2d** with the following Fields:
 
-|Field Type|Name|Identifier|Required|Translatable|
+|Field type|Name|Identifier|Required|Translatable|
 |----------|----|----------|--------|------------|
 | point2d  |Point 2D|`point_2d` | yes | no|
 
@@ -38,7 +38,7 @@ In **Content structure**, select **Create content**. There, under **Content**, y
 
 ![Selecting Point 2D from sidebar](menu_point2d.png)
 
-Here, you can fill in coordinates of your point, e.g. 3, 5. Provided coordinates will be used as a title for a new point.
+Here, you can fill in coordinates of your point, e.g. 3, 5. Provided coordinates are used as a title for a new point.
 
 ![Creating Point 2D](creating_new_point2d.png)
 
diff --git a/docs/tutorials/generic_field_type/6_settings.md b/docs/tutorials/generic_field_type/6_settings.md
index 05e02d2a9c..64277bb6b8 100644
--- a/docs/tutorials/generic_field_type/6_settings.md
+++ b/docs/tutorials/generic_field_type/6_settings.md
@@ -5,13 +5,13 @@ description: Learn how to add settings that format the Field value.
 # Step 6 - Implement Point 2D settings
 
 Implementing settings enables you to define the format for displaying the Field on the page.
-To do so, you will create the `format` field where you will be able to change the way coordinates for Point 2D are displayed.
+To do so, create the `format` field where you are able to change the way coordinates for Point 2D are displayed.
 
-## Define Field Type format
+## Define field type format
 
-In this step you will create the `format` field for Point 2D coordinates.
+In this step you create the `format` field for Point 2D coordinates.
 To do that, you need to define a `SettingsSchema` definition.
-You will also specify coordinates as placeholder values `%x%` and `%y%`.
+You also specify coordinates as placeholder values `%x%` and `%y%`.
 
 Open `src/FieldType/Point2D/Type.php` and add a `getSettingsSchema` method according to the following code block:
 
@@ -21,7 +21,7 @@ Open `src/FieldType/Point2D/Type.php` and add a `getSettingsSchema` method accor
 
 ## Add a format field
 
-In this part you will define and implement the edit form for your Field Type. 
+In this part you define and implement the edit form for your field type. 
 
 Define a `Point2DSettingsType` class and add a `format` field in `src/Form/Type/Point2DSettingsType.php`:
 
@@ -31,11 +31,11 @@ Define a `Point2DSettingsType` class and add a `format` field in `src/Form/Type/
 
 ## FieldDefinitionFormMapper Interface
 
-Now, enable the user to add the coordinates which will be validated.
-In `src/FieldType/Point2D/Type.php` you will:
+Now, enable the user to add the coordinates which are validated.
+In `src/FieldType/Point2D/Type.php` you:
  
 - implement the `FieldDefinitionFormMapperInterface` interface
-- add a `mapFieldDefinitionForm` method at the end that will define the field settings
+- add a `mapFieldDefinitionForm` method at the end that defines the field settings
 
 ```php
 [[= include_file('code_samples/field_types/2dpoint_ft/src/FieldType/Point2D/Type.php', 0, 4) =]]
@@ -65,7 +65,7 @@ Next, add `FieldDefinitionFormMapper` as an extra tag definition for `App\FieldT
 [[= include_file('code_samples/field_types/2dpoint_ft/config/services.yaml', 33, 38) =]]
 ```
 
-## Field Type definition
+## Field type definition
 
 To be able to display the new `format` field, you need to add a template for it.
 Create `templates/point2d_field_type_definition.html.twig`:
diff --git a/docs/tutorials/generic_field_type/7_add_a_validation.md b/docs/tutorials/generic_field_type/7_add_a_validation.md
index 2df69821a2..f28b66bce9 100644
--- a/docs/tutorials/generic_field_type/7_add_a_validation.md
+++ b/docs/tutorials/generic_field_type/7_add_a_validation.md
@@ -11,6 +11,6 @@ To provide basic validation that ensures both coordinates are provided, add asse
 // ...
 ```
 
-As a result, if a user tries to publish the Point 2D with just one value, they will receive an error message.
+As a result, if a user tries to publish the Point 2D with just one value, they receive an error message.
 
 ![Point 2D validation](point2d_validation.png)
diff --git a/docs/tutorials/generic_field_type/8_data_migration.md b/docs/tutorials/generic_field_type/8_data_migration.md
index 6c94b35ac5..f05138a1e0 100644
--- a/docs/tutorials/generic_field_type/8_data_migration.md
+++ b/docs/tutorials/generic_field_type/8_data_migration.md
@@ -2,10 +2,10 @@
 description: Learn how to serialize and deserialize Field data to enable sorting or search.
 ---
 
-# Step 8 -  Data migration between Field Type versions
+# Step 8 -  Data migration between field type versions
 
-Adding data migration enables you to easily change the output of the Field Type to fit your current needs.
-This process is important when a Field Type needs to be compared for sorting and searching purposes.
+Adding data migration enables you to easily change the output of the field type to fit your current needs.
+This process is important when a field type needs to be compared for sorting and searching purposes.
 Serialization allows changing objects to array by normalizing them, and then to the selected format by encoding them.
 In reverse, deserialization changes different formats into arrays by decoding and then denormalizing them into objects.
 
@@ -30,7 +30,7 @@ services:
 
 ## Backward compatibility
 
-To accept old versions of the Field Type you need to add support for denormalization in a `src/Serializer/Point2D/ValueDenormalizer.php`:
+To accept old versions of the field type you need to add support for denormalization in a `src/Serializer/Point2D/ValueDenormalizer.php`:
 
 ```php
 [[= include_file('code_samples/field_types/2dpoint_ft/src/Serializer/Point2D/ValueDenormalizer.php') =]]
@@ -53,4 +53,4 @@ To change the format on the fly, you need to replace the constructor in `src/Fie
 [[= include_file('code_samples/field_types/2dpoint_ft/src/FieldType/Point2D/Value.php', 24, 31) =]]
 ```
 
-Now you can easily change the internal representation format of the Point 2D Field Type.
+Now you can easily change the internal representation format of the Point 2D field type.
diff --git a/docs/tutorials/generic_field_type/creating_a_point2d_field_type.md b/docs/tutorials/generic_field_type/creating_a_point2d_field_type.md
index fd490801bb..11b2ea01e6 100644
--- a/docs/tutorials/generic_field_type/creating_a_point2d_field_type.md
+++ b/docs/tutorials/generic_field_type/creating_a_point2d_field_type.md
@@ -1,21 +1,21 @@
 ---
-description: Go through a Field Type tutorial to learn how to create a custom Field Type based on the built-in Generic Field Type.
+description: Go through a field type tutorial to learn how to create a custom field type based on the built-in Generic field type.
 ---
 
-# Creating a Point 2D Field Type 
+# Creating a Point 2D field type 
 
-This tutorial covers the creation and development of a custom [[= product_name =]] [Field Type](create_custom_generic_field_type.md).
-The Generic Field Type is a very powerful extension point. It enables you to easily build complex solutions on a ready-to-go Field Type template.
+This tutorial covers the creation and development of a custom [[= product_name =]] [field type](create_custom_generic_field_type.md).
+The Generic field type is a very powerful extension point. It enables you to easily build complex solutions on a ready-to-go field type template.
 
-Field Types are responsible for:
+Field types are responsible for:
 
 - Storing data, either using the native storage engine mechanisms or specific means
 - Validating input data
 - Making the data searchable (if applicable)
 - Displaying Fields
 
-You can find more information in [Field Type documentation](field_types.md).
-It describes how each component of a Field Type interacts with the various layers of the system, and how to implement them.
+You can find more information in [field type documentation](field_types.md).
+It describes how each component of a field type interacts with the various layers of the system, and how to implement them.
 
 ## Intended audience
 
@@ -23,22 +23,22 @@ This tutorial is aimed at developers who are familiar with [[= product_name =]]
 
 ## Content of the tutorial
 
-This tutorial will show you how to use the Generic Field Type as a template for a custom Field Type. You will:
+This tutorial shows you how to use the Generic field type as a template for a custom field type. You:
 
-- Create a custom Point 2D Field Type with two coordinates as input, e.g. (4,5)
-- Register the new Field Type as a service and define its template
-- Add basic validation to your Point 2D
-- Add data migration to the Field Type so you will be able to easily change its output
+- create a custom Point 2D field type with two coordinates as input, e.g. (4,5)
+- register the new field type as a service and define its template
+- add basic validation to your Point 2D
+- add data migration to the field type so you are able to easily change its output
 
 ## Steps
 
-In this tutorial you will go through the following steps:
+In this tutorial you go through the following steps:
 
 - [1. Implement the Point 2D Value class](1_implement_the_point2d_value_class.md)
-- [2. Define the Point 2D Field Type](2_define_point2d_field_type.md)
-- [3. Create form for editing Field Type](3_create_form_for_point2d.md)
+- [2. Define the Point 2D field type](2_define_point2d_field_type.md)
+- [3. Create form for editing field type](3_create_form_for_point2d.md)
 - [4. Introduce a template](4_introduce_a_template.md)
 - [5. Add a new Point 2D field](5_add_a_field.md)
 - [6. Implement Point 2D settings](6_settings.md)
 - [7. Add basic validation](7_add_a_validation.md)
-- [8. Data migration between Field Type versions](8_data_migration.md)
+- [8. Data migration between field type versions](8_data_migration.md)
diff --git a/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md b/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md
index 0517a54739..453abbaea2 100644
--- a/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md
+++ b/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md
@@ -23,7 +23,7 @@ Log in to the back office – add `/admin` to your installation's address (`<y
 - **Identifier:** `dog_breed`
 - **Fields:**
 
-| Field Type | Name              | Identifier          | Required | Searchable | Translatable |
+| Field type | Name              | Identifier          | Required | Searchable | Translatable |
 |------------|-------------------|---------------------|----------|------------|--------------|
 | Text line  | Name              | `name`              | yes      | yes        | yes          |
 | Text line  | Short Description | `short_description` | yes      | yes        | yes          |
@@ -36,17 +36,17 @@ Log in to the back office – add `/admin` to your installation's address (`<y
 - **Identifier:** `tip`
 - **Fields:**
 
-| Field Type  | Name  | Identifier | Required | Searchable | Translatable |
+| Field type  | Name  | Identifier | Required | Searchable | Translatable |
 |-------------|-------|------------|----------|------------|--------------|
 | Text line   | Title | `title`    | yes      | yes        | yes          |
 | Text block  | Body  | `body`     | no       | no         | yes          |
 
 ### Modify existing Article content type
 
-You also need to modify the built-in Article content type. It will make inserting photos into articles easier.
+You also need to modify the built-in Article content type. It makes inserting photos into articles easier.
 Edit it to remove the Image Field that has a Content Relation (ezobjectrelation) type, and create a new Field in its place:
 
-| Field Type | Name  | Identifier | Required | Searchable | Translatable |
+| Field type | Name  | Identifier | Required | Searchable | Translatable |
 |------------|-------|------------|----------|------------|--------------|
 | Image Asset | Image | `image`    |yes       |no          | no           |
 
@@ -119,13 +119,13 @@ Remember that you can **Save and close** them, but you should use the **Publish*
 
 Next, create a few content items of proper content types in each of these folders:
 
-- 4 Articles (at least, to best see the effects of the Content Scheduler block that you will create in step 3.)
+- 4 Articles (at least, to best see the effects of the Content Scheduler block that you can create in step 3.)
 - 3 Dog Breeds
 - 3 Tips
 
 ### Add images
 
 When you need an image, you can use one from [this image pack](img/photos.zip).
-This will let you compare effects of your work to screenshots in the tutorial.
+This lets you compare effects of your work to screenshots in the tutorial.
 
 At this point you're ready to proceed with the next step.
diff --git a/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md b/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
index d4d59082a9..4dd7916a2c 100644
--- a/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
+++ b/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
@@ -69,7 +69,7 @@ The `template` (line 8) points to the Twig file containing the template for thi
 #### Create Page template
 
 Configuration points to `sidebar.html.twig` as the template for the layout.
-The template defines what zones will be available in the layout.
+The template defines what zones are available in the layout.
 
 Create a `templates/layouts/sidebar.html.twig` file:
 
@@ -95,7 +95,7 @@ With these three elements: configuration, icon and template, the new layout is r
 
 Now you can change the Home Page to use the new layout. Edit Home and in the top bar select **Switch layout**.
 Choose the new layout called "Main section with sidebar on the right".
-The empty zones you defined in the template will be visible in the editor.
+The empty zones you defined in the template are visible in the editor.
 
 ![Select layout window](enterprise_tut_select_layout.png)
 
@@ -105,10 +105,10 @@ The empty zones you defined in the template will be visible in the editor.
 
 ![Empty page with new layout](enterprise_tut_new_layout.png)
 
-Publish the Home Page. You will notice that it still has some additional text information.
+Publish the Home Page. You can notice that it still has some additional text information.
 This is because the looks of a Page are controlled by two separate template files, and you have only prepared one of those.
 The `sidebar.html.twig` file defines how zones are organized and how content is displayed in them.
-But you also need a general template file that will be used for every Page, regardless of its layout.
+But you also need a general template file that is used for every Page, regardless of its layout.
 
 Add this new template, `templates/full/landing_page.html.twig`:
 
diff --git a/docs/tutorials/page_and_form_tutorial/3_use_existing_blocks.md b/docs/tutorials/page_and_form_tutorial/3_use_existing_blocks.md
index bef044d26d..455311bcb2 100644
--- a/docs/tutorials/page_and_form_tutorial/3_use_existing_blocks.md
+++ b/docs/tutorials/page_and_form_tutorial/3_use_existing_blocks.md
@@ -15,7 +15,7 @@ First, create an override template for the Content List block: `templates/blocks
 [[= include_file('code_samples/tutorials/page_tutorial/templates/blocks/contentlist/default.html.twig') =]]
 ```
 
-Then add a configuration that will tell the app to use this template instead of the default one.
+Then add a configuration that tells the app to use this template instead of the default one.
 In `config/packages/ibexa_fieldtype_page.yaml` add the following code at the end of the file, under the `ibexa_fieldtype_page` key on the same level as `layouts`:
 
 ``` yaml
@@ -23,7 +23,7 @@ In `config/packages/ibexa_fieldtype_page.yaml` add the following code at the end
 ```
 
 The template makes use of an [image variation](images.md) (line 10).
-it's the thumbnail of the Dog Breed image that will be displayed in the block.
+It's the thumbnail of the Dog Breed image that is displayed in the block.
 To configure this variation, open the `config/packages/image_variations.yaml` file and add the following code under the `image_variations` key:
 
 ``` yaml
@@ -42,13 +42,13 @@ At this point you can start adding blocks to the Page.
 You do it in the Page's Edit mode by dragging a block from the menu on the right to the correct zone on the page.
 
 Drag a Content List block from the menu to the left zone on the page.
-Click the block and fill in the form. Here you name the block and decide what it will display.
+Click the block and fill in the form. Here you name the block and decide what it displays.
 Choose the "Dog Breed Catalog" folder as the Parent, select Dog Breed as the content type to be displayed, and choose a limit (3).
 You'll display the first three Dog Breeds from the database.
 
 ![Window with Content List options](enterprise_tut_content_list_window.png)
 
-Click **Submit** and you should see a preview of what the block will look like with the dog breed information displayed.
+Click **Submit** and you should see a preview of what the block looks like with the dog breed information displayed.
 
 ![Content List Styled](enterprise_tut_content_list_styled.png "Content List Styled")
 
@@ -58,7 +58,7 @@ Publish the page now and move on to creating another type of block.
 
 ### Create a Content Scheduler block for featured articles
 
-The next block is the Content Scheduler block that will air articles at predetermined times.
+The next block is the Content Scheduler block that airs articles at predetermined times.
 
 First, add a configuration that points to the layout. Go to `config/packages/ibexa_fieldtype_page.yaml` again and add the following code under `blocks` on the same level as the `contentlist` key:
 
@@ -73,9 +73,9 @@ Create the new file `templates/blocks/schedule/featured.html.twig`:
 [[= include_file('code_samples/tutorials/page_tutorial/templates/blocks/schedule/featured.html.twig') =]]
 ```
 
-When you look at the template, you can see three blocks, each of which will render the content items using the `featured` view (line 11).
+When you look at the template, you can see three blocks, each of which render the content items using the `featured` view (line 11).
 So far you only have templates for `full` view for Articles. This means you need to create a `featured` view template,
-otherwise you will get an error when trying to add Content to the block.
+otherwise you get an error when trying to add Content to the block.
 
 You need to modify the `config/packages/views.yaml` file to indicate when to use the template.
 Add the following code to this file, on the same level as the `full` key:
@@ -122,20 +122,20 @@ Navigate to the "All Articles" folder and select the articles you had created an
 Accept the suggested airtime and click **Submit**.
 
 Now click the Airtime button next to one of the Articles and choose a time in the future.
-This article will be listed in the queue.
+This article is listed in the queue.
 
 ![Content Scheduler with scheduled content](enterprise_tut_choosing_airtime.png)
 
 Publish the Page.
 
 Now open the Timeline at the top of the screen.
-You can move the slider to different times and preview what the Content Scheduler block will look like at different hours.
-Content will be shown when you move the slider to the point when it airs.
+You can move the slider to different times and preview what the Content Scheduler block looks like at different hours.
+Content is shown when you move the slider to the point when it airs.
 
 !!! tip
 
     At this point you have configured the Content Scheduler block to work with Articles only.
-    If you try to add Content of any other type, you will see an error.
+    If you try to add Content of any other type, you can see an error.
     This is because there is no `featured` view for content other than Articles defined at the moment.
 
 ![Front Page after adding Featured Block](enterprise_tut_page_with_featured_articles.png "Front Page after adding Featured Block")
diff --git a/docs/tutorials/page_and_form_tutorial/4_create_a_custom_block.md b/docs/tutorials/page_and_form_tutorial/4_create_a_custom_block.md
index 02f8d3b371..852661c582 100644
--- a/docs/tutorials/page_and_form_tutorial/4_create_a_custom_block.md
+++ b/docs/tutorials/page_and_form_tutorial/4_create_a_custom_block.md
@@ -5,8 +5,8 @@ edition: experience
 
 # Step 4 — Create a custom block
 
-This step will guide you through creating a custom block.
-The custom block will display a randomly chosen content item from a selected folder.
+This step guides you through creating a custom block.
+The custom block displays a randomly chosen content item from a selected folder.
 
 To create a custom block from scratch you need four elements:
 
@@ -23,7 +23,7 @@ In `config/packages/ibexa_fieldtype_page.yaml` add the following block under the
 [[= include_file('code_samples/tutorials/page_tutorial/config/packages/ibexa_fieldtype_page.yaml', 24, 42) =]]
 ```
 
-This configuration defines one attribute, `parent`. You will use it to select the folder containing tips.
+This configuration defines one attribute, `parent`. Use it to select the folder containing tips.
 
 ### Block template
 
@@ -35,7 +35,7 @@ You also need to create the block template, `templates/blocks/random/default.ht
 
 ### Block listener
 
-Block listener provides the logic for the block. it's contained in `src/Event/RandomBlockListener.php`:
+Block listener provides the logic for the block. It's contained in `src/Event/RandomBlockListener.php`:
 
 ``` php
 [[= include_file('code_samples/tutorials/page_tutorial/src/Event/RandomBlockListener.php') =]]
@@ -57,7 +57,7 @@ Run `yarn encore <dev|prod>` to regenerate assets.
 Go back to editing the Front Page. Drag a Random Block from the Elements menu on the right to the Page's side column.
 Access the block's settings and choose the "All Tips" folder from the menu. Save and publish all the changes.
 
-Refresh the home page. The Tip of the Day block will display a random Tip from the "Tips" folder.
-Refresh the page a few more times and you will see the tip change randomly.
+Refresh the home page. The Tip of the Day block displays a random Tip from the "Tips" folder.
+Refresh the page a few more times and you can see the tip change randomly.
 
 ![Random Block with a Tip](enterprise_tut_random_block.png "Random Block with a Tip")
diff --git a/docs/tutorials/page_and_form_tutorial/5_create_newsletter_form.md b/docs/tutorials/page_and_form_tutorial/5_create_newsletter_form.md
index 2b0502e83f..e7750efb07 100644
--- a/docs/tutorials/page_and_form_tutorial/5_create_newsletter_form.md
+++ b/docs/tutorials/page_and_form_tutorial/5_create_newsletter_form.md
@@ -63,7 +63,7 @@ Go back to editing the Page.
 Edit the Form block again.
 In the **Design** tab, select the **Newsletter Form View** and click **Submit**.
 
-The block remains unchanged, but the results will be visible when you add CSS styling.
+The block remains unchanged, but the results are visible when you add CSS styling.
 
 ### Change the field template
 
diff --git a/docs/tutorials/page_and_form_tutorial/page_and_form_tutorial.md b/docs/tutorials/page_and_form_tutorial/page_and_form_tutorial.md
index f1ad82e685..e0b7b064cd 100644
--- a/docs/tutorials/page_and_form_tutorial/page_and_form_tutorial.md
+++ b/docs/tutorials/page_and_form_tutorial/page_and_form_tutorial.md
@@ -15,28 +15,28 @@ Ideally, you should be familiar with the concepts covered in the [Beginner tutor
 
 ### Learning outcomes
 
-After finishing this tutorial, you will:
+After finishing this tutorial, you:
 
-- Have a working knowledge of the Page functionality and architecture
-- Be able to create a Page and customize its layout
-- Be able to prepare and customize Page blocks
-- Be able to create a custom block
-- Know how to use Form Builder and configure your form
-- Know how to apply custom styling to blocks
+- have a working knowledge of the Page functionality and architecture
+- are able to create a Page and customize its layout
+- are able to prepare and customize Page blocks
+- are able to create a custom block
+- know how to use Form Builder and configure your form
+- know how to apply custom styling to blocks
 
 ## Scenario
 
-In the course of this scenario you will build a website for a magazine for dog owners called 'It's a Dog's World'.
+In the course of this scenario you can build a website for a magazine for dog owners called 'It's a Dog's World'.
 
-You will create a welcome page that will showcase the magazine's three most important types of content: articles, dog breed information and tips.
+You can create a welcome page that showcases the magazine's three most important types of content: articles, dog breed information and tips.
 
-You will do this by means of a Page, making use of its specific blocks, and crafting your own as well.
+You do this by means of a Page, making use of its specific blocks, and crafting your own as well.
 
 ![It's a Dog's World - final result](enterprise_tut_main_screen.png "It's a Dog's World - final result")
 
 ## Steps
 
-In this tutorial you will go through the following steps:
+In this tutorial you go through the following steps:
 
 1. [Get a starter website](1_get_a_starter_website.md)
 1. [Prepare the Page](2_prepare_the_landing_page.md)
diff --git a/docs/update_and_migration/from_1.x_2.x/update_app_to_2.5.md b/docs/update_and_migration/from_1.x_2.x/update_app_to_2.5.md
index d904197a85..ce025b7cdf 100644
--- a/docs/update_and_migration/from_1.x_2.x/update_app_to_2.5.md
+++ b/docs/update_and_migration/from_1.x_2.x/update_app_to_2.5.md
@@ -23,7 +23,7 @@ You need to install [Node.js](https://nodejs.org/en) and [Yarn](https://classic.
 
 In v2.5 it's still possible to use Assetic, like in earlier versions.
 However, if you're using the latest Bootstrap version, [`scssphp`](https://github.com/leafo/scssphp)
-will not compile correctly with Assetic.
+doesn't compile correctly with Assetic.
 In this case, use Webpack Encore. See [Importing assets from a bundle](importing_assets_from_bundle.md) for more information.
 
 If you experience issues during the update, see [Troubleshooting](troubleshooting.md#cloning-failed-using-an-ssh-key).
diff --git a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
index c14f3b25dd..f679f36f5a 100644
--- a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
+++ b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
@@ -69,7 +69,7 @@ To use the script:
     This script uses the layout defined in your Landing Page.
     To migrate successfully, you need to copy your zone configuration
     from `ez_systems_landing_page_field_type` under `ezplatform_page_fieldtype` in the new config.
-    Otherwise the script will encounter errors.
+    Otherwise the script encounters errors.
 
 You can remove the bundle after the migration is complete.
 
@@ -78,20 +78,20 @@ The operation is transactional and rolls back in case of errors.
 
 !!! caution "Avoid exception when migrating from eZ Publish"
 
-    If you [migrated to v1.13 from eZ Publish](migrating_from_ez_publish.md), and want to upgrade to v2.5, an exception will occur when you run the `bin/console ezplatform:page:migrate` command and the database contains internal drafts of Landing Pages. 
+    If you [migrated to v1.13 from eZ Publish](migrating_from_ez_publish.md), and want to upgrade to v2.5, an exception occurs when you run the `bin/console ezplatform:page:migrate` command and the database contains internal drafts of Landing Pages. 
     
     To avoid this exception, you must first [remove all internal drafts before you migrate](migrating_from_ez_publish.md#migration_exception). 
 
 ##### Block migration
 
 In v2.2 Page Builder does not offer all blocks that Landing Page editor did. The removed blocks include Keyword, Schedule, and Form blocks.
-The Places block has been removed from the clean installation and will only be available in the demo out of the box.
+The Places block has been removed from the clean installation and is only available in the demo out of the box.
 If you use this block in your site, re-apply its configuration based on the [demo](https://github.com/ezsystems/ezplatform-ee-demo/blob/v2.2.2/app/config/blocks.yml).
 
 Later versions of Page Builder come with a Content Scheduler block and new Form Blocks, but migration of Schedule blocks to Content Scheduler blocks and of Form Blocks is not supported. 
 
 If there are missing block definitions, such as Form Block or Schedule Block,
-you have an option to continue, but migrated Landing Pages will come without those blocks.
+you have an option to continue, but migrated Landing Pages come without those blocks.
 
 !!! tip
 
@@ -122,7 +122,7 @@ For more information about how custom blocks are implemented in Page Builder, ha
 
 For the migration of blocks from Landing Page to Page Builder, you'll need to provide a converter for attributes of custom blocks. For simple blocks you can use `\EzSystems\EzPlatformPageMigration\Converter\AttributeConverter\DefaultConverter`.
 Custom converters must implement the `\EzSystems\EzPlatformPageMigration\Converter\AttributeConverter\ConverterInterface` interface.
-`convert()` will parse XML `\DOMNode $node` and return an array of `\EzSystems\EzPlatformPageFieldType\FieldType\LandingPage\Model\Attribute` objects.
+`convert()` parses XML `\DOMNode $node` and return an array of `\EzSystems\EzPlatformPageFieldType\FieldType\LandingPage\Model\Attribute` objects.
 
 Below is an example of a simple converter for a custom block:
 
@@ -677,7 +677,7 @@ php bin/console ezplatform:form-builder:create-forms-container --content-type cu
 You also need to run a script to add database tables for the Form Builder.
 You can find it in https://github.com/ezsystems/ezplatform-ee-installer/blob/2.3/Resources/sql/schema.sql#L136
 
-!!! caution "Form (ezform) Field Type"
+!!! caution "Form (ezform) field type"
 
     After the update, in order to create forms, you have to add a new content type (for example, named "Form") that contains `Form` Field (this content type can contain other fields
     as well). After that you can use forms inside Landing Pages via Embed block.
@@ -776,7 +776,7 @@ php bin/console ezplatform:reindex
 
 The introduction of [support for PostgreSQL](databases.md#using-postgresql) includes a change in the way database schema is generated.
 
-it's now created based on [YAML configuration](https://github.com/ezsystems/ezpublish-kernel/blob/master/eZ/Bundle/EzPublishCoreBundle/Resources/config/storage/legacy/schema.yaml), using the new [`DoctrineSchemaBundle`](https://github.com/ezsystems/doctrine-dbal-schema).
+It's now created based on [YAML configuration](https://github.com/ezsystems/ezpublish-kernel/blob/master/eZ/Bundle/EzPublishCoreBundle/Resources/config/storage/legacy/schema.yaml), using the new [`DoctrineSchemaBundle`](https://github.com/ezsystems/doctrine-dbal-schema).
 
 If you're updating your application according to the usual procedure, no additional actions are required.
 However, if you do not update your meta-repository, you need to take two additional steps:
@@ -784,7 +784,7 @@ However, if you do not update your meta-repository, you need to take two additio
 - enable `EzSystems\DoctrineSchemaBundle\DoctrineSchemaBundle()` in `AppKernel.php`
 - add [`ez_doctrine_schema`](https://github.com/ezsystems/ezplatform/blob/2.5/app/config/config.yml#L33) configuration
 
-#### Changes to Matrix Field Type
+#### Changes to Matrix field type
 
 To migrate your content from legacy XML format to a new `ezmatrix` value use the following command:
 
@@ -833,7 +833,7 @@ CREATE INDEX ezpage_pages_content_id_version_no ON ezpage_pages(content_id, vers
 ##### Powered-By header
 
 In order to promote use of eZ Platform, `ezsystems/ez-support-tools` v1.0.10, as of eZ Platform v2.5.16, sets the Powered-By header.
-it's enabled by default and generates a header like `Powered-By: eZ Platform Enterprise v2`.
+It's enabled by default and generates a header like `Powered-By: eZ Platform Enterprise v2`.
 
 To omit the version number, use the following configuration:
 ``` yaml
diff --git a/docs/update_and_migration/from_2.5/adapt_code_to_v3.md b/docs/update_and_migration/from_2.5/adapt_code_to_v3.md
index 710f64f5b9..c41b2a5b6f 100644
--- a/docs/update_and_migration/from_2.5/adapt_code_to_v3.md
+++ b/docs/update_and_migration/from_2.5/adapt_code_to_v3.md
@@ -79,7 +79,7 @@ that your project uses have been adapted to Symfony 5.
 ### Automatic code refactoring (optional)
 
 To simplify the process of adapting your code to Symfony 5, you can use [Rector, a reconstructor tool](https://github.com/rectorphp/rector)
-that will automatically refactor your Symfony and PHPunit code.
+that automatically refactors your Symfony and PHPunit code.
 
 To properly refactor your code, you might need to run the Rector `process` command for each Symfony version from 4.0 to 5.0 in turn:
 
@@ -94,7 +94,7 @@ Now, go through the following steps and ensure all your code is up to date with
 
 - [1. Update templates](update_code/1_update_templates.md)
 - [2. Update configuration](update_code/2_update_configuration.md)
-- [3. Update Field Types](update_code/3_update_field_types.md)
+- [3. Update field types](update_code/3_update_field_types.md)
 - [4. Update Signal Slots](update_code/4_update_signal_slots.md)
 - [5. Update Online Editor](update_code/5_update_online_editor.md)
 - [6. Update workflow](update_code/6_update_workflow.md)
diff --git a/docs/update_and_migration/from_2.5/to_3.3.md b/docs/update_and_migration/from_2.5/to_3.3.md
index 2851f41459..73a1e72621 100644
--- a/docs/update_and_migration/from_2.5/to_3.3.md
+++ b/docs/update_and_migration/from_2.5/to_3.3.md
@@ -41,7 +41,7 @@ If you have not done it before, add the relevant meta-repository as an `upstream
 
 !!! tip
 
-    it's good practice to make git commits after every step of the update procedure.
+    It's good practice to make git commits after every step of the update procedure.
 
 ### A. Merge project skeleton
 
@@ -88,7 +88,7 @@ Resolve the conflicts in the following way:
 
 !!! caution
 
-    it's impossible to update an Enterprise edition (`ezsystems/ezplatform-ee`)
+    It's impossible to update an Enterprise edition (`ezsystems/ezplatform-ee`)
     to an [[= product_name_content =]] edition.
 
     Also, make sure that `composer.json` has the following `repositories` entry:
diff --git a/docs/update_and_migration/from_2.5/update_code/3_update_field_types.md b/docs/update_and_migration/from_2.5/update_code/3_update_field_types.md
index 83c6de1fd6..9cac1548e6 100644
--- a/docs/update_and_migration/from_2.5/update_code/3_update_field_types.md
+++ b/docs/update_and_migration/from_2.5/update_code/3_update_field_types.md
@@ -1,11 +1,11 @@
-# 4.3. Update Field Types
+# 4.3. Update field types
 
-You need to adapt your custom Field Types to the new Field Type architecture.
+You need to adapt your custom field types to the new field type architecture.
 
 ## `eZ\Publish\SPI\FieldType\FieldType` interface
 
 The `eZ\Publish\SPI\FieldType\FieldType` interface is now an abstract class.
-You need to replace `implements FieldType` in your Field Type code with `extends FieldType`.
+You need to replace `implements FieldType` in your field type code with `extends FieldType`.
 
 ## Deprecated `getName` method
 
@@ -47,7 +47,7 @@ You need to replace importing the following classes:
 |EzSystems\RepositoryForms\FieldType\FieldDefinitionFormMapperInterface|EzSystems\EzPlatformAdminUi\FieldType\FieldDefinitionFormMapperInterface|
 |EzSystems\RepositoryForms\FieldType\FieldValueFormMapperInterface|EzSystems\EzPlatformContentForms\FieldType\FieldValueFormMapperInterface|
 
-## Extending Field Type templates
+## Extending field type templates
 
 If you extended templates for `ezobjectrelationlist_field`, `ezimageasset_field`, or `ezobjectrelation_field` Fields
 using `{% extends "@EzPublishCore/content_fields.html.twig" %}`,
diff --git a/docs/update_and_migration/from_2.5/update_code/5_update_online_editor.md b/docs/update_and_migration/from_2.5/update_code/5_update_online_editor.md
index 80305e0542..5a2cb515af 100644
--- a/docs/update_and_migration/from_2.5/update_code/5_update_online_editor.md
+++ b/docs/update_and_migration/from_2.5/update_code/5_update_online_editor.md
@@ -2,7 +2,7 @@
 
 ## RichText
 
-Deprecated code related to the RichText Field Type has been removed from `ezpublish-kernel`.
+Deprecated code related to the RichText field type has been removed from `ezpublish-kernel`.
 
 If your code still relies on the `eZ\Publish\Core\FieldType\RichText` namespace, you need to rewrite it
 to use `EzSystems\EzPlatformRichText\eZ\RichText` instead.
diff --git a/docs/update_and_migration/from_3.3/to_4.0.md b/docs/update_and_migration/from_3.3/to_4.0.md
index 5bafc7ba06..0fa54faaa0 100644
--- a/docs/update_and_migration/from_3.3/to_4.0.md
+++ b/docs/update_and_migration/from_3.3/to_4.0.md
@@ -140,7 +140,7 @@ If you have no access to [[= product_name =]]'s `ibexa/installer` package, apply
 For every database connection you have configured, perform the following steps:
 
 1. Run `php bin/console doctrine:schema:update --dump-sql --em=ibexa_{connection}`
-2. Check the queries and verify that they're safe and will not damage the data.
+2. Check the queries and verify that they're safe and doesn't damage the data.
 3. Run `php bin/console doctrine:schema:update --dump-sql --em=ibexa_{connection} --force`
 
 Next, run the following commands to import necessary data migration scripts:
diff --git a/docs/update_and_migration/from_4.2/update_from_4.2.md b/docs/update_and_migration/from_4.2/update_from_4.2.md
index 0eea86cae2..fb8d979a85 100644
--- a/docs/update_and_migration/from_4.2/update_from_4.2.md
+++ b/docs/update_and_migration/from_4.2/update_from_4.2.md
@@ -93,7 +93,7 @@ php bin/console ibexa:migrate:customers  --input-user-group=3a3beb3d09ae0dacebf1
 ```
 
 - `--input-user-group` - represents the remote ID of a user group you want to migrate to a new content type.
-After migration, this will also be the ID of a new Private Customer user group.
+After migration, this is also the ID of a new Private Customer user group.
 - `--create-content-type` - if you add this parameter, the system creates the new content type based on the one defined in `--input-user-content-type`
 
 ##### Additional parameters
@@ -109,7 +109,7 @@ If you don't have custom User content types, use the basic migration.
 
 !!! caution
 
-    This improvement will prevent logged in backend users from making purchases in the frontend store.
+    This improvement prevents logged in backend users from making purchases in the frontend store.
 
 #### Execute migrations
 
diff --git a/docs/update_and_migration/from_4.3/update_from_4.3_new_commerce.md b/docs/update_and_migration/from_4.3/update_from_4.3_new_commerce.md
index ad2475a351..5459fb6d60 100644
--- a/docs/update_and_migration/from_4.3/update_from_4.3_new_commerce.md
+++ b/docs/update_and_migration/from_4.3/update_from_4.3_new_commerce.md
@@ -31,20 +31,20 @@ Run:
     composer require ibexa/commerce:[[= latest_tag_4_3 =]] --with-all-dependencies --no-scripts
     ```
 
-## Remove deprecated Field Types
+## Remove deprecated field types
 
 By default, every v4.3 installation has a set of built-in content types.
-Some of them use Field Types deprecated in v4.4, which need to be removed manually.
-Make sure to remove all occurrences of `sesspecificationstype`, `uivarvarianttype`, `sesselection`, `sesprofiledata` Field Types from your content types.
+Some of them use field types deprecated in v4.4, which need to be removed manually.
+Make sure to remove all occurrences of `sesspecificationstype`, `uivarvarianttype`, `sesselection`, `sesprofiledata` field types from your content types.
 
-This step should be performed on the working installation, omitting it will result in an error during update:
+This step should be performed on the working installation, omitting it results in an error during update:
 
 ```
   [Ibexa\Core\Persistence\Legacy\Content\FieldValue\Converter\Exception\NotFound (404)]
   Could not find 'Persistence Field Value Converter' with identifier 'sesspecificationstype'
 ```
 
-In that case, you can use [Null Field Type](nullfield.md) to define a replacement for deprecated Field Types in `config/services.yaml`:
+In that case, you can use [Null field type](nullfield.md) to define a replacement for deprecated field types in `config/services.yaml`:
 
 ```yaml
 services:
@@ -126,7 +126,7 @@ Review the old YAML files and move your custom configuration to the relevant new
 ### Flysystem v2
 
 Local adapters' `directory` key changed to `location`.
-it's defined in `config/packages/oneup_flysystem.yaml`:
+It's defined in `config/packages/oneup_flysystem.yaml`:
 
 ```yaml
 oneup_flysystem:
diff --git a/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md b/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md
index c8634734c0..7c6fee046e 100644
--- a/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md
+++ b/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md
@@ -73,7 +73,7 @@ Review the old YAML files and move your custom configuration to the relevant new
 #### Flysystem v2
 
 Local adapters' `directory` key changed to `location`.
-it's defined in `config/packages/oneup_flysystem.yaml`:
+It's defined in `config/packages/oneup_flysystem.yaml`:
 
 ```yaml
 oneup_flysystem:
diff --git a/docs/update_and_migration/from_4.5/update_from_4.5.md b/docs/update_and_migration/from_4.5/update_from_4.5.md
index b41783863c..ab123f76ae 100644
--- a/docs/update_and_migration/from_4.5/update_from_4.5.md
+++ b/docs/update_and_migration/from_4.5/update_from_4.5.md
@@ -240,7 +240,7 @@ And apply the following database script:
 
 ### Image picker migration
 
-The new Image picker by default expects an `ezkeyword` Field Type to exist in the `image` content type.
+The new Image picker by default expects an `ezkeyword` field type to exist in the `image` content type.
 
 You can add it running the following commands:
 
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/common_issues.md b/docs/update_and_migration/migrate_to_ibexa_dxp/common_issues.md
index c90114e893..e943588555 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/common_issues.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/common_issues.md
@@ -4,7 +4,7 @@ description: Check common issues that occur when updating from earlier version t
 
 # Common migration issues
 
-Below you will find cleanup commands from the EzPublishMigrationBundle for the most common
+Below you can find cleanup commands from the EzPublishMigrationBundle for the most common
 issues that can occur after migration to [[= product_name =]].
 
 !!! note "Enabling EzPublishMigrationBundle bundle"
@@ -48,14 +48,14 @@ php bin/console ezplatform:images:normalize-path
 the first time article is published (upon creation). It only happens after the article is
 edited and published.
 
-If this error occurs use the console command below. It will clean up redundant Relations rows:
+If this error occurs use the console command below. It cleans up redundant Relations rows:
 
 ```
 php bin/console ezpublish:update:legacy_storage_clean_up_relation_type_eq_zero
 ```
 The command can be executed in two modes:
 
-- list / dry-run - prints table with all corrupted Relations that will be deleted (to be executed first)
+- list / dry-run - prints table with all corrupted Relations that are deleted (to be executed first)
 - fix - executes clean up
 
 You can read more about this issue here: [EZP-27254](https://issues.ibexa.co/browse/EZP-27254)
@@ -64,21 +64,21 @@ You can read more about this issue here: [EZP-27254](https://issues.ibexa.co/bro
 
 Always available flag is set on all Fields, instead of only on Fields in the main
 language. This problem occurs when [[= product_name =]] is used to create content that is both
-always available and has multiple translations. The cleanup script will correctly set
+always available and has multiple translations. The cleanup script correctly sets
 always available flag for prioritized language filtering in Legacy search engine.
 
 ```
 php bin/console ezpublish:update:legacy_storage_fix_fields_always_available_flag
 ```
 
-Only affected Fields will be processed by the cleanup command.
+Only affected Fields are processed by the cleanup command.
 
 You can read more about this issue here: [EZP-24882](https://issues.ibexa.co/browse/EZP-24882)
 
 ## Listing sub-content
 
 it's possible that after upgrade `sort_key_string` is left empty. This may cause problems
-in searches throughout the API. The cleanup script will check if Fields of given Field
+in searches throughout the API. The cleanup script checks if Fields of given Field
 Type have correct sort key, and update it if needed.
 
 Execute the following command from the installation root directory:
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish.md b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish.md
index 5a58fc5066..2f56258057 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish.md
@@ -6,7 +6,7 @@ description: Migrate an older eZ Publish installation to eZ Platform.
 
 eZ Publish was eZ Platform's predecessor, a CMS in development for five major versions and several years.
 
-Users of eZ Publish will find eZ Platform largely similar to what they know. The improvements and enhancements did not turn the fundamental concepts underlying the system, such as the content model, upside down. However, specific features, solutions and recipes may work differently between the two versions.
+Users of eZ Publish can find eZ Platform largely similar to what they know. The improvements and enhancements did not turn the fundamental concepts underlying the system, such as the content model, upside down. However, specific features, solutions and recipes may work differently between the two versions.
 
 The release of eZ Platform brought about an inevitable disruption in backwards compatibility with eZ Publish. This means that the process of migrating existing installations requires more effort than simply upgrading from one version to another. Here you can find details on moving existing Publish-powered websites to eZ Platform.
 
@@ -23,7 +23,7 @@ The 6th generation is aimed at being fully backwards compatible on the following
 
 The specific incompatibilities
 
-The specific changes that will be migrated and are incompatible with legacy are: 
+The specific changes that are migrated and are incompatible with legacy are: 
 
 - XmlText fields have been replaced with a new [RichText](richtextfield.md) field
 - Page field (ezflow) has been replaced by the [LandingPage](pagefield.md) field, and is now provided by our commercial product [eZ Platform Enterprise Edition](http://ezstudio.com/)
@@ -37,7 +37,7 @@ Together these major improvements make it practically impossible to run eZ Platf
 
 If you're coming directly from legacy (4.x), you need to follow the best practice 5.x Platform migration path and do the following:
 
-- Rewrite custom Field Types for the new Platform stack. Alternatively you can use Null Field Type as a dummy implementation for the custom Field Types that you don't want to migrate. Using Null Field Type will prevent errors from the Platform Stack, see [Null Field Type Reference](nullfield.md)
+- Rewrite custom field types for the new Platform stack. Alternatively you can use Null field type as a dummy implementation for the custom field types that you don't want to migrate. Using Null field type prevents errors from the Platform Stack, see [Null field type Reference](nullfield.md)
 - Rewrite custom web front end to use the new Platform/Symfony stack, see [Beginner Tutorial](beginner_tutorial.md)
 - Rewrite custom admin modules to use the new Platform/Symfony stack
     - And if you do this while on 5.x, you can use several of the [available legacy migration features](https://doc.ez.no/display/EZP/Legacy+code+and+features) to make the new code appear in legacy admin
@@ -57,7 +57,7 @@ See Upgrade documentation on how to perform the actual upgrade: [Upgrade (eZ Pub
 
 As eZ Platform introduced completely new user interfaces with greatly improved user experience, the following custom developments needs to be made if you have customization needs:
 
-- Write UI code for custom Field Types for the new JavaScript-based editorial interface, (see [Page blocks](render_page.md)
+- Write UI code for custom field types for the new JavaScript-based editorial interface, (see [Page blocks](render_page.md)
 - Adjust custom admin modules for the new Symfony-based admin interface
 
 For a detailed guide through these developments see [Upgrading from 5.4.x and 2014.11 to 16.xx](migrating_from_ez_publish_platform.md#upgrading-from-54x-and-201411-to-16xx) 
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
index dcb8c740b3..5b98ea0714 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
@@ -24,7 +24,7 @@ You can then proceed with consecutive upgrades to further versions: v1.13 LTS an
     1. Additionally there are some other topics to be aware of for the code migration from eZ Publish to eZ Platform:
 
         - Symfony deprecations. The recommended version to migrate to is eZ Platform v2.5 LTS, which is using Symfony 3.4 LTS.
-        - [Field Types reference](field_type_reference.md) for overview of Field Types that do and don't exist in eZ Platform
+        - [Field types reference](field_type_reference.md) for overview of field types that do and don't exist in eZ Platform
         - API changes. While we have a strict backwards compatibility focus, some deprecated API features were removed and some changes were done to internal parts of the system. See [ezpublish-kernel:doc/bc/changes-6.0.md](https://github.com/ezsystems/ezpublish-kernel/blob/v6.7.0/doc/bc/changes-6.0.md)
 
 !!! note
@@ -73,15 +73,15 @@ Assuming you have own composer packages *(libraries and bundles, but not eZ Publ
 
 Adapt the command with your `vendor`, `package`, version number, and add `"–dev"` if a given package is for dev use. Also check if there are other changes in `composer.json` you should move over.
 
-#### 2.2.2 Install XmlText Field Type
+#### 2.2.2 Install XmlText field type
 
-While no longer bundled, the XmlText Field Type still exists and is needed to perform a migration from eZ Publish's XmlText to the new docbook-based format used by the RichText Field Type. If you plan to use Legacy Bridge for a while before migrating content, you'll also need this for rendering content with XMLText. From `<new-ez-root>` execute:
+While no longer bundled, the XmlText field type still exists and is needed to perform a migration from eZ Publish's XmlText to the new docbook-based format used by the RichText field type. If you plan to use Legacy Bridge for a while before migrating content, you'll also need this for rendering content with XMLText. From `<new-ez-root>` execute:
 
 `composer require --no-update "ezsystems/ezplatform-xmltext-fieldtype:^1.3.0"`
 
 !!! note
 
-    As of v1.3, be aware this Field Type now uses the Content View system introduced in eZ Platform 1.0, so make sure you adapt custom templates and override rules if you plan to use this for rendering content _(in Legacy Bridge setup)_.
+    As of v1.3, be aware this field type now uses the Content View system introduced in eZ Platform 1.0, so make sure you adapt custom templates and override rules if you plan to use this for rendering content _(in Legacy Bridge setup)_.
 
 
 ### 2.3. Config
@@ -115,7 +115,7 @@ To move over your own custom configurations, follow the conventions below and ma
 
 !!! note "Make sure to adapt SiteAccess names"
 
-    In the default configurations in **ezplatform.yaml** you'll find existing SiteAccesses like `site`, and depending on installation perhaps a few others, all under a site group called `site\_group`. Make sure to change those to what you had in **ezpublish.yaml** to avoid issues with having to log in to your website, given user/login policy rules will need to be updated if you change names of SiteAccess as part of the upgrade.
+    In the default configurations in **ezplatform.yaml** you'll find existing SiteAccesses like `site`, and depending on installation perhaps a few others, all under a site group called `site\_group`. Make sure to change those to what you had in **ezpublish.yaml** to avoid issues with having to log in to your website, given user/login policy rules need to be updated if you change names of SiteAccess as part of the upgrade.
 
 #### 2.3.1 Image aliases
 
@@ -169,7 +169,7 @@ Move over registration of _your_ bundles you have from src and from composer pac
 
 ### 2.5. Optional: Install Legacy Bridge
 
-If you don't plan to migrate content directly to newer eZ Platform Field Types, you can optionally install Legacy Bridge and gradually handle code and subsequent content migration afterwards. For installation instructions see [here](https://github.com/ezsystems/LegacyBridge/blob/master/INSTALL.md).
+If you don't plan to migrate content directly to newer eZ Platform field types, you can optionally install Legacy Bridge and gradually handle code and subsequent content migration afterwards. For installation instructions see [here](https://github.com/ezsystems/LegacyBridge/blob/master/INSTALL.md).
 
 !!! note
 
@@ -179,9 +179,9 @@ If you don't plan to migrate content directly to newer eZ Platform Field Types,
 
 As eZ Publish legacy is installed via composer, we need to take care of placing some files outside its generated `<new-ez-root>/ezpublish_legacy/` folder, and for instance use symlink to place them inside during installation.
 
-1. For design and settings files that you typically version in git, you can now take advantage of Legacy Bridge's built-in symlink convention. So as installation already hinted about, you can generate a structure and set up symlinks using `bin/console ezpublish:legacy:symlink -c`. This will create folders you can use below in `<new-ez-root>/src/legacy_files/`.
+1. For design and settings files that you typically version in git, you can now take advantage of Legacy Bridge's built-in symlink convention. So as installation already hinted about, you can generate a structure and set up symlinks using `bin/console ezpublish:legacy:symlink -c`. This creates folders you can use below in `<new-ez-root>/src/legacy_files/`.
 
-1. The same goes for the `<new-ez-root>/ezpublish_legacy/var/[<site>/]storage` folder. However, as it's typically not versioned in git, there's no predefined convention for this. If you create a folder within your project structure for symlinking into this folder, as opposed to a mount somewhere else, make sure to mark this folder as ignored by git once it and the corresponding `.keep` file have been added to your checkout. The example below will assume `<new-ez-root>/src/legacy_files/storage` was created for this purpose, if you opt for something else just adjust the instructions.
+1. The same goes for the `<new-ez-root>/ezpublish_legacy/var/[<site>/]storage` folder. However, as it's typically not versioned in git, there's no predefined convention for this. If you create a folder within your project structure for symlinking into this folder, as opposed to a mount somewhere else, make sure to mark this folder as ignored by git once it and the corresponding `.keep` file have been added to your checkout. The example below assumes `<new-ez-root>/src/legacy_files/storage` was created for this purpose, if you opt for something else just adjust the instructions.
 
 #### 2.5.2 Upgrade the legacy distribution files
 
@@ -220,7 +220,7 @@ When that is done, execute the following to update and install all packages from
 
 !!! note
 
-    At the end of the process, you will be asked for values for parameters.yaml not already moved from old installation, or new *(as defined in parameters.yaml.dist)*.
+    At the end of the process, you are asked for values for parameters.yaml not already moved from old installation, or new *(as defined in parameters.yaml.dist)*.
 
 ### 2.8 Register EzSystemsEzPlatformXmlTextFieldTypeBundle
 
@@ -238,25 +238,25 @@ Import to your database the changes provided in one of the following files. It's
 
 `Postgres: <new-ez-root>/vendor/ezsystems/ezpublish-kernel/data/update/postgres/dbupdate-5.4.0-to-6.13.0.sql`
 
-### 3.2. Once you're ready to migrate content to Platform Field Types
+### 3.2. Once you're ready to migrate content to Platform field types
 
-Steps here should only be done once you're ready to move away from legacy and Legacy Bridge, as the following Field Types are not supported by legacy. In other words, content you have migrated will not be editable in legacy admin interface anymore, but rather in the more modern eZ Platform back-end UI, allowing you to take full advantage of what the Platform has to offer.
+Steps here should only be done once you're ready to move away from legacy and Legacy Bridge, as the following field types are not supported by legacy. In other words, content you have migrated isn't be editable in legacy admin interface anymore, but rather in the more modern eZ Platform back-end UI, allowing you to take full advantage of what the Platform has to offer.
 
-The Field Types unsupported in eZ Platform are:
+The field types unsupported in eZ Platform are:
 
 - [XmlText](#321-migrate-xmltext-content-to-richtext)
 - [Page](#322-migrate-page-field-to-page-ez-enterprise-only)
 - Star Rating
 
-For Field Types which do not have specific procedures below, you must take one of the following actions:
+For field types which do not have specific procedures below, you must take one of the following actions:
 
 - implement them yourself in eZ Platform
 - remove them from all content types that use them
 
 !!! tip
 
-    To find out which content types use a specific Field Type,
-    you can run the following SQL query on your database (in this case, for the Star Rating Field Type):
+    To find out which content types use a specific field type,
+    you can run the following SQL query on your database (in this case, for the Star Rating field type):
 
     ``` sql
     select contentclass_id from ezcontentclass_attribute where data_type_string='ezsrrating' group by contentclass_id;
@@ -271,19 +271,19 @@ Run the conversion script on a copy of your production database as the script is
 
 - `-d memory_limit=1536M` specifies that each conversion process gets 1536MB of memory. This should be more than sufficient for most databases. If you have small `ezxmltext` documents, you may decrease the limit. If you have huge `ezxmltext` documents, you may need to increase it. See PHP documentation for more information about the [memory_limit setting](http://php.net/manual/en/ini.core.php#ini.memory-limit).
 - `--dry-run` prevents the conversion script from writing anything back to the database. It just tests if it's able to convert all the `ezxmltext` documents.
-- `--export-dir` specifies a directory where it will dump the `ezxmltext` for content object attributes which the conversion script finds problems with
+- `--export-dir` specifies a directory where it dumps the `ezxmltext` for content object attributes which the conversion script finds problems with
 - `--export-dir-filter` specifies what severity the problems found needs to be before the script dumps the `ezxmltext`:
     - `notice`: `ezxmltext` contains problems which the conversion tool was able to fix automatically and likely do not need manual intervention
     - `warning`: the conversion tool was able to convert the `ezxmltext` to valid `richtext`, but data could have been altered/removed/added in the process. Manual supervision recommended
     - `error`: the `ezxmltext` text cannot be converted and manual changes are required.
-- `--concurrency 4` specifies that the conversion script will spawn four child processes which run the conversion. If you have dedicated hardware for running the conversion, you should use concurrency level that matches the number of logical CPUs on your system. If your system needs to do other tasks while running the conversion, you should run with a smaller number.
-- `-v` specifies verbosity level. You may increase the verbosity level by supplying `-vv`, but `-v` will be sufficient in most cases.
+- `--concurrency 4` specifies that the conversion script spawns four child processes which run the conversion. If you have dedicated hardware for running the conversion, you should use concurrency level that matches the number of logical CPUs on your system. If your system needs to do other tasks while running the conversion, you should run with a smaller number.
+- `-v` specifies verbosity level. You may increase the verbosity level by supplying `-vv`, but `-v` is sufficient in most cases.
 
 The script also has an `--image-content-types` option which you should use if you have custom image classes. With this option, you specify the content class identifiers:
 
 `php bin/console ezxmltext:convert-to-richtext --image-content-types=image,custom_image -v`
 
-The script needs to know these identifiers in order to convert `<ezembed>` tags correctly. Failing to do so will prevent the editor from showing image thumbnails of embedded image objects. You may find the image content types in your installation by looking for these settings in `content.ini(.append.php)`:
+The script needs to know these identifiers in order to convert `<ezembed>` tags correctly. Failing to do so prevents the editor from showing image thumbnails of embedded image objects. You may find the image content types in your installation by looking for these settings in `content.ini(.append.php)`:
 
 ```
 [RelationGroupSettings]
@@ -291,7 +291,7 @@ ImagesClassList[]
 ImagesClassList[]=image
 ```
 
-If the `--image-content-types` option is not specified, the default setting `image` will be used.
+If the `--image-content-types` option is not specified, the default setting `image` is used.
 
 !!! note
 
@@ -318,7 +318,7 @@ But later realize the last identifier should be `profile`, not ``custom_image``,
 The last command would then ensure embedded objects with content type identifier `custom_image` are no longer tagged as images, while embedded objects with content type identifier `profile` are.
 
 
-Using the option `--export-dir`, the conversion will export problematic `ezxmltext` to files with the name pattern `[export-dir]/ezxmltext_[contentobject_id]_[contentobject_attribute_id]_[version]_[language].xml`. A corresponding `.log` file will also be created which includes information about why the conversion failed. Be aware that the reported location of the problem may not be accurate or may be misleading.
+Using the option `--export-dir`, the conversion exports problematic `ezxmltext` to files with the name pattern `[export-dir]/ezxmltext_[contentobject_id]_[contentobject_attribute_id]_[version]_[language].xml`. A corresponding `.log` file is also created which includes information about why the conversion failed. Be aware that the reported location of the problem may not be accurate or may be misleading.
 
 Below is an example of a xml dump, `ezxmltext_12_1234_2_eng-GB.xml`:
 
@@ -354,8 +354,8 @@ error: Validation errors when converting ezxmltext for contentobject_attribute.i
 - context : Error in 2:0: Element section has extra content: informaltable
 ```
 
-The first log message is a notice about the `ez-temporary=1` attribute which the conversion tool simply will remove during conversion.
-The second log message is an error, but the cause described may be confusing. During the conversion, the `<table>` element will be converted to an `<informaltable>` tag, which is problematic.
+The first log message is a notice about the `ez-temporary=1` attribute which the conversion tool simply removes during conversion.
+The second log message is an error, but the cause described may be confusing. During the conversion, the `<table>` element is converted to an `<informaltable>` tag, which is problematic.
 The exact problem in this case is the value of the second align attribute: `<td align="middle"....>`. An align attribute may only have the following values: `left`, `right`, `center`, `justify`.
 
 In order to fix the problem, open the .xml file in a text editor and correct the errors:
@@ -390,7 +390,7 @@ Now, you may test if the modified `ezxmltext` may be converted using the `--dry-
 
 If the tool reports no errors, then the `ezxmltext` is fixed. You may rerun the command without the `--dry-run` option in order to actually update the database with the correct XmlText.
 
-Once you have fixed all the dump files in `ezxmltext-export/`, you may skip the `--content-object` option and the script will import all the dump files located in the `export-dir`:
+Once you have fixed all the dump files in `ezxmltext-export/`, you may skip the `--content-object` option and the script imports all the dump files located in the `export-dir`:
 
 `php -d memory_limit=1536M bin/console ezxmltext:import-xml --export-dir=ezxmltext-export -v`
 
@@ -398,7 +398,7 @@ Typical problems that needs manual fixing:
 
 **Duplicate xhtml IDs**
 
-Xhtml IDs needs to be unique. The following `ezxmltext` will result in a warning:
+Xhtml IDs needs to be unique. The following `ezxmltext` results in a warning:
 
 ```
     <paragraph>
@@ -409,12 +409,12 @@ Xhtml IDs needs to be unique. The following `ezxmltext` will result in a warning
     </paragraph>
 ```
 
-The conversion tool will replace the duplicate id (`inv5`) with a random value. If you need the ID value to match your CSS, you need to change it manually.
-The conversion tool will also complain about IDs which contain invalid characters.
+The conversion tool replaces the duplicate id (`inv5`) with a random value. If you need the ID value to match your CSS, you need to change it manually.
+The conversion tool also complains about IDs which contain invalid characters.
 
 **Links with non-existing `object_remote_id` or `node_remote_id`.**
 
-In `ezxmltext` you may have links which refer to other objects by their remote ID. This is not supported in `richtext`, so the conversion tool must look up such remote IDs and replace them with the `object_id` or `node_id`. If the conversion tool cannot find the object by its remote id, it will issue a warning about it.
+In `ezxmltext` you may have links which refer to other objects by their remote ID. This is not supported in `richtext`, so the conversion tool must look up such remote IDs and replace them with the `object_id` or `node_id`. If the conversion tool cannot find the object by its remote id, it issues a warning about it.
 
 In older eZ Publish databases you may also have invalid links due to lack of reference to a target (no `href`, `url_id`, etc.):
 
@@ -422,7 +422,7 @@ In older eZ Publish databases you may also have invalid links due to lack of ref
     <link>some text</link>
 ```
 
-When the conversion tool detects links with no reference it will issue a warning and rewrite the URL to point to current page (`href="#"`).
+When the conversion tool detects links with no reference it issues a warning and rewrite the URL to point to current page (`href="#"`).
 
 **`<literal>`**
 
@@ -480,7 +480,7 @@ If you use Varnish, the recommended Varnish (4 or higher) VCL configuration can
 
 The officially recommended virtual configuration is now shipped in the `doc` folder, for both apache2 (`doc/apache2`) and nginx (`doc/nginx`). Both are built to be easy to understand and use, but aren't meant as drop-in replacements for your existing configuration.
 
-As was the case starting 5.4, one notable change is that `SetEnvIf` is now used to dynamically change rewrite rules depending on the Symfony environment. it's currently used for the assetic production rewrite rules.
+As was the case starting 5.4, one notable change is that `SetEnvIf` is now used to dynamically change rewrite rules depending on the Symfony environment. It's currently used for the assetic production rewrite rules.
 
 ## Step 5: Link assets
 
@@ -495,7 +495,7 @@ php bin/console assetic:dump --env=prod
 
 ##### Unstyled login screen after upgrade
 
-it's possible that after the upgrade your admin screen will be unstyled. This may happen because the new SiteAccess will not be available in the database. You can fix it by editing the permissions for the Anonymous user. Go to **Roles** in the Admin Panel and edit the limitations of the Anonymous user's `user/login` policy. Add all SiteAccesses to the limitation, save, and clear the browser cache. The login screen should now show proper styling.
+It's possible that after the upgrade your admin screen is unstyled. This may happen because the new SiteAccess isn't available in the database. You can fix it by editing the permissions for the Anonymous user. Go to **Roles** in the Admin Panel and edit the limitations of the Anonymous user's `user/login` policy. Add all SiteAccesses to the limitation, save, and clear the browser cache. The login screen should now show proper styling.
 
 ##### Translating URLs
 
@@ -523,13 +523,13 @@ In case of URLs with extended UTF-encoded names, the workaround must make use of
 
 ## Migrating legacy Page field (ezflow) to new Page (Enterprise)
 
-To move your legacy Page field / eZ Flow configuration to eZ Platform Enterprise Edition you can use a script that will aid in the migration process.
+To move your legacy Page field / eZ Flow configuration to eZ Platform Enterprise Edition you can use a script that aids in the migration process.
 
-The script will automatically migrate only data – to move custom views, layouts, blocks etc., you will have to provide their business logic again.
+The script automatically migrates only data – to move custom views, layouts, blocks etc., you have to provide their business logic again.
 
 !!! caution
 
-    The migration script will operate on your current database.
+    The migration script operates on your current database.
 
     Make sure to **back up your database** in case of an unexpected error.
 
@@ -537,7 +537,7 @@ To use the script, do the following:
 
 !!! note
 
-    Make a note of the paths to .ini files which define your legacy blocks. You will need these paths later.
+    Make a note of the paths to .ini files which define your legacy blocks. You need these paths later.
 
 **1.** Add `ezflow-migration-toolkit` to `composer.json` in your clean Platform installation.
 
@@ -575,11 +575,11 @@ bin/console ezflow:migrate <legacy path> —ini=<block definitions> [—ini=<ano
 bin/console ezflow:migrate /var/www/legacy.application.com/ —ini=extension/myapplication/settings/block.ini.append.php
 ```
 
-**5.** You will be warned about the need to create a [backup](backup.md) of your database. **Proceed only if you're sure you have done it.**
+**5.** You are warned about the need to create a [backup](backup.md) of your database. **Proceed only if you're sure you have done it.**
 
-A `MigrationBundle` will be generated in the `src/` folder.
+A `MigrationBundle` is generated in the `src/` folder.
 
-You will see a report summarizing the results of the migration.
+You can see a report summarizing the results of the migration.
 
 **6.** Add `MigrationBundle` to `AppKernel.php`.
 
@@ -590,8 +590,8 @@ new MigrationBundle\MigrationBundle()
 
 **7.** Clear cache again.
 
-At this point you can already view the initial effects of the migration, but they will still be missing some of your custom content.
+At this point you can already view the initial effects of the migration, but they are still missing some of your custom content.
 
 The `MigrationBundle` generates placeholders for layouts in the form of frames with a data dump.
 
-For blocks that could not be mapped to existing Page blocks, it will also generate PHP file templates that you need to fill with your own business logic.
+For blocks that could not be mapped to existing Page blocks, it also generates PHP file templates that you need to fill with your own business logic.
diff --git a/docs/users/invitations.md b/docs/users/invitations.md
index b3b142c81e..5f9caa65f5 100644
--- a/docs/users/invitations.md
+++ b/docs/users/invitations.md
@@ -20,7 +20,7 @@ Invitations are created with [InvitationService](../api/php_api/php_api_referenc
 but sending them requires additional setup.
 [[= product_name =]] provides you with `Ibexa\User\Invitation\MailSender` implementation of
 `InvitationSender` interface for sending invitations via email.
-If you want to send invitations through different channels, you will need to create a custom setup.
+If you want to send invitations through different channels, you need to create a custom setup.
 
 ## Invitation and registration form templates
 
@@ -29,7 +29,7 @@ If you want to send invitations through different channels, you will need to cre
 To set up custom templates for invitation or registration forms,
 create a template file and inform the system, through configuration, when to use this template.
 
-You might also set a SiteAccess under `scope`, to which the new user will be invited.
+You might also set a SiteAccess under `scope`, to which the new user is invited.
 If the SiteAccess is not set, it falls back to the default `site` value.
 
 For example, use the following [configuration](configuration.md#configuration-files):
diff --git a/docs/users/login_methods.md b/docs/users/login_methods.md
index b5e41514e4..9e001b4a93 100644
--- a/docs/users/login_methods.md
+++ b/docs/users/login_methods.md
@@ -43,7 +43,7 @@ It lists all User accounts with duplicate emails.
     you can come across issues if you use the option on an existing database.
 
     This may happen if more than one account uses the same email address.
-    Login through the User name will still be available.
+    Login through the User name is still available.
 
     To resolve the issues, run `ibexa:user:audit-database`
     and manually modify accounts that have duplicate emails.
diff --git a/docs/users/oauth_client.md b/docs/users/oauth_client.md
index 7de09b83c9..3dd84080d9 100644
--- a/docs/users/oauth_client.md
+++ b/docs/users/oauth_client.md
@@ -74,7 +74,7 @@ To use `ResourceOwnerToExistingOrNewUserMapper`, you need to extend it in your c
 !!! tip "OAuth User content type"
 
     When you implement your own mapper for external login,
-    it's good practice to create a special User content type for users registered in this way.
+    It's good practice to create a special User content type for users registered in this way.
     The users who register through an external service do not have a separate password in the system.
     Instead, they log in by their external service's password.
 
diff --git a/docs/users/passwords.md b/docs/users/passwords.md
index 5903c3e91f..35747a64ee 100644
--- a/docs/users/passwords.md
+++ b/docs/users/passwords.md
@@ -54,7 +54,7 @@ php bin/console ibexa:user:expire-password --user-group-id=13
 ## Password rules
 
 You can customize the password policy in your project.
-Each password setting is customizable per User Field Type.
+Each password setting is customizable per User field type.
 You can change the [password attributes](#password-attributes) or [password expiration settings](#password-expiration), and determine the rules for [repeating passwords](#repeating-passwords).
 
 To access the password settings:
@@ -92,7 +92,7 @@ The notification is displayed in the back office after login and in the User con
 ## Repeating passwords
 
 You can set a rule that the password cannot be reused.
-You set it for the User content type in the **User account (ezuser)** Field Type's settings.
+You set it for the User content type in the **User account (ezuser)** field type's settings.
 When this is set, the user cannot type in the same password when it expires.
 It has to be changed to a new one.
 
diff --git a/docs/users/user_authentication.md b/docs/users/user_authentication.md
index eec22a098e..adaf72392f 100644
--- a/docs/users/user_authentication.md
+++ b/docs/users/user_authentication.md
@@ -31,7 +31,7 @@ The *API user* is mainly used for permission checks against the repository and
 
 ### Customize the User class
 
-it's possible to customize the user class used by extending `Ibexa\Core\MVC\Symfony\Security\EventListener\SecurityListener` service, which defaults to `Ibexa\Core\MVC\Symfony\Security\EventListener\SecurityListener`.
+It's possible to customize the user class used by extending `Ibexa\Core\MVC\Symfony\Security\EventListener\SecurityListener` service, which defaults to `Ibexa\Core\MVC\Symfony\Security\EventListener\SecurityListener`.
 
 You can override `getUser()` to return whatever User class you want, as long as it implements `Ibexa\Core\MVC\Symfony\Security\UserInterface`.
 
diff --git a/mkdocs.yml b/mkdocs.yml
index 975d02b04c..071875f83f 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -38,10 +38,10 @@ nav:
             - 3. Use existing blocks: tutorials/page_and_form_tutorial/3_use_existing_blocks.md
             - 4. Create a custom block: tutorials/page_and_form_tutorial/4_create_a_custom_block.md
             - 5. Create a newsletter form: tutorials/page_and_form_tutorial/5_create_newsletter_form.md
-        - Generic Field Type:
-            - Creating Point 2D Field Type: tutorials/generic_field_type/creating_a_point2d_field_type.md
+        - Generic field type:
+            - Creating Point 2D field type: tutorials/generic_field_type/creating_a_point2d_field_type.md
             - 1. Implement Value class: tutorials/generic_field_type/1_implement_the_point2d_value_class.md
-            - 2. Define Field Type: tutorials/generic_field_type/2_define_point2d_field_type.md
+            - 2. Define field type: tutorials/generic_field_type/2_define_point2d_field_type.md
             - 3. Create a form: tutorials/generic_field_type/3_create_form_for_point2d.md
             - 4. Introduce a template: tutorials/generic_field_type/4_introduce_a_template.md
             - 5. Add a new Field: tutorials/generic_field_type/5_add_a_field.md
@@ -69,7 +69,7 @@ nav:
             - GraphQL queries: api/graphql/graphql_queries.md
             - GraphQL operations: api/graphql/graphql_operations.md
             - GraphQL customization: api/graphql/graphql_customization.md
-            - GraphQL custom Field Type: api/graphql/graphql_custom_ft.md
+            - GraphQL custom field type: api/graphql/graphql_custom_ft.md
         - Event reference:
             - Event reference: api/event_reference/event_reference.md
             - Content events: api/event_reference/content_events.md
@@ -220,56 +220,56 @@ nav:
             - Create data migration step: content_management/data_migration/create_data_migration_step.md
             - Add data migration matcher: content_management/data_migration/add_data_migration_matcher.md
             - Data migration API: content_management/data_migration/data_migration_api.md
-        - Field Types:
-            - Field Types: content_management/field_types/field_types.md
+        - Field types:
+            - Field types: content_management/field_types/field_types.md
             - Type and Value: content_management/field_types/type_and_value.md
             - Form and template: content_management/field_types/form_and_template.md
             - Storage: content_management/field_types/field_type_storage.md
             - Validation: content_management/field_types/field_type_validation.md
             - Searching: content_management/field_types/field_type_search.md
-            - Create custom generic Field Type: content_management/field_types/create_custom_generic_field_type.md
-            - Create custom Field Type comparison: content_management/field_types/create_custom_field_type_comparison.md
-            - Customize Field Type metadata: content_management/field_types/customize_field_type_metadata.md
-            - Field Type reference:
-                - Field Type reference: content_management/field_types/field_type_reference/field_type_reference.md
-                - Address Field Type: content_management/field_types/field_type_reference/addressfield.md
-                - Author Field Type: content_management/field_types/field_type_reference/authorfield.md
-                - BinaryFile Field Type: content_management/field_types/field_type_reference/binaryfilefield.md
-                - Checkbox Field Type: content_management/field_types/field_type_reference/checkboxfield.md
-                - Content query Field Type: content_management/field_types/field_type_reference/contentqueryfield.md
-                - Country Field Type: content_management/field_types/field_type_reference/countryfield.md
-                - CustomerGroup Field Type: content_management/field_types/field_type_reference/customergroupfield.md
-                - DateAndTime Field Type: content_management/field_types/field_type_reference/dateandtimefield.md
-                - Date Field Type: content_management/field_types/field_type_reference/datefield.md
-                - EmailAddress Field Type: content_management/field_types/field_type_reference/emailaddressfield.md
-                - Float Field Type: content_management/field_types/field_type_reference/floatfield.md
-                - Form Field Type: content_management/field_types/field_type_reference/formfield.md
-                - Image Field Type: content_management/field_types/field_type_reference/imagefield.md
-                - ImageAsset Field Type: content_management/field_types/field_type_reference/imageassetfield.md
-                - Integer Field Type: content_management/field_types/field_type_reference/integerfield.md
-                - ISBN Field Type: content_management/field_types/field_type_reference/isbnfield.md
-                - Keyword Field Type: content_management/field_types/field_type_reference/keywordfield.md
-                - MapLocation Field Type: content_management/field_types/field_type_reference/maplocationfield.md
-                - Matrix Field Type: content_management/field_types/field_type_reference/matrixfield.md
-                - Measurement Field Type: content_management/field_types/field_type_reference/measurementfield.md
-                - Media Field Type: content_management/field_types/field_type_reference/mediafield.md
-                - Null Field Type: content_management/field_types/field_type_reference/nullfield.md
-                - Page Field Type: content_management/field_types/field_type_reference/pagefield.md
-                - Relation Field Type: content_management/field_types/field_type_reference/relationfield.md
-                - RelationList Field Type: content_management/field_types/field_type_reference/relationlistfield.md
-                - RichText Field Type: content_management/field_types/field_type_reference/richtextfield.md
-                - Selection Field Type: content_management/field_types/field_type_reference/selectionfield.md
+            - Create custom generic field type: content_management/field_types/create_custom_generic_field_type.md
+            - Create custom field type comparison: content_management/field_types/create_custom_field_type_comparison.md
+            - Customize field type metadata: content_management/field_types/customize_field_type_metadata.md
+            - Field type reference:
+                - Field type reference: content_management/field_types/field_type_reference/field_type_reference.md
+                - Address field type: content_management/field_types/field_type_reference/addressfield.md
+                - Author field type: content_management/field_types/field_type_reference/authorfield.md
+                - BinaryFile field type: content_management/field_types/field_type_reference/binaryfilefield.md
+                - Checkbox field type: content_management/field_types/field_type_reference/checkboxfield.md
+                - Content query field type: content_management/field_types/field_type_reference/contentqueryfield.md
+                - Country field type: content_management/field_types/field_type_reference/countryfield.md
+                - CustomerGroup field type: content_management/field_types/field_type_reference/customergroupfield.md
+                - DateAndTime field type: content_management/field_types/field_type_reference/dateandtimefield.md
+                - Date field type: content_management/field_types/field_type_reference/datefield.md
+                - EmailAddress field type: content_management/field_types/field_type_reference/emailaddressfield.md
+                - Float field type: content_management/field_types/field_type_reference/floatfield.md
+                - Form field type: content_management/field_types/field_type_reference/formfield.md
+                - Image field type: content_management/field_types/field_type_reference/imagefield.md
+                - ImageAsset field type: content_management/field_types/field_type_reference/imageassetfield.md
+                - Integer field type: content_management/field_types/field_type_reference/integerfield.md
+                - ISBN field type: content_management/field_types/field_type_reference/isbnfield.md
+                - Keyword field type: content_management/field_types/field_type_reference/keywordfield.md
+                - MapLocation field type: content_management/field_types/field_type_reference/maplocationfield.md
+                - Matrix field type: content_management/field_types/field_type_reference/matrixfield.md
+                - Measurement field type: content_management/field_types/field_type_reference/measurementfield.md
+                - Media field type: content_management/field_types/field_type_reference/mediafield.md
+                - Null field type: content_management/field_types/field_type_reference/nullfield.md
+                - Page field type: content_management/field_types/field_type_reference/pagefield.md
+                - Relation field type: content_management/field_types/field_type_reference/relationfield.md
+                - RelationList field type: content_management/field_types/field_type_reference/relationlistfield.md
+                - RichText field type: content_management/field_types/field_type_reference/richtextfield.md
+                - Selection field type: content_management/field_types/field_type_reference/selectionfield.md
                 - SesExternalData: content_management/field_types/field_type_reference/sesexternaldata.md
                 - SesProfileData: content_management/field_types/field_type_reference/sesprofiledata.md
                 - SesSelection: content_management/field_types/field_type_reference/sesselection.md
                 - SpecificationsType: content_management/field_types/field_type_reference/specificationstype.md
-                - TaxonomyEntry Field Type: content_management/field_types/field_type_reference/taxonomyentryfield.md
-                - TaxonomyEntryAssignment Field Type: content_management/field_types/field_type_reference/taxonomyentryassignmentfield.md
-                - TextBlock Field Type: content_management/field_types/field_type_reference/textblockfield.md
-                - TextLine Field Type: content_management/field_types/field_type_reference/textlinefield.md
-                - Time Field Type: content_management/field_types/field_type_reference/timefield.md
-                - URL Field Type: content_management/field_types/field_type_reference/urlfield.md
-                - User Field Type: content_management/field_types/field_type_reference/userfield.md
+                - TaxonomyEntry field type: content_management/field_types/field_type_reference/taxonomyentryfield.md
+                - TaxonomyEntryAssignment field type: content_management/field_types/field_type_reference/taxonomyentryassignmentfield.md
+                - TextBlock field type: content_management/field_types/field_type_reference/textblockfield.md
+                - TextLine field type: content_management/field_types/field_type_reference/textlinefield.md
+                - Time field type: content_management/field_types/field_type_reference/timefield.md
+                - URL field type: content_management/field_types/field_type_reference/urlfield.md
+                - User field type: content_management/field_types/field_type_reference/userfield.md
     - Templating:
         - Templating: templating/templating.md
         - Render content:
@@ -797,7 +797,7 @@ nav:
                 - Adapt code to v3: update_and_migration/from_2.5/adapt_code_to_v3.md
                 - 1. Update templates: update_and_migration/from_2.5/update_code/1_update_templates.md
                 - 2. Update configuration: update_and_migration/from_2.5/update_code/2_update_configuration.md
-                - 3. Update Field Types: update_and_migration/from_2.5/update_code/3_update_field_types.md
+                - 3. Update field types: update_and_migration/from_2.5/update_code/3_update_field_types.md
                 - 4. Update Signal Slots: update_and_migration/from_2.5/update_code/4_update_signal_slots.md
                 - 5. Update Online Editor: update_and_migration/from_2.5/update_code/5_update_online_editor.md
                 - 6. Update workflow: update_and_migration/from_2.5/update_code/6_update_workflow.md
diff --git a/tests/features/EnterpriseTutorial.feature b/tests/features/EnterpriseTutorial.feature
index 8b2338b32d..5c30518dc8 100644
--- a/tests/features/EnterpriseTutorial.feature
+++ b/tests/features/EnterpriseTutorial.feature
@@ -3,18 +3,18 @@ Feature: Setup eZ Platform Enterprise dogs tutorial
     @step1
     Scenario: Get a starter website
         Given I create a "Dog Breed" content type with "dog_breed" identifier:
-            | Field Type | Name              | Identifier        | Required | Searchable | Translatable |
+            | Field type | Name              | Identifier        | Required | Searchable | Translatable |
             | Text line	 | Name              | name	             | yes      | yes	     | yes          |
             | Text line	 | Short Description | short_description | yes      | yes	     | yes          |
             | Image	     | Photo	         | photo	         | yes      | no	     | no           |
             | RichText	 | Full Description	 | description       | yes      | yes	     | yes          |
         And I create a "Tip" content type with "tip" identifier:
-            | Field Type | Name	 | Identifier | Required | Searchable | Translatable |
+            | Field type | Name	 | Identifier | Required | Searchable | Translatable |
             | Text line	 | Title | title	  | yes	     | yes	      | yes          |
             | Text block | Body	 | body	      | no	     | no	      | yes          |
         And I remove "image" field from Article content type
         And I add field to Article content type
-            | Field Type | Name  | Identifier |	Required | Searchable |	Translatable |
+            | Field type | Name  | Identifier |	Required | Searchable |	Translatable |
             | Image      | Image | image      | no	     | no         |	yes          |
         And I create "folder" content items in "Home"
             | contentName       |
diff --git a/tests/src/Context/TutorialContentTypeContext.php b/tests/src/Context/TutorialContentTypeContext.php
index e7dd28fe36..f4ca29f347 100644
--- a/tests/src/Context/TutorialContentTypeContext.php
+++ b/tests/src/Context/TutorialContentTypeContext.php
@@ -54,7 +54,7 @@ public function iAddFieldToArticleContentType($contentTypeIdentifier, TableNode
     private function getFieldDefinitionData(array $tableRow, int $position): array
     {
         return [
-            'fieldTypeIdentifier' => $this->fieldTypeMap[$tableRow['Field Type']],
+            'fieldTypeIdentifier' => $this->fieldTypeMap[$tableRow['Field type']],
             'identifier' => $tableRow['Identifier'],
             'names' => ['eng-GB' => $tableRow['Name']],
             'position' => $position,

From 2f6e6de0e42dcfd904682bb0bab164fe9bbca338 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 10 Oct 2024 14:06:04 +0200
Subject: [PATCH 05/77] New fixes

---
 .../reusable_components.md                    |  8 +--
 .../content_organization/content_types.md     |  2 +-
 docs/api/graphql/graphql_operations.md        |  2 +-
 docs/api/graphql/graphql_queries.md           |  2 +-
 docs/api/php_api/php_api.md                   |  6 +-
 docs/cdp/cdp_activation/cdp_data_export.md    |  4 +-
 docs/commerce/cart/cart.md                    |  2 +-
 docs/commerce/cart/quick_order.md             |  2 +-
 .../extend_transactional_emails.md            |  2 +-
 .../transactional_emails_parameters.md        |  2 +-
 .../content_management_guide.md               |  8 +--
 docs/content_management/content_model.md      |  6 +-
 .../field_type_reference/checkboxfield.md     |  2 +-
 .../field_type_reference/relationlistfield.md |  4 +-
 .../field_type_reference/richtextfield.md     |  2 +-
 .../field_types/field_types.md                |  2 +-
 .../file_management/file_management.md        |  2 +-
 .../images/configure_image_editor.md          |  2 +-
 docs/content_management/locations.md          | 10 ++--
 .../rich_text/extend_online_editor.md         |  2 +-
 docs/content_management/workflow/workflow.md  |  4 +-
 docs/customer_management/cp_page_builder.md   |  4 +-
 docs/getting_started/requirements.md          | 14 ++---
 .../cache/http_cache/content_aware_cache.md   |  4 +-
 .../cache/http_cache/context_aware_cache.md   |  2 +-
 .../cache/http_cache/fastly.md                |  2 +-
 .../http_cache/http_cache_configuration.md    |  2 +-
 .../cache/http_cache/reverse_proxy.md         |  6 +-
 .../cache/persistence_cache.md                |  6 +-
 .../performance.md                            |  2 +-
 .../security/security_checklist.md            |  4 +-
 docs/multisite/languages/languages.md         |  8 +--
 docs/multisite/multisite_configuration.md     |  2 +-
 .../site_factory_configuration.md             |  4 +-
 .../siteaccess_aware_configuration.md         |  2 +-
 docs/permissions/custom_policies.md           |  2 +-
 docs/permissions/limitation_reference.md      | 56 +++++++++----------
 docs/permissions/permission_overview.md       | 14 ++---
 docs/permissions/policies.md                  |  4 +-
 .../api_reference/content_api.md              |  3 +-
 .../api_reference/tracking_api.md             | 16 +++---
 .../personalization/enable_personalization.md |  2 +-
 .../legacy_recommendation_api.md              |  6 +-
 .../recommendation_integration.md             |  2 +-
 docs/personalization/tracking_integration.md  |  4 +-
 docs/release_notes/ez_platform_v1.7.0_lts.md  |  2 +-
 docs/release_notes/ez_platform_v2.4.md        |  4 +-
 docs/release_notes/ez_platform_v2.5.md        |  8 +--
 docs/release_notes/ez_platform_v3.0.md        |  2 +-
 docs/release_notes/ibexa_dxp_v4.3.md          |  2 +-
 .../contributing/contribute_translations.md   |  2 +-
 .../contributing/report_and_follow_issues.md  |  2 +-
 .../criteria_reference/baseprice_criterion.md |  2 +-
 .../currencycode_criterion.md                 |  2 +-
 .../customprice_criterion.md                  |  2 +-
 .../fieldrelation_criterion.md                |  2 +-
 .../criteria_reference/fulltext_criterion.md  |  2 +-
 .../iscurrencyenabled_criterion.md            |  2 +-
 .../isfieldempty_criterion.md                 |  4 +-
 .../isuserbased_criterion.md                  |  2 +-
 .../isuserenabled_criterion.md                |  2 +-
 .../maplocationdistance_criterion.md          |  2 +-
 .../price_isbaseprice_criterion.md            |  2 +-
 .../price_iscustomprice_criterion.md          |  2 +-
 docs/search/search_api.md                     |  2 +-
 .../configure_elastic_search.md               |  2 +-
 .../legacy_search_overview.md                 |  2 +-
 .../solr_search_engine/install_solr.md        |  6 +-
 .../baseprice_sort_clause.md                  |  2 +-
 .../contenttranslatedname_sort_clause.md      |  2 +-
 .../customfield_sort_clause.md                |  2 +-
 .../customprice_sort_clause.md                |  2 +-
 .../field_sort_clause.md                      |  2 +-
 .../ismainlocation_sort_clause.md             |  2 +-
 .../maplocationdistance_sort_clause.md        |  2 +-
 .../random_sort_clause.md                     |  2 +-
 .../score_sort_clause.md                      |  2 +-
 .../embed_and_list_content/render_images.md   |  2 +-
 docs/templating/templates/templates.md        |  2 +-
 .../cart_twig_functions.md                    |  2 +-
 .../image_twig_functions.md                   |  4 +-
 .../urls_and_routes/custom_breadcrumbs.md     |  2 +-
 .../8_enable_account_registration.md          |  2 +-
 .../2_prepare_the_landing_page.md             |  4 +-
 .../from_1.x_2.x/update_db_to_2.5.md          |  2 +-
 docs/update_and_migration/from_2.5/to_3.3.md  |  2 +-
 .../from_2.5/update_code/9_update_other.md    |  2 +-
 docs/update_and_migration/from_4.0/to_4.1.md  |  4 +-
 .../from_4.1/update_from_4.1.md               |  2 +-
 .../from_4.2/update_from_4.2.md               |  2 +-
 .../from_4.3/update_from_4.3_new_commerce.md  |  2 +-
 .../from_4.3/update_from_4.3_old_commerce.md  |  2 +-
 .../migrating_from_ez_publish_platform.md     |  6 +-
 docs/users/invitations.md                     |  2 +-
 docs/users/oauth_server.md                    |  2 +-
 docs/users/passwords.md                       |  4 +-
 docs/users/segment_api.md                     |  6 +-
 docs/users/user_authentication.md             | 12 ++--
 98 files changed, 196 insertions(+), 197 deletions(-)

diff --git a/docs/administration/back_office/back_office_elements/reusable_components.md b/docs/administration/back_office/back_office_elements/reusable_components.md
index 7892506d08..0fd5eb9d8e 100644
--- a/docs/administration/back_office/back_office_elements/reusable_components.md
+++ b/docs/administration/back_office/back_office_elements/reusable_components.md
@@ -53,12 +53,12 @@ Variables:
 
 |Name|Type|Values|
 |----|----|-----------|
-|`headline` (optional)|string|if not specified, the header is not rendered|
+|`headline` (optional)|string|if not specified, the header isn't rendered|
 |`headline_items`|array|
 |`view_mode`|string|`vertical`, default set to `''`|
 |`items`|hash|{`label`, `content_raw`, `content`}|
 
-If `headline` is not specified, the `headline_items` is not rendered.
+If `headline` isn't specified, the `headline_items` isn't rendered.
 
 ## Modal
 
@@ -80,7 +80,7 @@ Variables:
 |Name|Type|Values|
 |----|----|-----------|
 |`size`|string|`small`, `large`, `extra-large`, default set to: `''`|
-|`subtitle`|string|no default value, if not defined, the `subheader` is not rendered|
+|`subtitle`|string|no default value, if not defined, the `subheader` isn't rendered|
 |`no_header`|boolean|default set to `false`|
 |`no_header_border`|boolean|default set to `false`|
 |`class`|string|default `''`|
@@ -317,7 +317,7 @@ The tab component supports the following variables:
 - `id` - tab ID
 - `label` - human-readable label for the tab
 - `active` - true if tab is active
-- `content` - HTML content of tab if `tab_content` is not overridden
+- `content` - HTML content of tab if `tab_content` isn't overridden
 - `tab_content_class` - additional CSS classes attached to `.tab-content`
 - `tab_content_attributes` - additional HTML attributes added to `.tab-content`
 
diff --git a/docs/administration/content_organization/content_types.md b/docs/administration/content_organization/content_types.md
index 6e5b82a5a2..ed3249855d 100644
--- a/docs/administration/content_organization/content_types.md
+++ b/docs/administration/content_organization/content_types.md
@@ -79,7 +79,7 @@ They determine what Fields of what field types are included in all content items
     they're caused by the limitation of how many `$_POST` input variables can be accepted.
 
     The easiest way to fix them is by increasing the `max_input_vars` value in the `php.ini` configuration file.
-    Note that this solution is not universally recommended and you're proceeding on your own risk.
+    Note that this solution isn't universally recommended and you're proceeding on your own risk.
 
     Setting the limit inappropriately may damage your project or cause other issues.
     You may also experience performance problems with such large content types, in particular when you have many content items.
diff --git a/docs/api/graphql/graphql_operations.md b/docs/api/graphql/graphql_operations.md
index 2f506909fa..1672be625b 100644
--- a/docs/api/graphql/graphql_operations.md
+++ b/docs/api/graphql/graphql_operations.md
@@ -102,7 +102,7 @@ Response:
 
 !!! note
 
-    Uploading binary files is not possible through GraphiQL.
+    Uploading binary files isn't possible through GraphiQL.
     You can use alternative third-party clients such as [Altair GraphQL](https://altairgraphql.dev/).
 
 Uploading files makes use of dedicated mutations per content type, for example:
diff --git a/docs/api/graphql/graphql_queries.md b/docs/api/graphql/graphql_queries.md
index 6dad846102..d9d67d5fb1 100644
--- a/docs/api/graphql/graphql_queries.md
+++ b/docs/api/graphql/graphql_queries.md
@@ -765,7 +765,7 @@ You can paginate plural fields using `edges`:
 ```
 
 This query returns the first three articles, ordered by their publication date.
-If the current `Connection` (list of results) is not finished yet and there are more items to read,
+If the current `Connection` (list of results) isn't finished yet and there are more items to read,
 `hasNextPage` is `true`.
 
 For the `children` node, you can use the following pagination method:
diff --git a/docs/api/php_api/php_api.md b/docs/api/php_api/php_api.md
index 695b748706..ca4e447b1f 100644
--- a/docs/api/php_api/php_api.md
+++ b/docs/api/php_api/php_api.md
@@ -50,11 +50,11 @@ You can access the PHP API by injecting relevant services into your code:
 - By using [auto-wiring]([[=symfony_doc=]]/service_container/autowiring.html), and the service classname in the `Ibexa\Contracts` namespace (see `bin/console debug:autowiring | grep Ibexa.Contracts`).
 - By using [service parameters]([[=symfony_doc=]]/service_container.html#service-parameters), and service aliases (see `bin/console debug:autowiring | grep ibexa.api`).
 - By using the Repository's `get[ServiceName]()` methods: [`Repository::getContentService()`](php_api_reference/classes/Ibexa-Contracts-Core-Repository-Repository.html#method_getContentService), [`getUserService()`](php_api_reference/classes/Ibexa-Contracts-Core-Repository-Repository.html#method_getUserService), etc.
-  (Prefer injecting several Repository's dedicated services instead of the whole Repository if the Repository itself is not needed.)
+  (Prefer injecting several Repository's dedicated services instead of the whole Repository if the Repository itself isn't needed.)
 
 !!! caution
 
-    The PHP API's services can be accessed with `Ibexa\Bundle\Core\Controller::getRepository()` by extending it from a [custom controller](controllers.md), but such approach is not recommended, and you should prefer dependency injection.
+    The PHP API's services can be accessed with `Ibexa\Bundle\Core\Controller::getRepository()` by extending it from a [custom controller](controllers.md), but such approach isn't recommended, and you should prefer dependency injection.
 
 ## Value objects
 
@@ -141,7 +141,7 @@ In order to identify as a different user, you need to use the `UserService` toge
 
     [`Ibexa\Contracts\Core\Repository\PermissionService`](php_api_reference/classes/Ibexa-Contracts-Core-Repository-PermissionService.html) can be injected to have a Service which provides both `PermissionResolver` and `PermissionCriterionResolver`. It supports auto-wiring.    
 
-This is not required in template functions or controller code,
+This isn't required in template functions or controller code,
 as the HTTP layer takes care of identifying the user, and automatically sets it in the repository.
 
 If you want to identify a user with their credentials instead, provide them in the following way:
diff --git a/docs/cdp/cdp_activation/cdp_data_export.md b/docs/cdp/cdp_activation/cdp_data_export.md
index e4b91907a7..fe47a1f23b 100644
--- a/docs/cdp/cdp_activation/cdp_data_export.md
+++ b/docs/cdp/cdp_activation/cdp_data_export.md
@@ -55,9 +55,9 @@ Now, you can go to the **File mapping** section.
 
 Mapping is completed automatically, the system fills all required information and shows available columns with datapoints on the right.
 You can change their names if needed or disallow empty fields by checking **Mandatory**.
-If the provided file contains empty values, this option is not available.
+If the provided file contains empty values, this option isn't available.
 
-If provided file is not recognized, the system requires you to fill in the parsing-options manually or select an appropriate format.
+If provided file isn't recognized, the system requires you to fill in the parsing-options manually or select an appropriate format.
 If you make any alterations, select the **Parse File** to generate columns with new data.
 
 ## Transform & Map
diff --git a/docs/commerce/cart/cart.md b/docs/commerce/cart/cart.md
index 61781b7578..d2e2dbc35d 100644
--- a/docs/commerce/cart/cart.md
+++ b/docs/commerce/cart/cart.md
@@ -103,7 +103,7 @@ cartService.deleteCartEntry(cartIdentifier, entryIdentifier);
 ```
 
 Every cart service function returns a `Promise` object with a parsed response.
-When the request is not `OK`, it can throw an error with the response `statusText`.
+When the request isn't `OK`, it can throw an error with the response `statusText`.
 
 - `loadUserCarts(ownerId)` - loads 10 user carts
 - `loadCartSummary(cartIdentifier)` - load cart summary data
diff --git a/docs/commerce/cart/quick_order.md b/docs/commerce/cart/quick_order.md
index 486aed6f0d..d2660f1d2a 100644
--- a/docs/commerce/cart/quick_order.md
+++ b/docs/commerce/cart/quick_order.md
@@ -35,7 +35,7 @@ Customers can use one or both of the following methods to specify products and p
 
 4\. Uploads the filled in quick order file back to the system by drag and drop or file selection.
 
-5\. The file name appears in the **Add your order** section. At this point, only file validation is provided. The SKUs or product availability is not validated.
+5\. The file name appears in the **Add your order** section. At this point, only file validation is provided. The SKUs or product availability isn't validated.
 
 ![Customer uploads list of products](img/quick_order_add_order.png)
 
diff --git a/docs/commerce/transactional_emails/extend_transactional_emails.md b/docs/commerce/transactional_emails/extend_transactional_emails.md
index 52f5ac954b..39f1c56e2b 100644
--- a/docs/commerce/transactional_emails/extend_transactional_emails.md
+++ b/docs/commerce/transactional_emails/extend_transactional_emails.md
@@ -28,7 +28,7 @@ framework:
 ## Define additional variables
 
 [[= product_name =]] comes with a predefined [set of variables](transactional_emails_parameters.md) that you can use when building a template for your transactional email campaign at Actito.
-If this list is not sufficient, you can use Events to include additional variables:
+If this list isn't sufficient, you can use Events to include additional variables:
 
 ```php
 <?php
diff --git a/docs/commerce/transactional_emails/transactional_emails_parameters.md b/docs/commerce/transactional_emails/transactional_emails_parameters.md
index b458fd224d..69d880baa4 100644
--- a/docs/commerce/transactional_emails/transactional_emails_parameters.md
+++ b/docs/commerce/transactional_emails/transactional_emails_parameters.md
@@ -7,7 +7,7 @@ edition: commerce
 
 The following variables are provided with an installation of [[= product_name_base =]].
 You can use them when you create a template within an Actito transactional email campaign.
-If this extensive list of variables is not sufficient, you can [extend it to include additional variables](extend_transactional_emails.md#define-additional-variables).
+If this extensive list of variables isn't sufficient, you can [extend it to include additional variables](extend_transactional_emails.md#define-additional-variables).
 
 |Category|Variable|Description|Example values|Notes|
 |:----|:----|:----|:----|:----|
diff --git a/docs/content_management/content_management_guide.md b/docs/content_management/content_management_guide.md
index bf4141fd2f..9fbf969c16 100644
--- a/docs/content_management/content_management_guide.md
+++ b/docs/content_management/content_management_guide.md
@@ -96,7 +96,7 @@ and deleting them is done by using a visual interface, with no coding skills nee
 ### Content items
 
 Content items are pieces of content, such as, for example, products, articles, blog posts, or media. 
-In [[= product_name =]], everything is a content item — not just pages, articles or products, but also all media (images, videos, etc.) or even User accounts.
+In [[= product_name =]], everything is a content item — not just pages, articles or products, but also all media (images, videos, etc.) or even user accounts.
 
 Each content item, apart from its name and identifier, contains a composition of Fields, which differs depending on the type of content. 
 For example, articles might have a title, an author, a body, and an image, while products may have a name, category, price, size, color, etc.
@@ -205,7 +205,7 @@ Changing a Section setting does not result in moving a content item to a differe
 
 While reviewing the details of each individual content item in your content tree, you can assign a state to it, for example, “Locked” or “Not locked”. 
 Then you can set a permission that allows or denies users access to content items in a specific state. 
-This setting is not inherited.
+This setting isn't inherited.
 
 ![Object states in content item’s Details](img/object_states.png)
 
@@ -232,7 +232,7 @@ Reuse existing Fields Types or [customize them to fit your needs](create_custom_
 
 **2\. Define permissions**
 
-Although this step is not directly related to content management, 
+Although this step isn't directly related to content management, 
 it's a good time to [set up user roles and permissions]([[= user_doc =]]/permission_management/work_with_permissions/), which users would need to work with content.
 
 **3\. Author content**
@@ -244,7 +244,7 @@ You can pause and resume the work, preview the results, or send content for revi
 
 **4\. Publish**
 
-Again, this is not part of content management, but at this point you can [publish]([[= user_doc =]]/content_management/publish_instantly/) it right away or [schedule content for publication]([[= user_doc =]]/content_management/schedule_publishing/).
+Again, this isn't part of content management, but at this point you can [publish]([[= user_doc =]]/content_management/publish_instantly/) it right away or [schedule content for publication]([[= user_doc =]]/content_management/schedule_publishing/).
 
 **5\. Organize content**
 
diff --git a/docs/content_management/content_model.md b/docs/content_management/content_model.md
index eec0d29e4f..60f01d488c 100644
--- a/docs/content_management/content_model.md
+++ b/docs/content_management/content_model.md
@@ -47,7 +47,7 @@ See [Sections](sections.md) for more information.
 
 **`published`** - true if a published version exists, otherwise false.
 
-**`ownerId`** - ID of the User who initially created the content item.
+**`ownerId`** - ID of the user who initially created the content item.
 It's set by the system the first time the content item is published.
 The ownership of an item cannot be modified and doesn't change even if the owner is removed from the system.
 
@@ -110,7 +110,7 @@ Aside from the field type, the Field definition in a content type provides the f
 
 **[Searchable](search.md)** – a flag which indicates if the value of the Field is indexed for searching.
 
-The Searchable flag is not available for some Fields, because some field types do not allow searching through their values.
+The Searchable flag isn't available for some Fields, because some field types do not allow searching through their values.
 
 **[Translatable](languages.md)** – a flag which indicates if the value of the Field can be translated. This is independent of the field type, which means that even Fields such as "Float" or "Image" can be set as translatable.
 
@@ -127,7 +127,7 @@ Depending on the field type, there may also be other, specific information to fi
 Each content item can have multiple versions.
 Each version has one of the following statuses: *draft*, *archived* or *published*.
 
-A new version is created every time a content item is edited. The previous published version is not modified.
+A new version is created every time a content item is edited. The previous published version isn't modified.
 
 Only one version can be published at the same time.
 When you publish a new version, the previous published version changes its status to Archived.
diff --git a/docs/content_management/field_types/field_type_reference/checkboxfield.md b/docs/content_management/field_types/field_type_reference/checkboxfield.md
index ea136b31c8..1e697f5e7f 100644
--- a/docs/content_management/field_types/field_type_reference/checkboxfield.md
+++ b/docs/content_management/field_types/field_type_reference/checkboxfield.md
@@ -46,4 +46,4 @@ $checkboxValue = new Checkbox\Value( true );
 
 ##### String representation
 
-As this field type is not a string but a boolean, it returns "1" (true) or "0" (false) in cases where it's cast to string, and it's never considered empty.
+As this field type isn't a string but a boolean, it returns "1" (true) or "0" (false) in cases where it's cast to string, and it's never considered empty.
diff --git a/docs/content_management/field_types/field_type_reference/relationlistfield.md b/docs/content_management/field_types/field_type_reference/relationlistfield.md
index 7523d55720..081abdf4d8 100644
--- a/docs/content_management/field_types/field_type_reference/relationlistfield.md
+++ b/docs/content_management/field_types/field_type_reference/relationlistfield.md
@@ -60,11 +60,11 @@ This field type validates if:
 - the `selectionMethod` specified is `\Ibexa\Core\FieldType\RelationList\Type::SELECTION_BROWSE` or `\Ibexa\Core\FieldType\RelationList\Type::SELECTION_DROPDOWN`. A validation error is thrown if the value does not match.
 - the `selectionDefaultLocation` specified is `null`, `string` or `integer`. If the type validation fails a validation error is thrown.
 - the value specified in `selectionContentTypes` is an `array`. If not, a validation error in given.
-- the number of content items selected in the Field is not greater than the `selectionLimit`.
+- the number of content items selected in the Field isn't greater than the `selectionLimit`.
 
 !!! note
 
-    The dropdown selection method is not implemented yet.
+    The dropdown selection method isn't implemented yet.
 
 ### Settings
 
diff --git a/docs/content_management/field_types/field_type_reference/richtextfield.md b/docs/content_management/field_types/field_type_reference/richtextfield.md
index 39bac8c214..82e69ec0b6 100644
--- a/docs/content_management/field_types/field_type_reference/richtextfield.md
+++ b/docs/content_management/field_types/field_type_reference/richtextfield.md
@@ -65,7 +65,7 @@ The XHTML5 format is used by the Online Editor.
 !!! caution
 
     The custom DocBook format described below is subject to change
-    and is not covered by backwards compatibility promise.
+    and isn't covered by backwards compatibility promise.
 
 You can use the [[= product_name_base =]] flavor of the DocBook format in PHP API and in REST API requests
 by providing the DocBook content as a string.
diff --git a/docs/content_management/field_types/field_types.md b/docs/content_management/field_types/field_types.md
index 96dae5e218..412b1979a1 100644
--- a/docs/content_management/field_types/field_types.md
+++ b/docs/content_management/field_types/field_types.md
@@ -57,7 +57,7 @@ The following sequence diagrams visualize the process of creating and publishing
 !!! note "indexLocation()"
 
     For **Solr** Locations are indexed during Content indexing.
-    For **Legacy/SQL** indexing is not required as Location data already exists in a database.
+    For **Legacy/SQL** indexing isn't required as Location data already exists in a database.
 
 ![Publish content sequence](publish_content_sequence.png)
 
diff --git a/docs/content_management/file_management/file_management.md b/docs/content_management/file_management/file_management.md
index d110e98c35..8eabc2ec0d 100644
--- a/docs/content_management/file_management/file_management.md
+++ b/docs/content_management/file_management/file_management.md
@@ -81,7 +81,7 @@ Default values:
 
 !!! note
 
-    As SiteAccess configuration Flysystem's v2 native Local NFS adapter is not supported, the following
+    As SiteAccess configuration Flysystem's v2 native Local NFS adapter isn't supported, the following
     configuration should be used:
 
     ``` yaml
diff --git a/docs/content_management/images/configure_image_editor.md b/docs/content_management/images/configure_image_editor.md
index 4456ac7dc5..10d904e115 100644
--- a/docs/content_management/images/configure_image_editor.md
+++ b/docs/content_management/images/configure_image_editor.md
@@ -48,7 +48,7 @@ The default quality is 0.92:
 
 ### Additional information
 
-Each image can be accompanied by additional information that is not visible to the user.
+Each image can be accompanied by additional information that isn't visible to the user.
 By default, additional information stores the coordinates of the [focal point]([[= user_doc =]]/editing_images/#focal-point),
 but you can use this extension point to pass various parameters of custom features
 that you add by extending the Image Editor.
diff --git a/docs/content_management/locations.md b/docs/content_management/locations.md
index 31d79d9d75..0d4abbe7cf 100644
--- a/docs/content_management/locations.md
+++ b/docs/content_management/locations.md
@@ -32,7 +32,7 @@ The content tree is hierarchical. It has an empty root Location at the top and a
 Every Location (aside from the root) has one parent Location and can have any number of children.
 
 Top level Locations are direct children of the root of the tree.
-The root has Location ID 1, is not related to any content items and should not be used directly.
+The root has Location ID 1, isn't related to any content items and should not be used directly.
 
 Under this root there are preset top level Locations in each installation which cannot be deleted.
 
@@ -60,14 +60,14 @@ It contains a Folder content item.
 
 ### Users
 
-**Users** is the top level Location that contains the built-in system for managing User accounts.
+**Users** is the top level Location that contains the built-in system for managing user accounts.
 
 ![Users in admin panel](admin_panel_users.png "Users in admin panel")
 
-A User is simply a content item of the User account content type.
-The Users are organized within user group content items below this Location.
+A user is simply a content item of the user account content type.
+The users are organized within user group content items below this Location.
 
-In other words, the **Users** Location contains the actual Users and user groups,
+In other words, the **Users** Location contains the actual users and user groups,
 which can be viewed by selecting the **Users** tab in the Admin Panel.
 
 The default ID number of the **Users** Location is 5.
diff --git a/docs/content_management/rich_text/extend_online_editor.md b/docs/content_management/rich_text/extend_online_editor.md
index 76d6e849b9..f6b346e3d6 100644
--- a/docs/content_management/rich_text/extend_online_editor.md
+++ b/docs/content_management/rich_text/extend_online_editor.md
@@ -42,7 +42,7 @@ Place the `factbox.html.twig` template in the
 
 !!! tip
 
-    If an attribute is not required, check if it's defined by adding a check 
+    If an attribute isn't required, check if it's defined by adding a check 
     in the template, for example:
 
     ```html+twig
diff --git a/docs/content_management/workflow/workflow.md b/docs/content_management/workflow/workflow.md
index 8d1a84881c..c5555f6a83 100644
--- a/docs/content_management/workflow/workflow.md
+++ b/docs/content_management/workflow/workflow.md
@@ -73,7 +73,7 @@ You can restrict who can review the content item by setting `reviewers.user_grou
 To be able to search for users for review, the user must have the content/read Policy without any Limitation,
 or with a Limitation that allows reading users.
 This means that, in addition to your own settings for this Policy, 
-you must add the /Users subtree to the Limitation and add Users in the [content type Limitation](limitation_reference.md#content-type-limitation).
+you must add the /Users subtree to the Limitation and add users in the [content type Limitation](limitation_reference.md#content-type-limitation).
 
 ``` yaml hl_lines="8 9"
 [[= include_file('code_samples/workflow/custom_workflow/config/packages/workflows.yaml', 23, 32) =]]
@@ -172,7 +172,7 @@ For example, you can use it to only allow a legal team to edit content in the `l
 ### Validate form before workflow transition
 
 By default, sending content to the next stage of the workflow does not validate the form in UI,
-so with the publish action, the form is not verified for errors in UI.
+so with the publish action, the form isn't verified for errors in UI.
 However, during the publish action, the sent form is validated in the service.
 
 Therefore, if there are any errors in the form, you return to the edit page but errors aren't triggered,
diff --git a/docs/customer_management/cp_page_builder.md b/docs/customer_management/cp_page_builder.md
index b76d550905..b45e9def50 100644
--- a/docs/customer_management/cp_page_builder.md
+++ b/docs/customer_management/cp_page_builder.md
@@ -86,7 +86,7 @@ If members of the company don't have sufficient permissions for any Customer Por
 
 !!! note
 
-    Customer Portal is only available to users that are members of the company. Even if a user has all the sufficient permissions but is not a member of a company, they can't see the Customer Portal.
+    Customer Portal is only available to users that are members of the company. Even if a user has all the sufficient permissions but isn't a member of a company, they can't see the Customer Portal.
 
 ## Create and configure multiple portals
 
@@ -171,7 +171,7 @@ If members of the Customer Group don't have sufficient permissions for any Custo
 
 !!! note
 
-    Customer Portal is only available to users that are members of the company. Even if user has all the sufficient permissions but is not a member of a company, they won't see the Customer Portal.
+    Customer Portal is only available to users that are members of the company. Even if user has all the sufficient permissions but isn't a member of a company, they won't see the Customer Portal.
 
 #### Build-in portal mapping
 
diff --git a/docs/getting_started/requirements.md b/docs/getting_started/requirements.md
index d9cc70cc4b..78678346a5 100644
--- a/docs/getting_started/requirements.md
+++ b/docs/getting_started/requirements.md
@@ -376,7 +376,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
     ### Ibexa Cloud Setup support matrix
 
-    All Ibexa DXP features are supported in accordance with the example above. For example: As Legacy Bridge is not supported with v3, it's not supported on Ibexa Cloud either.
+    All Ibexa DXP features are supported in accordance with the example above. For example: As Legacy Bridge isn't supported with v3, it's not supported on Ibexa Cloud either.
 
     !!! note
 
@@ -399,7 +399,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     - Additional time for adaptation and configuration work, and testing by your development team
     - Additional consulting/onboarding time with Platform.sh, Ibexa technical services, and/or one of the many partners with prior experience using Platform.sh with Ibexa DXP
 
-    The cost and effort of this is not included in Ibexa Cloud subscription and is vary depending on the project.
+    The cost and effort of this isn't included in Ibexa Cloud subscription and is vary depending on the project.
 
     ### Custom integrations
 
@@ -423,7 +423,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
     ### Ibexa Cloud Setup support matrix
 
-    All Ibexa DXP features are supported in accordance with the example above. For example: As Legacy Bridge is not supported with v3, it's not supported on Ibexa Cloud either.
+    All Ibexa DXP features are supported in accordance with the example above. For example: As Legacy Bridge isn't supported with v3, it's not supported on Ibexa Cloud either.
 
     !!! note
 
@@ -446,7 +446,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     - Additional time for adaptation and configuration work, and testing by your development team
     - Additional consulting/onboarding time with Platform.sh, Ibexa technical services, and/or one of the many partners with prior experience using Platform.sh with Ibexa DXP
 
-    The cost and effort of this is not included in Ibexa Cloud subscription and is vary depending on the project.
+    The cost and effort of this isn't included in Ibexa Cloud subscription and is vary depending on the project.
 
     ### Custom integrations
 
@@ -465,7 +465,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     For example:
 
     - Platform.sh provides Redis support for versions 2.8, 3.0 and 3.2. eZ Platform supports Redis version 3.2 or higher. As a result, Redis is supported by eZ Platform Cloud versions 3.2.
-    - Platform.sh provides Elastic Search service (different versions supported). Elastic Search is not supported for use as search engine for eZ Platform.
+    - Platform.sh provides Elastic Search service (different versions supported). Elastic Search isn't supported for use as search engine for eZ Platform.
 
     Features or services supported by eZ Platform but not covered by Platform.sh may be possible by means of a [custom integration](#custom-integrations).
 
@@ -484,11 +484,11 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     - Additional time for adaptation and configuration work, and testing by your own team
     - Additional consulting/onboarding time with Platform.sh, Ibexa technical services, and/or one of the many partners with prior experience using Platform.sh with eZ Publish legacy
 
-    The cost and effort of this is not included in eZ Platform Cloud subscription and is vary depending on the project.
+    The cost and effort of this isn't included in eZ Platform Cloud subscription and is vary depending on the project.
 
     ### Experimental/custom Platform.sh setups
 
-    Any use of experimental versions or setups is not eligible for use with eZ Platform Cloud.
+    Any use of experimental versions or setups isn't eligible for use with eZ Platform Cloud.
     However, it's possible to use an eZ Enterprise subscription in combination with a Platform.sh contract,
     where you or a partner take ownership of the configuration to set up the project.
 
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
index b15d2eb81d..848bce2c78 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
@@ -125,7 +125,7 @@ If the given content has several Locations, you can see several `l<location-id>`
     
     - the response has attribute `view`
     - the view implements `Ibexa\Core\MVC\Symfony\View\CachableView`
-    - cache is not disabled on the individual view
+    - cache isn't disabled on the individual view
 
     If that checks out, the response is adapted with the following:
     
@@ -591,7 +591,7 @@ Surrogate-Key: ez-all
 ```
 
 The `Cache-Control` and `Vary` headers look correct. The request is handled by a custom controller and the `Surrogate-Key` only contains the default `ez-all` value. 
-This is not a problem as long as the controller
+This isn't a problem as long as the controller
 does not return values from any Content in the [[= product_name =]] Repository. If it does, the controller should also add
 the corresponding IDs to such objects in that header.
 
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
index ef9bb70afd..c6bb35cd1c 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
@@ -58,7 +58,7 @@ It also varies on `Authorization` to cover any possible basic authorization head
 
     If you use URI-based SiteAccess matching on a multi-repository installation (multiple databases), 
     the default SiteAccess on the domain needs to point to the same repository (database), 
-    because `/_fos_user_context_hash` is not SiteAccess-aware by default (see 
+    because `/_fos_user_context_hash` isn't SiteAccess-aware by default (see 
     `ibexa.rest.default_router.non_siteaccess_aware_routes` parameter).
     This occurs because reverse proxy does not have knowledge about SiteAccesses 
     and it does not pass the whole URL to be able to cache the user context hash response.
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md b/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md
index bf07880012..de1f7c5f88 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md
@@ -12,7 +12,7 @@ It means that you don't have to do any changes to the Fastly configuration to ma
 The information provided here is only applicable if you want to change the default Fastly configuration on Ibexa Cloud, 
 or if you're not using Ibexa Cloud and want to configure Fastly to work with [[= product_name =]] on premise.
 
-!!! note "The Fastly Web Interface is not available for Ibexa Cloud"
+!!! note "The Fastly Web Interface isn't available for Ibexa Cloud"
     It's recommend for Ibexa Cloud customers to use the Fastly CLI instead of using the Fastly API directly with `curl`, and so on.
 
 !!! note "Disable Varnish when you use Fastly"
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/http_cache_configuration.md b/docs/infrastructure_and_maintenance/cache/http_cache/http_cache_configuration.md
index eaf1e8e0da..bea19428b5 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/http_cache_configuration.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/http_cache_configuration.md
@@ -94,5 +94,5 @@ because your reverse proxy has to wait for the back end and cannot deliver cache
 
 !!! note "ESI limitations with the URIElement SiteAccess matcher"
 
-    Is is not possible to share ESIs across the SiteAccesses when using URI matching 
+    Is isn't possible to share ESIs across the SiteAccesses when using URI matching 
     as URI contains the SiteAccess name encoded in its path information.
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md b/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
index 6e3f81b5e2..80a71d865a 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
@@ -321,9 +321,9 @@ By default, [[= product_name =]] always soft purges content on reverse proxies t
 with the following logic in the out-of-the-box VCL:
 
 - Cache is within grace period.
-- Either the server is not responding, or the request comes without a session cookie (anonymous user).
+- Either the server isn't responding, or the request comes without a session cookie (anonymous user).
 
-Serving grace is not always allowed by default because:
+Serving grace isn't always allowed by default because:
 
 - It's a safe default. Even if just for anonymous users, stale cache can easily be confusing during acceptance testing.
 - It means REST API, which is used by the back office, would serve stale data, breaking the UI.
@@ -331,6 +331,6 @@ Serving grace is not always allowed by default because:
 !!! tip "Customizing stale cache handling"
 
     If you want to use grace handling for logged-in users as well, you can adapt the provided VCL to add a condition
-    for opting out if the request has a cookie and the path contains REST API prefix to make sure the back office is not negatively affected.
+    for opting out if the request has a cookie and the path contains REST API prefix to make sure the back office isn't negatively affected.
 
     If you want to disable grace mode, you can adapt the VCL to do hard instead of soft purges, or set grace/stale time to `0s`.
diff --git a/docs/infrastructure_and_maintenance/cache/persistence_cache.md b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
index 8404db8706..f1e20c4010 100644
--- a/docs/infrastructure_and_maintenance/cache/persistence_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
@@ -33,7 +33,7 @@ Notes:
   order to allow clearing cache by alternative indexes.
   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're too complex by design (for example, full text).
+- Search isn't defined as persistence and the queries themselves are not planned to be cached as they're too complex by design (for example, full text).
   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)
@@ -91,7 +91,7 @@ ibexa:
 
 Persistence cache layer caches selected objects in-memory for a short time.
 It avoids loading repeatedly the same data from e.g. a remote Redis instance, which can take up to 4-5ms per call due to the network latency and Redis instance load.
-The cache is organized in 2 pools, one for metadata which is not updated frequently, and one for content related objects that is only meant as a short-lived burst cache.
+The cache is organized in 2 pools, one for metadata which isn't updated frequently, and one for content related objects that is only meant as a short-lived burst cache.
 Limit is organized using a [least frequently used (LFU)](https://en.wikipedia.org/wiki/Least_frequently_used) approach.
 It makes sure repeatedly used objects stay in-memory until expired, and those seldom used are bulk evicted from cache every time the maximum number of cache items is reached.
 
@@ -149,7 +149,7 @@ Use of LRU or LFU is recommended. it's also possible to use `noeviction`, but it
 
 ##### `Symfony\Component\Cache\Adapter\RedisAdapter`
 
-**Pros**: Uses a bit less memory than `RedisTagAwareAdapter`, so it eliminated the risk of stopping saving cache when there is not enough memory.
+**Pros**: Uses a bit less memory than `RedisTagAwareAdapter`, so it eliminated the risk of stopping saving cache when there isn't enough memory.
 
 **Cons**: 1.5-2x more lookups to the back-end cache server then `RedisTagAwareAdapter`.
 Depending on the number of lookups and latency to cache server this might affect page load time.
diff --git a/docs/infrastructure_and_maintenance/performance.md b/docs/infrastructure_and_maintenance/performance.md
index f6c5f4614b..edb4a8ac23 100644
--- a/docs/infrastructure_and_maintenance/performance.md
+++ b/docs/infrastructure_and_maintenance/performance.md
@@ -76,7 +76,7 @@ In production setups:
 
     Check if your cloud provider has native service for Memcached/Redis, as those might be better tuned.
 
-- If you use Redis, make sure to tune it for in-memory cache usage. Its persistence feature is not needed with cache and severely slows down execution time.
+- If you use Redis, make sure to tune it for in-memory cache usage. Its persistence feature isn't needed with cache and severely slows down execution time.
     - [For use with sessions](sessions.md#cluster-setup) however, persistence can be a good fit if you want sessions to survive service interruptions.
     - Further tips for Redis with cache can be found in doc regarding [Redis Clustering](persistence_cache.md#redis-clustering).
 
diff --git a/docs/infrastructure_and_maintenance/security/security_checklist.md b/docs/infrastructure_and_maintenance/security/security_checklist.md
index 796b874c7b..731fd9f22e 100644
--- a/docs/infrastructure_and_maintenance/security/security_checklist.md
+++ b/docs/infrastructure_and_maintenance/security/security_checklist.md
@@ -31,7 +31,7 @@ make sure that your setup is secure.
     
 !!! note
 
-    On [[= product_name_cloud =]], if `APP_SECRET` is not set, the system sets it to [`PLATFORM_PROJECT_ENTROPY`](https://docs.platform.sh/guides/symfony/environment-variables.html#symfony-environment-variables)
+    On [[= product_name_cloud =]], if `APP_SECRET` isn't set, the system sets it to [`PLATFORM_PROJECT_ENTROPY`](https://docs.platform.sh/guides/symfony/environment-variables.html#symfony-environment-variables)
 
 ### Symfony production mode
 
@@ -230,7 +230,7 @@ You most likely need to vary the security headers based on the SiteAccess in que
 - `Strict-Transport-Security` - ensures that all requests are sent over HTTPS, with no fallback to HTTP. 
 All production sites should use HTTPS and this header unless they have very particular needs. 
 This header is less important during development provided that the site is on an internal, protected network. 
-- `X-Frame-Options` - ensures that the site is not be embedded in a frame by a compliant browser. 
+- `X-Frame-Options` - ensures that the site isn't embedded in a frame by a compliant browser. 
 Set the header to `SAMEORIGIN` to allow embedding by your own site, or `DENY` to block framing completely. 
 - `X-Content-Type-Options` - prevents the browser from second-guessing the mime-type of delivered content. 
 This header is less important if users cannot upload content and/or you trust your editors. However, it's safer to use it at all times. 
diff --git a/docs/multisite/languages/languages.md b/docs/multisite/languages/languages.md
index 66e5339251..0cfed55d85 100644
--- a/docs/multisite/languages/languages.md
+++ b/docs/multisite/languages/languages.md
@@ -34,7 +34,7 @@ Language versions consist of translated values of the content item's Fields. In
 
 [[= product_name =]] does not decide by itself which Fields can be translated and which cannot. For some Field values the need for a translation can be obvious, for example for the body of an article. In other cases, for instance images without text, integer numbers or e-mail addresses, translation is usually unnecessary. Despite that, [[= product_name =]] gives you the possibility to mark any Field as translatable regardless of its field type. It's only your decision to exclude the translation possibility for those Fields where it makes no sense.
 
-When a Field is not flagged as Translatable, its value is copied from the initial/main translation when a new language version is created. This copied value cannot be modified. When a Field is Translatable, you have to enter its value in a new language version manually.
+When a Field isn't flagged as Translatable, its value is copied from the initial/main translation when a new language version is created. This copied value cannot be modified. When a Field is Translatable, you have to enter its value in a new language version manually.
 
 For example, let's say that you need to store information about marathon contestants and their results. You build a "contestant" content type using the following Fields: name, photo, age, nationality, finish time. Allowing the translation of anything other than nationality would be pointless, since the values stored by the other Fields are the same regardless of the language used to describe the contestant. In other words, the name, photo, age and finish time would be the same in, for example, both English and Norwegian.
 
@@ -55,7 +55,7 @@ For details, see [Multi-language SiteAccesses](set_up_translation_siteaccess.md)
 
 ### Explicit translation SiteAccesses
 
-Configuration is not mandatory, but can help to distinguish which SiteAccesses can be considered translation SiteAccesses.
+Configuration isn't mandatory, but can help to distinguish which SiteAccesses can be considered translation SiteAccesses.
 
 ``` yaml
 ibexa:
@@ -169,7 +169,7 @@ ibexa:
 
 ### Using implicit *related SiteAccesses*
 
-If the `translation_siteaccesses` setting is not provided, implicit *related SiteAccesses* is used instead. SiteAccesses are considered *related* if they share:
+If the `translation_siteaccesses` setting isn't provided, implicit *related SiteAccesses* is used instead. SiteAccesses are considered *related* if they share:
 
 - The same Repository
 - The same root `location_id` (see [Multisite](multisite.md))
@@ -180,4 +180,4 @@ When setting up SiteAccesses with different language versions, you can specify a
 
 You can also assign a Default content availability flag to content types (available in the Admin Panel). When this flag is assigned, content items of this type are available even when they do not have a language version in any of the languages configured for the current SiteAccess.
 
-Note that if a language is not provided in the list of prioritized languages and it's not the content item's first language, the URL alias for this content in this language isn't generated.
+Note that if a language isn't provided in the list of prioritized languages and it's not the content item's first language, the URL alias for this content in this language isn't generated.
diff --git a/docs/multisite/multisite_configuration.md b/docs/multisite/multisite_configuration.md
index 5ccca640b1..471801c987 100644
--- a/docs/multisite/multisite_configuration.md
+++ b/docs/multisite/multisite_configuration.md
@@ -100,7 +100,7 @@ The available scopes are:
 4. `default`
 
 `global` overrides all other scopes.
-If `global` is not defined, the configuration then tries to match a SiteAccess, and then a SiteAccess group.
+If `global` isn't defined, the configuration then tries to match a SiteAccess, and then a SiteAccess group.
 Finally, if no other scope is matched, `default` is applied.
 
 In short: if you want a match that always applies, regardless of SiteAccesses, use `global`.
diff --git a/docs/multisite/site_factory/site_factory_configuration.md b/docs/multisite/site_factory/site_factory_configuration.md
index 4e464000d2..d78a48ee13 100644
--- a/docs/multisite/site_factory/site_factory_configuration.md
+++ b/docs/multisite/site_factory/site_factory_configuration.md
@@ -34,7 +34,7 @@ ibexa_site_factory:
 
 Now, you can see the path to the new site's parent Location under design selection.
 If you have sufficient permissions, you can change the defined Location during site creation.
-If the parent Location is not defined, you have to choose it from Universal Discovery Widget.
+If the parent Location isn't defined, you have to choose it from Universal Discovery Widget.
 
 ## Site skeletons
 
@@ -90,7 +90,7 @@ ibexa_site_factory:
 
 Manage the permissions associated to the user group skeleton by [assigning roles](https://doc.ibexa.co/projects/userguide/en/latest/site_organization/organizing_the_site/#managing-permissions).
 Make sure that the roles that you assign to the user group skeleton do not contain Location-based limitations. 
-User group skeletons cannot contain individual User content items either.
+User group skeletons cannot contain individual user content items either.
 
 User group skeletons are retained after deleting the site.
 
diff --git a/docs/multisite/siteaccess/siteaccess_aware_configuration.md b/docs/multisite/siteaccess/siteaccess_aware_configuration.md
index 9d22fc215e..d61993c81d 100644
--- a/docs/multisite/siteaccess/siteaccess_aware_configuration.md
+++ b/docs/multisite/siteaccess/siteaccess_aware_configuration.md
@@ -252,7 +252,7 @@ that ensures the array setting has unique values. It only works on normal arrays
 
 !!! note
 
-    Merge is not recursive. Only second level merge is possible by using `ContextualizerInterface::MERGE_FROM_SECOND_LEVEL` option.
+    Merge isn't recursive. Only second level merge is possible by using `ContextualizerInterface::MERGE_FROM_SECOND_LEVEL` option.
 
 ### Dedicated mapper object
 
diff --git a/docs/permissions/custom_policies.md b/docs/permissions/custom_policies.md
index 8a9052d03a..6f5b505413 100644
--- a/docs/permissions/custom_policies.md
+++ b/docs/permissions/custom_policies.md
@@ -4,7 +4,7 @@ description: Create a custom policy to cover non-standard permission needs.
 
 # Custom policies
 
-The content Repository uses [roles and policies](permissions.md) to give Users access to different functions of the system.
+The content Repository uses [roles and policies](permissions.md) to give users access to different functions of the system.
 
 Any bundle can expose available Policies via a `PolicyProvider` which can be added to IbexaCoreBundle's [service container](php_api.md#service-container) extension.
 
diff --git a/docs/permissions/limitation_reference.md b/docs/permissions/limitation_reference.md
index 245b28bcfd..bb5d987c13 100644
--- a/docs/permissions/limitation_reference.md
+++ b/docs/permissions/limitation_reference.md
@@ -11,7 +11,7 @@ A generic limitation type to use when no other limitation has been implemented.
 Without any Limitation assigned, a `LimitationNotFoundException` is thrown.
 
 It's called "blocking" because it always informs the permissions system that 
-the User does not have access to any policy the limitation is assigned to, making 
+the user does not have access to any policy the limitation is assigned to, making 
 the permissions system move on to the next policy.
 
 ### Possible values
@@ -51,7 +51,7 @@ The `CartOwner` limitation specifies whether the user can modify a cart.
 
 |Value|UI value|Description|
 |------|------|------|
-|"self"|"self"|Only the User who is the owner of the cart gets access.|
+|"self"|"self"|Only the user who is the owner of the cart gets access.|
 |`null`| none |User can access all carts.|
 
 ## Change Owner limitation
@@ -66,14 +66,14 @@ The Change Owner (`ChangeOwner`) limitation specifies whether the user can chang
 
 ## Content type Group limitation
 
-The content type Group (`UserGroup`) limitation specifies that only Users with at least one common *direct* user 
+The content type Group (`UserGroup`) limitation specifies that only users with at least one common *direct* user 
 Group with the owner of content get the selected access right.
 
 ### Possible values
 
 |Value|UI value|Description|
 |------|------|------|
-|`1`|"self"|Only a User who has at least one common *direct* user group with the owner gets access|
+|`1`|"self"|Only a user who has at least one common *direct* user group with the owner gets access|
 
 ## Content type Group of Parent limitation
 
@@ -85,11 +85,11 @@ used by `content/create` permission.
 
 |Value|UI value|Description|
 |------|------|------|
-|`1`|"self"|Only a User who has at least one common *direct* user group with owner of the parent Location gets access|
+|`1`|"self"|Only a user who has at least one common *direct* user group with owner of the parent Location gets access|
 
 ## Content type limitation
 
-The Content Typ (`ContentType`) limitation specifies whether the User has access to content with a specific 
+The Content Typ (`ContentType`) limitation specifies whether the user has access to content with a specific 
 content type.
 
 ### Possible values
@@ -100,13 +100,13 @@ content type.
 
 ## Content type of Parent limitation
 
-The content type of Parent (`ParentContentType`) limitation specifies whether the User has access to content whose parent Location 
+The content type of Parent (`ParentContentType`) limitation specifies whether the user has access to content whose parent Location 
 contains a specific content type, used by `content/create`.
 
 This limitation combined with `ContentType` limitation allows you to define business 
-rules like allowing Users to create "Blog Post" within a "Blog." 
+rules like allowing users to create "Blog Post" within a "Blog." 
 If you also combine it with `Owner of Parent` limitation, you effectively limit 
-access to create Blog Posts in the Users' own Blogs.
+access to create Blog Posts in the users' own Blogs.
 
 ### Possible values
 
@@ -116,7 +116,7 @@ access to create Blog Posts in the Users' own Blogs.
 
 ## Field Group limitation [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
-A Field Group (`FieldGroup`) limitation specifies whether the User can work with content Fields belonging 
+A Field Group (`FieldGroup`) limitation specifies whether the user can work with content Fields belonging 
 to a specific group.
 A user with this limitation is allowed to edit Fields belonging to the indicated group.
 Otherwise, the Fields are inactive and filled with the default value (if set).
@@ -129,7 +129,7 @@ Otherwise, the Fields are inactive and filled with the default value (if set).
 
 ## Language limitation
 
-A Language (`Language`) limitation specifies whether the User has access to work on the specified translation.
+A Language (`Language`) limitation specifies whether the user has access to work on the specified translation.
 
 A user with this limitation is allowed to:
 
@@ -147,7 +147,7 @@ This only applies to creating the first version of a content item.
 
 ## Location limitation
 
-A Location (`Location`) limitation specifies whether the User has access to content with a specific 
+A Location (`Location`) limitation specifies whether the user has access to content with a specific 
 Location, in case of `content/create` the parent Location is evaluated.
 
 ### Possible values
@@ -158,7 +158,7 @@ Location, in case of `content/create` the parent Location is evaluated.
 
 ## New Section limitation
 
-A New Section (`NewSection`) limitation specifies whether the User has access to assigning content to a given Section.
+A New Section (`NewSection`) limitation specifies whether the user has access to assigning content to a given Section.
 
 In the `section/assign` policy you can combine this with Section limitation to 
 limit both from and to values.
@@ -171,7 +171,7 @@ limit both from and to values.
 
 ## New State limitation
 
-A New State (`NewObjectState`) limitation specifies whether the User has access to (assigning) a given Object 
+A New State (`NewObjectState`) limitation specifies whether the user has access to (assigning) a given Object 
 state to content.
 
 In the `state/assign` policy you can combine this with State limitation to limit 
@@ -185,7 +185,7 @@ both from and to values.
 
 ## Object State limitation
 
-The Object State (`ObjectState`) limitation specifies whether the User has access to content with a specific 
+The Object State (`ObjectState`) limitation specifies whether the user has access to content with a specific 
 Object state.
 
 ### Possible values
@@ -213,24 +213,24 @@ access right.
 
 |Value|UI value|Description|
 |------|------|------|
-|`1`|"self"|Only the User who is the owner gets access|
+|`1`|"self"|Only the user who is the owner gets access|
 |`2`|"session"|Deprecated and works exactly like "self" in public PHP API since it has no knowledge of user Sessions|
 
 ## Owner of Parent limitation
 
-The Owner of Parent (`ParentOwner`) limitation specifies that only the Users who own all parent Locations of 
+The Owner of Parent (`ParentOwner`) limitation specifies that only the users who own all parent Locations of 
 a content item get a certain access right, used for `content/create` permission.
 
 ### Possible values
 
 |Value|UI value|Description|
 |------|------|------|
-|`1`|"self"|Only the User who is the owner of all parent Locations gets access|
+|`1`|"self"|Only the user who is the owner of all parent Locations gets access|
 |`2`|"session"|Deprecated and works exactly like "self" in public PHP API since it has no knowledge of user Sessions|
 
 ## Parent Depth limitation
 
-The Parent Depth (`ParentDepth`) limitation specifies whether the User has access to creating content under 
+The Parent Depth (`ParentDepth`) limitation specifies whether the user has access to creating content under 
 a parent Location within a specific depth of the tree, used for `content/create` 
 permission.
 
@@ -253,12 +253,12 @@ The Payment Owner (`PaymentOwner`) limitation specifies whether the user can mod
 
 ## Personalization access limitation
 
-The Personalization limitation specifies the SiteAccesses for which the User can view or modify 
+The Personalization limitation specifies the SiteAccesses for which the user can view or modify 
 the scenario configuration.
 
 ## Product Type limitation
 
-The Product Type (`ProductType`) limitation specifies whether the User has access to products belonging to a specific Product Type.
+The Product Type (`ProductType`) limitation specifies whether the user has access to products belonging to a specific Product Type.
 
 ### Possible values
 
@@ -268,7 +268,7 @@ The Product Type (`ProductType`) limitation specifies whether the User has acces
 
 ## Section limitation
 
-The Section (`Section`) limitation specifies whether the User has access to content within a specific 
+The Section (`Section`) limitation specifies whether the user has access to content within a specific 
 Section.
 
 This limitation can be used as a role limitation.
@@ -305,7 +305,7 @@ by `user/login`.
 
 ### Legacy compatibility notes
 
-`SiteAccess` limitation is deprecated and is not used actively in public PHP API, 
+`SiteAccess` limitation is deprecated and isn't used actively in public PHP API, 
 but is allowed for being able to read / create limitations for legacy.
 
 ## Shipment Owner limitation
@@ -320,7 +320,7 @@ The Shipment Owner (`ShipmentOwner`) limitation specifies whether the user can m
 
 ## Subtree limitation
 
-The Subtree (`Subtree`) limitation specifies whether the User has access to content within a specific 
+The Subtree (`Subtree`) limitation specifies whether the user has access to content within a specific 
 Subtree of Location, in case of `content/create` the parent Subtree of Location 
 is evaluated.
 
@@ -334,12 +334,12 @@ This limitation can be used as a role limitation.
 
 ### Usage notes
 
-For more information on how to restrict User's access to part of the Subtree 
+For more information on how to restrict user's access to part of the Subtree 
 follow [the example in the Admin management section](permission_use_cases.md#restrict-editing-to-part-of-the-tree).
 
 ## Version Lock limitation
 
-The Version Lock (`VersionLock`) limitation specifies whether the User can perform actions, for example, edit 
+The Version Lock (`VersionLock`) limitation specifies whether the user can perform actions, for example, edit 
 or unlock, on content items that are in a workflow.
 
 This limitation can be used as a role limitation.
@@ -353,7 +353,7 @@ This limitation can be used as a role limitation.
 
 ## Workflow Stage limitation
 
-The Workflow Stage (`WorkflowStage`) limitation specifies whether the User can edit content in a specific workflow 
+The Workflow Stage (`WorkflowStage`) limitation specifies whether the user can edit content in a specific workflow 
 stage.
 
 ### Possible values
@@ -362,7 +362,7 @@ The limitation takes as values stages configured for the workflow.
 
 ## Workflow Transition limitation
 
-The Workflow Transition (`WorkflowTransition`) limitation specifies whether the User can move the content in a workflow through 
+The Workflow Transition (`WorkflowTransition`) limitation specifies whether the user can move the content in a workflow through 
 a specific transition.
 
 ### Possible values
diff --git a/docs/permissions/permission_overview.md b/docs/permissions/permission_overview.md
index 707beb03e1..6c7693a697 100644
--- a/docs/permissions/permission_overview.md
+++ b/docs/permissions/permission_overview.md
@@ -4,31 +4,31 @@ description: The permission system is based on policies that you assign to users
 
 # Permission overview
 
-A new User does not have permissions for any part of the system, unless they're explicitly given access.
+A new user does not have permissions for any part of the system, unless they're explicitly given access.
 To get access they need to inherit roles, typically assigned to the user group they belong to.
 
 Each role can contain one or more **Policies**. A policy is a rule that gives access to a single **function** in a **module**.
-For example, a `section/assign` Policy allows the User to assign content to Sections.
+For example, a `section/assign` Policy allows the user to assign content to Sections.
 
 When you add a policy to a role, you can also restrict it using one or more **Limitations**.
 A policy with a limitation only applies when the condition in the limitation is fulfilled.
-For example, a `content/publish` policy with a `ContentType` limitation on the "Blog Post" content type allows the User to publish only Blog Posts, and not other content.
+For example, a `content/publish` policy with a `ContentType` limitation on the "Blog Post" content type allows the user to publish only Blog Posts, and not other content.
 
-A limitation, like a policy, specifies what a User *can* do, not what they *can't do*.
-A `Section` limitation, for example, *gives* the User access to the selected Section, not *prohibits* it.
+A limitation, like a policy, specifies what a user *can* do, not what they *can't do*.
+A `Section` limitation, for example, *gives* the user access to the selected Section, not *prohibits* it.
 
 See [Limitation reference](limitation_reference.md) for further information
 and [Permission use cases](permission_use_cases.md) for example permission setups.
 
 ## Assigning roles to users
 
-Every user or user group can have many roles. A User can also belong to many groups, for example, Administrators, Editors, Subscribers.
+Every user or user group can have many roles. A user can also belong to many groups, for example, Administrators, Editors, Subscribers.
 
 it's best practice to avoid assigning roles to users directly.
 Instead, try to organize your content so that it can be covered with general roles assigned to user groups.
 
 Using Groups is easier to manage and more secure. It also improves system performance.
-The more role assignments and complex policies you add for a given User, the more complex the search/load queries are, because they always take permissions into account.
+The more role assignments and complex policies you add for a given user, the more complex the search/load queries are, because they always take permissions into account.
 
 ## Permissions for custom controllers
 
diff --git a/docs/permissions/policies.md b/docs/permissions/policies.md
index 2d92795854..64e6f25e54 100644
--- a/docs/permissions/policies.md
+++ b/docs/permissions/policies.md
@@ -196,14 +196,14 @@ which define, which parts of the application or website the user has access to.
 |                        | <nobr>`read`</nobr>               | view the content both in front and back end                                                                                             | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Content type Group](limitation_reference.md#content-type-group-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Object State](limitation_reference.md#object-state-limitation)                                                                                                                                                                                                                                                                                                                                               |
 |                        | <nobr>`remove`</nobr>             | remove Locations and send content to Trash                                                                                              | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Object State](limitation_reference.md#object-state-limitation)</br>[Language](limitation_reference.md#language-limitation)                                                                                                                                                                                                                                                                                                                                                                   |
 |                        | <nobr>`restore`</nobr>            | restore content from Trash                                                                                                              |
-|                        | <nobr>`reverserelatedlist`</nobr> | see all content that a content item relates to (even when the User is not allowed to view it as an individual content items)            | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
+|                        | <nobr>`reverserelatedlist`</nobr> | see all content that a content item relates to (even when the User isn't allowed to view it as an individual content items)            | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
 |                        | <nobr>`translate`</nobr>          | unused                                                                                                                                  | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Language](limitation_reference.md#language-limitation)                                                                                                                                                                                                                                                                                                                                                                                                                                       |
 |                        | <nobr>`translations`</nobr>       | manage the language list in Admin                                                                                                       |
 |                        | <nobr>`unlock`</nobr>             | unlock drafts locked to a user for performing actions                                                                                   | [Owner](limitation_reference.md#owner-limitation)</br>[Content type Group](limitation_reference.md#content-type-group-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Language](limitation_reference.md#language-limitation)</br>[Version Lock](limitation_reference.md#version-lock-limitation)                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
 |                        | <nobr>`urltranslator`</nobr>      | manage URL aliases of a content item                                                                                                    |
 |                        | <nobr>`versionread`</nobr>        | view content after publishing, and to preview any content in the Site mode                                                              | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>Status</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Object State](limitation_reference.md#object-state-limitation)                                                                                                                                                                                                                                                                                                                                                                                                                    |
 |                        | <nobr>`versionremove`</nobr>      | remove archived content versions                                                                                                        | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>Status</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Object State](limitation_reference.md#object-state-limitation)                                                                                                                                                                                                                                                                                                                                                                                                                    |
-|                        | <nobr>`view_embed`</nobr>         | view content embedded in another content item (even when the User is not allowed to view it as an individual content item)              | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
+|                        | <nobr>`view_embed`</nobr>         | view content embedded in another content item (even when the User isn't allowed to view it as an individual content item)              | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 
 #### Content types
 
diff --git a/docs/personalization/api_reference/content_api.md b/docs/personalization/api_reference/content_api.md
index 6fe6360a70..e1cce3f178 100644
--- a/docs/personalization/api_reference/content_api.md
+++ b/docs/personalization/api_reference/content_api.md
@@ -44,8 +44,7 @@ Use the POST request to create or update items with the given ID in the database
 `POST: https://admin.perso.ibexa.co/api/[customerid]/item`
 
 A body of the request must contain a valid XML document.
-Once uploaded, the item is scheduled to be inserted in the database, and it 
-is not directly available.
+Once uploaded, the item is scheduled to be inserted in the database, and itsn't directly available.
 
 ## DELETE requests
 
diff --git a/docs/personalization/api_reference/tracking_api.md b/docs/personalization/api_reference/tracking_api.md
index 5eb8d4f231..1f1a833771 100644
--- a/docs/personalization/api_reference/tracking_api.md
+++ b/docs/personalization/api_reference/tracking_api.md
@@ -95,11 +95,11 @@ After logout, the anonymous user ID can be used again.
     If a browser has JavaScript or cookies disabled, make sure that you put some
     "dummy" value as identifier in the tracking request to avoid losing tracking
     information.
-    Even if the event is not user-specific, it's still useful for [popularity models]([[= user_doc =]]/personalization/recommendation_models/).
+    Even if the event isn't user-specific, it's still useful for [popularity models]([[= user_doc =]]/personalization/recommendation_models/).
 
 The Personalization server internally creates a hash of every user ID.
-The original ID is not saved.
-It's still possible that the original ID appears in the log files for the debugging
+The original ID isn't saved.
+it's still possible that the original ID appears in the log files for the debugging
 purposes but log files are purged regularly.
 The user ID is case sensitive.
 
@@ -246,7 +246,7 @@ and `quantity` can be set to 4.
 
 The Buy event is only relevant if the user is charged per product, like in a classic shop.
 If products are sold on a subscription basis, or the web presence is ad-sponsored,
-this event type is not applicable.
+this event type isn't applicable.
 
 #### Prices in a Buy event
 
@@ -261,7 +261,7 @@ For more information, see [Content API](content_api.md).
 
 The currency is stored with the price and normalized only when statistic information
 is requested.
-It's often a good choice to select a base currency and convert prices before
+it's often a good choice to select a base currency and convert prices before
 sending the buy event.
 The price attached to a buy event never overwrites the price which was defined
 in an item import.
@@ -297,10 +297,10 @@ Some optional request parameters can be set over query string parameters (GET pa
 !!! note "eCommerce vs. content publishing"
 
     The Consume event is important for content publishing websites.
-    For eCommerce stores, this event is not required but can be used in custom implementations.
+    For eCommerce stores, this event isn't required but can be used in custom implementations.
 
 The event is sent when the end user stays on the page for a predefined period of time.
-It's then assumed that the user consumed the item (read an article or watched a video).
+it's then assumed that the user consumed the item (read an article or watched a video).
 
 The URL has the following format:
 
@@ -503,7 +503,7 @@ The URL for a Rendered event has the following format:
 
 For a detailed description of embedded parameters, see [event parameters](#event-parameters).
 
-It's common that recommendations are rendered as a block with multiple items.
+it's common that recommendations are rendered as a block with multiple items.
 To save traffic and speed up the process, you can bundle multiple recommendations in one request.
 Several item IDs must be comma-separated.
 
diff --git a/docs/personalization/enable_personalization.md b/docs/personalization/enable_personalization.md
index a909416b12..8465128dfa 100644
--- a/docs/personalization/enable_personalization.md
+++ b/docs/personalization/enable_personalization.md
@@ -528,7 +528,7 @@ before the main subscriber is run.
 
 ### Image variations
 
-Displaying image variations is not supported out of the box.
+Displaying image variations isn't supported out of the box.
 
 You can work around this limitation by creating a template
 (based on [recommendations.html.twig](https://github.com/ibexa/personalization-client/blob/main/src/bundle/Resources/views/recommendations.html.twig)).
diff --git a/docs/personalization/legacy_recommendation_api.md b/docs/personalization/legacy_recommendation_api.md
index 1a945ede94..90f8eed750 100644
--- a/docs/personalization/legacy_recommendation_api.md
+++ b/docs/personalization/legacy_recommendation_api.md
@@ -219,7 +219,7 @@ The last modification timestamp indicates a change that could influence the reco
 | Bestselling products last 7 days | no context | 24 hours | The model with the 7 days scope is usually built once a day. It can be easily cached for 24 hours. It has no context and can therefore be cached globally for all the users of a customer. |
 | Also bought products in the last month | current product | 24 hours | The model with the 30 days scope is usually built once a day. The context is always the same. It can be cached for every product. The same result can be used for all users of a customer. |
 | Also consumed read articles in the last hour | current article | 30 minutes | Models with a short scope are usually built several times a day or even per hour. In this case the expiration time is set to the half of the model build frequency/period. |
-| Personalized recommendation based on the user's statistic | customers click history | now | Although the statistic model is not updated within minutes, it's very likely that the context is changed shortly (customer clicks another product and therefore the click is added to his history). The expiration time should not be much longer than the user activity on the web page. |
+| Personalized recommendation based on the user's statistic | customers click history | now | Although the statistic model isn't updated within minutes, it's very likely that the context is changed shortly (customer clicks another product and therefore the click is added to his history). The expiration time should not be much longer than the user activity on the web page. |
 
 In most cases you do not need to calculate the expiration time manually. The table above is provided for the orientation, how the Expires header of the HTTP response is calculated by the recommendation engine and already provided to your caching system. You just need to make sure that the Expires header is used in the configuration of your caching system instead of a static value out of your configuration.
 
@@ -231,7 +231,7 @@ There are several ways to integrate the REST calls to the Recommendation engine
 
 The simplest way to load recommendations is to synchronously request the Recommendation Engine for recommendations as they're needed.
 This way is sufficient in most cases. The most important drawback is that the request time increases by the time of the recommendation request.
-If the network is overloaded or the Recommendation Engine is not available it can lock the request.
+If the network is overloaded or the Recommendation Engine isn't available it can lock the request.
 
 #### Loading in the bottom
 
@@ -266,7 +266,7 @@ An overview of pros and cons for each of the above techniques:
 
 |Problem|Simple Way|Bottom loading|Background loading|JSONP|XMLHttpRequest + Proxy|
 |---|---|---|---|---|---|
-|Is not blocked by ad blockers or no-track plug-ins|Yes|Yes|Yes|-|Yes|
+|Isn't blocked by ad blockers or no-track plug-ins|Yes|Yes|Yes|-|Yes|
 |Works if JavaScript is disabled|Yes|depends|-|-|-|	 	 
 |Works for server without multithreading functionality|Yes|Yes|-|Yes|Yes|
 |Compatible with frontend caching on the server|-|-|-|Yes|Yes|
diff --git a/docs/personalization/recommendation_integration.md b/docs/personalization/recommendation_integration.md
index 71e26610a6..16b1e861e4 100644
--- a/docs/personalization/recommendation_integration.md
+++ b/docs/personalization/recommendation_integration.md
@@ -23,7 +23,7 @@ The simplest way to load recommendations is to synchronously request the Persona
 server for recommendations as they're needed. This way is sufficient in most cases. 
 The most important drawback is that the request time increases by the time 
 of the recommendation request. 
-If the network is overloaded or the Personalization server is not available, 
+If the network is overloaded or the Personalization server isn't available, 
 it can lock the request.
 
 ## Load in the bottom
diff --git a/docs/personalization/tracking_integration.md b/docs/personalization/tracking_integration.md
index a94bb2d9b1..89dfb423f1 100644
--- a/docs/personalization/tracking_integration.md
+++ b/docs/personalization/tracking_integration.md
@@ -32,7 +32,7 @@ or do-not-track plugins on the client side.
 
 Another option is to call the tracker from the server. 
 The most important drawback is that the event request increases the general request time. 
-If the network is overloaded or the Personalization server is not available, 
+If the network is overloaded or the Personalization server isn't available, 
 the number of requests can grow and lead to a stalled and finally crashing HTTP service. 
 See below the techniques that help avoid these problems.
 
@@ -75,7 +75,7 @@ An overview of pros and cons for every technique:
 
 | Feature | Pixel | Server-side | Page bottom | Async. reporting | JSONP | XMLHttpRequest + Proxy |
 |----|-----|-----|-----|-----|-----|------|
-| Is not blocked by ad blockers or do-not-track plug-ins. |-|&#10004;|&#10004;|&#10004;|-|&#10004;|
+| Isn't blocked by ad blockers or do-not-track plug-ins. |-|&#10004;|&#10004;|&#10004;|-|&#10004;|
 | Works if JavaScript is disabled. |&#10004;|&#10004;|&#10004;|&#10004;|-|-|
 | Is compatible with frontend caching on the server. |-|-|-|-|&#10004;|&#10004;|
 | Doesn't delay page rendering. |&#10004;|-|&#10004;|&#10004;|&#10004;|&#10004;|
diff --git a/docs/release_notes/ez_platform_v1.7.0_lts.md b/docs/release_notes/ez_platform_v1.7.0_lts.md
index 75eb67cf9b..51b1895d8d 100644
--- a/docs/release_notes/ez_platform_v1.7.0_lts.md
+++ b/docs/release_notes/ez_platform_v1.7.0_lts.md
@@ -81,7 +81,7 @@ Submitted results can be previewed in the UI or downloaded in a CSV file, and a
 
 ### Updated Demo Sites
 
-The Enterprise demo site has been significantly improved featuring a new **Product content type** that is used to show products in the Tasteful Planet demo. The product we used are meals that, in a non-demo ideal world, would be available to order and consume. This ordering part is not in the demo, nevertheless, the content looks really yummy... Other improvements includes the good setup of all content type field categories and the demonstration of basic SEO field types. Demo content itself has also been upgraded with more content to better demonstrate the capabilities.
+The Enterprise demo site has been significantly improved featuring a new **Product content type** that is used to show products in the Tasteful Planet demo. The product we used are meals that, in a non-demo ideal world, would be available to order and consume. This ordering part isn't in the demo, nevertheless, the content looks really yummy... Other improvements includes the good setup of all content type field categories and the demonstration of basic SEO field types. Demo content itself has also been upgraded with more content to better demonstrate the capabilities.
 
 ![](productcontenttype.png)
 
diff --git a/docs/release_notes/ez_platform_v2.4.md b/docs/release_notes/ez_platform_v2.4.md
index 218c5e7bfb..f2864d1993 100644
--- a/docs/release_notes/ez_platform_v2.4.md
+++ b/docs/release_notes/ez_platform_v2.4.md
@@ -120,7 +120,7 @@ See [Simplified Filtered search](https://doc.ibexa.co/projects/userguide/en/2.5/
 
 ### Sub-items limit
 
-You can now set a number of items displayed in the table using sub-items from your User Settings.
+You can now set a number of items displayed in the table using sub-items from your user Settings.
 
 ![Setting for subitems limit in user preferences](2.4_subitems_limit_pref.png)
 
@@ -227,7 +227,7 @@ you're now able to load multiple Locations at once, using `LocationService->load
                  # ...
     ```
 
-    4\. Make sure that parameter `page_builder.token_authenticator.enabled` has value `true`. If the parameter is not present, add it to `/app/config/config.yml`:
+    4\. Make sure that parameter `page_builder.token_authenticator.enabled` has value `true`. If the parameter isn't present, add it to `/app/config/config.yml`:
 
     ``` yaml
      # ...
diff --git a/docs/release_notes/ez_platform_v2.5.md b/docs/release_notes/ez_platform_v2.5.md
index 8a27b84898..6fc1a0f7c0 100644
--- a/docs/release_notes/ez_platform_v2.5.md
+++ b/docs/release_notes/ez_platform_v2.5.md
@@ -129,9 +129,9 @@ This release introduced several back office improvements to facilitate editorial
 
 ### Permissions
 
-#### Content/Create policy for Users
+#### Content/Create policy for users
 
-You can now define a 'Content/Create' policy for a User or a user group.
+You can now define a 'Content/Create' policy for a user or a user group.
 It enables or disables (if not set) the **Create** button in your dashboard.
 
 #### Universal Discovery Widget
@@ -246,7 +246,7 @@ This section provides a list of deprecated features to be removed in eZ Platform
 
 - The `\EzSystems\PlatformInstallerBundle\Installer\CleanInstaller` class and its [service container](https://doc.ibexa.co/en/2.5/api/service_container) definition (`ezplatform.installer.clean_installer`) have been deprecated in favor of `EzSystems\PlatformInstallerBundle\Installer\CoreInstaller` which requires the [Doctrine Schema Bundle](https://github.com/ezsystems/doctrine-dbal-schema) to be enabled.
 - The `ezplatform.installer.db_based_installer` service container definition has been deprecated in favor of its FQCN-named equivalent (`EzSystems\PlatformInstallerBundle\Installer\DbBasedInstaller`).
-- `vendor/ezsystems/ezpublish-kernel/data/mysql/schema.sql` has been deprecated and is not used by the installation process anymore.
+- `vendor/ezsystems/ezpublish-kernel/data/mysql/schema.sql` has been deprecated and isn't used by the installation process anymore.
 
 
 ## eZ Platform v2.5.6
@@ -281,4 +281,4 @@ When searching in the back office you can now select languages to filter results
 
 ### Searchable Matrix Field
 
-The Matrix Field is not fully searchable.
+The Matrix Field isn't fully searchable.
diff --git a/docs/release_notes/ez_platform_v3.0.md b/docs/release_notes/ez_platform_v3.0.md
index e019113b01..2429456e20 100644
--- a/docs/release_notes/ez_platform_v3.0.md
+++ b/docs/release_notes/ez_platform_v3.0.md
@@ -216,7 +216,7 @@ In GraphQL, you can now [query Locations and their children](https://doc.ibexa.c
 
 #### Improved translating of notifications
 
-`TranslationService` is not injected into the `NotificationService`.
+`TranslationService` isn't injected into the `NotificationService`.
 You can now use `TranslatableNotificationHandlerInterface` for translated notifications.
 
 #### Multilingual content route
diff --git a/docs/release_notes/ibexa_dxp_v4.3.md b/docs/release_notes/ibexa_dxp_v4.3.md
index f5d90fe681..d1924b1e7d 100644
--- a/docs/release_notes/ibexa_dxp_v4.3.md
+++ b/docs/release_notes/ibexa_dxp_v4.3.md
@@ -111,7 +111,7 @@ Now, as a Personalization admin, after editing a model in the back office,
 Objects of `Ibexa\Contracts\Taxonomy\Value\TaxonomyEntry` type,
 which are returned by `TaxonomyService`, now contain the information about nesting level in the tree.
 
-The `TaxonomyEntryId` Search Criterion is not available in Legacy search Engine.
+The `TaxonomyEntryId` Search Criterion isn't available in Legacy search Engine.
 
 ### Other improvements
 
diff --git a/docs/resources/contributing/contribute_translations.md b/docs/resources/contributing/contribute_translations.md
index 569e5191fe..694c3302e8 100644
--- a/docs/resources/contributing/contribute_translations.md
+++ b/docs/resources/contributing/contribute_translations.md
@@ -16,6 +16,6 @@ use the Crowdin website.
 
 Visit [[[= product_name =]]'s Crowdin page](https://crowdin.com/project/ibexa-dxp), choose a language, and you can see a list of files containing strings. Here you can suggest your translations.
 
-If the language you want to translate to is not available, you can ask for it to be added in the [Crowdin discussion forum for [[= product_name =]]](https://crowdin.com/project/ibexa-dxp/discussions).
+If the language you want to translate to isn't available, you can ask for it to be added in the [Crowdin discussion forum for [[= product_name =]]](https://crowdin.com/project/ibexa-dxp/discussions).
 
 Crowdin then automatically creates a GitHub PR and the translations are updated in the product.
diff --git a/docs/resources/contributing/report_and_follow_issues.md b/docs/resources/contributing/report_and_follow_issues.md
index f6bc88de66..11b6e1786a 100644
--- a/docs/resources/contributing/report_and_follow_issues.md
+++ b/docs/resources/contributing/report_and_follow_issues.md
@@ -29,7 +29,7 @@ Click **Create** at the top of the bugtracker window and fill in the following f
 |**Project**|Select **Ibexa IBX**.|
 |**Issue type**|Choose **Bug** or **Improvement** depending on what you're reporting, do not use other issue types (they're for internal use only).|
 |**Summary**|Write a short sentence describing what you're reporting.|
-|**Priority**|Select the priority you consider the issue to be. Please try to keep a cool head while selecting it. A 1 pixel alignment bug is not a "blocker".|
+|**Priority**|Select the priority you consider the issue to be. Please try to keep a cool head while selecting it. A 1 pixel alignment bug isn't a "blocker".|
 |**Component/s**|This is important, as it makes your issue appear on the radar (dashboards, filters) of people dealing with various parts of Ibexa projects.|
 |**Affect version/s**|Add the versions of the application you experienced the issue on.|
 |**Assignee**|Leave blank, unless you're willing to work on the issue yourself.|
diff --git a/docs/search/criteria_reference/baseprice_criterion.md b/docs/search/criteria_reference/baseprice_criterion.md
index 73fd5f4567..13d9077931 100644
--- a/docs/search/criteria_reference/baseprice_criterion.md
+++ b/docs/search/criteria_reference/baseprice_criterion.md
@@ -9,7 +9,7 @@ The [`BasePrice` Search Criterion](../../api/php_api/php_api_reference/classes/I
 
 ## Limitations
 
-The `BasePrice` Criterion is not available in the Legacy Search engine.
+The `BasePrice` Criterion isn't available in the Legacy Search engine.
 
 ## Example
 
diff --git a/docs/search/criteria_reference/currencycode_criterion.md b/docs/search/criteria_reference/currencycode_criterion.md
index 0f4fd83f2b..4a0d995720 100644
--- a/docs/search/criteria_reference/currencycode_criterion.md
+++ b/docs/search/criteria_reference/currencycode_criterion.md
@@ -8,7 +8,7 @@ The `CurrencyCodeCriterion` Search Criterion searches for currencies by their co
 
 ## Limitations
 
-The `CurrencyCodeCriterion` Criterion is not available in Solr or Elasticsearch engines.
+The `CurrencyCodeCriterion` Criterion isn't available in Solr or Elasticsearch engines.
 
 ## Example
 
diff --git a/docs/search/criteria_reference/customprice_criterion.md b/docs/search/criteria_reference/customprice_criterion.md
index c771ff9015..3afc709501 100644
--- a/docs/search/criteria_reference/customprice_criterion.md
+++ b/docs/search/criteria_reference/customprice_criterion.md
@@ -11,7 +11,7 @@ If you do not provide a customer group, the query uses the group related to the
 
 ## Limitations
 
-The `CustomPrice` Criterion is not available in the Legacy Search engine.
+The `CustomPrice` Criterion isn't available in the Legacy Search engine.
 
 ## Example
 
diff --git a/docs/search/criteria_reference/fieldrelation_criterion.md b/docs/search/criteria_reference/fieldrelation_criterion.md
index c7104e7697..1200802a22 100644
--- a/docs/search/criteria_reference/fieldrelation_criterion.md
+++ b/docs/search/criteria_reference/fieldrelation_criterion.md
@@ -13,7 +13,7 @@ Use of IN means the Relation needs to have one of the provided IDs, while CONTAI
 
 ## Limitations
 
-The `FieldRelation` Criterion is not available in [Repository filtering](search_api.md#repository-filtering).
+The `FieldRelation` Criterion isn't available in [Repository filtering](search_api.md#repository-filtering).
 
 ## Example
 
diff --git a/docs/search/criteria_reference/fulltext_criterion.md b/docs/search/criteria_reference/fulltext_criterion.md
index 89565586c0..fe2aa9da84 100644
--- a/docs/search/criteria_reference/fulltext_criterion.md
+++ b/docs/search/criteria_reference/fulltext_criterion.md
@@ -31,7 +31,7 @@ supports asterisks as wildcards located at the beginning or end of a query.
 
 When using the Elasticsearch search engine, a full text query performs an OR query by default, while the OR and AND operators return unexpected results.
 
-The `FullText` Criterion is not available in [Repository filtering](search_api.md#repository-filtering).
+The `FullText` Criterion isn't available in [Repository filtering](search_api.md#repository-filtering).
 
 ## Example
 
diff --git a/docs/search/criteria_reference/iscurrencyenabled_criterion.md b/docs/search/criteria_reference/iscurrencyenabled_criterion.md
index 49592891bc..2d3869920f 100644
--- a/docs/search/criteria_reference/iscurrencyenabled_criterion.md
+++ b/docs/search/criteria_reference/iscurrencyenabled_criterion.md
@@ -9,7 +9,7 @@ or disabled Currencies (`false`)
 
 ## Limitations
 
-The `IsCurrencyEnabledCriterion` Criterion is not available in Solr or Elasticsearch engines.
+The `IsCurrencyEnabledCriterion` Criterion isn't available in Solr or Elasticsearch engines.
 
 ## Example
 
diff --git a/docs/search/criteria_reference/isfieldempty_criterion.md b/docs/search/criteria_reference/isfieldempty_criterion.md
index 2f3c82456a..8eea7bde20 100644
--- a/docs/search/criteria_reference/isfieldempty_criterion.md
+++ b/docs/search/criteria_reference/isfieldempty_criterion.md
@@ -11,9 +11,9 @@ or non-empty Fields (`false`)
 
 ## Limitations
 
-The `IsFieldEmpty` Criterion is not available in [Repository filtering](search_api.md#repository-filtering).
+The `IsFieldEmpty` Criterion isn't available in [Repository filtering](search_api.md#repository-filtering).
 
-The Richtext field type (`ezrichtext`) is not searchable in the Legacy search engine.
+The Richtext field type (`ezrichtext`) isn't searchable in the Legacy search engine.
 
 ## Example
 
diff --git a/docs/search/criteria_reference/isuserbased_criterion.md b/docs/search/criteria_reference/isuserbased_criterion.md
index 9f608b2b43..edcb0f281e 100644
--- a/docs/search/criteria_reference/isuserbased_criterion.md
+++ b/docs/search/criteria_reference/isuserbased_criterion.md
@@ -15,7 +15,7 @@ or non-User-based content
 
 ## Limitations
 
-The `IsUserBased` Criterion is not available in Solr or Elastic search engines.
+The `IsUserBased` Criterion isn't available in Solr or Elastic search engines.
 
 ## Example
 
diff --git a/docs/search/criteria_reference/isuserenabled_criterion.md b/docs/search/criteria_reference/isuserenabled_criterion.md
index 8a445aa32a..8740ae5a0a 100644
--- a/docs/search/criteria_reference/isuserenabled_criterion.md
+++ b/docs/search/criteria_reference/isuserenabled_criterion.md
@@ -10,7 +10,7 @@ or disabled User accounts
 
 ## Limitations
 
-The `IsUserEnabled` Criterion is not available in Solr or Elastic search engines.
+The `IsUserEnabled` Criterion isn't available in Solr or Elastic search engines.
 
 ## Example
 
diff --git a/docs/search/criteria_reference/maplocationdistance_criterion.md b/docs/search/criteria_reference/maplocationdistance_criterion.md
index 2cd27cedaf..d4b30223bf 100644
--- a/docs/search/criteria_reference/maplocationdistance_criterion.md
+++ b/docs/search/criteria_reference/maplocationdistance_criterion.md
@@ -18,7 +18,7 @@ The `distance` argument requires:
 
 ## Limitations
 
-The `MapLocationDistance` Criterion is not available in [Repository filtering](search_api.md#repository-filtering).
+The `MapLocationDistance` Criterion isn't available in [Repository filtering](search_api.md#repository-filtering).
 
 ## Example
 
diff --git a/docs/search/criteria_reference/price_isbaseprice_criterion.md b/docs/search/criteria_reference/price_isbaseprice_criterion.md
index a7dcc62e20..8bf30eaf97 100644
--- a/docs/search/criteria_reference/price_isbaseprice_criterion.md
+++ b/docs/search/criteria_reference/price_isbaseprice_criterion.md
@@ -12,7 +12,7 @@ This Criterion takes no arguments.
 
 ## Limitations
 
-The `IsBasePrice` Criterion is not available in Solr or Elasticsearch engines.
+The `IsBasePrice` Criterion isn't available in Solr or Elasticsearch engines.
 
 ## Example
 
diff --git a/docs/search/criteria_reference/price_iscustomprice_criterion.md b/docs/search/criteria_reference/price_iscustomprice_criterion.md
index 30201366be..7d0f98253d 100644
--- a/docs/search/criteria_reference/price_iscustomprice_criterion.md
+++ b/docs/search/criteria_reference/price_iscustomprice_criterion.md
@@ -12,7 +12,7 @@ This Criterion takes no arguments.
 
 ## Limitations
 
-The `IsCustomPrice` Criterion is not available in Solr or Elasticsearch engines.
+The `IsCustomPrice` Criterion isn't available in Solr or Elasticsearch engines.
 
 ## Example
 
diff --git a/docs/search/search_api.md b/docs/search/search_api.md
index 13b8c6e722..6fcfd29472 100644
--- a/docs/search/search_api.md
+++ b/docs/search/search_api.md
@@ -115,7 +115,7 @@ You can use the `ContentService::find(Filter)` method to find content items or
 `ContentService::find` returns an iterable [`ContentList`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-ContentList.html)
 while `LocationService::find` returns an iterable [`LocationList`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-LocationList.html).
 
-Filtering differs from search. It does not use the `SearchService` and is not based on indexed data.
+Filtering differs from search. It does not use the `SearchService` and isn't based on indexed data.
 
 [`Filter`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Filter-Filter.html) enables you to configure a query using chained methods to select criteria, sorting, limit and offset.
 
diff --git a/docs/search/search_engines/elastic_search/configure_elastic_search.md b/docs/search/search_engines/elastic_search/configure_elastic_search.md
index 395457fe38..ff11a63dfd 100644
--- a/docs/search/search_engines/elastic_search/configure_elastic_search.md
+++ b/docs/search/search_engines/elastic_search/configure_elastic_search.md
@@ -51,7 +51,7 @@ When you configure a node, you need to set the following parameters:
 If you have several Elasticsearch instances that run on the same host, and want to make them
 distinct, you can change the default number.
 - `scheme` - a protocol used to access the node. Default value: `http`.
-- `path` - by default, path is not used. Default value: `null`.
+- `path` - by default, path isn't used. Default value: `null`.
 If you have several Elasticsearch instances that run on the same host, and want to make them
 distinct, you can define a path for each instance.  
 - `user`/`pass` - credentials, if needed to log in to the host. Default values: `null`.
diff --git a/docs/search/search_engines/legacy_search_engine/legacy_search_overview.md b/docs/search/search_engines/legacy_search_engine/legacy_search_overview.md
index c6ea657a32..dfc084b434 100644
--- a/docs/search/search_engines/legacy_search_engine/legacy_search_overview.md
+++ b/docs/search/search_engines/legacy_search_engine/legacy_search_overview.md
@@ -6,7 +6,7 @@ description: Legacy search engine overview.
 
 Legacy search engine is the default search engine. it's SQL-based and uses Doctrine's database connection.
 The connections are defined in the same way as for storage engine, and no further specific configuration is needed.
-Legacy search engine is recommended for basic needs and is not intended in production.
+Legacy search engine is recommended for basic needs and isn't intended in production.
 It allows you to use filtering and fulltext search, but with some limitations.
 For more information, check [search engine comparison](search_engines.md#search-engines-comparison)
 
diff --git a/docs/search/search_engines/solr_search_engine/install_solr.md b/docs/search/search_engines/solr_search_engine/install_solr.md
index d077865d90..02c3f380b3 100644
--- a/docs/search/search_engines/solr_search_engine/install_solr.md
+++ b/docs/search/search_engines/solr_search_engine/install_solr.md
@@ -276,15 +276,15 @@ php bin/console --env=prod --siteaccess=<name> ibexa:reindex
 
 ### Possible exceptions
 
-If you have not configured your setup correctly, some exceptions might happen on indexing.
+If you haven't configured your setup correctly, some exceptions might happen on indexing.
 Here are the most common issues you may encounter:
 
 - Exception if Binary files in database have an invalid path prefix
     - Make sure `var_dir` is configured properly in `ibexa.yaml` configuration.
     - If your database is inconsistent in regards to file paths, try to update entries to be correct *(make sure to make a backup first)*.
 - Exception on unsupported field types
-    - Make sure to implement all field types in your installation, or to configure missing ones as [NullType](nullfield.md) if implementation is not needed.
-- Content is not immediately available 
+    - Make sure to implement all field types in your installation, or to configure missing ones as [NullType](nullfield.md) if implementation isn't needed.
+- Content isn't immediately available 
     - Solr Bundle on purpose does not commit changes directly on Repository updates *(on indexing)*, but lets you control this using Solr configuration. Adjust Solr's `autoSoftCommit` (visibility of changes to search index) and/or `autoCommit` (hard commit, for durability and replication) to balance performance and load on your Solr instance against needs you have for "[NRT](https://cwiki.apache.org/confluence/display/solr/Near+Real+Time+Searching)".
 - Running out of memory during indexing
     - In general make sure to run indexing using the prod environment to avoid debuggers and loggers from filling up memory.
diff --git a/docs/search/sort_clause_reference/baseprice_sort_clause.md b/docs/search/sort_clause_reference/baseprice_sort_clause.md
index 51266b0190..f8dcb8bc26 100644
--- a/docs/search/sort_clause_reference/baseprice_sort_clause.md
+++ b/docs/search/sort_clause_reference/baseprice_sort_clause.md
@@ -9,7 +9,7 @@ The `BasePrice` Sort Clause sorts search results by the product's base price.
 
 ## Limitations
 
-The `BasePrice` Sort Clause is not available in the Legacy Search engine.
+The `BasePrice` Sort Clause isn't available in the Legacy Search engine.
 
 ## Example
 
diff --git a/docs/search/sort_clause_reference/contenttranslatedname_sort_clause.md b/docs/search/sort_clause_reference/contenttranslatedname_sort_clause.md
index 936712c867..41e9375b40 100644
--- a/docs/search/sort_clause_reference/contenttranslatedname_sort_clause.md
+++ b/docs/search/sort_clause_reference/contenttranslatedname_sort_clause.md
@@ -9,7 +9,7 @@ sorts search results by the content items' translated names.
 
 ## Limitations
 
-The `ContentTranslatedName` Sort Clause is not available in [Repository filtering](search_api.md#repository-filtering).
+The `ContentTranslatedName` Sort Clause isn't available in [Repository filtering](search_api.md#repository-filtering).
 
 ## Example
 
diff --git a/docs/search/sort_clause_reference/customfield_sort_clause.md b/docs/search/sort_clause_reference/customfield_sort_clause.md
index 35bd817915..ed8d9ff9a7 100644
--- a/docs/search/sort_clause_reference/customfield_sort_clause.md
+++ b/docs/search/sort_clause_reference/customfield_sort_clause.md
@@ -15,7 +15,7 @@ sorts search results by raw search index fields.
     To keep your project search engine independent, do not use the `CustomField` Sort Clause in production code.
     Valid use cases are: testing, or temporary (one-off) tools.
 
-The `CustomField` Sort Clause is not available in [Repository filtering](search_api.md#repository-filtering).
+The `CustomField` Sort Clause isn't available in [Repository filtering](search_api.md#repository-filtering).
 
 ## Example
 
diff --git a/docs/search/sort_clause_reference/customprice_sort_clause.md b/docs/search/sort_clause_reference/customprice_sort_clause.md
index 06c4c1ae6a..e0e126a763 100644
--- a/docs/search/sort_clause_reference/customprice_sort_clause.md
+++ b/docs/search/sort_clause_reference/customprice_sort_clause.md
@@ -11,7 +11,7 @@ If you do not provide a customer group, the query uses the group related to the
 
 ## Limitations
 
-The `CustomPrice` Sort Clause is not available in the Legacy Search engine.
+The `CustomPrice` Sort Clause isn't available in the Legacy Search engine.
 
 ## Example
 
diff --git a/docs/search/sort_clause_reference/field_sort_clause.md b/docs/search/sort_clause_reference/field_sort_clause.md
index e836a690ac..c4b1758ff6 100644
--- a/docs/search/sort_clause_reference/field_sort_clause.md
+++ b/docs/search/sort_clause_reference/field_sort_clause.md
@@ -14,7 +14,7 @@ Results of the query that do not belong to the content type are ranked lower.
 
 ## Limitations
 
-The `Field` Sort Clause is not available in [Repository filtering](search_api.md#repository-filtering).
+The `Field` Sort Clause isn't available in [Repository filtering](search_api.md#repository-filtering).
 
 ## Example
 
diff --git a/docs/search/sort_clause_reference/ismainlocation_sort_clause.md b/docs/search/sort_clause_reference/ismainlocation_sort_clause.md
index 5f026e2621..5b79ef1ec2 100644
--- a/docs/search/sort_clause_reference/ismainlocation_sort_clause.md
+++ b/docs/search/sort_clause_reference/ismainlocation_sort_clause.md
@@ -11,7 +11,7 @@ Locations that are not main Locations are ranked as lower values (e.g. with asce
 
 ## Limitations
 
-The `Location\IsMainLocation` Sort Clause is not available in [Repository filtering](search_api.md#repository-filtering).
+The `Location\IsMainLocation` Sort Clause isn't available in [Repository filtering](search_api.md#repository-filtering).
 
 ## Example
 
diff --git a/docs/search/sort_clause_reference/maplocationdistance_sort_clause.md b/docs/search/sort_clause_reference/maplocationdistance_sort_clause.md
index d889b85077..2ea5d75833 100644
--- a/docs/search/sort_clause_reference/maplocationdistance_sort_clause.md
+++ b/docs/search/sort_clause_reference/maplocationdistance_sort_clause.md
@@ -13,7 +13,7 @@ sorts search results by the distance of the indicated MapLocation Field to the p
 
 ## Limitations
 
-The `MapLocationDistance` Sort Clause is not available in [Repository filtering](search_api.md#repository-filtering).
+The `MapLocationDistance` Sort Clause isn't available in [Repository filtering](search_api.md#repository-filtering).
 
 ## Example
 
diff --git a/docs/search/sort_clause_reference/random_sort_clause.md b/docs/search/sort_clause_reference/random_sort_clause.md
index f4b01a34f3..30a9955423 100644
--- a/docs/search/sort_clause_reference/random_sort_clause.md
+++ b/docs/search/sort_clause_reference/random_sort_clause.md
@@ -10,7 +10,7 @@ orders search results randomly.
 
 ## Limitations
 
-The `Random` Sort Clause is not available in [Repository filtering](search_api.md#repository-filtering).
+The `Random` Sort Clause isn't available in [Repository filtering](search_api.md#repository-filtering).
 In Elasticsearch engine, you cannot combine the `Random` Sort Clause with any other Sort Clause.
 
 ## Example
diff --git a/docs/search/sort_clause_reference/score_sort_clause.md b/docs/search/sort_clause_reference/score_sort_clause.md
index 94d9dc49dd..719ae688aa 100644
--- a/docs/search/sort_clause_reference/score_sort_clause.md
+++ b/docs/search/sort_clause_reference/score_sort_clause.md
@@ -9,7 +9,7 @@ orders search results by their score.
 
 ## Limitations
 
-The `Score` Sort Clause is not available in [Repository filtering](search_api.md#repository-filtering).
+The `Score` Sort Clause isn't available in [Repository filtering](search_api.md#repository-filtering).
 
 ## Example
 
diff --git a/docs/templating/embed_and_list_content/render_images.md b/docs/templating/embed_and_list_content/render_images.md
index b2b32b1275..c8938cb6ae 100644
--- a/docs/templating/embed_and_list_content/render_images.md
+++ b/docs/templating/embed_and_list_content/render_images.md
@@ -28,7 +28,7 @@ This enables you to avoid a situation where, for example, the featured image in
 because the first image Field was left empty.
 
 The [`ibexa_content_field_identifier_first_filled_image()`](image_twig_functions.md#ibexa_content_field_identifier_first_filled_image) Twig function
-returns the identifier of the first image Field that is not empty.
+returns the identifier of the first image Field that isn't empty.
 
 ``` html+twig
 {% set firstImage = ibexa_content_field_identifier_first_filled_image(content) %}
diff --git a/docs/templating/templates/templates.md b/docs/templating/templates/templates.md
index 765e9c8f07..2b8000627a 100644
--- a/docs/templating/templates/templates.md
+++ b/docs/templating/templates/templates.md
@@ -54,7 +54,7 @@ Main variables include:
 |`ibexa.siteaccess`| Current [SiteAccess](multisite.md). |
 |`ibexa.rootLocation`| Root Location object. |
 |`ibexa.requestedUriString`| Requested URI string. |
-|`ibexa.systemUriString`| System URI string. System URI is the URI for internal content controller. If the current route is not a URL alias, then the current PathInfo is returned. |
+|`ibexa.systemUriString`| System URI string. System URI is the URI for internal content controller. If the current route isn't a URL alias, then the current PathInfo is returned. |
 |`ibexa.viewParameters`| View parameters as a hash. |
 |`ibexa.viewParametersString`| View parameters as a string. |
 |`ibexa.translationSiteAccess`| Translation SiteAccess for a given language (null if the SiteAccess cannot be found). |
diff --git a/docs/templating/twig_function_reference/cart_twig_functions.md b/docs/templating/twig_function_reference/cart_twig_functions.md
index d46567ab62..c9a603b029 100644
--- a/docs/templating/twig_function_reference/cart_twig_functions.md
+++ b/docs/templating/twig_function_reference/cart_twig_functions.md
@@ -10,7 +10,7 @@ You can use cart Twig functions to check whether products can be added to cart,
 
 ### `ibexa_can_be_added_to_cart()`
 
-The `ibexa_can_be_added_to_cart()` function checks whether the provided product can be added to cart. It eliminates products that are not available, products that do not have a price that corresponds to a currency selected for the cart, and products, for which VAT category is not set. It also eliminates products that have variants but are not one of those variants. 
+The `ibexa_can_be_added_to_cart()` function checks whether the provided product can be added to cart. It eliminates products that are not available, products that do not have a price that corresponds to a currency selected for the cart, and products, for which VAT category isn't set. It also eliminates products that have variants but are not one of those variants. 
 
 ``` html+twig
 {% set is_disabled = (is_disabled or ibexa_can_be_added_to_cart(product) == false)|default(false) %}
diff --git a/docs/templating/twig_function_reference/image_twig_functions.md b/docs/templating/twig_function_reference/image_twig_functions.md
index ec2ccd08eb..73a975b03d 100644
--- a/docs/templating/twig_function_reference/image_twig_functions.md
+++ b/docs/templating/twig_function_reference/image_twig_functions.md
@@ -6,7 +6,7 @@ page_type: reference
 # Image Twig functions
 
 - [`ibexa_image_alias`](#ibexa_image_alias) returns the selected variation of an image Field.
-- [`ibexa_content_field_identifier_first_filled_image`](#ibexa_content_field_identifier_first_filled_image) returns the identifier of the first image Field in a content item that is not empty.
+- [`ibexa_content_field_identifier_first_filled_image`](#ibexa_content_field_identifier_first_filled_image) returns the identifier of the first image Field in a content item that isn't empty.
 
 ## Image rendering
 
@@ -41,7 +41,7 @@ with the variation name passed as an argument, for example:
 
 ### `ibexa_content_field_identifier_first_filled_image()`
 
-`ibexa_content_field_identifier_first_filled_image()` returns the identifier of the first image field that is not empty.
+`ibexa_content_field_identifier_first_filled_image()` returns the identifier of the first image field that isn't empty.
 
 !!! caution
 
diff --git a/docs/templating/urls_and_routes/custom_breadcrumbs.md b/docs/templating/urls_and_routes/custom_breadcrumbs.md
index 795b96e0fb..8a8c8c667e 100644
--- a/docs/templating/urls_and_routes/custom_breadcrumbs.md
+++ b/docs/templating/urls_and_routes/custom_breadcrumbs.md
@@ -22,7 +22,7 @@ Both `breadcrumb_path` and `breadcrumb_names` must be configured for the breadcr
 |Option|Description|
 |--- |--- |
 |`breadcrumb_path`|Valid route identifier which exists in at least one of the routing YAML files.|
-|`breadcrumb_names`|Name for the breadcrumb element. If the translation is not set, there is a fallback to route translation.</br>In the example above if the `Blog List` key has no translation, the fallback key is `custom_blog_index|breadcrumb`.|
+|`breadcrumb_names`|Name for the breadcrumb element. If the translation isn't set, there is a fallback to route translation.</br>In the example above if the `Blog List` key has no translation, the fallback key is `custom_blog_index|breadcrumb`.|
 
 ### Multi-part routes
 
diff --git a/docs/tutorials/beginner_tutorial/8_enable_account_registration.md b/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
index 9cc7a62a7b..35579ace6f 100644
--- a/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
+++ b/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
@@ -204,7 +204,7 @@ Now add the following policies to the Contributors role.
 
 !!! tip
 
-    The limitations are a powerful tool for fine-tuning the permission management of the Users.
+    The limitations are a powerful tool for fine-tuning the permission management of the users.
     See [the documentation about limitations for more technical details](limitation_reference.md#content-type-group-limitation).
 
 Once the policies are set, go to the "Assignments" tab and assign the role to the user group *Go Bike Members*.
diff --git a/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md b/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
index 4dd7916a2c..a479c7edcb 100644
--- a/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
+++ b/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
@@ -101,7 +101,7 @@ The empty zones you defined in the template are visible in the editor.
 
 !!! tip
 
-    If the new layout is not available when editing the Page, you may need to clear the cache (using `php bin/console cache:clear`) and/or reload the app.
+    If the new layout isn't available when editing the Page, you may need to clear the cache (using `php bin/console cache:clear`) and/or reload the app.
 
 ![Empty page with new layout](enterprise_tut_new_layout.png)
 
@@ -126,6 +126,6 @@ Edit the `config/packages/views.yaml` file and add the following code under the
 ```
 
 After adding this template you can check the new Page.
-The part between menu and footer should be empty, because you have not added any content to it yet.
+The part between menu and footer should be empty, because you haven't added any content to it yet.
 
 ![Empty Page](enterprise_tut_empty_page.png)
diff --git a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
index f679f36f5a..74f0e56912 100644
--- a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
+++ b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
@@ -88,7 +88,7 @@ In v2.2 Page Builder does not offer all blocks that Landing Page editor did. The
 The Places block has been removed from the clean installation and is only available in the demo out of the box.
 If you use this block in your site, re-apply its configuration based on the [demo](https://github.com/ezsystems/ezplatform-ee-demo/blob/v2.2.2/app/config/blocks.yml).
 
-Later versions of Page Builder come with a Content Scheduler block and new Form Blocks, but migration of Schedule blocks to Content Scheduler blocks and of Form Blocks is not supported. 
+Later versions of Page Builder come with a Content Scheduler block and new Form Blocks, but migration of Schedule blocks to Content Scheduler blocks and of Form Blocks isn't supported. 
 
 If there are missing block definitions, such as Form Block or Schedule Block,
 you have an option to continue, but migrated Landing Pages come without those blocks.
diff --git a/docs/update_and_migration/from_2.5/to_3.3.md b/docs/update_and_migration/from_2.5/to_3.3.md
index 73a1e72621..b5f4316f95 100644
--- a/docs/update_and_migration/from_2.5/to_3.3.md
+++ b/docs/update_and_migration/from_2.5/to_3.3.md
@@ -19,7 +19,7 @@ When updating from v3.2 to v3.3, you need to follow a special update procedure.
 
 First, create an update branch `update-[[=target_version=]]` in git and commit your work.
 
-If you have not done it before, add the relevant meta-repository as an `upstream` remote:
+If you haven't done it before, add the relevant meta-repository as an `upstream` remote:
 
 === "ezplatform"
 
diff --git a/docs/update_and_migration/from_2.5/update_code/9_update_other.md b/docs/update_and_migration/from_2.5/update_code/9_update_other.md
index c258991e86..6ef9b7e046 100644
--- a/docs/update_and_migration/from_2.5/update_code/9_update_other.md
+++ b/docs/update_and_migration/from_2.5/update_code/9_update_other.md
@@ -20,7 +20,7 @@ security:
 
 ## Commands
 
-The `ContainerAwareCommand` class is not available in Symfony 5. Therefore, if your custom commands use `Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand`
+The `ContainerAwareCommand` class isn't available in Symfony 5. Therefore, if your custom commands use `Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand`
 as a base class, you must rewrite them to use `Symfony\Component\Console\Command\Command` instead. 
 
 ## Permissions
diff --git a/docs/update_and_migration/from_4.0/to_4.1.md b/docs/update_and_migration/from_4.0/to_4.1.md
index e0705b455e..f62eb8151e 100644
--- a/docs/update_and_migration/from_4.0/to_4.1.md
+++ b/docs/update_and_migration/from_4.0/to_4.1.md
@@ -25,7 +25,7 @@ First, update your application to the latest version of v4.0: v4.0.8.
 ### Update Flex server
 
 The `flex.ibexa.co` Flex server has been disabled.
-If you're using earlier v4.x versions, and you have not done it before,
+If you're using earlier v4.x versions, and you haven't done it before,
 you have to update your Flex server.
 
 To do it, in your `composer.json`, check whether the `https://flex.ibexa.co` endpoint is still listed in `extra.symfony.endpoint`.
@@ -119,7 +119,7 @@ Apply the following database update scripts:
 
 #### Ibexa Open Source
 
-If you're using [[= product_name_oss =]] and have no access to [[= product_name =]]'s `ibexa/installer` package, database upgrade is not necessary.
+If you're using [[= product_name_oss =]] and have no access to [[= product_name =]]'s `ibexa/installer` package, database upgrade isn't necessary.
 
 ## Update the app to latest version of v4.1
 
diff --git a/docs/update_and_migration/from_4.1/update_from_4.1.md b/docs/update_and_migration/from_4.1/update_from_4.1.md
index f63b4ea71f..db04c3225e 100644
--- a/docs/update_and_migration/from_4.1/update_from_4.1.md
+++ b/docs/update_and_migration/from_4.1/update_from_4.1.md
@@ -129,7 +129,7 @@ Apply the following database update scripts:
 
 #### Ibexa Open Source
 
-If you have no access to [[= product_name =]]'s `ibexa/installer` package, database upgrade is not necessary.
+If you have no access to [[= product_name =]]'s `ibexa/installer` package, database upgrade isn't necessary.
 
 ## Ensure password safety
 
diff --git a/docs/update_and_migration/from_4.2/update_from_4.2.md b/docs/update_and_migration/from_4.2/update_from_4.2.md
index fb8d979a85..39c1f583ed 100644
--- a/docs/update_and_migration/from_4.2/update_from_4.2.md
+++ b/docs/update_and_migration/from_4.2/update_from_4.2.md
@@ -142,7 +142,7 @@ Apply the following database update scripts:
 
 #### Ibexa Open Source
 
-If you have no access to [[= product_name =]]'s `ibexa/installer` package, database upgrade is not necessary.
+If you have no access to [[= product_name =]]'s `ibexa/installer` package, database upgrade isn't necessary.
 
 ### Clean-up taxonomy database
 
diff --git a/docs/update_and_migration/from_4.3/update_from_4.3_new_commerce.md b/docs/update_and_migration/from_4.3/update_from_4.3_new_commerce.md
index 5459fb6d60..d55e776226 100644
--- a/docs/update_and_migration/from_4.3/update_from_4.3_new_commerce.md
+++ b/docs/update_and_migration/from_4.3/update_from_4.3_new_commerce.md
@@ -320,7 +320,7 @@ Apply the following database update scripts:
 
 #### Ibexa Open Source
 
-If you have no access to Ibexa DXP's `ibexa/installer` package, database upgrade is not necessary.
+If you have no access to Ibexa DXP's `ibexa/installer` package, database upgrade isn't necessary.
 
 ## Ensure password safety
 
diff --git a/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md b/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md
index 7c6fee046e..02a6e296df 100644
--- a/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md
+++ b/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md
@@ -195,7 +195,7 @@ Apply the following database update scripts:
 
 #### Ibexa Open Source
 
-If you have no access to Ibexa DXP's `ibexa/installer` package, database upgrade is not necessary.
+If you have no access to Ibexa DXP's `ibexa/installer` package, database upgrade isn't necessary.
 
 ## Ensure password safety
 
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
index 5b98ea0714..5cf2ff5d1e 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
@@ -291,7 +291,7 @@ ImagesClassList[]
 ImagesClassList[]=image
 ```
 
-If the `--image-content-types` option is not specified, the default setting `image` is used.
+If the `--image-content-types` option isn't specified, the default setting `image` is used.
 
 !!! note
 
@@ -414,7 +414,7 @@ The conversion tool also complains about IDs which contain invalid characters.
 
 **Links with non-existing `object_remote_id` or `node_remote_id`.**
 
-In `ezxmltext` you may have links which refer to other objects by their remote ID. This is not supported in `richtext`, so the conversion tool must look up such remote IDs and replace them with the `object_id` or `node_id`. If the conversion tool cannot find the object by its remote id, it issues a warning about it.
+In `ezxmltext` you may have links which refer to other objects by their remote ID. This isn't supported in `richtext`, so the conversion tool must look up such remote IDs and replace them with the `object_id` or `node_id`. If the conversion tool cannot find the object by its remote id, it issues a warning about it.
 
 In older eZ Publish databases you may also have invalid links due to lack of reference to a target (no `href`, `url_id`, etc.):
 
@@ -426,7 +426,7 @@ When the conversion tool detects links with no reference it issues a warning and
 
 **`<literal>`**
 
-The `<literal>` tag is not yet supported in eZ Platform. For more information about this, please have a look at [EZP-29328](https://issues.ibexa.co/browse/EZP-29328) and [EZP-29027](https://issues.ibexa.co/browse/EZP-29027).
+The `<literal>` tag isn't yet supported in eZ Platform. For more information about this, please have a look at [EZP-29328](https://issues.ibexa.co/browse/EZP-29328) and [EZP-29027](https://issues.ibexa.co/browse/EZP-29027).
 
 When you're ready to migrate your eZ Publish XmlText content to the eZ Platform RichText format and start using pure eZ Platform setup, start the conversion script without the `--dry-run` option. Execute the following from &lt;new-ez-root&gt;:
 
diff --git a/docs/users/invitations.md b/docs/users/invitations.md
index 5f9caa65f5..9b133c43f4 100644
--- a/docs/users/invitations.md
+++ b/docs/users/invitations.md
@@ -30,7 +30,7 @@ To set up custom templates for invitation or registration forms,
 create a template file and inform the system, through configuration, when to use this template.
 
 You might also set a SiteAccess under `scope`, to which the new user is invited.
-If the SiteAccess is not set, it falls back to the default `site` value.
+If the SiteAccess isn't set, it falls back to the default `site` value.
 
 For example, use the following [configuration](configuration.md#configuration-files):
 
diff --git a/docs/users/oauth_server.md b/docs/users/oauth_server.md
index 4bfa0f5d03..6071f1cad2 100644
--- a/docs/users/oauth_server.md
+++ b/docs/users/oauth_server.md
@@ -11,7 +11,7 @@ Client applications, such as mobile apps, are able to authenticate a user, and t
 
 ## Server installation
 
-[[= product_name =]] Oauth2 server package is `ibexa/oauth2-server` and is not part of the default installation.
+[[= product_name =]] Oauth2 server package is `ibexa/oauth2-server` and isn't part of the default installation.
 You can install it with the following command:
 
 ```bash
diff --git a/docs/users/passwords.md b/docs/users/passwords.md
index 35747a64ee..42f66eacdd 100644
--- a/docs/users/passwords.md
+++ b/docs/users/passwords.md
@@ -87,12 +87,12 @@ In the **User account (ezuser)** Field definition, you can set password expirati
 ![Password expiry settings](password_expiry.png)
 
 You can also decide when the user is notified that they need to change their password.
-The notification is displayed in the back office after login and in the User content item's preview.
+The notification is displayed in the back office after login and in the user content item's preview.
 
 ## Repeating passwords
 
 You can set a rule that the password cannot be reused.
-You set it for the User content type in the **User account (ezuser)** field type's settings.
+You set it for the user content type in the **User account (ezuser)** field type's settings.
 When this is set, the user cannot type in the same password when it expires.
 It has to be changed to a new one.
 
diff --git a/docs/users/segment_api.md b/docs/users/segment_api.md
index a3870616a9..3cacd22bc1 100644
--- a/docs/users/segment_api.md
+++ b/docs/users/segment_api.md
@@ -26,15 +26,15 @@ Similarly, you can load a Segment by using `SegmentationService::loadSegmentById
 
 ## Checking assignment
 
-You can check whether a User is assigned to a Segment with `SegmentationService::isUserAssignedToSegment()`:
+You can check whether a user is assigned to a Segment with `SegmentationService::isUserAssignedToSegment()`:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/SegmentCommand.php', 66, 71) =]]
 ```
 
-## Assigning Users
+## Assigning users
 
-To assign a User to a Segment, use `SegmentationService::assignUserToSegment()`:
+To assign a user to a Segment, use `SegmentationService::assignUserToSegment()`:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/SegmentCommand.php', 64, 65) =]]
diff --git a/docs/users/user_authentication.md b/docs/users/user_authentication.md
index adaf72392f..c8ae7e6754 100644
--- a/docs/users/user_authentication.md
+++ b/docs/users/user_authentication.md
@@ -12,28 +12,28 @@ This makes it easier to integrate any kind of login handlers, including SSO and
 However, to be able to use *external* user providers with [[= product_name =]], a valid Platform user needs to be injected into the Repository.
 This is mainly for the kernel to be able to manage content-related permissions (but not limited to this).
 
-Depending on your context, you either want to create a Platform User, return an existing User, or even always use a generic User.
+Depending on your context, you either want to create a Platform user, return an existing user, or even always use a generic user.
 
 Whenever an *external* user is matched (i.e. one that does not come from Platform repository, like coming from LDAP), [[= product_name =]] kernel initiates an `MVCEvents::INTERACTIVE_LOGIN` event.
 Every service listening to this event receives an `Ibexa\Core\MVC\Symfony\Event\InteractiveLoginEvent` object which contains the original security token (that holds the matched user) and the request.
 
-Then, it's up to the listener to retrieve a Platform User from the Repository and to assign it back to the event object.
+Then, it's up to the listener to retrieve a Platform user from the Repository and to assign it back to the event object.
 This user is injected into the repository and used for the rest of the request.
 
-If no [[= product_name =]] User is returned, the Anonymous User is used.
+If no [[= product_name =]] user is returned, the Anonymous user is used.
 
 ### User exposed and security token
 
 When an *external* user is matched, a different token is injected into the security context, the `InteractiveLoginToken`.
-This token holds a `UserWrapped` instance which contains the originally matched User and the *API user* (the one from the [[= product_name =]] Repository).
+This token holds a `UserWrapped` instance which contains the originally matched user and the *API user* (the one from the [[= product_name =]] Repository).
 
 The *API user* is mainly used for permission checks against the repository and thus stays *under the hood*.
 
-### Customize the User class
+### Customize the user class
 
 It's possible to customize the user class used by extending `Ibexa\Core\MVC\Symfony\Security\EventListener\SecurityListener` service, which defaults to `Ibexa\Core\MVC\Symfony\Security\EventListener\SecurityListener`.
 
-You can override `getUser()` to return whatever User class you want, as long as it implements `Ibexa\Core\MVC\Symfony\Security\UserInterface`.
+You can override `getUser()` to return whatever user class you want, as long as it implements `Ibexa\Core\MVC\Symfony\Security\UserInterface`.
 
 The following is an example of using the in-memory user provider:
 

From 880aa0a5c2b4853071a917186926b67e722b9aee Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Fri, 11 Oct 2024 08:48:02 +0200
Subject: [PATCH 06/77] Fixes

---
 docs/administration/back_office/content_tab_switcher.md     | 2 +-
 .../configuration/repository_configuration.md               | 2 +-
 docs/administration/content_organization/sections.md        | 2 +-
 docs/api/graphql/graphql.md                                 | 2 +-
 docs/cdp/cdp.md                                             | 2 +-
 docs/content_management/content_management_guide.md         | 4 ++--
 docs/content_management/content_model.md                    | 4 ++--
 .../field_types/field_type_reference/nullfield.md           | 2 +-
 .../field_types/field_type_reference/pagefield.md           | 2 +-
 .../field_types/field_type_reference/richtextfield.md       | 2 +-
 .../field_types/field_type_reference/userfield.md           | 2 +-
 docs/content_management/field_types/type_and_value.md       | 2 +-
 .../file_management/binary_and_media_download.md            | 2 +-
 docs/content_management/images/fastly_io.md                 | 2 +-
 docs/content_management/images/images.md                    | 2 +-
 docs/content_management/taxonomy/taxonomy.md                | 2 +-
 docs/content_management/url_management/url_management.md    | 2 +-
 docs/customer_management/customer_portal_guide.md           | 6 +++---
 docs/getting_started/first_steps.md                         | 2 +-
 docs/getting_started/install_ibexa_dxp.md                   | 2 +-
 docs/getting_started/requirements.md                        | 6 +++---
 docs/getting_started/troubleshooting.md                     | 2 +-
 .../cache/http_cache/content_aware_cache.md                 | 4 ++--
 .../cache/http_cache/fastly.md                              | 2 +-
 .../cache/http_cache/reverse_proxy.md                       | 2 +-
 .../cache/persistence_cache.md                              | 2 +-
 docs/infrastructure_and_maintenance/databases.md            | 2 +-
 docs/infrastructure_and_maintenance/performance.md          | 2 +-
 docs/multisite/multisite_configuration.md                   | 2 +-
 docs/permissions/permission_use_cases.md                    | 4 ++--
 docs/personalization/api_reference/content_api.md           | 2 +-
 docs/personalization/api_reference/tracking_api.md          | 2 +-
 docs/pim/pim_guide.md                                       | 6 +++---
 docs/release_notes/ez_platform_v1.10.0.md                   | 2 +-
 docs/release_notes/ez_platform_v1.12.0.md                   | 2 +-
 docs/release_notes/ez_platform_v2.1.0.md                    | 2 +-
 docs/release_notes/ez_platform_v2.5.md                      | 2 +-
 docs/release_notes/ez_platform_v3.1.md                      | 2 +-
 docs/release_notes/ibexa_dxp_v4.5.md                        | 2 +-
 .../activity_log_search_reference/logged_at_criterion.md    | 2 +-
 docs/search/aggregation_reference/aggregation_reference.md  | 2 +-
 docs/search/search_criteria_and_sort_clauses.md             | 2 +-
 .../elastic_search/configure_elastic_search.md              | 2 +-
 .../sort_clause_reference/ismainlocation_sort_clause.md     | 2 +-
 docs/search/sort_clause_reference/visibility_sort_clause.md | 2 +-
 docs/snippets/update/check_out_version.md                   | 2 +-
 docs/templating/embed_and_list_content/embed_content.md     | 2 +-
 docs/templating/layout/add_search_form.md                   | 2 +-
 docs/templating/layout/customize_storefront_layout.md       | 2 +-
 docs/templating/queries_and_controllers/content_queries.md  | 2 +-
 docs/templating/render_content/render_content_in_php.md     | 2 +-
 .../twig_function_reference/cart_twig_functions.md          | 2 +-
 docs/tutorials/generic_field_type/6_settings.md             | 2 +-
 .../generic_field_type/creating_a_point2d_field_type.md     | 2 +-
 docs/update_and_migration/from_2.5/to_3.3.md                | 2 +-
 .../migrating_from_ez_publish_platform.md                   | 6 +++---
 docs/users/customer_groups.md                               | 2 +-
 57 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/docs/administration/back_office/content_tab_switcher.md b/docs/administration/back_office/content_tab_switcher.md
index 9fdd52c483..e1c19170fe 100644
--- a/docs/administration/back_office/content_tab_switcher.md
+++ b/docs/administration/back_office/content_tab_switcher.md
@@ -1,7 +1,7 @@
 # Tab switcher in content edit page
 
 Tabs switcher allows separating the default field types in the content type from the field types that enhance the content with new functionalities.
-The best example of such field types are SEO or Taxonomy, as these are not typical field types but a field types that handle functionalities for the whole content object.
+The best example of such field types are SEO or Taxonomy, as these aren't typical field types but a field types that handle functionalities for the whole content object.
 
 The following example shows how to add a Meta tab with automatically assigned Taxonomy field type.
 
diff --git a/docs/administration/configuration/repository_configuration.md b/docs/administration/configuration/repository_configuration.md
index 66e0cc72a6..cb8f31a0bb 100644
--- a/docs/administration/configuration/repository_configuration.md
+++ b/docs/administration/configuration/repository_configuration.md
@@ -251,7 +251,7 @@ ibexa:
 ```
 
 You can override these settings if you have other content types that should be treated as users/user groups in the back office.
-When viewing such content in the back office you are able to see e.g. the assigned policies.
+When viewing such content in the back office you're able to see e.g. the assigned policies.
 
 ## Top-level Locations
 
diff --git a/docs/administration/content_organization/sections.md b/docs/administration/content_organization/sections.md
index decc5d5b6a..e2371a55ca 100644
--- a/docs/administration/content_organization/sections.md
+++ b/docs/administration/content_organization/sections.md
@@ -28,7 +28,7 @@ Other references to the Section remain and thus the system most likely loses con
 
     Removing Sections may corrupt permission settings, template output and other things in the system.
 
-Section ID numbers are not recycled. If a Section is removed, its ID number cannot be reused when a new Section is created.
+Section ID numbers aren't recycled. If a Section is removed, its ID number cannot be reused when a new Section is created.
 
 ### Registering users
 
diff --git a/docs/api/graphql/graphql.md b/docs/api/graphql/graphql.md
index c93216a247..9f58584c7b 100644
--- a/docs/api/graphql/graphql.md
+++ b/docs/api/graphql/graphql.md
@@ -31,7 +31,7 @@ for example names that start with a digit.
 This concerns image variations, content types, content type groups, product types, and Field definition identifiers.
 
 It's recommended to rename the relevant identifiers. Failure to generate schema is registered in logs.
-To find identifiers that are not included in the schema, look for "Skipped schema generation" log messages, for example:
+To find identifiers that aren't included in the schema, look for "Skipped schema generation" log messages, for example:
 `Skipped schema generation for Image Variation`.
 
 ## Domain schema
diff --git a/docs/cdp/cdp.md b/docs/cdp/cdp.md
index b3510d5b8d..8e8127dd80 100644
--- a/docs/cdp/cdp.md
+++ b/docs/cdp/cdp.md
@@ -9,7 +9,7 @@ edition: experience
 
 [[= product_name_cdp =]] helps you solve one of the hardest challenges facing business world today:
 building unique experiences for your customers.
-With [[= product_name_cdp =]] you are able to track and aggregate data of your customers' activity on multiple channels.
+With [[= product_name_cdp =]] you're able to track and aggregate data of your customers' activity on multiple channels.
 It allows you to create individual customer profiles that enable you to personalize their experience on your platform.
 
 ![Ibexa CDP control panel](img/cdp_control_panel.png)
diff --git a/docs/content_management/content_management_guide.md b/docs/content_management/content_management_guide.md
index 9fbf969c16..efa1dc185a 100644
--- a/docs/content_management/content_management_guide.md
+++ b/docs/content_management/content_management_guide.md
@@ -161,7 +161,7 @@ These operations, like in your computer’s file system, can apply both to indiv
 
 ![Content organization operations](img/content_arrangement.png)
 
-Content items can be hidden when necessary, for example, until a certain event, like a Holiday Sale or Board announcement comes. Hidden content items are not visible to website visitors and are greyed out in the content tree.
+Content items can be hidden when necessary, for example, until a certain event, like a Holiday Sale or Board announcement comes. Hidden content items aren't visible to website visitors and are greyed out in the content tree.
 
 ![Hidden content item](img/hidden_content_item.png)
 
@@ -211,7 +211,7 @@ This setting isn't inherited.
 
 ### User segments
 
-Although segments are not meant to classify content, they could fall into this category, because their role is about targeting users, and not controlling their access to content. 
+Although segments aren't meant to classify content, they could fall into this category, because their role is about targeting users, and not controlling their access to content. 
 With segments, you can reach specific groups, or categories, of visitors with specific information about content or products that could be of their interest. 
 For example, you can build Pages that contain different recommendations, depending on who is visiting them.
 
diff --git a/docs/content_management/content_model.md b/docs/content_management/content_model.md
index 60f01d488c..45f704f4e9 100644
--- a/docs/content_management/content_model.md
+++ b/docs/content_management/content_model.md
@@ -27,7 +27,7 @@ The Fields can cover data ranging from single variables and text lines to media
 General information about a content item is stored in a [`ContentInfo`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-ContentInfo.html) object.
 `ContentInfo` does not include Fields. It contains following information:
 
-**`id`** - the unique ID of the Content object. These numbers are not recycled, so if an item is deleted, its ID isn't reused when a new one is created.
+**`id`** - the unique ID of the Content object. These numbers aren't recycled, so if an item is deleted, its ID isn't reused when a new one is created.
 
 **`contentTypeId`** - the unique numerical ID of the content type, on which the content item is based.
 
@@ -36,7 +36,7 @@ The name is in the main language of the content item.
 
 !!! note
 
-    `name` is always searchable, even if the Field(s) used to generate it are not.
+    `name` is always searchable, even if the Field(s) used to generate it aren't.
 
 **`sectionId`** - the unique number of the Section to which the content item belongs.
 New content items are placed in the Standard Section by default.
diff --git a/docs/content_management/field_types/field_type_reference/nullfield.md b/docs/content_management/field_types/field_type_reference/nullfield.md
index b7ae1217a5..51f1424262 100644
--- a/docs/content_management/field_types/field_type_reference/nullfield.md
+++ b/docs/content_management/field_types/field_type_reference/nullfield.md
@@ -8,7 +8,7 @@ This field type is used as fallback for migration scenarios, and for testing pur
 
 ## Description
 
-The Null field type serves as an aid when migrating from eZ Publish Platform and earlier legacy versions. It's a dummy for legacy field types that are not implemented in [[= product_name =]].
+The Null field type serves as an aid when migrating from eZ Publish Platform and earlier legacy versions. It's a dummy for legacy field types that aren't implemented in [[= product_name =]].
 
 Null field type accepts anything provided as a value and is usually combined with:
 
diff --git a/docs/content_management/field_types/field_type_reference/pagefield.md b/docs/content_management/field_types/field_type_reference/pagefield.md
index 213becba7b..c771074bdb 100644
--- a/docs/content_management/field_types/field_type_reference/pagefield.md
+++ b/docs/content_management/field_types/field_type_reference/pagefield.md
@@ -16,7 +16,7 @@ Page field type is only used in the Page content type that is included in [[= pr
 
     If you create content type with both `ezlandingpage` and `ezuser` field types,
     you aren't redirected to Page Builder after selecting `Edit` or `Create`.
-    This is caused by `ezuser` field type which requires separate handling. You are redirected to the standard back office edit or create mode.
+    This is caused by `ezuser` field type which requires separate handling. You're redirected to the standard back office edit or create mode.
 
 ## Layout and zones
 
diff --git a/docs/content_management/field_types/field_type_reference/richtextfield.md b/docs/content_management/field_types/field_type_reference/richtextfield.md
index 82e69ec0b6..e35fc90e10 100644
--- a/docs/content_management/field_types/field_type_reference/richtextfield.md
+++ b/docs/content_management/field_types/field_type_reference/richtextfield.md
@@ -117,7 +117,7 @@ The RichText format enriches [DocBook](https://docbook.org/) with the following
 
 !!! note "Unsupported DocBook elements"
 
-    Some DocBook elements are not supported by RichText.
+    Some DocBook elements aren't supported by RichText.
     Refer to [`ezpublish.rng`](https://github.com/ibexa/fieldtype-richtext/blob/main/src/bundle/Resources/richtext/schemas/docbook/ezpublish.rng#L137) for a full list.
 
 ### Online Editor elements
diff --git a/docs/content_management/field_types/field_type_reference/userfield.md b/docs/content_management/field_types/field_type_reference/userfield.md
index e57ea3768c..9bc4741ce4 100644
--- a/docs/content_management/field_types/field_type_reference/userfield.md
+++ b/docs/content_management/field_types/field_type_reference/userfield.md
@@ -32,7 +32,7 @@ This field type validates and stores information about a user.
 
     Old password hash types like MD5 have numerical hash type value from 1 to 5. These types were deprecated in v1.13 and removed in v3.0.
     Between v1.13 and v3.0 it was possible to update hashes automatically when users logged in.
-    Since v3.0, login is only possible with hash type 6 or larger. Automatic updates of older types on login are not possible anymore.
+    Since v3.0, login is only possible with hash type 6 or larger. Automatic updates of older types on login aren't possible anymore.
     A mass migration of all hashes has never been possible, because this would require knowing the passwords, which only users themselves do.
     Users who still have an old, unsupported password hash type can request a new, valid password using the "Forgot password" feature.
 
diff --git a/docs/content_management/field_types/type_and_value.md b/docs/content_management/field_types/type_and_value.md
index 1bbb20b123..a125ff7ba8 100644
--- a/docs/content_management/field_types/type_and_value.md
+++ b/docs/content_management/field_types/type_and_value.md
@@ -53,7 +53,7 @@ It's important to note that the schema definitions of the field type can be both
 
     Since it's not possible to enforce a schema format, the code using a specific field type must basically know all field types it deals with.
 
-This also applies to all user interfaces and the REST API, which therefore must provide extension points to register handling code for custom field type. These extensions are not defined yet.
+This also applies to all user interfaces and the REST API, which therefore must provide extension points to register handling code for custom field type. These extensions aren't defined yet.
 
 ### field type name
 
diff --git a/docs/content_management/file_management/binary_and_media_download.md b/docs/content_management/file_management/binary_and_media_download.md
index a58ca67006..1c5c195a88 100644
--- a/docs/content_management/file_management/binary_and_media_download.md
+++ b/docs/content_management/file_management/binary_and_media_download.md
@@ -5,7 +5,7 @@ description: Create route to to enable binary and media files download.
 # Binary and Media download
 
 You can restrict files stored in BinaryFile or Media Fields to certain user roles.
-These files are not publicly downloadable from disk, and are instead served by Symfony, using a custom route that runs the necessary checks.
+These files aren't publicly downloadable from disk, and are instead served by Symfony, using a custom route that runs the necessary checks.
 This route is automatically generated as the `url` property for those Field values.
 
 ## `content/download` route
diff --git a/docs/content_management/images/fastly_io.md b/docs/content_management/images/fastly_io.md
index d7ca540d65..6d9d518cf2 100644
--- a/docs/content_management/images/fastly_io.md
+++ b/docs/content_management/images/fastly_io.md
@@ -76,7 +76,7 @@ that they should reflect variations in your original setup.
 The built-in image optimizer serves as backup to Fastly IO in case of misconfiguration,
 so it needs to be able to serve the same image variations.
 
-Fastly IO image filters are not compatible with our built-in filters,
+Fastly IO image filters aren't compatible with our built-in filters,
 so you aren't able to reflect your original filters accurately with Fastly.
 The script below helps you find replacement filters within Fastly configuration for the basic filters.
 For more optimization options on Fastly side, see [Fastly IO reference](https://developer.fastly.com/reference/io/).
diff --git a/docs/content_management/images/images.md b/docs/content_management/images/images.md
index d295d2757f..32aa5f7274 100644
--- a/docs/content_management/images/images.md
+++ b/docs/content_management/images/images.md
@@ -225,7 +225,7 @@ a custom extension that lets you display and download files in your templates.
 
     SVG images may contain JavaScript, so they may introduce XSS or other security 
     vulnerabilities.
-    Make sure end users are not allowed to upload SVG images, and be restrictive 
+    Make sure end users aren't allowed to upload SVG images, and be restrictive 
     about which editors are allowed to do so.
 
 First, enable adding SVG files to content by removing them from the blacklist 
diff --git a/docs/content_management/taxonomy/taxonomy.md b/docs/content_management/taxonomy/taxonomy.md
index fedafcd2f7..542d148fa8 100644
--- a/docs/content_management/taxonomy/taxonomy.md
+++ b/docs/content_management/taxonomy/taxonomy.md
@@ -99,7 +99,7 @@ ibexa:
 
 ## Remove orphaned content items
 
-In some rare case, especially in [[= product_name =]] v4.2 and older, when deleting parent of huge subtrees, some Taxonomy entries are not properly deleted, leaving content items that point to a non-existing parent.
+In some rare case, especially in [[= product_name =]] v4.2 and older, when deleting parent of huge subtrees, some Taxonomy entries aren't properly deleted, leaving content items that point to a non-existing parent.
 The command `ibexa:taxonomy:remove-orphaned-content` deletes those orphaned content item.
 It works on a taxonomy passed as an argument, and has two options that act as a protective measure against deleting data by mistake:
 
diff --git a/docs/content_management/url_management/url_management.md b/docs/content_management/url_management/url_management.md
index a6fbd314e6..8c815a71b1 100644
--- a/docs/content_management/url_management/url_management.md
+++ b/docs/content_management/url_management/url_management.md
@@ -152,7 +152,7 @@ For each URL alias definition the history of changes is preserved, so that users
     had the same name in multiple languages. 
     For more information, see [the Jira ticket](https://issues.ibexa.co/browse/EZP-31818). 
 
-URL aliases are not SiteAccess-aware. When creating an alias, you can select a SiteAccess to base it on.
+URL aliases aren't SiteAccess-aware. When creating an alias, you can select a SiteAccess to base it on.
 If the SiteAccess root path (configured in `content.tree_root.location_id`) is different than the default,
 the prefix path that results from the configured content root is prepended to the final alias path.
 
diff --git a/docs/customer_management/customer_portal_guide.md b/docs/customer_management/customer_portal_guide.md
index df6ee26806..429f7f323d 100644
--- a/docs/customer_management/customer_portal_guide.md
+++ b/docs/customer_management/customer_portal_guide.md
@@ -39,7 +39,7 @@ To create a new Customer Portal, go to Content and, from the menu, select Conten
 There, navigate to the root container for your Customer Portals and select Customer Portal Page. 
 In the Page Builder creation box, you see the Customer Portal layout where you can add a dedicated Customer Portal block, 
 Sales Representative, or choose from a selection of blocks available to your [[= product_name =]] version.
-If the built-in page blocks are not sufficient to fulfill your needs, you can add your own.
+If the built-in page blocks aren't sufficient to fulfill your needs, you can add your own.
 
 ![Editable in Page Builder](img/cp_edit_in_page_builder.png)
 
@@ -66,7 +66,7 @@ You can also set up Policies for every user who has a business account by editin
 
 ### Members
 
-Company members are not standard users. They belong to a separate category called Corporate Accounts. 
+Company members aren't standard users. They belong to a separate category called Corporate Accounts. 
 This category is located in **Admin** -> **Corporate** -> **Corporate Accounts**. 
 There, you can find a list of companies and their members.
 
@@ -116,7 +116,7 @@ you can also decide between which states the user may move applications:
 - accept
 - reject
 
-If built-in statuses are not sufficient, you can add custom ones. You can also edit or add reasons for not accepting the company application. Finally, you can customize the registration site itself.
+If built-in statuses aren't sufficient, you can add custom ones. You can also edit or add reasons for not accepting the company application. Finally, you can customize the registration site itself.
 
 ### REST API
 
diff --git a/docs/getting_started/first_steps.md b/docs/getting_started/first_steps.md
index 0ebaa7ab8a..9f3dd8ef29 100644
--- a/docs/getting_started/first_steps.md
+++ b/docs/getting_started/first_steps.md
@@ -254,7 +254,7 @@ Call the group "Bloggers".
 ![Assigning a role](first-steps-assign-roles.png)
 
 You can now log out and log in again as the new User.
-You are able to create Blog Posts only.
+You're able to create Blog Posts only.
 
 !!! tip  "More information"
 
diff --git a/docs/getting_started/install_ibexa_dxp.md b/docs/getting_started/install_ibexa_dxp.md
index 3ba8810dd8..e305d82e1d 100644
--- a/docs/getting_started/install_ibexa_dxp.md
+++ b/docs/getting_started/install_ibexa_dxp.md
@@ -93,7 +93,7 @@ Log in to your service portal on [support.ibexa.co](https://support.ibexa.co/),
     If you configure several projects on one machine, make sure that
     you set different tokens for each of the projects in their respective `auth.json` files.
 
-After this, when running Composer to get updates, you are asked for a username and password. Use:
+After this, when running Composer to get updates, you're asked for a username and password. Use:
 
 - as username - your Installation key found on the **Maintenance and Support agreement details** page in the service portal
 - as password - the token password you retrieved in step 3 above.
diff --git a/docs/getting_started/requirements.md b/docs/getting_started/requirements.md
index 78678346a5..b24929020d 100644
--- a/docs/getting_started/requirements.md
+++ b/docs/getting_started/requirements.md
@@ -202,19 +202,19 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 === "Ibexa DXP v4.6"
 
     - For content search, Solr 7.7 LTS or Solr 8, recommended 8.11.1 or higher. Alternatively, Elasticsearch 7.16.2 or higher 7.x version.
-    - The above solutions require Oracle Java/Open JDK. The minimum requirement is 8 LTS, recommended 11 LTS. Newer versions are not supported.
+    - The above solutions require Oracle Java/Open JDK. The minimum requirement is 8 LTS, recommended 11 LTS. Newer versions aren't supported.
 
 === "Ibexa DXP v3.3"
 
     - For content search, Solr 7.7 LTS or Solr 8, recommended 8.11.1 or higher. Alternatively, Elasticsearch 7.16.2 or higher 7.x version.
     - For BinaryFile Field indexing, Apache Tika 1.20 or higher 1.x version, recommended 1.28.1 or higher.
-    - The above solutions require Oracle Java/Open JDK. The minimum requirement is 8 LTS, recommended 11 LTS. Newer versions are not supported.
+    - The above solutions require Oracle Java/Open JDK. The minimum requirement is 8 LTS, recommended 11 LTS. Newer versions aren't supported.
 
 === "eZ Platform v2.5"
 
     - For content search, Solr 7.7 LTS or Solr 8, recommended 8.11.1 or higher. Alternatively, Elasticsearch 7.16.2 or higher 7.x version.
     - For BinaryFile Field indexing, Apache Tika 1.20 or higher 1.x version, recommended 1.28.1 or higher.
-    - The above solutions require Oracle Java/Open JDK. The minimum requirement is 8 LTS, recommended 11 LTS. Newer versions are not supported.
+    - The above solutions require Oracle Java/Open JDK. The minimum requirement is 8 LTS, recommended 11 LTS. Newer versions aren't supported.
 
 ## Graphic Handler
 
diff --git a/docs/getting_started/troubleshooting.md b/docs/getting_started/troubleshooting.md
index 2bd7f86886..27e06541a7 100644
--- a/docs/getting_started/troubleshooting.md
+++ b/docs/getting_started/troubleshooting.md
@@ -32,7 +32,7 @@ The output from `bin2hex` is limited to 0-9 and a-f. This more than doubles the
 If you have problems installing [[= product_name =]] on a system with limited RAM (for example 1GB or 2GB), enable swap.
 It allows your operating system to use the hard disk to supplement RAM when it runs out.
 
-With swap enables you are able to successfully run `php -d memory_limit=-1 bin/console ibexa:install --env prod ezplatform-clean`.
+With swap enables you're able to successfully run `php -d memory_limit=-1 bin/console ibexa:install --env prod ezplatform-clean`.
 
 When a system runs out of RAM, you may see `Killed` when trying to clear the cache (e.g. `php bin/console --env=prod cache:clear` from your project's root directory).
 
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
index 848bce2c78..473e9a545f 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
@@ -43,7 +43,7 @@ Current content tags (and when the system purges on them):
     This is why in multi-repository setup you can see cache tags such as `1p2`.
     In this example `1` represents the index among configured repositories, meaning the second repository in the system.
 
-    Tags are not prefixed for default repository (index "0").
+    Tags aren't prefixed for default repository (index "0").
 
 The content tags are returned in a header in the responses from [[= product_name =]]. The header name is dependent on
 which HTTP Cache [[= product_name =]] is configured with:
@@ -515,7 +515,7 @@ The document might also be removed from the cache by purging any of the keys pro
 
 So back to the original problem here. This resource is for some reason not cached by Fastly ( remember the
 `x-cache: MISS` we started with). But origin says this page can be cached for 1 day. How can that be?
-The likely reason is that this page also contains some ESI fragments and that one or more of these are not cachable.
+The likely reason is that this page also contains some ESI fragments and that one or more of these aren't cachable.
 
 So, first let's see if there are any ESIs here. We remove the `-IXGET` options (in order to see content of the response,
 not only headers) to curl and search for esi:
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md b/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md
index de1f7c5f88..846f01ecb0 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md
@@ -21,7 +21,7 @@ or if you're not using Ibexa Cloud and want to configure Fastly to work with [[=
 
 ## Prepare for using Fastly locally
 
-These steps are not needed when you use Ibexa Cloud, because Fastly is preconfigured in it.
+These steps aren't needed when you use Ibexa Cloud, because Fastly is preconfigured in it.
 
 ### Get Fastly credentials from Ibexa Cloud installation
 
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md b/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
index 80a71d865a..d57ac1335c 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
@@ -72,7 +72,7 @@ Failing to configure reverse proxies correctly may introduce several problems, i
 
 - [[= product_name =]] generating links with a wrong protocol schema (HTTP instead of HTTPS) if HTTPS termination is done before the web server due to the `X-Forward-Proto` headers being ignored
 - [[= product_name =]] generating links with wrong port numbers due to the `X-Forward-Port` headers being ignored
-- back office showing the login screen because JWT tokens are not accepted due to the `X-Forward-For` headers being ignored
+- back office showing the login screen because JWT tokens aren't accepted due to the `X-Forward-For` headers being ignored
 
 ### Configure Symfony front controller
 
diff --git a/docs/infrastructure_and_maintenance/cache/persistence_cache.md b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
index f1e20c4010..83960f8f13 100644
--- a/docs/infrastructure_and_maintenance/cache/persistence_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
@@ -33,7 +33,7 @@ Notes:
   order to allow clearing cache by alternative indexes.
   For instance tree operations or changes to content types are
   examples of operations that also need to invalidate content cache by tags.
-- Search isn't defined as persistence and the queries themselves are not planned to be cached as they're too complex by design (for example, full text).
+- Search isn't defined as persistence and the queries themselves aren't planned to be cached as they're too complex by design (for example, full text).
   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)
diff --git a/docs/infrastructure_and_maintenance/databases.md b/docs/infrastructure_and_maintenance/databases.md
index 644f5329c1..0ad31fe788 100644
--- a/docs/infrastructure_and_maintenance/databases.md
+++ b/docs/infrastructure_and_maintenance/databases.md
@@ -14,7 +14,7 @@ To use PostgreSQL, you need to have the `pdo_pgsql` PHP extension installed.
 
 ### Provide parameters
 
-When you run `composer install`, you are asked to [provide installation parameters](install_ibexa_dxp.md#change-installation-parameters).
+When you run `composer install`, you're asked to [provide installation parameters](install_ibexa_dxp.md#change-installation-parameters).
 
 !!! tip
 
diff --git a/docs/infrastructure_and_maintenance/performance.md b/docs/infrastructure_and_maintenance/performance.md
index edb4a8ac23..164828cdd1 100644
--- a/docs/infrastructure_and_maintenance/performance.md
+++ b/docs/infrastructure_and_maintenance/performance.md
@@ -69,7 +69,7 @@ In production setups:
     [Symfony v3.4.15](https://github.com/symfony/symfony/pull/28249) may have resolved this.
 
 - Memcached/Redis can in some cases perform better than filesystem cache even with a single server, as it offers better general performance for operations invalidating cache.
-    - However, pure read performance is slower, especially if the next points are not optimized.
+    - However, pure read performance is slower, especially if the next points aren't optimized.
     - With cache being on different node(s) than web server, make sure to try to tune latency between the two.
 
 !!! tip
diff --git a/docs/multisite/multisite_configuration.md b/docs/multisite/multisite_configuration.md
index 471801c987..1d64126d26 100644
--- a/docs/multisite/multisite_configuration.md
+++ b/docs/multisite/multisite_configuration.md
@@ -200,7 +200,7 @@ even though they're outside the Location provided in `content.tree_root.location
 
 !!! note
     
-    Prefixes are not case sensitive.
+    Prefixes aren't case sensitive.
     Leading slashes (`/`) are automatically trimmed internally, so they can be ignored.
 
 !!! tip
diff --git a/docs/permissions/permission_use_cases.md b/docs/permissions/permission_use_cases.md
index 20ae0ce3ae..53252a9976 100644
--- a/docs/permissions/permission_use_cases.md
+++ b/docs/permissions/permission_use_cases.md
@@ -91,7 +91,7 @@ You do it by creating two new roles for a user group:
 
 Follow the example below to learn how to do that.
 
-**Cookbook**, **Dinner recipes** and **Dessert recipes** containers are not accessible in the frontend. 
+**Cookbook**, **Dinner recipes** and **Dessert recipes** containers aren't accessible in the frontend. 
 Edit access to them in the **Admin Panel**. 
 
 ![Subtree file structure](subtree_usability_notes_1.png)
@@ -265,7 +265,7 @@ See below for a detailed listing of permissions that apply to Commerce, together
 !!! note "Owner limitation"
 
     For anonymous users, orders, shipments, and/or payments are saved with a 'null' user reference. 
-    Therefore, when you apply the `Owner/self` imitation to any of the permissions below, anonymous users are not allowed to interact with any of these entities.
+    Therefore, when you apply the `Owner/self` imitation to any of the permissions below, anonymous users aren't allowed to interact with any of these entities.
 
 ### Cart 
 
diff --git a/docs/personalization/api_reference/content_api.md b/docs/personalization/api_reference/content_api.md
index e1cce3f178..914a508df0 100644
--- a/docs/personalization/api_reference/content_api.md
+++ b/docs/personalization/api_reference/content_api.md
@@ -235,6 +235,6 @@ The old item is wiped, including all attributes.
 
 !!! note
 
-    The attributes of the "old" item ID are not moved or merged, and if you 
+    The attributes of the "old" item ID aren't moved or merged, and if you 
     rely on attributes, for example, for filtering based on prices, 
     you must reimport the new item.
diff --git a/docs/personalization/api_reference/tracking_api.md b/docs/personalization/api_reference/tracking_api.md
index 1f1a833771..5d2b86cc52 100644
--- a/docs/personalization/api_reference/tracking_api.md
+++ b/docs/personalization/api_reference/tracking_api.md
@@ -274,7 +274,7 @@ structure of the website.
 
 !!! note
 
-    User IDs are not stored in the database.
+    User IDs aren't stored in the database.
     they're irreversibly anonymized before saving to disk or building the
     recommendation model.
 
diff --git a/docs/pim/pim_guide.md b/docs/pim/pim_guide.md
index 28265df17f..630e9a2c1e 100644
--- a/docs/pim/pim_guide.md
+++ b/docs/pim/pim_guide.md
@@ -184,7 +184,7 @@ Catalogs can be created just like with the local PIM, but the criteria are limit
 #### Limitations
 
 The default implementation, which serves as a basis for the example remote PIM package, has some limitations: certain functionalities either do not operate or operate within defined constraints.
-Therefore, if your specific requirements are not met, you may need to extend [[= product_name =]].
+Therefore, if your specific requirements aren't met, you may need to extend [[= product_name =]].
 
 ##### Editing product types, products and product attributes
 
@@ -193,8 +193,8 @@ Therefore, if your specific requirements are not met, you may need to extend [[=
 
 ##### Content-model-based features
 
-The following features rely on [[= product_name =]]'s content model capabilities, which are not supported by the default implementation of remote PIM support.
-Therefore, if your specific requirements are not met, you must extend the application by using extension points exposed in the Product catalog module.
+The following features rely on [[= product_name =]]'s content model capabilities, which aren't supported by the default implementation of remote PIM support.
+Therefore, if your specific requirements aren't met, you must extend the application by using extension points exposed in the Product catalog module.
 
 - Assets
 - Product variants
diff --git a/docs/release_notes/ez_platform_v1.10.0.md b/docs/release_notes/ez_platform_v1.10.0.md
index 6ebd636b9f..a524df3883 100644
--- a/docs/release_notes/ez_platform_v1.10.0.md
+++ b/docs/release_notes/ez_platform_v1.10.0.md
@@ -17,7 +17,7 @@ This release introduces the ability to add tables in the RichText editor, enabli
 
 ![](platformui-table.gif)
 
-This is a first step. We aim to provide more in terms of table support in the editor later. For the time being images and embedding are not supported within the table, as you won't be able to move them out or edit them. We also don't provide yet ability to style the table within the editor.
+This is a first step. We aim to provide more in terms of table support in the editor later. For the time being images and embedding aren't supported within the table, as you won't be able to move them out or edit them. We also don't provide yet ability to style the table within the editor.
 
  
 
diff --git a/docs/release_notes/ez_platform_v1.12.0.md b/docs/release_notes/ez_platform_v1.12.0.md
index 45b5133d86..3c1bb24d1c 100644
--- a/docs/release_notes/ez_platform_v1.12.0.md
+++ b/docs/release_notes/ez_platform_v1.12.0.md
@@ -88,7 +88,7 @@ To update to this version, follow the [updating guide](https://doc.ibexa.co/en/
 
     #### How to still use the old VCL and the old X-Location-Id headers
 
-    In all 1.x releases you are still able to revert this and use the old deprecated system if you need to. To do that:
+    In all 1.x releases you're still able to revert this and use the old deprecated system if you need to. To do that:
     - Keep using the VCL for BAN
     - Disable _(comment out)_ `EzSystemsPlatformHttpCacheBundle` in `app/AppKernel.php`
     - Change `app/AppCache.php` back to extend `eZ\Bundle\EzPublishCoreBundle\HttpCache`
diff --git a/docs/release_notes/ez_platform_v2.1.0.md b/docs/release_notes/ez_platform_v2.1.0.md
index 71d10ccfa5..2d4bef87a4 100644
--- a/docs/release_notes/ez_platform_v2.1.0.md
+++ b/docs/release_notes/ez_platform_v2.1.0.md
@@ -66,7 +66,7 @@ You can now perform REST search via `POST /views` using custom `FieldCriterion`.
 
 ### Other UI improvements
 
-- When accessing the back office from a link to a specific content item, after logging in you are now redirected to the proper content view.
+- When accessing the back office from a link to a specific content item, after logging in you're now redirected to the proper content view.
 - In edit mode you can now preview content as it looks in any SiteAccess it's available in.
 - When you start editing a content item that already has an open draft, you can see a draft conflict screen:
 
diff --git a/docs/release_notes/ez_platform_v2.5.md b/docs/release_notes/ez_platform_v2.5.md
index 6fc1a0f7c0..adf1fe75ee 100644
--- a/docs/release_notes/ez_platform_v2.5.md
+++ b/docs/release_notes/ez_platform_v2.5.md
@@ -171,7 +171,7 @@ For full list of supported versions, see [Requirements](https://doc.ibexa.co/en/
 This version introduces stricter default password quality requirements.
 
 Passwords must be at least 10 characters long, and must include upper and lower case letters, and digits.
-Existing passwords are not changed.
+Existing passwords aren't changed.
 
 See [backwards compatibility changes](https://github.com/ezsystems/ezpublish-kernel/blob/7.5/doc/bc/changes-7.5.md)
 for detailed information.
diff --git a/docs/release_notes/ez_platform_v3.1.md b/docs/release_notes/ez_platform_v3.1.md
index 3708371190..3b3a6b9842 100644
--- a/docs/release_notes/ez_platform_v3.1.md
+++ b/docs/release_notes/ez_platform_v3.1.md
@@ -111,7 +111,7 @@ or whole content items for completeness at other stages of the editing process.
 #### ezplatform-search
 
 [`ezplatform-search`](https://github.com/ezsystems/ezplatform-search) is a new repository
-that contains search functionalities that are not dependent on the search engine.
+that contains search functionalities that aren't dependent on the search engine.
 
 #### Search controller
 
diff --git a/docs/release_notes/ibexa_dxp_v4.5.md b/docs/release_notes/ibexa_dxp_v4.5.md
index 358f352969..f06dc7cdd1 100644
--- a/docs/release_notes/ibexa_dxp_v4.5.md
+++ b/docs/release_notes/ibexa_dxp_v4.5.md
@@ -88,7 +88,7 @@ For more information, see [Translation comparison](https://doc.ibexa.co/projects
 
 ### Page Builder for B2B portals [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
-With this release, you are able to use Page Builder to create custom Customer Portals for your clients.
+With this release, you're able to use Page Builder to create custom Customer Portals for your clients.
 With new Sales rep page block and using all available blocks from the original Page Builder, you can create a unique experience for each customer group.
 Additionally, you can assign each customer group to a specific Customer Portal or create an availability hierarchy based on rules and configuration.
 
diff --git a/docs/search/activity_log_search_reference/logged_at_criterion.md b/docs/search/activity_log_search_reference/logged_at_criterion.md
index 54ee74b65b..ec69838960 100644
--- a/docs/search/activity_log_search_reference/logged_at_criterion.md
+++ b/docs/search/activity_log_search_reference/logged_at_criterion.md
@@ -19,7 +19,7 @@ matches activity log group that has a log entry created before or after a given
 
 ## Example
 
-The following example is to match all activity log groups that are not older than a day:
+The following example is to match all activity log groups that aren't older than a day:
 
 ```php
 $query = new ActivityLog\Query([
diff --git a/docs/search/aggregation_reference/aggregation_reference.md b/docs/search/aggregation_reference/aggregation_reference.md
index 722052f62d..ee8edf9d55 100644
--- a/docs/search/aggregation_reference/aggregation_reference.md
+++ b/docs/search/aggregation_reference/aggregation_reference.md
@@ -15,7 +15,7 @@ There are three types of aggregations:
 
 !!! tip
 
-    Aggregations are not available in the Legacy Search engine.
+    Aggregations aren't available in the Legacy Search engine.
 
 ## Content aggregations
 
diff --git a/docs/search/search_criteria_and_sort_clauses.md b/docs/search/search_criteria_and_sort_clauses.md
index 55bd4c5a3a..6e7790f97f 100644
--- a/docs/search/search_criteria_and_sort_clauses.md
+++ b/docs/search/search_criteria_and_sort_clauses.md
@@ -20,7 +20,7 @@ or [`ContentId` Criterion handler](https://github.com/ibexa/solr/blob/main/src/l
 
 ## Custom Criteria and Sort Clauses
 
-Sometimes you can find that standard Search Criteria and Sort Clauses provided with [[= product_name =]] are not sufficient for your needs. Most often this is the case if you have a custom field type using external storage which cannot be searched using the standard Field Criterion.
+Sometimes you can find that standard Search Criteria and Sort Clauses provided with [[= product_name =]] aren't sufficient for your needs. Most often this is the case if you have a custom field type using external storage which cannot be searched using the standard Field Criterion.
 
 !!!note
 
diff --git a/docs/search/search_engines/elastic_search/configure_elastic_search.md b/docs/search/search_engines/elastic_search/configure_elastic_search.md
index ff11a63dfd..b32417f5eb 100644
--- a/docs/search/search_engines/elastic_search/configure_elastic_search.md
+++ b/docs/search/search_engines/elastic_search/configure_elastic_search.md
@@ -491,7 +491,7 @@ The name of the new template should indicate the language it applies to, for exa
 #### Change match pattern for the new template
 
 The default template matches on `*_location_*` and `*_content_*`.
-These patterns are not language-specific and you cannot use them if you plan to use different templates for different languages.
+These patterns aren't language-specific and you cannot use them if you plan to use different templates for different languages.
 In your copy of the default template, change the pattern as follows:
 
 ```diff
diff --git a/docs/search/sort_clause_reference/ismainlocation_sort_clause.md b/docs/search/sort_clause_reference/ismainlocation_sort_clause.md
index 5b79ef1ec2..a3867e7ad1 100644
--- a/docs/search/sort_clause_reference/ismainlocation_sort_clause.md
+++ b/docs/search/sort_clause_reference/ismainlocation_sort_clause.md
@@ -3,7 +3,7 @@
 The [`Location\IsMainLocation` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-IsMainLocation.html)
 sorts search results by whether their Location is the main Location of the content item.
 
-Locations that are not main Locations are ranked as lower values (e.g. with ascending order they are returned first).
+Locations that aren't main Locations are ranked as lower values (e.g. with ascending order they are returned first).
 
 ## Arguments
 
diff --git a/docs/search/sort_clause_reference/visibility_sort_clause.md b/docs/search/sort_clause_reference/visibility_sort_clause.md
index 5f4e0e19be..3f06734da3 100644
--- a/docs/search/sort_clause_reference/visibility_sort_clause.md
+++ b/docs/search/sort_clause_reference/visibility_sort_clause.md
@@ -3,7 +3,7 @@
 The [`Location\Visibility` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-Visibility.html)
 sorts search results by whether the Location is visible or not.
 
-Locations that are not visible are ranked as higher values (e.g. with ascending order they're returned last).
+Locations that aren't visible are ranked as higher values (e.g. with ascending order they're returned last).
 
 ## Arguments
 
diff --git a/docs/snippets/update/check_out_version.md b/docs/snippets/update/check_out_version.md
index 7c4ec5f328..ded92fc122 100644
--- a/docs/snippets/update/check_out_version.md
+++ b/docs/snippets/update/check_out_version.md
@@ -35,7 +35,7 @@ If it's not added as a remote yet, add an `upstream` remote:
 ??? note "Adding `sort-packages` option when updating from <=v1.13.4, v2.2.3, v2.3.2"
 
     Composer sorts packages listed in `composer.json`.
-    If your packages are not sorted yet, you should prepare for this update to make it clearer which changes you introduce.
+    If your packages aren't sorted yet, you should prepare for this update to make it clearer which changes you introduce.
 
     Assuming you have installed packages on your installation (`composer install`), do the following steps:
 
diff --git a/docs/templating/embed_and_list_content/embed_content.md b/docs/templating/embed_and_list_content/embed_content.md
index 0ed0bb1c3b..6adbd5dd2d 100644
--- a/docs/templating/embed_and_list_content/embed_content.md
+++ b/docs/templating/embed_and_list_content/embed_content.md
@@ -28,7 +28,7 @@ The results of the Siblings query are placed in the `items` variable, which you
 
 ## Embed Relations with a custom controller
 
-You can use a custom controller for any situation where Query types are not sufficient.
+You can use a custom controller for any situation where Query types aren't sufficient.
 
 ``` yaml
 [[= include_file('code_samples/front/embed_content/config/packages/views.yaml', 23, 30) =]]
diff --git a/docs/templating/layout/add_search_form.md b/docs/templating/layout/add_search_form.md
index e81977bda3..abf5522f4d 100644
--- a/docs/templating/layout/add_search_form.md
+++ b/docs/templating/layout/add_search_form.md
@@ -63,5 +63,5 @@ Create the `parts/search_form.html.twig` file:
 ```
 
 This template renders only a basic query field and a submit button.
-`'render_rest': false` ensures that the fields you do not explicitly add to the template are not rendered
+`'render_rest': false` ensures that the fields you do not explicitly add to the template aren't rendered
 (in this case, date selection, content type, and so on).
diff --git a/docs/templating/layout/customize_storefront_layout.md b/docs/templating/layout/customize_storefront_layout.md
index 292139adf2..057fc25155 100644
--- a/docs/templating/layout/customize_storefront_layout.md
+++ b/docs/templating/layout/customize_storefront_layout.md
@@ -85,7 +85,7 @@ The most important templates are:
 
 To avoid self-reference, `@IbexaCart` is used instead of `@ibexadesign`.
 
-Built-in components are not styled, so you can freely customize them according to your needs.
+Built-in components aren't styled, so you can freely customize them according to your needs.
 You can add CSS classes to the base Twig using attributes' objects.
 For example, if you want to add custom CSS classes to quantity input in Add to Cart component, use the following:
 
diff --git a/docs/templating/queries_and_controllers/content_queries.md b/docs/templating/queries_and_controllers/content_queries.md
index 47a30b168f..8c1f729082 100644
--- a/docs/templating/queries_and_controllers/content_queries.md
+++ b/docs/templating/queries_and_controllers/content_queries.md
@@ -21,7 +21,7 @@ For more complex cases, you can build custom [controllers](controllers.md).
 The Query controller offers a set of [built-in Query types](built-in_query_types.md).
 You can use them in the content view configuration, or in the [Content query Field](#content-query-field).
 
-You can also write [custom Query types](create_custom_query_type.md) for the cases that are not covered by the built-in ones.
+You can also write [custom Query types](create_custom_query_type.md) for the cases that aren't covered by the built-in ones.
 
 ### Query type configuration
 
diff --git a/docs/templating/render_content/render_content_in_php.md b/docs/templating/render_content/render_content_in_php.md
index b5db638c86..b3c879f61d 100644
--- a/docs/templating/render_content/render_content_in_php.md
+++ b/docs/templating/render_content/render_content_in_php.md
@@ -36,7 +36,7 @@ Create the command in `src/Command/ViewCommand.php`:
 
 !!! caution
 
-    As `Ibexa\Core\MVC\Symfony\View\Builder\ContentViewBuilder` and `Ibexa\Core\MVC\Symfony\View\Renderer\TemplateRenderer` are not part of the public PHP API's `Ibexa\Contracts` namespace, they might change without notice.
+    As `Ibexa\Core\MVC\Symfony\View\Builder\ContentViewBuilder` and `Ibexa\Core\MVC\Symfony\View\Renderer\TemplateRenderer` aren't part of the public PHP API's `Ibexa\Contracts` namespace, they might change without notice.
 
 Use the command with some simple views:
 
diff --git a/docs/templating/twig_function_reference/cart_twig_functions.md b/docs/templating/twig_function_reference/cart_twig_functions.md
index c9a603b029..4cdac70bc7 100644
--- a/docs/templating/twig_function_reference/cart_twig_functions.md
+++ b/docs/templating/twig_function_reference/cart_twig_functions.md
@@ -10,7 +10,7 @@ You can use cart Twig functions to check whether products can be added to cart,
 
 ### `ibexa_can_be_added_to_cart()`
 
-The `ibexa_can_be_added_to_cart()` function checks whether the provided product can be added to cart. It eliminates products that are not available, products that do not have a price that corresponds to a currency selected for the cart, and products, for which VAT category isn't set. It also eliminates products that have variants but are not one of those variants. 
+The `ibexa_can_be_added_to_cart()` function checks whether the provided product can be added to cart. It eliminates products that aren't available, products that do not have a price that corresponds to a currency selected for the cart, and products, for which VAT category isn't set. It also eliminates products that have variants but aren't one of those variants.
 
 ``` html+twig
 {% set is_disabled = (is_disabled or ibexa_can_be_added_to_cart(product) == false)|default(false) %}
diff --git a/docs/tutorials/generic_field_type/6_settings.md b/docs/tutorials/generic_field_type/6_settings.md
index 64277bb6b8..8c297fd1b9 100644
--- a/docs/tutorials/generic_field_type/6_settings.md
+++ b/docs/tutorials/generic_field_type/6_settings.md
@@ -5,7 +5,7 @@ description: Learn how to add settings that format the Field value.
 # Step 6 - Implement Point 2D settings
 
 Implementing settings enables you to define the format for displaying the Field on the page.
-To do so, create the `format` field where you are able to change the way coordinates for Point 2D are displayed.
+To do so, create the `format` field where you're able to change the way coordinates for Point 2D are displayed.
 
 ## Define field type format
 
diff --git a/docs/tutorials/generic_field_type/creating_a_point2d_field_type.md b/docs/tutorials/generic_field_type/creating_a_point2d_field_type.md
index 11b2ea01e6..55ef83b7b4 100644
--- a/docs/tutorials/generic_field_type/creating_a_point2d_field_type.md
+++ b/docs/tutorials/generic_field_type/creating_a_point2d_field_type.md
@@ -28,7 +28,7 @@ This tutorial shows you how to use the Generic field type as a template for a cu
 - create a custom Point 2D field type with two coordinates as input, e.g. (4,5)
 - register the new field type as a service and define its template
 - add basic validation to your Point 2D
-- add data migration to the field type so you are able to easily change its output
+- add data migration to the field type so you're able to easily change its output
 
 ## Steps
 
diff --git a/docs/update_and_migration/from_2.5/to_3.3.md b/docs/update_and_migration/from_2.5/to_3.3.md
index b5f4316f95..81688d60ac 100644
--- a/docs/update_and_migration/from_2.5/to_3.3.md
+++ b/docs/update_and_migration/from_2.5/to_3.3.md
@@ -75,7 +75,7 @@ This introduces changes from the relevant website skeleton and results in confli
 
 Resolve the conflicts in the following way:
 
-- Make sure all automatically added `ezsystems/*` packages are removed. If you explicitly added any packages that are not part of the standard installation, retain them.
+- Make sure all automatically added `ezsystems/*` packages are removed. If you explicitly added any packages that aren't part of the standard installation, retain them.
 - Review the rest of the packages. If your project requires a package, keep it.
 - If a package is only used as a dependency of an `ezsystems` package, remove it. You can check how the package is used with `composer why <packageName>`.
 - Keep the dependencies listed in the website skeleton.
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
index 5cf2ff5d1e..5e8a6c327e 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
@@ -220,7 +220,7 @@ When that is done, execute the following to update and install all packages from
 
 !!! note
 
-    At the end of the process, you are asked for values for parameters.yaml not already moved from old installation, or new *(as defined in parameters.yaml.dist)*.
+    At the end of the process, you're asked for values for parameters.yaml not already moved from old installation, or new *(as defined in parameters.yaml.dist)*.
 
 ### 2.8 Register EzSystemsEzPlatformXmlTextFieldTypeBundle
 
@@ -240,7 +240,7 @@ Import to your database the changes provided in one of the following files. It's
 
 ### 3.2. Once you're ready to migrate content to Platform field types
 
-Steps here should only be done once you're ready to move away from legacy and Legacy Bridge, as the following field types are not supported by legacy. In other words, content you have migrated isn't be editable in legacy admin interface anymore, but rather in the more modern eZ Platform back-end UI, allowing you to take full advantage of what the Platform has to offer.
+Steps here should only be done once you're ready to move away from legacy and Legacy Bridge, as the following field types aren't supported by legacy. In other words, content you have migrated isn't be editable in legacy admin interface anymore, but rather in the more modern eZ Platform back-end UI, allowing you to take full advantage of what the Platform has to offer.
 
 The field types unsupported in eZ Platform are:
 
@@ -575,7 +575,7 @@ bin/console ezflow:migrate <legacy path> —ini=<block definitions> [—ini=<ano
 bin/console ezflow:migrate /var/www/legacy.application.com/ —ini=extension/myapplication/settings/block.ini.append.php
 ```
 
-**5.** You are warned about the need to create a [backup](backup.md) of your database. **Proceed only if you're sure you have done it.**
+**5.** You're warned about the need to create a [backup](backup.md) of your database. **Proceed only if you're sure you have done it.**
 
 A `MigrationBundle` is generated in the `src/` folder.
 
diff --git a/docs/users/customer_groups.md b/docs/users/customer_groups.md
index ae3296fd04..1558126fe6 100644
--- a/docs/users/customer_groups.md
+++ b/docs/users/customer_groups.md
@@ -11,7 +11,7 @@ For example, you can offer a 10% discount for all products in the catalog to use
 
 !!! tip
 
-    Note that customer groups are not the same as [user groups](user_registration.md#user-groups).
+    Note that customer groups aren't the same as [user groups](user_registration.md#user-groups).
     User groups concern all users in the system and can be used, for example, to handle permissions.
     Customer groups refer specifically to the commerce functionalities and enable handling prices.
 

From 1bf737c0d02712f1ea457e5dc7b4bd452d49b835 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Fri, 11 Oct 2024 08:48:27 +0200
Subject: [PATCH 07/77] Typo fix

---
 docs/personalization/api_reference/content_api.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/personalization/api_reference/content_api.md b/docs/personalization/api_reference/content_api.md
index 914a508df0..096116eac5 100644
--- a/docs/personalization/api_reference/content_api.md
+++ b/docs/personalization/api_reference/content_api.md
@@ -44,7 +44,7 @@ Use the POST request to create or update items with the given ID in the database
 `POST: https://admin.perso.ibexa.co/api/[customerid]/item`
 
 A body of the request must contain a valid XML document.
-Once uploaded, the item is scheduled to be inserted in the database, and itsn't directly available.
+Once uploaded, the item is scheduled to be inserted in the database, and isn't directly available.
 
 ## DELETE requests
 

From c880dda0457b8936813451a6e3b2b53bfd7927cd Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Fri, 11 Oct 2024 09:06:43 +0200
Subject: [PATCH 08/77] Field -> field

---
 .../extending_thumbnails.md                   | 14 +++----
 .../back_office/content_tab_switcher.md       |  4 +-
 .../back_office/content_type_anchor_menu.md   |  2 +-
 .../back_office/multifile_upload.md           |  8 ++--
 .../configuration/repository_configuration.md |  6 +--
 .../content_organization/content_types.md     | 20 +++++-----
 .../project_organization/architecture.md      |  2 +-
 .../project_organization/bundles.md           |  2 +-
 docs/api/graphql/graphql.md                   |  4 +-
 docs/api/graphql/graphql_custom_ft.md         |  2 +-
 docs/api/graphql/graphql_customization.md     |  2 +-
 docs/api/php_api/php_api.md                   |  2 +-
 docs/content_management/content_model.md      | 38 +++++++++----------
 .../field_type_reference/richtextfield.md     |  2 +-
 .../field_types/type_and_value.md             | 18 ++++-----
 .../binary_and_media_download.md              | 10 ++---
 docs/content_management/images/images.md      |  4 +-
 docs/content_management/taxonomy/taxonomy.md  |  8 ++--
 docs/customer_management/cp_configuration.md  |  2 +-
 docs/customer_management/cp_page_builder.md   |  2 +-
 docs/getting_started/first_steps.md           |  4 +-
 docs/getting_started/requirements.md          |  4 +-
 docs/getting_started/troubleshooting.md       |  4 +-
 .../cache/http_cache/content_aware_cache.md   |  2 +-
 docs/multisite/languages/languages.md         | 10 ++---
 .../personalization/enable_personalization.md |  4 +-
 docs/release_notes/ez_platform_v1.10.0.md     |  2 +-
 docs/release_notes/ez_platform_v2.1.0.md      |  4 +-
 docs/release_notes/ez_platform_v2.5.md        | 14 +++----
 docs/release_notes/ez_platform_v3.1.md        | 18 ++++-----
 .../aggregation_reference.md                  |  2 +-
 .../search_criteria_and_sort_clauses.md       |  2 +-
 .../configure_elastic_search.md               |  2 +-
 .../content_queries.md                        | 24 ++++++------
 .../generic_field_type/6_settings.md          |  4 +-
 .../creating_a_point2d_field_type.md          |  2 +-
 .../from_1.x_2.x/update_db_to_2.5.md          |  4 +-
 .../update_code/3_update_field_types.md       |  2 +-
 .../migrate_to_ibexa_dxp/common_issues.md     |  8 ++--
 docs/users/customer_groups.md                 |  2 +-
 40 files changed, 135 insertions(+), 135 deletions(-)

diff --git a/docs/administration/back_office/back_office_elements/extending_thumbnails.md b/docs/administration/back_office/back_office_elements/extending_thumbnails.md
index 5f908d9746..b7da91cd91 100644
--- a/docs/administration/back_office/back_office_elements/extending_thumbnails.md
+++ b/docs/administration/back_office/back_office_elements/extending_thumbnails.md
@@ -24,15 +24,15 @@ For example for users thumbnails can be downloaded from an avatar-generating ser
 
 For this layer there are following default implementations:
 
-- The mechanism looks for Fields that can be thumbnail, if found, the mechanism moves to the second layer.
-- If there are no Fields that can be a thumbnail, the content type icon is used as a thumbnail.
+- The mechanism looks for fields that can be thumbnail, if found, the mechanism moves to the second layer.
+- If there are no fields that can be a thumbnail, the content type icon is used as a thumbnail.
 
 ### Second layer
 
-Second layer of mechanism enables selection of thumbnail from a Field that the first layer has found. 
-It searches the content type for all the Fields e.g. images with function "Can be a thumbnail" turned on.
+Second layer of mechanism enables selection of thumbnail from a field that the first layer has found. 
+It searches the content type for all the fields e.g. images with function "Can be a thumbnail" turned on.
 
-If there is more than one Field in the content type that can be used as a thumbnail, this layer returns the first nonempty Field as a thumbnail.
+If there is more than one field in the content type that can be used as a thumbnail, this layer returns the first nonempty field as a thumbnail.
 
 This mechanism can be modified to fit your site needs, so you can decide from where and how the thumbnails is downloaded.
 
@@ -60,14 +60,14 @@ At this point you can go to the back office and check the results.
     This strategy overrides all generated thumbnails. You can specify a specific content type. See the example [here](https://github.com/ibexa/user/blob/main/src/lib/Strategy/DefaultThumbnailStrategy.php)
 
 
-## Other Fields as thumbnails
+## Other fields as thumbnails
 
 Any field type can generate a thumbnail, e.g.:
 
 - DateAndTime (`ezdatetime`) - you can add a mini calendar thumbnail for Appointment content type and on the day of the appointment a clock thumbnail with a specific time when it takes place
 - TextBlock (`eztext`) -  you can add a first letter of the text block that is inside
 
-### Add eztext Field as thumbnail
+### Add eztext field as thumbnail
 
 First, create a strategy that adds support for `eztext` as the thumbnail.
 It enables you to add a thumbnail URL in the text field.
diff --git a/docs/administration/back_office/content_tab_switcher.md b/docs/administration/back_office/content_tab_switcher.md
index e1c19170fe..51038250cf 100644
--- a/docs/administration/back_office/content_tab_switcher.md
+++ b/docs/administration/back_office/content_tab_switcher.md
@@ -30,9 +30,9 @@ ibexa:
 ![Meta tab](tab_switcher.png)
 
 
-### Configure Field groups for Meta tab
+### Configure field groups for Meta tab
 
-The default configuration makes the `ibexa_taxonomy_entry_assignment` Field always visible in the Meta tab in the content form. 
+The default configuration makes the `ibexa_taxonomy_entry_assignment` field always visible in the Meta tab in the content form. 
 With this new feature, you can indicate what field types, previously set in the back office content type, are shown in the Meta tab section in the content form. 
 You can automatically move all field types from Metadata group to the Meta tab in the content form.
 To do it, use the following configuration:
diff --git a/docs/administration/back_office/content_type_anchor_menu.md b/docs/administration/back_office/content_type_anchor_menu.md
index f0c3c72805..c802bb2d6d 100644
--- a/docs/administration/back_office/content_type_anchor_menu.md
+++ b/docs/administration/back_office/content_type_anchor_menu.md
@@ -5,7 +5,7 @@ description: Add anchor menu to the content type configuration screen, to make f
 # Add anchor menu to content type edit screen
 
 With the anchor menu you can increase visibility of certain [field types](field_types.md), which provide more complex functionality, 
-by separating them from the [Field definitions](content_types.md#field-definitions) section in [content type](content_types.md) configuration screen. 
+by separating them from the [field definitions](content_types.md#field-definitions) section in [content type](content_types.md) configuration screen. 
 One example of such field type would be [SEO]([[= user_doc =]]/search_engine_optimization/work_with_seo/), 
 because it handles functionality that applies to all content items of the content type.
 You can use the anchor menu feature with other field types, including [custom ones](create_custom_generic_field_type.md).
diff --git a/docs/administration/back_office/multifile_upload.md b/docs/administration/back_office/multifile_upload.md
index 90177d24ac..08fe7c10da 100644
--- a/docs/administration/back_office/multifile_upload.md
+++ b/docs/administration/back_office/multifile_upload.md
@@ -97,13 +97,13 @@ All of the following properties must be used, otherwise the multi-file upload do
         - **defaultMappings** _{Array}_ - a list of file type to content type mappings
         Sample mapping be an object and should follow the convention:
             - **contentTypeIdentifier** _{String}_ - content type identifier
-            - **contentFieldIdentifier** _{String}_ - Field identifier
-            - **nameFieldIdentifier** _{String}_ - name Field identifier
+            - **contentFieldIdentifier** _{String}_ - field identifier
+            - **nameFieldIdentifier** _{String}_ - name field identifier
             - **mimeTypes** _{Array}_ - a list of file types assigned to a specific content type
         - **fallbackContentType** _{Object}_ - a fallback content type definition. Should contain the following info:
             - **contentTypeIdentifier** _{String}_ - content type identifier
-            - **contentFieldIdentifier** _{String}_ - Field identifier
-            - **nameFieldIdentifier** _{String}_ - name Field identifier
+            - **contentFieldIdentifier** _{String}_ - field identifier
+            - **nameFieldIdentifier** _{String}_ - name field identifier
         - **locationMappings** _{Array}_ - list of file type to content type mappings based on a Location identifier
         - **maxFileSize** {Number} - maximum file size allowed for uploading. It's a number of bytes
     - **token** _{String}_ - CSRF token
diff --git a/docs/administration/configuration/repository_configuration.md b/docs/administration/configuration/repository_configuration.md
index cb8f31a0bb..b0d0d59881 100644
--- a/docs/administration/configuration/repository_configuration.md
+++ b/docs/administration/configuration/repository_configuration.md
@@ -1,5 +1,5 @@
 ---
-description: Configure Repository connections, archive limits, Field groups and other settings.
+description: Configure Repository connections, archive limits, field groups and other settings.
 ---
 
 # Repository configuration
@@ -161,7 +161,7 @@ SECOND_DATABASE_URL=otherdb://otheruser:otherpasswd@otherhost:otherport/otherdbn
 ## Field groups configuration
 
 Field groups, used in content and content type editing, can be configured under the `repositories` key.
-Values entered there are Field group *identifiers*:
+Values entered there are field group *identifiers*:
 
 ``` yaml
 repositories:
@@ -173,7 +173,7 @@ repositories:
 
 These identifiers can be given human-readable values and can be translated. Those values are used when editing content types.
 The translation domain is `ibexa_fields_groups`.
-This example in `translations/ibexa_fields_groups.en.yaml` defines English names for Field groups:
+This example in `translations/ibexa_fields_groups.en.yaml` defines English names for field groups:
 
 ``` yaml
 content: Content
diff --git a/docs/administration/content_organization/content_types.md b/docs/administration/content_organization/content_types.md
index ed3249855d..72a793e3ff 100644
--- a/docs/administration/content_organization/content_types.md
+++ b/docs/administration/content_organization/content_types.md
@@ -5,11 +5,11 @@ description: A content type is a base for new content items.
 # Content types
 
 A content type is a base for new content items.
-It defines what Fields are available in the content item.
+It defines what fields are available in the content item.
 
 ![Content types](admin_panel_content_types.png "Content types")
 
-For example, a new content type called *Article* can have Fields such as title, author, body, image, etc.
+For example, a new content type called *Article* can have fields such as title, author, body, image, etc.
 Based on this content type, you can create any number of content items.
 content types are organized into groups.
 
@@ -28,13 +28,13 @@ Each content type is characterized by a set of metadata which define the general
 
 !!! note
 
-    Note that even if your content type defines a Field intended as a name for the content item (for example, a title of an article or product name), do not confuse it with this Name, which is a piece of metadata, not a Field.
+    Note that even if your content type defines a field intended as a name for the content item (for example, a title of an article or product name), do not confuse it with this Name, which is a piece of metadata, not a field.
 
 **Identifier** – an identifier for internal use in configuration files, templates, PHP code, etc. It must be unique, can only contain lowercase letters, digits and underscores; the maximum length is 50 characters. (Mandatory.)
 
 **Description** – a detailed description of the content type. (Optional.)
 
-<a id="content-name-pattern"></a>**Content name pattern** – a pattern that defines what name a new content item based on this content type gets. The pattern usually consists of Field identifiers that tell the system which Fields it should use when generating the name of a content item. Each Field identifier has to be surrounded with angle brackets. Text outside the angle brackets is included literally. If no pattern is provided, the system automatically uses the first Field. (Optional.)
+<a id="content-name-pattern"></a>**Content name pattern** – a pattern that defines what name a new content item based on this content type gets. The pattern usually consists of field identifiers that tell the system which fields it should use when generating the name of a content item. Each field identifier has to be surrounded with angle brackets. Text outside the angle brackets is included literally. If no pattern is provided, the system automatically uses the first field. (Optional.)
 
 **URL alias name pattern** – a pattern which controls how the virtual URLs of the Locations are generated when content items are created based on this content type. Note that only the last part of the virtual URL is affected. The pattern works in the same way as the content name pattern. Text outside the angle brackets is converted using the selected method of URL transformation. If no pattern is provided, the system automatically uses the name of the content item itself. (Optional.)
 
@@ -62,8 +62,8 @@ Each content type is characterized by a set of metadata which define the general
 
 ## Field definitions
 
-Aside from the metadata, a content type may contain any number of Field definitions (but has to contain at least one).
-They determine what Fields of what field types are included in all content items based on this content type.
+Aside from the metadata, a content type may contain any number of field definitions (but has to contain at least one).
+They determine what fields of what field types are included in all content items based on this content type.
 
 ![Field definitions](admin_panel_field_definitions.png)
 
@@ -71,7 +71,7 @@ They determine what Fields of what field types are included in all content items
 
 !!! note
 
-    You can assign each Field defined in a content type to a group by selecting one of the groups in the Category drop-down. [Available groups can be configured in the content repository](repository_configuration.md).
+    You can assign each field defined in a content type to a group by selecting one of the groups in the Category drop-down. [Available groups can be configured in the content repository](repository_configuration.md).
 
 !!! caution
 
@@ -87,11 +87,11 @@ They determine what Fields of what field types are included in all content items
 
 ## Modifying content types
 
-A content type and its Field definitions can be modified after creation,
+A content type and its field definitions can be modified after creation,
 even if there are already content items based on it in the system.
 When a content type is modified, each of its instances are changed as well.
-If a new Field definition is added to a content type, this Field appears (empty) in every relevant content item.
-If a Field definition is deleted from the content type, all the corresponding Fields are removed from content items of this type.
+If a new field definition is added to a content type, this field appears (empty) in every relevant content item.
+If a field definition is deleted from the content type, all the corresponding fields are removed from content items of this type.
 
 ## Removing content types
 
diff --git a/docs/administration/project_organization/architecture.md b/docs/administration/project_organization/architecture.md
index b1c675abcb..89b12da3bb 100644
--- a/docs/administration/project_organization/architecture.md
+++ b/docs/administration/project_organization/architecture.md
@@ -21,7 +21,7 @@ The architecture of [[= product_name =]] is layered and uses clearly defined API
 | [Controllers](controllers.md)                       | Controllers created by you to read information from a Request object, create and return a Response objects.                                                                                    |
 | [Twig templates](twig_function_reference.md)        | Set of custom and built-in Twig templates. User interfaces are developed with the Twig template engine and query the public PHP API directly.                                                  |
 | [REST API v2](rest_api_usage.md)                    | The REST API v2 enables you to interact with an [[= product_name =]] installation using the HTTP protocol, following a REST interaction model.                                                 |
-| [GraphQL](graphql.md)                               | GraphQL for [[= product_name =]] exposes the domain model using the Repository, based on content type groups, content types and Field definitions.                                             |
+| [GraphQL](graphql.md)                               | GraphQL for [[= product_name =]] exposes the domain model using the Repository, based on content type groups, content types and field definitions.                                             |
 | [Public PHP API](php_api.md)                        | Public PHP API exposes the Repository which enables you to create, read, update, manage and delete all objects available in [[= product_name =]].                                              |
 | Business Logic                                      | The business logic is defined in the kernel. This business logic is exposed to applications via an API. It is used to organize development of the user interface layer.                        |
 | SPI                                                 | Service Provider Interface which defines contracts for implementing various parts of the system, including persistence layer (`SPI\Persistence`), custom field types, custom limitations, etc. |
diff --git a/docs/administration/project_organization/bundles.md b/docs/administration/project_organization/bundles.md
index 41ee7989f8..0ca296614f 100644
--- a/docs/administration/project_organization/bundles.md
+++ b/docs/administration/project_organization/bundles.md
@@ -92,7 +92,7 @@ see the [How to Remove a Bundle]([[= symfony_doc =]]/bundles/remove.html) instru
 |ibexa/seo|Search Engine Optimization (SEO) tool|
 |ibexa/taxonomy|Taxonomy functionality|
 |ibexa/tree-builder|Tree builder functionality|
-|ibexa/version-comparison|Enables comparing between two versions of the same Field|
+|ibexa/version-comparison|Enables comparing between two versions of the same field|
 |ibexa/workflow|Collaboration feature that enables you to send content draft to any user for a review or rewriting|
 |ibexa/recommendation-client|Client for connecting with the personalization engine **deprecated**|
 |ibexa/commerce-base-design|Standard design and theme for the shop **deprecated** |
diff --git a/docs/api/graphql/graphql.md b/docs/api/graphql/graphql.md
index 9f58584c7b..13cab741aa 100644
--- a/docs/api/graphql/graphql.md
+++ b/docs/api/graphql/graphql.md
@@ -28,7 +28,7 @@ you can [query](graphql_queries.md) and [operate on](graphql_operations.md).
 GraphQL schema cannot be generated for names that do not follow the [GraphQL specification](http://spec.graphql.org/June2018/#sec-Names),
 for example names that start with a digit.
 
-This concerns image variations, content types, content type groups, product types, and Field definition identifiers.
+This concerns image variations, content types, content type groups, product types, and field definition identifiers.
 
 It's recommended to rename the relevant identifiers. Failure to generate schema is registered in logs.
 To find identifiers that aren't included in the schema, look for "Skipped schema generation" log messages, for example:
@@ -46,7 +46,7 @@ Use the singular field to query a single content item, and the plural to get a w
 With the queries you can inspect:
 
 - the existing types 
-- details of content types, and their Fields in the context of developing your own application
+- details of content types, and their fields in the context of developing your own application
 
 You can request additional content information such as the Section or Objects states,
 available under the `_info` field.
diff --git a/docs/api/graphql/graphql_custom_ft.md b/docs/api/graphql/graphql_custom_ft.md
index ff317f4da5..e236c1f40d 100644
--- a/docs/api/graphql/graphql_custom_ft.md
+++ b/docs/api/graphql/graphql_custom_ft.md
@@ -167,7 +167,7 @@ class MyFieldDefinitionMapper extends DecoratingFieldDefinitionMapper implements
 
 The following variables are available in the resolver's expression:
 
-- `field` is the current field, as an extension of the API's Field object that proxies properties requests to the Field Value
+- `field` is the current field, as an extension of the API's field object that proxies properties requests to the field Value
 - `content` is the resolved content item's `Content`
 - `location` is the content item's resolved location, for more information, see [Querying Locations](graphql_queries.md#querying-locations)
 - `item` is the content together with its location `\Ibexa\GraphQL\Value\Item`
diff --git a/docs/api/graphql/graphql_customization.md b/docs/api/graphql/graphql_customization.md
index 7496aa287e..b710863475 100644
--- a/docs/api/graphql/graphql_customization.md
+++ b/docs/api/graphql/graphql_customization.md
@@ -92,7 +92,7 @@ SomethingPayload:
 
 You can customize the name used by GraphQL as the content field name.
 
-Use this setting to avoid conflicts with Field names that derive from a content type definition.
+Use this setting to avoid conflicts with field names that derive from a content type definition.
 
 ``` yaml
 parameters:
diff --git a/docs/api/php_api/php_api.md b/docs/api/php_api/php_api.md
index ca4e447b1f..10ada13e14 100644
--- a/docs/api/php_api/php_api.md
+++ b/docs/api/php_api/php_api.md
@@ -79,7 +79,7 @@ for example [`ContentInfo`](https://github.com/ibexa/core/blob/main/src/contract
 for [`Content`](https://github.com/ibexa/core/blob/main/src/contracts/Repository/Values/Content/Content.php).
 These objects provide you with lower-level information.
 For instance, `ContentInfo` contains `currentVersionNo` or `remoteId`,
-while `Content` enables you to retrieve Fields, content type, or previous versions.
+while `Content` enables you to retrieve fields, content type, or previous versions.
 
 !!! note
 
diff --git a/docs/content_management/content_model.md b/docs/content_management/content_model.md
index 45f704f4e9..a56a99b03b 100644
--- a/docs/content_management/content_model.md
+++ b/docs/content_management/content_model.md
@@ -1,5 +1,5 @@
 ---
-description: Ibexa DXP's content model relies on content items that are instances of content types and contain content Fields.
+description: Ibexa DXP's content model relies on content items that are instances of content types and contain content fields.
 ---
 
 # Content model
@@ -20,12 +20,12 @@ A content item consists of:
 
 - [Content information](#content-information)
 - [Fields](#fields), defined by the [content type](content_types.md).
-The Fields can cover data ranging from single variables and text lines to media files or blocks of formatted text.
+The fields can cover data ranging from single variables and text lines to media files or blocks of formatted text.
 
 #### Content information
 
 General information about a content item is stored in a [`ContentInfo`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-ContentInfo.html) object.
-`ContentInfo` does not include Fields. It contains following information:
+`ContentInfo` does not include fields. It contains following information:
 
 **`id`** - the unique ID of the Content object. These numbers aren't recycled, so if an item is deleted, its ID isn't reused when a new one is created.
 
@@ -36,7 +36,7 @@ The name is in the main language of the content item.
 
 !!! note
 
-    `name` is always searchable, even if the Field(s) used to generate it aren't.
+    `name` is always searchable, even if the field(s) used to generate it aren't.
 
 **`sectionId`** - the unique number of the Section to which the content item belongs.
 New content items are placed in the Standard Section by default.
@@ -76,43 +76,43 @@ If a published item is removed from the Trash (or removed without being put in t
 
 ![Diagram of an example content item](content_model_item_diagram.png)
 
-The Fields of a content item are defined by the content type to which the content item belongs.
-s
+The fields of a content item are defined by the content type to which the content item belongs.
+
 ## Fields
 
-A Field is the smallest unit of storage in the content model and the building block of all content items. Every Field belongs to a field type.
+A field is the smallest unit of storage in the content model and the building block of all content items. Every field belongs to a field type.
 
 Beyond the built-in set of field types, you can [create your own](create_custom_generic_field_type.md).
 
 ### Field value validation
 
-The values entered in a Field may undergo validation, which means the system makes sure that they're correct for the chosen field type and can be used without a problem.
+The values entered in a field may undergo validation, which means the system makes sure that they're correct for the chosen field type and can be used without a problem.
 
-Validation depends on the settings of a particular field type. It cannot be turned off for a Field if its field type supports it.
+Validation depends on the settings of a particular field type. It cannot be turned off for a field if its field type supports it.
 
 ### Field details
 
-Aside from the field type, the Field definition in a content type provides the following information:
+Aside from the field type, the field definition in a content type provides the following information:
 
-**Name** – a user-friendly name that describes the Field. This name is used in the interface, but not internally by the system. It can consist of letters, digits, spaces and special characters; the maximum length is 255 characters. If no name is provided, a unique one is automatically generated.
+**Name** – a user-friendly name that describes the field. This name is used in the interface, but not internally by the system. It can consist of letters, digits, spaces and special characters; the maximum length is 255 characters. If no name is provided, a unique one is automatically generated.
 
 **Identifier** – an identifier for internal use in configuration files, templates, PHP code, etc. It can only contain lowercase letters, digits and underscores; the maximum length is 50 characters. This identifier is also used in name patterns for the content type.
 
-**Description** – a detailed description of the Field.
+**Description** – a detailed description of the field.
 
-**Required** – a flag which indicates if the Field is required for the system to accept the content item. By default, if a Field is flagged as Required, a user isn't able to publish a content item without filling in this Field.
+**Required** – a flag which indicates if the field is required for the system to accept the content item. By default, if a field is flagged as Required, a user isn't able to publish a content item without filling in this field.
 
 !!! note
-    You can use the `ContentService::validate()` method to decide whether the required Fields or whole content items are checked for 
+    You can use the `ContentService::validate()` method to decide whether the required fields or whole content items are checked for 
     completeness at other stages of the editing process.
 
-    The Required flag is in no way related to Field validation. A Field's value is validated whether the Field is set as required or not.
+    The Required flag is in no way related to field validation. A field's value is validated whether the field is set as required or not.
 
-**[Searchable](search.md)** – a flag which indicates if the value of the Field is indexed for searching.
+**[Searchable](search.md)** – a flag which indicates if the value of the field is indexed for searching.
 
-The Searchable flag isn't available for some Fields, because some field types do not allow searching through their values.
+The Searchable flag isn't available for some fields, because some field types do not allow searching through their values.
 
-**[Translatable](languages.md)** – a flag which indicates if the value of the Field can be translated. This is independent of the field type, which means that even Fields such as "Float" or "Image" can be set as translatable.
+**[Translatable](languages.md)** – a flag which indicates if the value of the field can be translated. This is independent of the field type, which means that even fields such as "Float" or "Image" can be set as translatable.
 
 Depending on the field type, there may also be other, specific information to fill in. For example, the "Country" field type allows you to select the default country, as well as to allow selecting multiple countries at the same time.
 
@@ -120,7 +120,7 @@ Depending on the field type, there may also be other, specific information to fi
 
 !!! tip
 
-    You can disable the possibility to edit specific Field details per field type by [adding custom service definition for `ModifyFieldDefinitionsCollectionTypeExtension`](customize_field_type_metadata.md).
+    You can disable the possibility to edit specific field details per field type by [adding custom service definition for `ModifyFieldDefinitionsCollectionTypeExtension`](customize_field_type_metadata.md).
 
 ## Content versions
 
diff --git a/docs/content_management/field_types/field_type_reference/richtextfield.md b/docs/content_management/field_types/field_type_reference/richtextfield.md
index e35fc90e10..9f1bb9d763 100644
--- a/docs/content_management/field_types/field_type_reference/richtextfield.md
+++ b/docs/content_management/field_types/field_type_reference/richtextfield.md
@@ -106,7 +106,7 @@ When creating RichText content with the REST API, use the `xml` key of the `fiel
 
 The RichText format enriches [DocBook](https://docbook.org/) with the following custom elements:
 
-- `section` - main element of a RichText Field
+- `section` - main element of a RichText field
 - `ezembed` - holds embedded images
 - `ezembedinline` - holds embedded content items
 - `eztemplate` - holds custom tags, including built-in custom tags for embedded Facebook, Twitter and YouTube content
diff --git a/docs/content_management/field_types/type_and_value.md b/docs/content_management/field_types/type_and_value.md
index a125ff7ba8..760fde1629 100644
--- a/docs/content_management/field_types/type_and_value.md
+++ b/docs/content_management/field_types/type_and_value.md
@@ -1,5 +1,5 @@
 ---
-description: The basis of all field types are their Type and Value classes, containing, respectively, the logic and the data for the Fields.
+description: The basis of all field types are their Type and Value classes, containing, respectively, the logic and the data for the fields.
 ---
 
 # Type and Value
@@ -8,9 +8,9 @@ A field type must contain a Type class which contains the logic of the field typ
 A Type class must implement `Ibexa\Core\FieldType\FieldType` ("field type interface").
 All native field types also extend the `Ibexa\Core\FieldType\FieldType` abstract class that implements this interface and provides implementation facilities through a set of abstract methods of its own.
 
-You should also provide a value object class for storing the custom Field value provided by the field type.
+You should also provide a value object class for storing the custom field value provided by the field type.
 The Value is used to represent an instance of the field type within a content item.
-Each Field presents its data using an instance of the Type's Value class.
+Each field presents its data using an instance of the Type's Value class.
 A Value class must implement the `Ibexa\Contracts\Core\FieldType` interface.
 It may also extend the `Ibexa\Core\FieldType\Value` abstract class.
 It's meant to be stateless and as lightweight as possible.
@@ -22,13 +22,13 @@ The Type class of a field type provides an implementation of the [`Ibexa\Contrac
 
 ### Field Definition handling
 
-A custom field type is used in a Field definition of a custom content type.
+A custom field type is used in a field definition of a custom content type.
 You can additionally provide [settings for the field type](#field-type-settings) and a [validator configuration](field_type_validation.md).
 Since the public PHP API cannot know anything about these, their handling is delegated to the field type itself through the following methods:
 
 #### `getFieldTypeIdentifier()`
 
-Returns a unique identifier for the custom field type which is used to assign the type to a Field definition.
+Returns a unique identifier for the custom field type which is used to assign the type to a field definition.
 By convention it should be prefixed by a unique vendor shortcut (e.g. `ibexa` for [[= product_name =]]).
 
 #### `getSettingsSchema()`
@@ -55,14 +55,14 @@ It's important to note that the schema definitions of the field type can be both
 
 This also applies to all user interfaces and the REST API, which therefore must provide extension points to register handling code for custom field type. These extensions aren't defined yet.
 
-### field type name
+### Field type name
 
 The content item name is retrieved by the `Ibexa\Core\FieldType\FieldType::getName` method which must be implemented.
 To generate content item name or URL alias the field type name must be a part of a name schema or a URL schema.
 
 ## Value handling
 
-A field type needs to deal with the custom value format provided by it. In order for the public PHP API to work properly, it delegates working with such custom Field values to the corresponding field type. The `Ibexa\Core\FieldType\FieldType` interface therefore provides the following methods:
+A field type needs to deal with the custom value format provided by it. In order for the public PHP API to work properly, it delegates working with such custom field values to the corresponding field type. The `Ibexa\Core\FieldType\FieldType` interface therefore provides the following methods:
 
 #### `acceptValue()`
 
@@ -78,7 +78,7 @@ For example: a user provides an HTTP link as a string, `acceptValue()` converts
 
 The field type can specify that the user may define a default value for the `Field` of the type through settings. If no default value is provided, the field type is asked for an "empty value" as the final fallback.
 
-The value chain for filling a specific Field of the field type is as follows:
+The value chain for filling a specific field of the field type is as follows:
 
 1. Is a value provided by the filling user?
 2. If not, is a default value provided by the`FieldDefinition`?
@@ -140,7 +140,7 @@ This ensures that the initialization steps shared by all field types are execute
 
 To make the search engine aware of the data stored in a field type, register it as [indexable](field_type_search.md)
 
-## field type settings
+## Field type settings
 
 It's recommended to use a simple associative array format for the settings schema returned by `Ibexa\Contracts\Core\FieldType\FieldType::getSettingsSchema()`, which follows these rules:
 
diff --git a/docs/content_management/file_management/binary_and_media_download.md b/docs/content_management/file_management/binary_and_media_download.md
index 1c5c195a88..b36349f773 100644
--- a/docs/content_management/file_management/binary_and_media_download.md
+++ b/docs/content_management/file_management/binary_and_media_download.md
@@ -4,9 +4,9 @@ description: Create route to to enable binary and media files download.
 
 # Binary and Media download
 
-You can restrict files stored in BinaryFile or Media Fields to certain user roles.
+You can restrict files stored in BinaryFile or Media fields to certain user roles.
 These files aren't publicly downloadable from disk, and are instead served by Symfony, using a custom route that runs the necessary checks.
-This route is automatically generated as the `url` property for those Field values.
+This route is automatically generated as the `url` property for those field values.
 
 ## `content/download` route
 
@@ -21,8 +21,8 @@ The [`ibexa_render_field`](field_twig_functions.md#ibexa_render_field) Twig hel
 
 ## Download link generation
 
-To generate a direct download link for a File Field you have to create
-a [RouteReference](urls_and_routes.md#routereference) with the `ibexa_route` helper, passing `content` and File Field identifier as parameters.
+To generate a direct download link for a File field you have to create
+a [RouteReference](urls_and_routes.md#routereference) with the `ibexa_route` helper, passing `content` and File field identifier as parameters.
 Optional parameter `inLanguage` may be used to specify File content translation.
 
 ```html+twig
@@ -32,6 +32,6 @@ Optional parameter `inLanguage` may be used to specify File content translation.
 
 ## REST API: `uri` property
 
-The `uri` property of Binary Fields in REST contains a valid download URL, of the same format as the public PHP API, prefixed with the same host as the REST Request.
+The `uri` property of Binary fields in REST contains a valid download URL, of the same format as the public PHP API, prefixed with the same host as the REST Request.
 
 For [more information about REST API see the documentation](rest_api_usage.md).
diff --git a/docs/content_management/images/images.md b/docs/content_management/images/images.md
index 32aa5f7274..7039e57368 100644
--- a/docs/content_management/images/images.md
+++ b/docs/content_management/images/images.md
@@ -101,7 +101,7 @@ php bin/console ibexa:images:resize-original <Field identifier> <content type id
 You must provide the command with:
 
 - identifier of the image content type
-- identifier of the Field that you want to affect
+- identifier of the field that you want to affect
 - name of the image variation to apply to the images
 
 For example:
@@ -290,7 +290,7 @@ sudo apt-get install optipng
 The [RichText](richtextfield.md) field allows you to embed other 
 content items within the field.
 
-Content items that are identified as images are rendered in the Rich Text Field 
+Content items that are identified as images are rendered in the Rich Text field 
 by using a dedicated template.
 
 You can determine content types that are treated as images and rendered.
diff --git a/docs/content_management/taxonomy/taxonomy.md b/docs/content_management/taxonomy/taxonomy.md
index 542d148fa8..816fe2d20a 100644
--- a/docs/content_management/taxonomy/taxonomy.md
+++ b/docs/content_management/taxonomy/taxonomy.md
@@ -23,7 +23,7 @@ The associated content type is `tag`.
 * `ibexa_taxonomies.tags.field_mappings` - field types map of a content type which taxonomy receives information about the tag from. 
 
 Three fields are available: `identifier`, `parent` and `name`.
-The identifiers correspond to Field names defined in the content type. The `name` Field is used to automatically generate an identifier.
+The identifiers correspond to field names defined in the content type. The `name` field is used to automatically generate an identifier.
 
 ## Customize taxonomy structure
 
@@ -45,15 +45,15 @@ Translate the configuration identifier in the `ibexa_taxonomy` domain by, for ex
 taxonomy.content_categories: 'Content categories'
 ```
 
-Then, create a content type with `content_category` identifier and include the following Field definitions:
+Then, create a content type with `content_category` identifier and include the following field definitions:
 
-* `name` of `ezstring` type and required. Use this Field, as `<name>`, for content name pattern.
+* `name` of `ezstring` type and required. Use this field, as `<name>`, for content name pattern.
 * `category_identifier` of `ezstring` type and required.
 * `parent_category` of `ibexa_taxonomy_entry` type and not required. In its Taxonomy drop-down menu, select Content categories (or `taxonomy.content_categories` if no translation has been provided).
 
 Finish taxonomy setup by creating a new Content category named Root with identifier `content_categories_root` under the previously created container folder named Content categories.
 
-To use this new taxonomy, add an `ibexa_taxonomy_entry_assignement` Field to a content type and select Content categories (or `taxonomy.content_categories`) in its Taxonomy drop-down setting.
+To use this new taxonomy, add an `ibexa_taxonomy_entry_assignement` field to a content type and select Content categories (or `taxonomy.content_categories`) in its Taxonomy drop-down setting.
 
 ### Hide Content tab
 
diff --git a/docs/customer_management/cp_configuration.md b/docs/customer_management/cp_configuration.md
index cc59bdbef1..f680379290 100644
--- a/docs/customer_management/cp_configuration.md
+++ b/docs/customer_management/cp_configuration.md
@@ -70,7 +70,7 @@ To do so, [create and configure user registration form](create_user_registration
 
 ## Address
 
-With the Address field type, you can customize address Fields and configure them per country.
+With the Address field type, you can customize address fields and configure them per country.
 To learn more, see [Address field type documentation](addressfield.md).
 
 ## Templates
diff --git a/docs/customer_management/cp_page_builder.md b/docs/customer_management/cp_page_builder.md
index b45e9def50..e280bb0261 100644
--- a/docs/customer_management/cp_page_builder.md
+++ b/docs/customer_management/cp_page_builder.md
@@ -20,7 +20,7 @@ If you plan to expand your portal portfolio in the future, see [multiple portal
 First, create a Customer Portal page, its location ID needs to be later specified in the configuration.
 To do it, go to **Content** -> **Content structure**, and select **Customer Portal Page**.
 
-For now, you only need to add a name and a description in the Field view, you can find it in the upper toolbar on the left side.
+For now, you only need to add a name and a description in the field view, you can find it in the upper toolbar on the left side.
 Next, click **Publish** to see the page in the content tree.
 
 ![Add name and description to Customer Portal](img/cp_name_description.png)
diff --git a/docs/getting_started/first_steps.md b/docs/getting_started/first_steps.md
index 9f3dd8ef29..00ddab505f 100644
--- a/docs/getting_started/first_steps.md
+++ b/docs/getting_started/first_steps.md
@@ -54,9 +54,9 @@ module.exports = [ eZConfig, ibexaConfig, ...customConfigs ];
 
 5\. Input the content type's name, for example "Blog Post", and identifier: `blog_post`.
 
-6\. Below, add a Field definition of the type Text Line. Name it "Title" and give it identifier `title`.
+6\. Below, add a field definition of the type Text Line. Name it "Title" and give it identifier `title`.
 
-7\. Add another Field definition: Text (type Rich text) with identifier `text`.
+7\. Add another field definition: Text (type Rich text) with identifier `text`.
 
 8\. Save the content type.
 
diff --git a/docs/getting_started/requirements.md b/docs/getting_started/requirements.md
index b24929020d..421767ebc6 100644
--- a/docs/getting_started/requirements.md
+++ b/docs/getting_started/requirements.md
@@ -207,13 +207,13 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 === "Ibexa DXP v3.3"
 
     - For content search, Solr 7.7 LTS or Solr 8, recommended 8.11.1 or higher. Alternatively, Elasticsearch 7.16.2 or higher 7.x version.
-    - For BinaryFile Field indexing, Apache Tika 1.20 or higher 1.x version, recommended 1.28.1 or higher.
+    - For BinaryFile field indexing, Apache Tika 1.20 or higher 1.x version, recommended 1.28.1 or higher.
     - The above solutions require Oracle Java/Open JDK. The minimum requirement is 8 LTS, recommended 11 LTS. Newer versions aren't supported.
 
 === "eZ Platform v2.5"
 
     - For content search, Solr 7.7 LTS or Solr 8, recommended 8.11.1 or higher. Alternatively, Elasticsearch 7.16.2 or higher 7.x version.
-    - For BinaryFile Field indexing, Apache Tika 1.20 or higher 1.x version, recommended 1.28.1 or higher.
+    - For BinaryFile field indexing, Apache Tika 1.20 or higher 1.x version, recommended 1.28.1 or higher.
     - The above solutions require Oracle Java/Open JDK. The minimum requirement is 8 LTS, recommended 11 LTS. Newer versions aren't supported.
 
 ## Graphic Handler
diff --git a/docs/getting_started/troubleshooting.md b/docs/getting_started/troubleshooting.md
index 27e06541a7..4aec5a8a1f 100644
--- a/docs/getting_started/troubleshooting.md
+++ b/docs/getting_started/troubleshooting.md
@@ -38,11 +38,11 @@ When a system runs out of RAM, you may see `Killed` when trying to clear the cac
 
 ## Upload size limit
 
-To make use of the back office, the defined maximum upload size must be consistent with the maximum file size defined in the content type using a File, Media or Image Field.
+To make use of the back office, the defined maximum upload size must be consistent with the maximum file size defined in the content type using a File, Media or Image field.
 
 This is done by setting `LimitRequestBody` for Apache or `client_max_body_size` for nginx.
 
-For instance, if one of those Fields is configured to accept files up to 10MB, then `client_max_body_size` (in case of nginx) should be set above 10MB, with a safe margin, for example to 15MB.
+For instance, if one of those fields is configured to accept files up to 10MB, then `client_max_body_size` (in case of nginx) should be set above 10MB, with a safe margin, for example to 15MB.
 
 You also need to define settings for uploading files in `php.ini`: `upload_max_filesize` and `post_max_size`.
 
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
index 473e9a545f..9ace79cf40 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
@@ -26,7 +26,7 @@ and updated in the background when someone requests them.
 
 Current content tags (and when the system purges on them):
 
-- Content: `c<content-id>` - Purged on all smaller or larger changes to content (including its metadata, Fields and Locations).
+- Content: `c<content-id>` - Purged on all smaller or larger changes to content (including its metadata, fields and Locations).
 - Content Version: `cv<content-id>` - Purged when any version of Content is changed (for example, a draft is created or removed).
 - Content type: `ct<content-type-id>` - Used when the content type changes, affecting content of its type.
 - Location: `l<location-id>` - Used for clearing all cache relevant for a given Location.
diff --git a/docs/multisite/languages/languages.md b/docs/multisite/languages/languages.md
index 0cfed55d85..423644ab6e 100644
--- a/docs/multisite/languages/languages.md
+++ b/docs/multisite/languages/languages.md
@@ -28,15 +28,15 @@ yarn encore <environment>
 
 **The new language must then be added to the [SiteAccess](multisite.md) configuration**. Once this is done, any user with proper permissions can create content item versions in these languages in the user interface.
 
-### Translatable and untranslatable Fields
+### Translatable and untranslatable fields
 
-Language versions consist of translated values of the content item's Fields. In the content type definition every Field is set to be Translatable or not.
+Language versions consist of translated values of the content item's fields. In the content type definition every field is set to be Translatable or not.
 
-[[= product_name =]] does not decide by itself which Fields can be translated and which cannot. For some Field values the need for a translation can be obvious, for example for the body of an article. In other cases, for instance images without text, integer numbers or e-mail addresses, translation is usually unnecessary. Despite that, [[= product_name =]] gives you the possibility to mark any Field as translatable regardless of its field type. It's only your decision to exclude the translation possibility for those Fields where it makes no sense.
+[[= product_name =]] does not decide by itself which fields can be translated and which cannot. For some field values the need for a translation can be obvious, for example for the body of an article. In other cases, for instance images without text, integer numbers or e-mail addresses, translation is usually unnecessary. Despite that, [[= product_name =]] gives you the possibility to mark any field as translatable regardless of its field type. It's only your decision to exclude the translation possibility for those fields where it makes no sense.
 
-When a Field isn't flagged as Translatable, its value is copied from the initial/main translation when a new language version is created. This copied value cannot be modified. When a Field is Translatable, you have to enter its value in a new language version manually.
+When a field isn't flagged as Translatable, its value is copied from the initial/main translation when a new language version is created. This copied value cannot be modified. When a field is Translatable, you have to enter its value in a new language version manually.
 
-For example, let's say that you need to store information about marathon contestants and their results. You build a "contestant" content type using the following Fields: name, photo, age, nationality, finish time. Allowing the translation of anything other than nationality would be pointless, since the values stored by the other Fields are the same regardless of the language used to describe the contestant. In other words, the name, photo, age and finish time would be the same in, for example, both English and Norwegian.
+For example, let's say that you need to store information about marathon contestants and their results. You build a "contestant" content type using the following fields: name, photo, age, nationality, finish time. Allowing the translation of anything other than nationality would be pointless, since the values stored by the other fields are the same regardless of the language used to describe the contestant. In other words, the name, photo, age and finish time would be the same in, for example, both English and Norwegian.
 
 ### Access control
 
diff --git a/docs/personalization/enable_personalization.md b/docs/personalization/enable_personalization.md
index 8465128dfa..ea160bb3ad 100644
--- a/docs/personalization/enable_personalization.md
+++ b/docs/personalization/enable_personalization.md
@@ -397,7 +397,7 @@ render(controller('ibexa_personalization::showRecommendationsAction', {
 | `crossContentType`| bool | If set to `true`, returns recommendations for all content types specified in the scenario. |
 | `limit`          | int    | Number of recommendations to fetch. |
 | `template`       | string | Template name. |
-| `attributes`     | array  | Fields that are required and are requested from the Personalization server. These Field names are also used inside Handlebars templates. |
+| `attributes`     | array  | Fields that are required and are requested from the Personalization server. These field names are also used inside Handlebars templates. |
 
 You can also bypass named arguments with standard value passing as arguments.
 
@@ -413,7 +413,7 @@ in the recommendation call.
 This response data can be used in templates to render and style recommendations.
 
 For example, the following GET request should deliver the response below
-if the content Fields were previously exported by the export script.
+if the content fields were previously exported by the export script.
 
 `GET https://reco.perso.ibexa.co/api/v2/<your_customer_id>/someuser/popular.json?contextitems=71&numrecs=5&categorypath=/&outputtypeid=<your_item_type>&attribute=name,author,uri,image`
 
diff --git a/docs/release_notes/ez_platform_v1.10.0.md b/docs/release_notes/ez_platform_v1.10.0.md
index a524df3883..2445b6244d 100644
--- a/docs/release_notes/ez_platform_v1.10.0.md
+++ b/docs/release_notes/ez_platform_v1.10.0.md
@@ -33,7 +33,7 @@ As part of ongoing effort to simplify everyday aspects of the API for v2, [one n
 
 ###### Example
 
-For objects such as Content, ContentType, Field Definitions and more, to get translated name, description or fields you would before this change have to do the following in PHP and Twig:
+For objects such as content, content type, field definitions and more, to get translated name, description or fields you would before this change have to do the following in PHP and Twig:
 
 **Typical use of API prior to v1.10:**
 
diff --git a/docs/release_notes/ez_platform_v2.1.0.md b/docs/release_notes/ez_platform_v2.1.0.md
index 2d4bef87a4..29315c96ca 100644
--- a/docs/release_notes/ez_platform_v2.1.0.md
+++ b/docs/release_notes/ez_platform_v2.1.0.md
@@ -12,9 +12,9 @@
 
 ### Custom Tags
 
-You can now add custom tags to RichText Fields.
+You can now add custom tags to RichText fields.
 
-Custom tags enable you to extend the menu of available elements when editing a RichText Field with the Online Editor.
+Custom tags enable you to extend the menu of available elements when editing a RichText field with the Online Editor.
 
 See [Custom tags](https://doc.ibexa.co/en/2.5/guide/extending/extending_online_editor/#custom-tags) for more information.
 
diff --git a/docs/release_notes/ez_platform_v2.5.md b/docs/release_notes/ez_platform_v2.5.md
index adf1fe75ee..40aac81bba 100644
--- a/docs/release_notes/ez_platform_v2.5.md
+++ b/docs/release_notes/ez_platform_v2.5.md
@@ -49,7 +49,7 @@ See [GraphQL documentation](https://graphql.org/) for more information about Gra
 ### Matrix field type
 
 The new [Matrix field type](https://doc.ibexa.co/en/2.5/api/field_types_reference/matrixfield) enables you to store a table of data.
-Columns in the matrix are defined in the Field definition.
+Columns in the matrix are defined in the field definition.
 
 ![Configuring a Matrix field type](2.5_matrix_ft.png)
 
@@ -80,13 +80,13 @@ all features related to user management, such as user accounts, registering, cha
 
 ### Online editor improvements
 
-#### Anchors in Rich Text Field
+#### Anchors in Rich Text field
 
-You can now link fragments of text by adding Anchors in Rich Text Fields.
+You can now link fragments of text by adding Anchors in Rich Text fields.
 
 #### Inline custom tags
 
-You can now create [inline custom tags](https://doc.ibexa.co/en/2.5/guide/extending/extending_online_editor/#inline-custom-tags) in Rich Text Fields.
+You can now create [inline custom tags](https://doc.ibexa.co/en/2.5/guide/extending/extending_online_editor/#inline-custom-tags) in Rich Text fields.
 
 #### Custom CK Editor plugins
 
@@ -111,7 +111,7 @@ The User Settings menu has been expanded with the following options:
 
 - Preferred language of the back office
 - Preferred date format
-- Option to enable or disable a character counter for Rich Text Fields
+- Option to enable or disable a character counter for Rich Text fields
 
 ![User settings screen with new settings](2.5_user_settings.png)
 
@@ -279,6 +279,6 @@ With v2.5.6 you can optionally use Solr 7.7. To enable it:
 
 When searching in the back office you can now select languages to filter results through.
 
-### Searchable Matrix Field
+### Searchable Matrix field
 
-The Matrix Field isn't fully searchable.
+The Matrix field isn't fully searchable.
diff --git a/docs/release_notes/ez_platform_v3.1.md b/docs/release_notes/ez_platform_v3.1.md
index 3b3a6b9842..f237701f8e 100644
--- a/docs/release_notes/ez_platform_v3.1.md
+++ b/docs/release_notes/ez_platform_v3.1.md
@@ -47,21 +47,21 @@ This release of eZ Platform introduces the following new features:
 
     ![](3_1_filter_elements.png)
 
-    ### Field Group permissions
+    ### Field group permissions
 
-    The new [Field Group Limitation](https://doc.ibexa.co/en/latest/guide/limitation_reference/#field-group-limitation)
-    enables you to control who can edit content Fields per Field group.
+    The new [field group Limitation](https://doc.ibexa.co/en/latest/guide/limitation_reference/#field-group-limitation)
+    enables you to control who can edit content fields per field group.
     
     ### Version comparison
     
-    You can now compare additional Fields in version comparison of content item:
+    You can now compare additional fields in version comparison of content item:
     
     - Content Relation and Content Relations
     - Image Asset and Image
     - Matrix
     - Media
     
-    For overview of additional Fields, see [User documentation on Comparing versions]([[= user_doc =]]/publishing/publishing/#comparing-versions).
+    For overview of additional fields, see [User documentation on Comparing versions]([[= user_doc =]]/publishing/publishing/#comparing-versions).
     
 ### URL management UI
 
@@ -87,15 +87,15 @@ For more information about configuring the Universal Discovery Widget, see [Exte
 
 ### Field group display
 
-Display of Field groups has been improved in content preview and editing.
+Display of field groups has been improved in content preview and editing.
 
-When editing, Field groups are now presented in tabs:
+When editing, field groups are now presented in tabs:
 
-![Field group tabls in Content editing](3.1_collapsible_fields_edit.png)
+![Field group tabls in content editing](3.1_collapsible_fields_edit.png)
 
 In Content preview, the group sections are collapsible:
 
-![Collapsible Field groups in Content view](3.1_collapsible_fields.png)
+![Collapsible field groups in content view](3.1_collapsible_fields.png)
 
 ### Saving incomplete draft
 
diff --git a/docs/search/aggregation_reference/aggregation_reference.md b/docs/search/aggregation_reference/aggregation_reference.md
index ee8edf9d55..0d713f2e4f 100644
--- a/docs/search/aggregation_reference/aggregation_reference.md
+++ b/docs/search/aggregation_reference/aggregation_reference.md
@@ -38,7 +38,7 @@ There are three types of aggregations:
 
 ## Field aggregations
 
-|Name | Type | Based on Field|
+|Name | Type | Based on field|
 |---|---|---|
 |[AuthorTermAggregation](authorterm_aggregation.md) | Term | [Author](authorfield.md) |
 |[CheckboxTermAggregation](checkboxterm_aggregation.md) | Term |[Checkbox](checkboxfield.md)|
diff --git a/docs/search/search_criteria_and_sort_clauses.md b/docs/search/search_criteria_and_sort_clauses.md
index 6e7790f97f..165ef184e8 100644
--- a/docs/search/search_criteria_and_sort_clauses.md
+++ b/docs/search/search_criteria_and_sort_clauses.md
@@ -32,7 +32,7 @@ In such cases you can implement a custom Criterion or Sort Clause, together with
 
     Field Criterion and Sort Clause do not perform well by design when using SQL database.
     If you have a large database and want to use them, you either need to use the Solr search engine,
-    or develop your own Custom Criterion or Sort Clause. This way you can avoid using the attributes (Fields) database table,
+    or develop your own Custom Criterion or Sort Clause. This way you can avoid using the attributes (fields) database table,
     and instead use a custom simplified table which can handle the amount of data you have.
 
 ### Difference between Content and Location Search
diff --git a/docs/search/search_engines/elastic_search/configure_elastic_search.md b/docs/search/search_engines/elastic_search/configure_elastic_search.md
index b32417f5eb..9845452c1f 100644
--- a/docs/search/search_engines/elastic_search/configure_elastic_search.md
+++ b/docs/search/search_engines/elastic_search/configure_elastic_search.md
@@ -335,7 +335,7 @@ By default, debugging is disabled. To enable debugging, you can toggle either of
 ## Define field type mapping templates
 
 Before you can re-index the [[= product_name =]] data, so that Elasticsearch can search through its contents, you must define an index template.
-Templates instruct Elasticsearch to recognize [[= product_name =]] Fields as specific data types, based on, for example, a field name.
+Templates instruct Elasticsearch to recognize [[= product_name =]] fields as specific data types, based on, for example, a field name.
 They help you prevent Elasticsearch from using the dynamic field mapping feature to create type mappings automatically.
 You can create several field type mapping templates for each index, for example, to define settings that are specific for different languages.
 When you establish a relationship between a field mapping template and a connection, you can apply several templates, too.
diff --git a/docs/templating/queries_and_controllers/content_queries.md b/docs/templating/queries_and_controllers/content_queries.md
index 8c1f729082..0a67f1a860 100644
--- a/docs/templating/queries_and_controllers/content_queries.md
+++ b/docs/templating/queries_and_controllers/content_queries.md
@@ -1,5 +1,5 @@
 ---
-description: Query content by using Query types and content query Field.
+description: Query content by using Query types and content query field.
 ---
 
 # Content queries
@@ -19,7 +19,7 @@ For more complex cases, you can build custom [controllers](controllers.md).
 ## Query types
 
 The Query controller offers a set of [built-in Query types](built-in_query_types.md).
-You can use them in the content view configuration, or in the [Content query Field](#content-query-field).
+You can use them in the content view configuration, or in the [content query field](#content-query-field).
 
 You can also write [custom Query types](create_custom_query_type.md) for the cases that aren't covered by the built-in ones.
 
@@ -81,16 +81,16 @@ Use the [`pagerfanta`](https://www.babdev.com/open-source/packages/pagerfanta/do
 [[= include_file('code_samples/front/query_pagination/templates/themes/my_theme/full/folder.html.twig') =]]
 ```
 
-## Content query Field
+## Content query field
 
-The [Content query Field](contentqueryfield.md) is a Field that defines a query.
-The results of the query are available in the Field value.
+The [Content query field](contentqueryfield.md) is a field that defines a query.
+The results of the query are available in the field value.
 
-![Content query Field definition](content_query_field_definition.png)
+![Content query field definition](content_query_field_definition.png)
 
 ### Query type
 
-When adding the Field to a content type definition, select the Query type in the **Query type** dropdown.
+When adding the field to a content type definition, select the Query type in the **Query type** dropdown.
 All Query types in the application are available, both [built-in](built-in_query_types.md) and [custom ones](create_custom_query_type.md).
 
 ### Returned types
@@ -107,8 +107,8 @@ contentType: '@=returnedType'
 
 Select **Enable pagination** and set the number of items per page to paginate the results.
 
-You can override the pagination settings from Field definition
-by setting the `enablePagination`, `disablePagination` or `itemsPerPage` parameters when rendering the Content query Field:
+You can override the pagination settings from field definition
+by setting the `enablePagination`, `disablePagination` or `itemsPerPage` parameters when rendering the content query field:
 
 ``` html+twig
 {{ ibexa_render_field(content, 'query', {
@@ -144,14 +144,14 @@ The following variables are available in parameter expressions:
 
 ### Content view configuration
 
-To render a Content query Field, in the content view configuration, use the `content_query_field` view type:
+To render a content query field, in the content view configuration, use the `content_query_field` view type:
 
 ``` yaml
 [[= include_file('code_samples/front/list_content/config/packages/views.yaml', 8, 9) =]][[= include_file('code_samples/front/list_content/config/packages/views.yaml', 22, 28) =]]
 ```
 
-The identifier of the Content query Field must be matched by
+The identifier of the content query field must be matched by
 using the `'@Ibexa\FieldTypeQuery\ContentView\FieldDefinitionIdentifierMatcher'` matcher.
 
 Query results are provided to the template in the `items` variable.
-See [List content](list_content.md#list-children-in-content-query-field) for an example of using the Content query Field.
+See [List content](list_content.md#list-children-in-content-query-field) for an example of using the content query field.
diff --git a/docs/tutorials/generic_field_type/6_settings.md b/docs/tutorials/generic_field_type/6_settings.md
index 8c297fd1b9..6811db5e5f 100644
--- a/docs/tutorials/generic_field_type/6_settings.md
+++ b/docs/tutorials/generic_field_type/6_settings.md
@@ -1,10 +1,10 @@
 ---
-description: Learn how to add settings that format the Field value.
+description: Learn how to add settings that format the field value.
 ---
 
 # Step 6 - Implement Point 2D settings
 
-Implementing settings enables you to define the format for displaying the Field on the page.
+Implementing settings enables you to define the format for displaying the field on the page.
 To do so, create the `format` field where you're able to change the way coordinates for Point 2D are displayed.
 
 ## Define field type format
diff --git a/docs/tutorials/generic_field_type/creating_a_point2d_field_type.md b/docs/tutorials/generic_field_type/creating_a_point2d_field_type.md
index 55ef83b7b4..4dfafe5a6d 100644
--- a/docs/tutorials/generic_field_type/creating_a_point2d_field_type.md
+++ b/docs/tutorials/generic_field_type/creating_a_point2d_field_type.md
@@ -12,7 +12,7 @@ Field types are responsible for:
 - Storing data, either using the native storage engine mechanisms or specific means
 - Validating input data
 - Making the data searchable (if applicable)
-- Displaying Fields
+- Displaying fields
 
 You can find more information in [field type documentation](field_types.md).
 It describes how each component of a field type interacts with the various layers of the system, and how to implement them.
diff --git a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
index 74f0e56912..e99c94f66f 100644
--- a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
+++ b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
@@ -679,7 +679,7 @@ You can find it in https://github.com/ezsystems/ezplatform-ee-installer/blob/2.3
 
 !!! caution "Form (ezform) field type"
 
-    After the update, in order to create forms, you have to add a new content type (for example, named "Form") that contains `Form` Field (this content type can contain other fields
+    After the update, in order to create forms, you have to add a new content type (for example, named "Form") that contains `Form` field (this content type can contain other fields
     as well). After that you can use forms inside Landing Pages via Embed block.
 
 ### C. Update to v2.4
@@ -943,7 +943,7 @@ CREATE INDEX idx_workflow_name ON ezeditorialworkflow_workflows(workflow_name);
     Clear the cache and refresh the page. The dropdown should now be active.
     Select any option in the dropdown and save the content type.
 
-    You should now be able to remove the Field definition from the content type.
+    You should now be able to remove the field definition from the content type.
 
     Afterwards, you can remove the configuration above from `ezplatform.yml`.
 
diff --git a/docs/update_and_migration/from_2.5/update_code/3_update_field_types.md b/docs/update_and_migration/from_2.5/update_code/3_update_field_types.md
index 9cac1548e6..d2fc28f014 100644
--- a/docs/update_and_migration/from_2.5/update_code/3_update_field_types.md
+++ b/docs/update_and_migration/from_2.5/update_code/3_update_field_types.md
@@ -49,7 +49,7 @@ You need to replace importing the following classes:
 
 ## Extending field type templates
 
-If you extended templates for `ezobjectrelationlist_field`, `ezimageasset_field`, or `ezobjectrelation_field` Fields
+If you extended templates for `ezobjectrelationlist_field`, `ezimageasset_field`, or `ezobjectrelation_field` fields
 using `{% extends "@EzPublishCore/content_fields.html.twig" %}`,
 you now need to extend `EzSystemsPlatformHttpCache` instead, if you wish to make use of cache:
 `{% extends "@EzSystemsPlatformHttpCache/content_fields.html.twig" %}`.
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/common_issues.md b/docs/update_and_migration/migrate_to_ibexa_dxp/common_issues.md
index e943588555..036294e53d 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/common_issues.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/common_issues.md
@@ -60,9 +60,9 @@ The command can be executed in two modes:
 
 You can read more about this issue here: [EZP-27254](https://issues.ibexa.co/browse/EZP-27254)
 
-## Always available flag set on all Fields
+## Always available flag set on all fields
 
-Always available flag is set on all Fields, instead of only on Fields in the main
+Always available flag is set on all fields, instead of only on fields in the main
 language. This problem occurs when [[= product_name =]] is used to create content that is both
 always available and has multiple translations. The cleanup script correctly sets
 always available flag for prioritized language filtering in Legacy search engine.
@@ -71,14 +71,14 @@ always available flag for prioritized language filtering in Legacy search engine
 php bin/console ezpublish:update:legacy_storage_fix_fields_always_available_flag
 ```
 
-Only affected Fields are processed by the cleanup command.
+Only affected fields are processed by the cleanup command.
 
 You can read more about this issue here: [EZP-24882](https://issues.ibexa.co/browse/EZP-24882)
 
 ## Listing sub-content
 
 it's possible that after upgrade `sort_key_string` is left empty. This may cause problems
-in searches throughout the API. The cleanup script checks if Fields of given Field
+in searches throughout the API. The cleanup script checks if fields of given field
 Type have correct sort key, and update it if needed.
 
 Execute the following command from the installation root directory:
diff --git a/docs/users/customer_groups.md b/docs/users/customer_groups.md
index 1558126fe6..c5ece13415 100644
--- a/docs/users/customer_groups.md
+++ b/docs/users/customer_groups.md
@@ -20,4 +20,4 @@ For example, you can offer a 10% discount for all products in the catalog to use
 To enable using customer groups, you need to modify the User content type's definition
 by adding a [Customer Group Field](customergroupfield.md).
 
-With this Field you can add a user to any of the predefined customer groups.
+With this field you can add a user to any of the predefined customer groups.

From 705aa0f70e1c3b6b6b47511419036aaff0f2a5a2 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Fri, 11 Oct 2024 09:24:56 +0200
Subject: [PATCH 09/77] Capitalization fixes

---
 .../back_office/customize_search_suggestion.md     |  2 +-
 docs/content_management/content_relations.md       |  2 +-
 .../data_migration/add_data_migration_matcher.md   |  2 +-
 .../data_migration/data_migration.md               |  8 ++++----
 .../data_migration/exporting_data.md               | 14 +++++++-------
 .../data_migration/importing_data.md               |  4 ++--
 .../field_type_reference/contentqueryfield.md      |  2 +-
 .../field_type_reference/field_type_reference.md   |  2 +-
 .../field_types/field_type_storage.md              |  2 +-
 .../rich_text/online_editor_guide.md               |  2 +-
 docs/content_management/user_generated_content.md  |  2 +-
 docs/customer_management/customer_portal_guide.md  |  2 +-
 docs/getting_started/first_steps.md                |  8 ++++----
 .../cache/http_cache/content_aware_cache.md        |  6 +++---
 .../cache/persistence_cache.md                     |  6 +++---
 docs/multisite/languages/languages.md              |  4 ++--
 docs/multisite/multisite.md                        |  2 +-
 docs/multisite/site_factory/site_factory.md        |  2 +-
 docs/permissions/permission_use_cases.md           |  4 ++--
 docs/pim/pim_configuration.md                      |  2 +-
 docs/pim/pim_guide.md                              |  2 +-
 docs/release_notes/ez_platform_v3.1.md             |  2 +-
 .../embed_and_list_content/embed_content.md        |  2 +-
 .../2_create_the_content_model.md                  |  2 +-
 .../3_customize_the_front_page.md                  |  2 +-
 .../from_1.x_2.x/update_db_to_2.5.md               |  2 +-
 .../migrating_from_ez_publish_platform.md          |  6 +++---
 docs/users/oauth_client.md                         |  6 +++---
 docs/users/user_authentication.md                  |  6 +++---
 29 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/docs/administration/back_office/customize_search_suggestion.md b/docs/administration/back_office/customize_search_suggestion.md
index cf527f6a90..7fb24af739 100644
--- a/docs/administration/back_office/customize_search_suggestion.md
+++ b/docs/administration/back_office/customize_search_suggestion.md
@@ -34,7 +34,7 @@ After this event, the suggestion collection is sorted by score and truncated to
     php bin/console debug:event BuildSuggestionCollectionEvent
     ```
 
-The following example is boosting Product suggestions.
+The following example is boosting product suggestions.
 It's a subscriber that passes after the default one (because priority is set to zero), adds matching products at a score above the earlier content suggestions, and avoids duplicates.
 
 - If the suggestion source finds a number of matching products that is equal or greater than the `result_limit`, only those products end up in the suggestion.
diff --git a/docs/content_management/content_relations.md b/docs/content_management/content_relations.md
index 38f7316c61..19de54b0d2 100644
--- a/docs/content_management/content_relations.md
+++ b/docs/content_management/content_relations.md
@@ -9,7 +9,7 @@ However, content items themselves can also be related to one another.
 
 ![Content Relations](content_management_relations.png "Content Relations")
 
-A **Relation** can exist between any two content items in the Repository.
+A **Relation** can exist between any two content items in the repository.
 For example, images are linked to news articles they're used in.
 Instead of using a fixed set of image attributes, the images are stored as separate content items outside the article.
 
diff --git a/docs/content_management/data_migration/add_data_migration_matcher.md b/docs/content_management/data_migration/add_data_migration_matcher.md
index 32544b020b..976a5f11cc 100644
--- a/docs/content_management/data_migration/add_data_migration_matcher.md
+++ b/docs/content_management/data_migration/add_data_migration_matcher.md
@@ -4,7 +4,7 @@ description: Create a matcher for handling data migrations.
 
 # Create data migration matcher
 
-[Matchers in data migrations](exporting_data.md#match-property) enable you to select which data from the Repository to export.
+[Matchers in data migrations](exporting_data.md#match-property) enable you to select which data from the repository to export.
 
 In addition to the built-in matchers, you can create custom matchers for content.
 
diff --git a/docs/content_management/data_migration/data_migration.md b/docs/content_management/data_migration/data_migration.md
index cde2f3286e..8c5441b88d 100644
--- a/docs/content_management/data_migration/data_migration.md
+++ b/docs/content_management/data_migration/data_migration.md
@@ -1,5 +1,5 @@
 ---
-description: Data migration enables you to import and export Repository data by using YAML files.
+description: Data migration enables you to import and export repository data by using YAML files.
 page_type: landing_page
 ---
 
@@ -7,9 +7,9 @@ page_type: landing_page
 
 Data migration allows exporting and importing selected data from an [[= product_name =]] installation.
 
-[*Exporting*](exporting_data.md) data consists in saving selected Repository information in YAML format.
-[*Importing*](importing_data.md) reads migration YAML files and creates or modifies Repository content based on them.
-You can migrate your Repository data, that is content items, as well as content types, languages, Object states, Sections, and so on,
+[*Exporting*](exporting_data.md) data consists in saving selected repository information in YAML format.
+[*Importing*](importing_data.md) reads migration YAML files and creates or modifies repository content based on them.
+You can migrate your repository data, that is content items, as well as content types, languages, Object states, Sections, and so on,
 between installations.
 
 You can use migrations in projects that require the same data to be present across multiple instances.
diff --git a/docs/content_management/data_migration/exporting_data.md b/docs/content_management/data_migration/exporting_data.md
index 87049921a9..2e193c6315 100644
--- a/docs/content_management/data_migration/exporting_data.md
+++ b/docs/content_management/data_migration/exporting_data.md
@@ -1,5 +1,5 @@
 ---
-description: Export Repository data to use in future data migrations.
+description: Export repository data to use in future data migrations.
 page_type: reference
 ---
 
@@ -7,8 +7,8 @@ page_type: reference
 
 To see an example of migrations in action, export data already present in your installation.
 
-To export Repository content, use the `ibexa:migrations:generate` command.
-This command generates a YAML file with the requested part of the Repository.
+To export repository content, use the `ibexa:migrations:generate` command.
+This command generates a YAML file with the requested part of the repository.
 The file is located by default in the `src/Migrations/Ibexa/migrations` folder
 or in [a custom folder that you configure](managing_migrations.md#migration-folders).
 You can later use this file to import the data.
@@ -141,7 +141,7 @@ Note that you should test your migrations. See [Importing data](importing_data.m
 
 ## type
 
-The mandatory `--type` option defines the type of Repository data to export.
+The mandatory `--type` option defines the type of repository data to export.
 The following types are available:
 
 - `content`
@@ -210,7 +210,7 @@ This option is also important if you use [several repositories with their own da
 
 ## match-property
 
-The optional `--match-property` option, together with `value`, enables you to select which data from the Repository to export.
+The optional `--match-property` option, together with `value`, enables you to select which data from the repository to export.
 `match-property` defines what property should be used as a criterion for selecting data.
 The following properties are available (per type):
 
@@ -269,7 +269,7 @@ You can extend the list of available matchers by creating [a custom one](add_dat
 
 ## value
 
-The optional `--value` option, together with `match-property`, filters the Repository content that the command exports.
+The optional `--value` option, together with `match-property`, filters the repository content that the command exports.
 `value` defines which values of the `match-property` should be included in the export.
 
 For example, to export only Article content items, use the `content_type_identifier` match property with `article` as the value:
@@ -298,7 +298,7 @@ php bin/console ibexa:migrations:generate --type=content --mode=create --file=my
 ## user-context
 
 The optional `--user-context` option enables you to run the export command as a specified User.
-The command only exports Repository data that the selected User has access to.
+The command only exports repository data that the selected User has access to.
 By default the admin account is used, unless specifically overridden by this option or in
 bundle configuration (`ibexa_migrations.default_user_login`).
 
diff --git a/docs/content_management/data_migration/importing_data.md b/docs/content_management/data_migration/importing_data.md
index a1fd2ae176..a2316b1a09 100644
--- a/docs/content_management/data_migration/importing_data.md
+++ b/docs/content_management/data_migration/importing_data.md
@@ -1,12 +1,12 @@
 ---
-description: Import data into your Repository from prepared YAML files.
+description: Import data into your repository from prepared YAML files.
 page_type: reference
 month_change: false
 ---
 
 # Importing data
 
-To import data from YAML migration files into Repository, you run the `ibexa:migrations:migrate` command.
+To import data from YAML migration files into repository, you run the `ibexa:migrations:migrate` command.
 
 The `ibexa:migrations:import` command automatically places migration files in the correct folder.
 
diff --git a/docs/content_management/field_types/field_type_reference/contentqueryfield.md b/docs/content_management/field_types/field_type_reference/contentqueryfield.md
index fc281e7ccb..fc752e2419 100644
--- a/docs/content_management/field_types/field_type_reference/contentqueryfield.md
+++ b/docs/content_management/field_types/field_type_reference/contentqueryfield.md
@@ -1,6 +1,6 @@
 # Content query field type
 
-This field type maps an executable Repository query to a Field.
+This field type maps an executable repository query to a Field.
 
 | Name      | Internal name | Expected input |
 |-----------|---------------|----------------|
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
index 00a0fa0362..0b0bcda2a6 100644
--- 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
@@ -23,7 +23,7 @@ Custom field types have to be programmed in PHP. However, the built-in field ty
 | [Author](authorfield.md) | Stores a list of authors, each consisting of author name and author email. | No | Yes |
 | [BinaryFile](binaryfilefield.md) | Stores a file.| Yes | Yes |
 | [Checkbox](checkboxfield.md) | Stores a boolean value. | Yes | Yes |
-| [Content query](contentqueryfield.md) | Maps an executable Repository query to a Field. | No | No |
+| [Content query](contentqueryfield.md) | Maps an executable repository query to a Field. | No | No |
 | [Country](countryfield.md) | Stores country names as a string. | Yes[^1^](#1-note-on-legacy-search-engine) | Yes |
 | [Customer group](customergroupfield.md) | Stores customer group to which a user belongs.
 | [DateAndTime](dateandtimefield.md) | Stores a full date including time information. | Yes | Yes |
diff --git a/docs/content_management/field_types/field_type_storage.md b/docs/content_management/field_types/field_type_storage.md
index c845e9c13c..0e2a65e390 100644
--- a/docs/content_management/field_types/field_type_storage.md
+++ b/docs/content_management/field_types/field_type_storage.md
@@ -138,7 +138,7 @@ The registry mechanism is realized as a base class for `FieldStorage` implementa
 ### Registering external storage
 
 To use external storage, you need to define a service implementing the `Ibexa\Contracts\Core\FieldType\FieldStorage` interface
-and tag it as `ibexa.field_type.storage.external.handler` to be recognized by the Repository.
+and tag it as `ibexa.field_type.storage.external.handler` to be recognized by the repository.
 
 Here is an example for the `myfield` field type:
 
diff --git a/docs/content_management/rich_text/online_editor_guide.md b/docs/content_management/rich_text/online_editor_guide.md
index be46e8ed3e..64a343ade0 100644
--- a/docs/content_management/rich_text/online_editor_guide.md
+++ b/docs/content_management/rich_text/online_editor_guide.md
@@ -27,7 +27,7 @@ To start using it, create any content item with a RichText Field
 
 Online Editor covers all fundamental formatting options for rich text, 
 such as headings, lists, tables, inline text formatting, anchors and links. 
-It also allows embedding other content from the Repository, as well as from Facebook, Twitter or YouTube.
+It also allows embedding other content from the repository, as well as from Facebook, Twitter or YouTube.
 
 #### Links
 
diff --git a/docs/content_management/user_generated_content.md b/docs/content_management/user_generated_content.md
index 6d6157cef8..f9e59d6bb2 100644
--- a/docs/content_management/user_generated_content.md
+++ b/docs/content_management/user_generated_content.md
@@ -1,5 +1,5 @@
 ---
-description: You can enable users to create new content in the Repository by using forms available in the front end of the site.
+description: You can enable users to create new content in the repository by using forms available in the front end of the site.
 ---
 
 # User-generated content
diff --git a/docs/customer_management/customer_portal_guide.md b/docs/customer_management/customer_portal_guide.md
index 429f7f323d..de60c6e550 100644
--- a/docs/customer_management/customer_portal_guide.md
+++ b/docs/customer_management/customer_portal_guide.md
@@ -62,7 +62,7 @@ The main company management takes place in the back office where each company ha
 From there, they can activate and deactivate the company, edit its information, invite members, manage their roles and edit their basic information.
 
 In the roles section, you can define policies for each user group, for example, a Company buyer. 
-You can also set up Policies for every user who has a business account by editing a Corporate Access role.
+You can also set up policies for every user who has a business account by editing a Corporate Access role.
 
 ### Members
 
diff --git a/docs/getting_started/first_steps.md b/docs/getting_started/first_steps.md
index 00ddab505f..dfd2a8e8fa 100644
--- a/docs/getting_started/first_steps.md
+++ b/docs/getting_started/first_steps.md
@@ -243,11 +243,11 @@ Call the group "Bloggers".
 
 5\. Now add policies that allow the User to create and publish content, limited to Blog Posts:
 
-- `Content/Create` with Limitation for content type Blog Post
-- `Content/Edit` with Limitation for content type Blog Post
-- `Content/Publish` with Limitation for content type Blog Post
+- `Content/Create` with limitation for content type Blog Post
+- `Content/Edit` with limitation for content type Blog Post
+- `Content/Publish` with limitation for content type Blog Post
 
-![Adding Limitations to a policy](first-steps-policy-limitations.png)
+![Adding limitations to a policy](first-steps-policy-limitations.png)
 
 6\. In the Assignments tab assign the "Blogger" role to the "Bloggers" group.
 
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
index 9ace79cf40..c740b9fcdd 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
@@ -256,7 +256,7 @@ See [Tagging from Twig Templates](https://foshttpcachebundle.readthedocs.io/en/l
 
 ### Default tag purging
 
-`ibexa/http-cache` uses Repository API event subscribers to listen to events emitted on Repository operations,
+`ibexa/http-cache` uses repository API event subscribers to listen to events emitted on repository operations,
 and depending on the operation triggers expiry on a specific tag or set of tags.
 All event subscribers can be found in `http-cache/src/lib/EventSubscriber/CachePurge`.
 
@@ -352,7 +352,7 @@ Example for purging by all cache:
 bin/console fos:httpcache:invalidate:tag ez-all
 ```
 
-!!! tip "Purge is done on the current Repository"
+!!! tip "Purge is done on the current repository"
 
     Similarly to purging from code, the tags you purge on, are prefixed to match the currently configured SiteAccess. 
     When you use this command in combination with multi-repository setup, make sure to specify SiteAccess argument.
@@ -592,7 +592,7 @@ Surrogate-Key: ez-all
 
 The `Cache-Control` and `Vary` headers look correct. The request is handled by a custom controller and the `Surrogate-Key` only contains the default `ez-all` value. 
 This isn't a problem as long as the controller
-does not return values from any Content in the [[= product_name =]] Repository. If it does, the controller should also add
+does not return values from any Content in the [[= product_name =]] repository. If it does, the controller should also add
 the corresponding IDs to such objects in that header.
 
 The `Set-Cookie` here may cause the problem. A ESI fragment should never set a cookie because:
diff --git a/docs/infrastructure_and_maintenance/cache/persistence_cache.md b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
index 83960f8f13..56f36288b4 100644
--- a/docs/infrastructure_and_maintenance/cache/persistence_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
@@ -10,7 +10,7 @@ description: Persistence cache caches SPI\Persistence calls used in common page
 
 Persistence cache can best be described as an implementation of `SPI\Persistence` that decorates the main backend implementation, aka Storage Engine *(currently: "Legacy Storage Engine")*.
 
-As shown in the illustration, this is done in the exact same way as the Event layer is a custom implementation of `API\Repository` decorating the main Repository.
+As shown in the illustration, this is done in the exact same way as the Event layer is a custom implementation of `API\Repository` decorating the main repository.
 In the case of Persistence Cache, instead of sending events on calls passed on to the decorated implementation, most of the load calls are cached, and calls that perform changes purge the affected caches.
 Cache handlers *(Memcached, Redis, Filesystem, etc.)* can be configured using Symfony configuration.
 For details on how to reuse this Cache service in your own custom code, see below.
@@ -66,7 +66,7 @@ to use [FilesystemTagAwareAdapter](https://github.com/ibexa/recipes/blob/master/
 
 You can select a different cache backend and configure its parameters in the relevant file in the `cache_pool` folder.
 
-### Multi Repository setup
+### Multi repository setup
 
 You can [configure multisite to work with multiple Repositories](repository_configuration.md#defining-custom-connection).
 Then, in configuration you can specify which cache pool you want to use on a SiteAccess or SiteAccess group level.
@@ -83,7 +83,7 @@ ibexa:
             cache_service_name: '%cache_pool%'
 ```
 
-!!! note "One cache pool for each Repository"
+!!! note "One cache pool for each repository"
 
     If your installation has several Repositories *(databases)*, make sure every group of sites using different Repositories also uses a different cache pool.
 
diff --git a/docs/multisite/languages/languages.md b/docs/multisite/languages/languages.md
index 423644ab6e..be3f55d785 100644
--- a/docs/multisite/languages/languages.md
+++ b/docs/multisite/languages/languages.md
@@ -40,7 +40,7 @@ For example, let's say that you need to store information about marathon contest
 
 ### Access control
 
-You can control whether a user or user group is able to translate content or not. You do this by adding a [Language limitation](limitation_reference.md#language-limitation) to policies that allow creating or editing content. This Limitation enables you to define which role can work with which languages in the system. (For more information of the permissions system, see [Permissions](permissions.md).)
+You can control whether a user or user group is able to translate content or not. You do this by adding a [Language limitation](limitation_reference.md#language-limitation) to policies that allow creating or editing content. This limitation enables you to define which role can work with which languages in the system. (For more information of the permissions system, see [Permissions](permissions.md).)
 
 In addition, you can also control the access to the global translation list by using the Content/Translations policy. This policy allows users to add and remove languages from the global translation list.
 
@@ -171,7 +171,7 @@ ibexa:
 
 If the `translation_siteaccesses` setting isn't provided, implicit *related SiteAccesses* is used instead. SiteAccesses are considered *related* if they share:
 
-- The same Repository
+- The same repository
 - The same root `location_id` (see [Multisite](multisite.md))
 
 ### Fallback languages and missing translations
diff --git a/docs/multisite/multisite.md b/docs/multisite/multisite.md
index e454df2dda..e9e49103fb 100644
--- a/docs/multisite/multisite.md
+++ b/docs/multisite/multisite.md
@@ -1,5 +1,5 @@
 ---
-description: Multisite enables hosting multiple websites with different content, templates and configuration using one Repository.
+description: Multisite enables hosting multiple websites with different content, templates and configuration using one repository.
 page_type: landing_page
 ---
 
diff --git a/docs/multisite/site_factory/site_factory.md b/docs/multisite/site_factory/site_factory.md
index 30df58fa4e..52a034bd5e 100644
--- a/docs/multisite/site_factory/site_factory.md
+++ b/docs/multisite/site_factory/site_factory.md
@@ -182,7 +182,7 @@ Set the below policies to allow users to:
 - `site/change_status` - change status of the public accesses to `Live` or `Offline`
 - `site/delete` - delete sites
 
-For full documentation on how Permissions work and how to set them up, see [the Permissions section](permissions.md).
+For full documentation on how permissions work and how to set them up, see [the permissions section](permissions.md).
 
 To learn how to use Site Factory, see [User documentation]([[= user_doc =]]/site_organization/site_factory/).
 
diff --git a/docs/permissions/permission_use_cases.md b/docs/permissions/permission_use_cases.md
index 53252a9976..80959fd60f 100644
--- a/docs/permissions/permission_use_cases.md
+++ b/docs/permissions/permission_use_cases.md
@@ -171,7 +171,7 @@ To let users create and assign taxonomy entries, set the following permissions:
 - `taxonomy/read` to see the Taxonomy interface
 - `taxonomy/manage` to create, edit and delete tags
 
-With limitations, you can configure whether permissions apply to Tags, Product categories or both.
+With limitations, you can configure whether permissions apply to Tags, product categories or both.
 
 ## Register Users
 
@@ -220,7 +220,7 @@ Users are treated like other content, so to create and modify them, the User nee
 
 ## Product catalog
 
-You can control to what extend users can access the Product catalog and all its related parts.
+You can control to what extend users can access the product catalog and all its related parts.
 
 ### Product type
 
diff --git a/docs/pim/pim_configuration.md b/docs/pim/pim_configuration.md
index fed97c7198..377ed934a2 100644
--- a/docs/pim/pim_configuration.md
+++ b/docs/pim/pim_configuration.md
@@ -32,7 +32,7 @@ ibexa_product_catalog:
                 product_type_group_identifier: 'product'
 ```
 
-The `local` type is the built-in type of catalog based on the Repository.
+The `local` type is the built-in type of catalog based on the repository.
 
 Under `options.product_type_group_identifier` you can define the identifier of the content type Group used for storing products.
 
diff --git a/docs/pim/pim_guide.md b/docs/pim/pim_guide.md
index 630e9a2c1e..739b368988 100644
--- a/docs/pim/pim_guide.md
+++ b/docs/pim/pim_guide.md
@@ -194,7 +194,7 @@ Therefore, if your specific requirements aren't met, you may need to extend [[=
 ##### Content-model-based features
 
 The following features rely on [[= product_name =]]'s content model capabilities, which aren't supported by the default implementation of remote PIM support.
-Therefore, if your specific requirements aren't met, you must extend the application by using extension points exposed in the Product catalog module.
+Therefore, if your specific requirements aren't met, you must extend the application by using extension points exposed in the product catalog module.
 
 - Assets
 - Product variants
diff --git a/docs/release_notes/ez_platform_v3.1.md b/docs/release_notes/ez_platform_v3.1.md
index f237701f8e..7549071af4 100644
--- a/docs/release_notes/ez_platform_v3.1.md
+++ b/docs/release_notes/ez_platform_v3.1.md
@@ -49,7 +49,7 @@ This release of eZ Platform introduces the following new features:
 
     ### Field group permissions
 
-    The new [field group Limitation](https://doc.ibexa.co/en/latest/guide/limitation_reference/#field-group-limitation)
+    The new [field group limitation](https://doc.ibexa.co/en/latest/guide/limitation_reference/#field-group-limitation)
     enables you to control who can edit content fields per field group.
     
     ### Version comparison
diff --git a/docs/templating/embed_and_list_content/embed_content.md b/docs/templating/embed_and_list_content/embed_content.md
index 6adbd5dd2d..496d9b0cc6 100644
--- a/docs/templating/embed_and_list_content/embed_content.md
+++ b/docs/templating/embed_and_list_content/embed_content.md
@@ -4,7 +4,7 @@ description: Embed a content item in another using query types or controllers.
 
 # Embed related content
 
-To embed content in another content item, you query for it in the Repository.
+To embed content in another content item, you query for it in the repository.
 There are two ways to query for a content item:
 
 - by using a [Query type](#embed-siblings-with-query-type)
diff --git a/docs/tutorials/beginner_tutorial/2_create_the_content_model.md b/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
index fa6337ab76..02b0453b04 100644
--- a/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
+++ b/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
@@ -11,7 +11,7 @@ Below is a short introduction that only covers points needed for this tutorial.
 
 ## Content model overview
 
-The [[= product_name =]] content Repository is centered around **content items**. A content item is a single piece of content, for example an article, a product review, a place, etc.
+The [[= product_name =]] content repository is centered around **content items**. A content item is a single piece of content, for example an article, a product review, a place, etc.
 
 Every content item is an instance of a content type. Content types define what **Fields** are included in each content item.
 For example, an article could include Fields such as *title*, *image*, *abstract*, *article's body*, *publication date* and *list of authors*.
diff --git a/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md b/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md
index 00c7a03572..db0eb5afe6 100644
--- a/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md
+++ b/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md
@@ -261,4 +261,4 @@ Refresh the page and you should see the "Hello world" placed inside a styled lay
 
 ![Homepage with a Hello world](bike_tutorial_hello_world.png)
 
-At this point, the template is static. It does not render any dynamic data from the Repository.
+At this point, the template is static. It does not render any dynamic data from the repository.
diff --git a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
index e99c94f66f..8b21185699 100644
--- a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
+++ b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
@@ -695,7 +695,7 @@ The built-in Forms folder is located in the Form Section in versions 2.4+.
 
 If you're updating your Enterprise installation, you need to add this Section manually and move the folder to it.
 
-To allow anonymous users to access Forms, you also need to add the `content/read` Policy
+To allow anonymous users to access Forms, you also need to add the `content/read` policy
 with the *Form* Section to the Anonymous User.
 
 #### Changes to Custom tags
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
index 5e8a6c327e..10c0cb932e 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
@@ -93,11 +93,11 @@ To move over your own custom configurations, follow the conventions below and ma
 - `<old-ez-root>/ezpublish/config/config.yaml =>  <new-ez-root>/app/config/config.yaml`
     -  *For system/framework config, and for defining global db, cache, search settings.*
 - `<old-ez-root>/ezpublish/config/ezpublish.yaml => <new-ez-root>/app/config/ezplatform.yaml`
-    -  *For SiteAccess, site groups and Repository settings.*
+    -  *For SiteAccess, site groups and repository settings.*
 
-!!! note "Changes to Repository configuration"
+!!! note "Changes to repository configuration"
 
-    When moving configuration over, be aware that as of 5.4.5 and higher, Repository configuration has been enhanced to allow configuring storage engine and search engine independently.
+    When moving configuration over, be aware that as of 5.4.5 and higher, repository configuration has been enhanced to allow configuring storage engine and search engine independently.
 
     ``` yaml
     # Default ezplatform.yaml Repositories configuration with comments
diff --git a/docs/users/oauth_client.md b/docs/users/oauth_client.md
index 3dd84080d9..c9ff278be0 100644
--- a/docs/users/oauth_client.md
+++ b/docs/users/oauth_client.md
@@ -59,7 +59,7 @@ By adding the `Ibexa\Bundle\OAuth2Client\Security\Authenticator\OAuth2Authentica
 
 ## Resource owner mappers
 
-Resource owner mappers map the data received from the OAuth2 authorization server to user information in the Repository.
+Resource owner mappers map the data received from the OAuth2 authorization server to user information in the repository.
 
 Resource owner mappers must implement the [`Ibexa\Contracts\OAuth2Client\ResourceOwner\ResourceOwnerMapper`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-OAuth2Client-ResourceOwner-ResourceOwnerMapper.html) interface.
 Four implementations of `ResourceOwnerMapper` are proposed by default:
@@ -67,7 +67,7 @@ Four implementations of `ResourceOwnerMapper` are proposed by default:
 - `ResourceOwnerToExistingUserMapper` is the base class extended by the following mappers:
     - `ResourceOwnerIdToUserMapper` - loads a user (resource owner) based on the identifier, but doesn't create a new user.
     - `ResourceOwnerEmailToUserMapper` - loads a user (resource owner) based on the email, but doesn't create a new user.
-- `ResourceOwnerToExistingOrNewUserMapper` - checks whether the user exists and loads the data if it does.  If not, creates a new user in the Repository.
+- `ResourceOwnerToExistingOrNewUserMapper` - checks whether the user exists and loads the data if it does.  If not, creates a new user in the repository.
 
 To use `ResourceOwnerToExistingOrNewUserMapper`, you need to extend it in your custom mapper.
 
@@ -87,7 +87,7 @@ The following example shows how to create a Resource Owner mapper for the `googl
 
 Create a resource owner mapper for Google login in `src/OAuth/GoogleResourceOwnerMapper.php`.
 The mapper extends `ResourceOwnerToExistingOrNewUserMapper`,
-which enables it to create a new user in the Repository if the user doesn't exist yet.
+which enables it to create a new user in the repository if the user doesn't exist yet.
 
 The mapper loads a user (line 51) or creates a new one (line 61),
 based on the information from `resourceOwner`, that's the OAuth2 authorization server.
diff --git a/docs/users/user_authentication.md b/docs/users/user_authentication.md
index c8ae7e6754..99b3694905 100644
--- a/docs/users/user_authentication.md
+++ b/docs/users/user_authentication.md
@@ -9,7 +9,7 @@ description: Customize user authentication.
 Symfony provides native support for [multiple user providers]([[= symfony_doc =]]/security/multiple_user_providers.html).
 This makes it easier to integrate any kind of login handlers, including SSO and existing third party bundles (e.g. [FR3DLdapBundle](https://github.com/Maks3w/FR3DLdapBundle), [HWIOauthBundle](https://github.com/hwi/HWIOAuthBundle), [FOSUserBundle](https://github.com/FriendsOfSymfony/FOSUserBundle), [BeSimpleSsoAuthBundle](https://github.com/BeSimple/BeSimpleSsoAuthBundle), etc.).
 
-However, to be able to use *external* user providers with [[= product_name =]], a valid Platform user needs to be injected into the Repository.
+However, to be able to use *external* user providers with [[= product_name =]], a valid Platform user needs to be injected into the repository.
 This is mainly for the kernel to be able to manage content-related permissions (but not limited to this).
 
 Depending on your context, you either want to create a Platform user, return an existing user, or even always use a generic user.
@@ -17,7 +17,7 @@ Depending on your context, you either want to create a Platform user, return an
 Whenever an *external* user is matched (i.e. one that does not come from Platform repository, like coming from LDAP), [[= product_name =]] kernel initiates an `MVCEvents::INTERACTIVE_LOGIN` event.
 Every service listening to this event receives an `Ibexa\Core\MVC\Symfony\Event\InteractiveLoginEvent` object which contains the original security token (that holds the matched user) and the request.
 
-Then, it's up to the listener to retrieve a Platform user from the Repository and to assign it back to the event object.
+Then, it's up to the listener to retrieve a Platform user from the repository and to assign it back to the event object.
 This user is injected into the repository and used for the rest of the request.
 
 If no [[= product_name =]] user is returned, the Anonymous user is used.
@@ -25,7 +25,7 @@ If no [[= product_name =]] user is returned, the Anonymous user is used.
 ### User exposed and security token
 
 When an *external* user is matched, a different token is injected into the security context, the `InteractiveLoginToken`.
-This token holds a `UserWrapped` instance which contains the originally matched user and the *API user* (the one from the [[= product_name =]] Repository).
+This token holds a `UserWrapped` instance which contains the originally matched user and the *API user* (the one from the [[= product_name =]] repository).
 
 The *API user* is mainly used for permission checks against the repository and thus stays *under the hood*.
 

From 5388580d24b185ca97fc79ae5769321c1e1e95b0 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Fri, 11 Oct 2024 13:52:18 +0200
Subject: [PATCH 10/77] Fixes

---
 .../administration/admin_panel/admin_panel.md |   6 +-
 .../admin_panel/corporate_admin_panel.md      |   6 +-
 .../admin_panel/languages_admin_panel.md      |   6 +-
 .../admin_panel/roles_admin_panel.md          |   7 +-
 .../admin_panel/segments_admin_panel.md       |   2 +-
 .../admin_panel/users_admin_panel.md          |   3 +-
 docs/administration/administration.md         |   2 +-
 .../administration/back_office/back_office.md |  11 +-
 .../back_office/back_office_configuration.md  |   7 +-
 .../back_office_elements/add_drag_and_drop.md |   2 +-
 .../back_office_elements/add_dropdowns.md     |   5 +-
 .../back_office_elements/custom_components.md |   3 +-
 .../back_office_elements/custom_icons.md      |   3 +-
 .../extending_thumbnails.md                   |   2 +-
 .../importing_assets_from_bundle.md           |  17 +--
 .../reusable_components.md                    |  13 +-
 .../back_office_menus/add_menu_item.md        |  15 +--
 .../back_office_menus/back_office_menus.md    |  10 +-
 .../back_office_tabs/back_office_tabs.md      |   4 +-
 .../back_office_tabs/create_dashboard_tab.md  |   9 +-
 .../back_office/browser/add_browser_tab.md    |   4 +-
 .../back_office/browser/browser.md            |   7 +-
 .../back_office/content_tab_switcher.md       |  10 +-
 .../back_office/content_type_anchor_menu.md   |  15 +--
 .../back_office/customize_calendar.md         |   4 +-
 .../back_office/subitems_list.md              |  10 +-
 .../configuration/configuration.md            |   9 +-
 .../configuration/dynamic_configuration.md    |   5 +-
 .../configuration/repository_configuration.md |  30 ++---
 .../content_organization/content_types.md     |  50 +++++---
 .../content_organization/sections.md          |  16 ++-
 .../dashboard/configure_default_dashboard.md  |  12 +-
 .../project_organization/architecture.md      |   6 +-
 .../project_organization/bundles.md           |  15 +--
 .../project_organization.md                   |  10 +-
 .../recent_activity/recent_activity.md        |  10 +-
 docs/api/api.md                               |   2 +-
 docs/api/graphql/graphql.md                   |  30 ++---
 docs/api/graphql/graphql_custom_ft.md         |  11 +-
 docs/api/graphql/graphql_customization.md     |   8 +-
 docs/api/graphql/graphql_operations.md        |   2 +-
 docs/api/graphql/graphql_queries.md           |   8 +-
 docs/api/php_api/php_api.md                   |  45 +++----
 .../adding_custom_media_type.md               |   7 +-
 .../creating_new_rest_resource.md             |  21 +--
 docs/api/rest_api/rest_api_authentication.md  |  63 +++++----
 .../rest_api/rest_api_usage/rest_api_usage.md |  11 +-
 .../rest_api/rest_api_usage/rest_requests.md  |  17 +--
 .../rest_api/rest_api_usage/rest_responses.md |   2 +-
 .../rest_api_usage/testing_rest_api.md        |   8 +-
 docs/cdp/cdp_activation/cdp_activation.md     |   2 +-
 .../cdp_add_clientside_tracking.md            |   5 +-
 docs/commerce/cart/cart.md                    |   2 +-
 docs/commerce/checkout/checkout_api.md        |   4 +-
 docs/commerce/checkout/customize_checkout.md  |   4 +-
 docs/commerce/checkout/reorder.md             |   2 +-
 .../order_management/order_management_api.md  |   3 +-
 docs/commerce/payment/payment.md              |   4 +-
 .../shipping_management.md                    |   4 +-
 .../content_api/browsing_content.md           |   5 +-
 .../content_api/creating_content.md           |   3 +-
 .../content_api/managing_content.md           |   4 +-
 .../content_management_api/bookmark_api.md    |   2 +-
 .../content_management_api/section_api.md     |   2 +-
 .../content_management_guide.md               |  12 +-
 docs/content_management/content_model.md      |  15 +--
 .../data_migration/data_migration.md          |   3 +-
 .../data_migration/exporting_data.md          |   6 +-
 .../data_migration/importing_data.md          |   2 +-
 .../field_type_reference/imagefield.md        |   2 +-
 .../field_types/type_and_value.md             |  12 +-
 docs/content_management/images/fastly_io.md   |   2 +-
 docs/content_management/images/images.md      | 120 ++++++------------
 .../rich_text/online_editor_guide.md          |  23 ++--
 .../url_management/url_management.md          |  15 +--
 docs/customer_management/cp_page_builder.md   |   2 +-
 docs/ibexa_engage/create_campaign.md          |   2 +-
 docs/ibexa_products/ibexa_headless.md         |   2 +-
 .../cache/http_cache/content_aware_cache.md   |  39 +++---
 .../clustering/clustering.md                  |   4 +-
 .../environments.md                           |   4 +-
 .../support_and_maintenance_faq.md            |   3 +-
 docs/permissions/permission_use_cases.md      |   2 +-
 docs/personalization/personalization_guide.md |   3 +-
 docs/pim/add_remote_pim_support.md            |   2 +-
 docs/pim/pim_guide.md                         |   4 +-
 docs/pim/products.md                          |   3 +-
 docs/release_notes/ez_platform_v1.11.0.md     |   2 +-
 docs/release_notes/ez_platform_v1.7.0_lts.md  |  15 ++-
 docs/release_notes/ez_platform_v1.8.0.md      |   2 +-
 docs/release_notes/ez_platform_v1.9.0.md      |   2 +-
 docs/release_notes/ez_platform_v2.2.0.md      |   8 +-
 docs/release_notes/ez_platform_v2.5.md        |   2 +-
 .../ez_platform_v3.0_deprecations.md          |   6 +-
 docs/release_notes/ez_platform_v3.1.md        |  25 ++--
 docs/release_notes/ibexa_dxp_v3.2.md          |   3 +-
 docs/release_notes/ibexa_dxp_v4.2.md          |   2 +-
 docs/release_notes/ibexa_dxp_v4.3.md          |   3 +-
 docs/release_notes/ibexa_dxp_v4.5.md          |   9 +-
 docs/release_notes/ibexa_dxp_v4.6.md          |   2 +-
 docs/resources/new_in_doc.md                  |  19 +--
 .../configure_elastic_search.md               |   3 +-
 docs/templating/layout/add_breadcrumbs.md     |   3 +-
 docs/templating/layout/add_navigation_menu.md |   3 +-
 docs/templating/templates/templates.md        |   3 +-
 .../checkout_twig_functions.md                |   3 +-
 .../field_twig_functions.md                   |  84 ++++++------
 .../2_prepare_the_landing_page.md             |   6 +-
 .../from_1.x_2.x/update_db_to_2.5.md          |  24 ++--
 .../migrating_from_ez_publish.md              |   2 +-
 mkdocs.yml                                    |   2 +-
 111 files changed, 506 insertions(+), 636 deletions(-)

diff --git a/docs/administration/admin_panel/admin_panel.md b/docs/administration/admin_panel/admin_panel.md
index 654b63b5a7..08cf8b9b06 100644
--- a/docs/administration/admin_panel/admin_panel.md
+++ b/docs/administration/admin_panel/admin_panel.md
@@ -1,12 +1,12 @@
 ---
-description: Ibexa DXP back office contains managements options for permissions, users, languages, content types, as well as system information.
+description: Ibexa DXP back office contains managements options for permissions, users, languages, content types, and system information.
 page_type: landing_page
 ---
 
 # Admin panel
 
 Once you set up your environment you can start your work as an administrator.
-Your most useful tools can be found in **Admin Panel**.
+Your most functional tools can be found in **Admin Panel**.
 
 To access Admin Panel, click the icon: ![Admin Panel Icon](admin_panel_icon.png){.inline-image}.
 
@@ -18,5 +18,5 @@ To access Admin Panel, click the icon: ![Admin Panel Icon](admin_panel_icon.png)
     "administration/admin_panel/segments_admin_panel",
     "administration/admin_panel/corporate_admin_panel",
     "administration/admin_panel/workflow_admin_panel",
-    "administration/admin_panel/system_information_admin_panel",                
+    "administration/admin_panel/system_information_admin_panel"
 ], columns=4) =]]
diff --git a/docs/administration/admin_panel/corporate_admin_panel.md b/docs/administration/admin_panel/corporate_admin_panel.md
index 016fc60e49..db7a00709c 100644
--- a/docs/administration/admin_panel/corporate_admin_panel.md
+++ b/docs/administration/admin_panel/corporate_admin_panel.md
@@ -6,10 +6,8 @@ description: You can manage companies profiles in the Admin Panel.
 
 You can manage companies profiles in the Admin Panel.
 
-There, in the **Corporate** section, you can find basic information about existing companies, 
-for example, details, versions, locations, translations, a list of members, billing addresses 
-and technical details regarding the organization, such as visibility, IDs, or relations.
+There, in the **Corporate** section, you can find basic information about existing companies, for example, details, versions, locations, translations, a list of members, billing addresses, and technical details regarding the organization, such as visibility, IDs, or relations.
 
 ![Corporate section](admin_panel_corporate.png "Corporate section")
 
-See [Customer management](https://doc.ibexa.co/projects/userguide/en/latest/customer_management/manage_customers/) for further information. 
\ No newline at end of file
+See [Customer management](https://doc.ibexa.co/projects/userguide/en/latest/customer_management/manage_customers/) for further information.
\ No newline at end of file
diff --git a/docs/administration/admin_panel/languages_admin_panel.md b/docs/administration/admin_panel/languages_admin_panel.md
index acf71c74f1..a4b97f9f47 100644
--- a/docs/administration/admin_panel/languages_admin_panel.md
+++ b/docs/administration/admin_panel/languages_admin_panel.md
@@ -12,10 +12,8 @@ Every new language must have a name and a language code, written in the `xxx-XX`
 
 ![Languages](admin_panel_languages.png "Languages")
 
-The multilanguage system operates based on a global translation list 
-that contains all languages available in the installation.
+The multilanguage system operates based on a global translation list that contains all languages available in the installation.
 After adding a language you may have to reload the application to be able to use it.
-Depending on your set up, additional configuration may be necessary 
-for the new language to work properly, especially with SiteAccesses.
+Depending on your set up, additional configuration may be necessary for the new language to work properly, especially with SiteAccesses.
 
 See [Languages](languages.md) for further information.
diff --git a/docs/administration/admin_panel/roles_admin_panel.md b/docs/administration/admin_panel/roles_admin_panel.md
index 87fbfdc2ae..a1dd7ffd1b 100644
--- a/docs/administration/admin_panel/roles_admin_panel.md
+++ b/docs/administration/admin_panel/roles_admin_panel.md
@@ -23,8 +23,8 @@ See [example use case](permission_use_cases.md#restrict-editing-to-part-of-the-t
 !!! note
 
     Limitation specifies what a user can do, not what they can't do.
-    A `Location` limitation, for example, gives the user access to content with a specific Location, 
-    not prohibits it. See [Limitation reference](limitation_reference.md) for further information.
+    A `Location` limitation, for example, gives the user access to content with a specific Location, not prohibits it.
+    See [Limitation reference](limitation_reference.md) for further information.
 
 **Assignments**
 
@@ -39,5 +39,4 @@ Model your content (content types, Sections, Locations etc.) in a way that can b
 That way system is be more secure and easier to manage.
 This approach also improves performance. Role assignments and policies are taken into account during search/load queries.
 
-See [Permissions overview](permissions.md) for further information
-and [Permission use cases](permission_use_cases.md) for details on how to customize access to different parts of the back office.
\ No newline at end of file
+See [Permissions overview](permissions.md) for further information and [Permission use cases](permission_use_cases.md) for details on how to customize access to different parts of the back office.
\ No newline at end of file
diff --git a/docs/administration/admin_panel/segments_admin_panel.md b/docs/administration/admin_panel/segments_admin_panel.md
index ac65d10b63..a0f7db0b3f 100644
--- a/docs/administration/admin_panel/segments_admin_panel.md
+++ b/docs/administration/admin_panel/segments_admin_panel.md
@@ -6,7 +6,7 @@ edition: experience
 # Segments
 
 You can use Segments to display specific content to specific [ussers](users.md).
-they're used out of the box in the Targeting and Dynamic targeting blocks in the Page.
+they're used out of the box in the Targeting and Dynamic targeting blocks in the page.
 
 Segments are collected in Segment Groups:
 
diff --git a/docs/administration/admin_panel/users_admin_panel.md b/docs/administration/admin_panel/users_admin_panel.md
index 50f07a070a..6ac21cb991 100644
--- a/docs/administration/admin_panel/users_admin_panel.md
+++ b/docs/administration/admin_panel/users_admin_panel.md
@@ -5,8 +5,7 @@ description: All user groups and users can be accessed in the users tab.
 # Users
 
 [Users](users.md) in [[= product_name =]] are treated the same way as content items.
-they're organized in groups such as *Guests*, *Editors*, *Anonymous*,
-which makes it easier to manage them and their permissions.
+they're organized in groups such as *Guests*, *Editors*, *Anonymous*, which makes it easier to manage them and their permissions.
 All user groups and users can be accessed in the Admin panel by selecting **Users**.
 
 ![Users and user groups](admin_panel_users.png "Users and user groups")
diff --git a/docs/administration/administration.md b/docs/administration/administration.md
index 6a333d4fea..cbd7aeb391 100644
--- a/docs/administration/administration.md
+++ b/docs/administration/administration.md
@@ -11,5 +11,5 @@ Administer and configure your [[= product_name =]] installation.
     "administration/admin_panel/admin_panel",
     "administration/project_organization/project_organization",
     "administration/configuration/configuration",
-    "administration/back_office/back_office",
+    "administration/back_office/back_office"
 ], columns=4) =]]
diff --git a/docs/administration/back_office/back_office.md b/docs/administration/back_office/back_office.md
index c7174cc8bc..79e6b0d730 100644
--- a/docs/administration/back_office/back_office.md
+++ b/docs/administration/back_office/back_office.md
@@ -9,16 +9,13 @@ The back office interface is produced by the [`ibexa/admin-ui` bundle](https://g
 Additionally, it uses React-based modules that make each part of the UI extensible, and Bootstrap for styling.
 The interface is accessible in your browser at `http://<yourdomain>/admin`.
 
-To extend the back office with PHP code, you can use [events]([[= symfony_doc =]]/event_dispatcher.html),
-either built-in Symfony events or events dispatched by the application.
+To extend the back office with PHP code, you can use [events]([[= symfony_doc =]]/event_dispatcher.html), either built-in Symfony events or events dispatched by the application.
 
-Some extensibility, such as [adding custom tags](extend_online_editor.md#configure-custom-tags),
-is possible without writing your own code, with configuration and templating only.
+Some extensibility, such as [adding custom tags](extend_online_editor.md#configure-custom-tags), is possible without writing your own code, with configuration and templating only.
 
 !!! note "String translations"
 
-    Refer to [Custom string translations](back_office_translations.md#custom-string-translations)
-    to learn how to provide string translations when extending the back office.
+    Refer to [Custom string translations](back_office_translations.md#custom-string-translations) to learn how to provide string translations when extending the back office.
 
 [[= cards([
     "administration/back_office/back_office_configuration",
@@ -28,5 +25,5 @@ is possible without writing your own code, with configuration and templating onl
     "administration/back_office/notifications",
     "administration/back_office/browser/browser",
     "administration/back_office/add_user_setting",
-    "administration/back_office/customize_calendar",
+    "administration/back_office/customize_calendar"
 ], columns=4) =]]
diff --git a/docs/administration/back_office/back_office_configuration.md b/docs/administration/back_office/back_office_configuration.md
index 3bb5a9f3d7..2426d99e49 100644
--- a/docs/administration/back_office/back_office_configuration.md
+++ b/docs/administration/back_office/back_office_configuration.md
@@ -41,12 +41,9 @@ ibexa:
 
 ## Copy subtree limit
 
-Copying large subtrees can cause performance issues, so you can limit the number of content items
-that can be copied at once using the `ibexa.system.<scope>.subtree_operations.copy_subtree.limit`
-[configuration key](configuration.md#configuration-files).
+Copying large subtrees can cause performance issues, so you can limit the number of content items that can be copied at once using the `ibexa.system.<scope>.subtree_operations.copy_subtree.limit` [configuration key](configuration.md#configuration-files).
 
-The default value is `100`. You can set it to `-1` for no limit,
-or to `0` to completely disable copying subtrees.
+The default value is `100`. You can set it to `-1` for no limit, or to `0` to completely disable copying subtrees.
 
 You can copy subtree from CLI using the command: `bin/console ibexa:copy-subtree <sourceLocationId> <targetLocationId>`.
 
diff --git a/docs/administration/back_office/back_office_elements/add_drag_and_drop.md b/docs/administration/back_office/back_office_elements/add_drag_and_drop.md
index 3a68aa93b5..1b7ec8d1d0 100644
--- a/docs/administration/back_office/back_office_elements/add_drag_and_drop.md
+++ b/docs/administration/back_office/back_office_elements/add_drag_and_drop.md
@@ -9,7 +9,7 @@ You can create a generic interface for drag and drop interactions that you can r
 First, prepare the HTML code structure and place it in a Twig template. See the example:
 
 ```html
-<div 
+<div
         class="items-container-drag"
         data-placeholder='<div class="item-placeholder-drag">item placeholder name</div>'
 >
diff --git a/docs/administration/back_office/back_office_elements/add_dropdowns.md b/docs/administration/back_office/back_office_elements/add_dropdowns.md
index a74834b483..811f3fd3b7 100644
--- a/docs/administration/back_office/back_office_elements/add_dropdowns.md
+++ b/docs/administration/back_office/back_office_elements/add_dropdowns.md
@@ -17,7 +17,7 @@ Set elements which are available for the `<select>` input, for example:
     <option value="DE">DE</option>
     <option value="US">US</option>
     <option value="NO">NO</option>
-    <option value="PL">PL</option> 
+    <option value="PL">PL</option>
 </select>
 {% endset %}
 ```
@@ -88,7 +88,8 @@ For `value`, see the example:
 
 ## Prepare custom drop-down structure
 
-Next, prepare the component structure and place it in the template after setting the needed attributes. See the example:
+Next, prepare the component structure and place it in the template after setting the needed attributes.
+See the example:
 
 ```twig
 {% include '@ibexadesign/ui/component/dropdown/dropdown.html.twig' with {
diff --git a/docs/administration/back_office/back_office_elements/custom_components.md b/docs/administration/back_office/back_office_elements/custom_components.md
index 4677cafa74..5f490bc4fc 100644
--- a/docs/administration/back_office/back_office_elements/custom_components.md
+++ b/docs/administration/back_office/back_office_elements/custom_components.md
@@ -37,8 +37,7 @@ App\Component\MyNewComponent:
 
 ## Base component classes
 
-If you only need to inject a short element (for example, a Twig template or a CSS link) without writing a class,
-you can make use of the following base classes:
+If you only need to inject a short element (for example, a Twig template or a CSS link) without writing a class, you can make use of the following base classes:
 
 - `TwigComponent` renders a Twig template.
 - `LinkComponent` renders the HTML `<link>` tag.
diff --git a/docs/administration/back_office/back_office_elements/custom_icons.md b/docs/administration/back_office/back_office_elements/custom_icons.md
index 8d3276b3ed..574bb31b97 100644
--- a/docs/administration/back_office/back_office_elements/custom_icons.md
+++ b/docs/administration/back_office/back_office_elements/custom_icons.md
@@ -6,8 +6,7 @@ description: Configure custom icons to use for content types.
 
 ## Customize content type icons
 
-To add custom icons for existing content types or custom content types in [[= product_name =]],
-use the following configuration under the `ibexa.system.<scope>.content_type` [configuration key](configuration.md#configuration-files):
+To add custom icons for existing content types or custom content types in [[= product_name =]], use the following configuration under the `ibexa.system.<scope>.content_type` [configuration key](configuration.md#configuration-files):
 
 ```yaml
 ibexa:
diff --git a/docs/administration/back_office/back_office_elements/extending_thumbnails.md b/docs/administration/back_office/back_office_elements/extending_thumbnails.md
index b7da91cd91..40ab2bd489 100644
--- a/docs/administration/back_office/back_office_elements/extending_thumbnails.md
+++ b/docs/administration/back_office/back_office_elements/extending_thumbnails.md
@@ -109,5 +109,5 @@ Next, add the strategy with the `ibexa.repository.thumbnail.strategy.field` tag
         tags:
             - { name: ibexa.repository.thumbnail.strategy.field, priority: 100 }
 ```
- 
+
 At this point you can go to the back office and check the results.
diff --git a/docs/administration/back_office/back_office_elements/importing_assets_from_bundle.md b/docs/administration/back_office/back_office_elements/importing_assets_from_bundle.md
index ce61d60d8c..4fcca0c224 100644
--- a/docs/administration/back_office/back_office_elements/importing_assets_from_bundle.md
+++ b/docs/administration/back_office/back_office_elements/importing_assets_from_bundle.md
@@ -35,9 +35,7 @@ To import CSS files only, use:
     For a full example of importing asset configuration,
     see [`ibexa.config.js`](https://github.com/ibexa/admin-ui/blob/main/src/bundle/Resources/encore/ibexa.config.js)
 
-To edit existing configuration entries, either in the bundle's `Resources/encore/` folder, 
-or in the `encore` folder in the root folder of your project, 
-create an `ibexa.config.manager.js` file:
+To edit existing configuration entries, either in the bundle's `Resources/encore/` folder, or in the `encore` folder in the root folder of your project, create an `ibexa.config.manager.js` file:
 
 ``` js
 const path = require('path');
@@ -80,9 +78,7 @@ module.exports = (ibexaConfig, ibexaConfigManager) => {
     For a full example of overriding configuration,
     see [`ibexa.config.manager.js`](https://github.com/ibexa/fieldtype-matrix/blob/main/src/bundle/Resources/encore/ibexa.config.manager.js).
 
-To add a new configuration under your own namespace and with its own dependencies, 
-create an `ibexa.webpack.custom.config.js` file that you create either in the bundle's `Resources/encore/` folder, 
-or in the `encore` folder in the root directory of your project, for example:
+To add a new configuration under your own namespace and with its own dependencies, create an `ibexa.webpack.custom.config.js` file that you create either in the bundle's `Resources/encore/` folder, or in the `encore` folder in the root directory of your project, for example:
 
 ``` js
 	const Encore = require('@symfony/webpack-encore');
@@ -103,18 +99,15 @@ or in the `encore` folder in the root directory of your project, for example:
 
 !!! tip
 
-    If you don't plan to add multiple entry files on the same page in your custom configuration,
-    use the `disableSingleRuntimeChunk()` function to avoid adding a separate `runtime.js` file.
+    If you don't plan to add multiple entry files on the same page in your custom configuration, use the `disableSingleRuntimeChunk()` function to avoid adding a separate `runtime.js` file.
     Otherwise, your JS code may be run multiple times.
     By default, the `enableSingleRuntimeChunk()` function is used.
 
 ## Configuration from main project files
 
-If you prefer to include the asset configuration in the main project files,
-add it in [`webpack.config.js`](https://github.com/ibexa/recipes/blob/master/ibexa/oss/4.0/encore/webpack.config.js#L31).
+If you prefer to include the asset configuration in the main project files, add it in [`webpack.config.js`](https://github.com/ibexa/recipes/blob/master/ibexa/oss/4.0/encore/webpack.config.js#L31).
 
-To overwrite the built-in assets, use the following configuration to replace, remove or add asset files
-in `webpack.config.js`:
+To overwrite the built-in assets, use the following configuration to replace, remove or add asset files in `webpack.config.js`:
 
 ``` js
 ibexaConfigManager.replace({
diff --git a/docs/administration/back_office/back_office_elements/reusable_components.md b/docs/administration/back_office/back_office_elements/reusable_components.md
index 0fd5eb9d8e..c4f28cc621 100644
--- a/docs/administration/back_office/back_office_elements/reusable_components.md
+++ b/docs/administration/back_office/back_office_elements/reusable_components.md
@@ -19,7 +19,7 @@ With `embed` you can override blocks that are defined inside the included templa
 
 The alert component has the following properties:
 
-- `type` - available types of alert: error, info, success and warning
+- `type` - available types of alert: error, info, success, and warning
 - `icon` - name of the icon, taken from the default icon set
 - `icon_path` - full icon path, in case you do not want to use an icon from the default icon set
 - `title` - alert title
@@ -208,14 +208,14 @@ The following example shows how to render both text and hyperlink which redirect
 See the example below to learn how to create an action button which removes the article in the table.
 The table component has to be wrapped into the remove article form.
 
-As in many cases you want a button to be disabled when no item in a table is selected and enabled otherwise, there is a built-in mechanism for this. 
+As in many cases you want a button to be disabled when no item in a table is selected and enabled otherwise, there is a built-in mechanism for this.
 To enable it you need to add the `ibexa-toggle-btn-state` CSS class to the form element alongside `data-toggle-button-id` data-attribute
 which holds the id of the button that should be enabled/disabled after a checkbox state change.
 
 Next, pass a button under the `action` parameter to the table headline.
 
 Action buttons are rendered on the right side of the table headline (do not confuse it with the table header).
-You can also specify headline text, which is a table title displayed above, by passing it under `headline` parameter. 
+You can also specify headline text, which is a table title displayed above, by passing it under `headline` parameter.
 
 You can generate various headline texts using the `results_headline` macro with a few parameters:
 
@@ -230,10 +230,10 @@ Column types available for the table header :
 - normal content column `{ content: col_name }` (content is the title of the column)
 - icon column `{ has_icon: true }`
 - checkbox column `{ has_checkbox: true }`
-- action buttons column `{  }` 
+- action buttons column `{  }`
 
 Additional parameters available for all of the objects mentioned earlier:
- 
+
     - class (CSS class)
     - attr (HTML attributes)
 
@@ -297,10 +297,11 @@ To avoid wrapping headline inside the form, as it's done in the earlier example,
 {% endblock %}
 ```
 
-This method is useful in case of another form inside headline actions or to avoid interferences with the form like button triggering its submission.
+This method is practical in case of another form inside headline actions or to avoid interferences with the form like button triggering its submission.
 
 By default, tables are wrapped in a scrollable wrapper which prevents them from being too long.
 To disable it, set the `is_scrollable` parameter to `false`.
+
 !!! tip
 
     For an example of using the table component, see [Add menu item](add_menu_item.md).
diff --git a/docs/administration/back_office/back_office_menus/add_menu_item.md b/docs/administration/back_office/back_office_menus/add_menu_item.md
index 826ae078af..0c0ea85f62 100644
--- a/docs/administration/back_office/back_office_menus/add_menu_item.md
+++ b/docs/administration/back_office/back_office_menus/add_menu_item.md
@@ -4,11 +4,9 @@ description: Create a custom menu in the back office.
 
 # Add menu item
 
-To add a new menu entry in the back office, you need to use an event subscriber
-and subscribe to [one of the events](back_office_menus.md#menu-events) dispatched when building menus.
+To add a new menu entry in the back office, you need to use an event subscriber and subscribe to [one of the events](back_office_menus.md#menu-events) dispatched when building menus.
 
-The following example shows how to add a "Content list" item to the main top menu
-and list all content items there, with a shortcut button to edit them.
+The following example shows how to add a "Content list" item to the main top menu and list all content items there, with a shortcut button to edit them.
 
 ## Create event subscriber
 
@@ -48,10 +46,7 @@ Finally, create the `templates/themes/admin/list/all_content_list.html.twig` fil
 [[= include_file('code_samples/back_office/menu/menu_item/templates/themes/admin/all_content_list.html.twig') =]]
 ```
 
-This template uses the [reusable table template](reusable_components.md#tables)
-to render a table that fits the style of the back office.
+This template uses the [reusable table template](reusable_components.md#tables) to render a table that fits the style of the back office.
 
-You can configure the columns of the table in the `head_cols` variable
-and the regular table rows in `body_rows`.
-In this case, `body_rows` contains information about the content item provided by the controller,
-and an edit button.
+You can configure the columns of the table in the `head_cols` variable and the regular table rows in `body_rows`.
+In this case, `body_rows` contains information about the content item provided by the controller, and an edit button.
diff --git a/docs/administration/back_office/back_office_menus/back_office_menus.md b/docs/administration/back_office/back_office_menus/back_office_menus.md
index 9a928728cc..717ec37114 100644
--- a/docs/administration/back_office/back_office_menus/back_office_menus.md
+++ b/docs/administration/back_office/back_office_menus/back_office_menus.md
@@ -4,7 +4,7 @@ description: All menus in the back office are based on KnpMenuBundle and you can
 
 # Back office menus
 
-Back office menus are based on the [KnpMenuBundle](https://github.com/KnpLabs/KnpMenuBundle) and are easily extensible.
+Back office menus are based on the [KnpMenuBundle](https://github.com/KnpLabs/KnpMenuBundle) and they're extensible.
 
 !!! tip
 
@@ -15,8 +15,6 @@ Menus are extensible using event subscribers, for example:
 
 ``` php
 [[= include_file('code_samples/back_office/menu/menu_item/src/EventSubscriber/MyMenuSubscriber.php', 0, 29) =]]
-    }
-}
 ```
 
 !!! tip
@@ -65,8 +63,7 @@ You can listen to the following events:
 
 ## Adding menu items
 
-To add a menu item, use the `addChild()` method. Provide the method with the new menu item's identifier
-and, optionally, with parameters.
+To add a menu item, use the `addChild()` method. Provide the method with the new menu item's identifier and, optionally, with parameters.
 
 To add an inactive menu section, do not add a route to its parameters.
 
@@ -133,8 +130,7 @@ For example, the following code changes the default icon for the **Create conten
 
 ## Removing menu items
 
-To remove a menu item, for example, to remove the **Copy subtree** item from the right menu in content view,
-use the following event listener:
+To remove a menu item, for example, to remove the **Copy subtree** item from the right menu in content view, use the following event listener:
 
 ``` php
 [[= include_file('code_samples/back_office/menu/menu_item/src/EventSubscriber/MyMenuSubscriber.php', 44, 45) =]]
diff --git a/docs/administration/back_office/back_office_tabs/back_office_tabs.md b/docs/administration/back_office/back_office_tabs/back_office_tabs.md
index 820994df1b..ddd1857a67 100644
--- a/docs/administration/back_office/back_office_tabs/back_office_tabs.md
+++ b/docs/administration/back_office/back_office_tabs/back_office_tabs.md
@@ -4,7 +4,7 @@ description: Tabs are used for content view, in dashboard, system information an
 
 # Back office tabs
 
-Many elements of the back office interface, such as content view, dashboard or system information, are built using tabs.
+Many elements of the back office interface, such as content view, dashboard, or system information, are built using tabs.
 
 ![Tabs in System Information](tabs_system_info.png)
 
@@ -56,7 +56,7 @@ Tabs are displayed according to this value in ascending order.
     It is good practice to reserve some distance between these values, for example to stagger them by step of 10.
     It may come useful if you later need to place something between the existing tabs.
 
-You can also influence tab display (for example, order tabs, remove or modify them) by using the following event listeners:
+You can also influence tab display (for example, order tabs, remove, or modify them) by using the following event listeners:
 
 - `TabEvents::TAB_GROUP_PRE_RENDER`
 - `TabEvents::TAB_PRE_RENDER`
diff --git a/docs/administration/back_office/back_office_tabs/create_dashboard_tab.md b/docs/administration/back_office/back_office_tabs/create_dashboard_tab.md
index d40d21b011..5ee6d5f32d 100644
--- a/docs/administration/back_office/back_office_tabs/create_dashboard_tab.md
+++ b/docs/administration/back_office/back_office_tabs/create_dashboard_tab.md
@@ -11,13 +11,10 @@ This adds a tab to the **Common content** dashboard block that displays all arti
 [[= include_file('code_samples/back_office/dashboard/article_tab/src/Tab/Dashboard/Everyone/EveryoneArticleTab.php') =]]
 ```
 
-This tab searches for content with content type "Article" (lines 57-60)
-and renders the results using the built-in `all_content.html.twig` template,
-which ensures the tab looks the same as the existing tabs (lines 71-73).
+This tab searches for content with content type "Article" (lines 57-60) and renders the results using the built-in `all_content.html.twig` template, which ensures the tab looks the same as the existing tabs (lines 71-73).
 
-The tab also implements OrderedTabInterface (line 17),
-which enables you to define the order in which the tab is displayed on the dashboard page.
-This is done using the `getOrder()` method (line 45).
+The tab also implements OrderedTabInterface (line 17), which enables you to define the order in which the tab is displayed on the dashboard page.
+It's done using the `getOrder()` method (line 45).
 
 Register this tab as a service:
 
diff --git a/docs/administration/back_office/browser/add_browser_tab.md b/docs/administration/back_office/browser/add_browser_tab.md
index f7a33a7b80..79585a81b5 100644
--- a/docs/administration/back_office/browser/add_browser_tab.md
+++ b/docs/administration/back_office/browser/add_browser_tab.md
@@ -119,7 +119,7 @@ ibexaConfigManager.add({
 ```
 
 ## Check results
-    
+
 In the back office go to **Content** -> **Dashboard**. On the top right, click the **Create content** button.
 In the UDW a new **Images** tab appears, listing all images from the Repository.
 
@@ -127,5 +127,5 @@ In the UDW a new **Images** tab appears, listing all images from the Repository.
 
 !!! tip
 
-    If you cannot see the results or encounter an error, clear the cache and reload the application. 
+    If you cannot see the results or encounter an error, clear the cache and reload the application.
     Remember, after any change of css/js files you should always run `yarn encore dev` in the terminal.
diff --git a/docs/administration/back_office/browser/browser.md b/docs/administration/back_office/browser/browser.md
index 6ff384c574..318123c085 100644
--- a/docs/administration/back_office/browser/browser.md
+++ b/docs/administration/back_office/browser/browser.md
@@ -4,8 +4,8 @@ description: Customize the configuration of the content browser.
 
 # Browser
 
-Browsing the content structure and selecting content from the Repository uses the module Universal Discovery Widget (UDW). UDW has an interactive interface
-which allows you to create, move or copy content items.
+Browsing the content structure and selecting content from the Repository uses the module Universal Discovery Widget (UDW).
+UDW has an interactive interface which allows you to create, move or copy content items.
 
 ## Using UDW
 
@@ -98,8 +98,7 @@ General configuration for tabs, for example, browse, search, bookmarks.
 |`title`|string|yes|The title of Universal Discovery Widget.|
 
 UDW configuration is SiteAccess-aware. For each defined SiteAccess, you need to be able to use the same configuration tree to define SiteAccess-specific config.
-These settings need to be mapped to SiteAccess-aware internal parameters that 
-you can retrieve with the [ConfigResolver](dynamic_configuration.md#configresolver).
+These settings need to be mapped to SiteAccess-aware internal parameters that you can retrieve with the [ConfigResolver](dynamic_configuration.md#configresolver).
 
 ## Add new configuration
 
diff --git a/docs/administration/back_office/content_tab_switcher.md b/docs/administration/back_office/content_tab_switcher.md
index 51038250cf..a7c9af48a0 100644
--- a/docs/administration/back_office/content_tab_switcher.md
+++ b/docs/administration/back_office/content_tab_switcher.md
@@ -1,3 +1,7 @@
+---
+description: Tabs switcher allows separating the default field types in the content type from the field types that enhance the content with new functionalities.
+---
+
 # Tab switcher in content edit page
 
 Tabs switcher allows separating the default field types in the content type from the field types that enhance the content with new functionalities.
@@ -32,8 +36,8 @@ ibexa:
 
 ### Configure field groups for Meta tab
 
-The default configuration makes the `ibexa_taxonomy_entry_assignment` field always visible in the Meta tab in the content form. 
-With this new feature, you can indicate what field types, previously set in the back office content type, are shown in the Meta tab section in the content form. 
+The default configuration makes the `ibexa_taxonomy_entry_assignment` field always visible in the Meta tab in the content form.
+With this new feature, you can indicate what field types, previously set in the back office content type, are shown in the Meta tab section in the content form.
 You can automatically move all field types from Metadata group to the Meta tab in the content form.
 To do it, use the following configuration:
 
@@ -62,7 +66,7 @@ ibexa:
 ```
 
 
-The `meta_field_groups_list` configuration can be easily overriden.
+The `meta_field_groups_list` configuration can be overriden.
 
 ## Add custom tab
 
diff --git a/docs/administration/back_office/content_type_anchor_menu.md b/docs/administration/back_office/content_type_anchor_menu.md
index c802bb2d6d..4389949d3b 100644
--- a/docs/administration/back_office/content_type_anchor_menu.md
+++ b/docs/administration/back_office/content_type_anchor_menu.md
@@ -4,10 +4,8 @@ description: Add anchor menu to the content type configuration screen, to make f
 
 # Add anchor menu to content type edit screen
 
-With the anchor menu you can increase visibility of certain [field types](field_types.md), which provide more complex functionality, 
-by separating them from the [field definitions](content_types.md#field-definitions) section in [content type](content_types.md) configuration screen. 
-One example of such field type would be [SEO]([[= user_doc =]]/search_engine_optimization/work_with_seo/), 
-because it handles functionality that applies to all content items of the content type.
+With the anchor menu you can increase visibility of certain [field types](field_types.md), which provide more complex functionality, by separating them from the [field definitions](content_types.md#field-definitions) section in [content type](content_types.md) configuration screen.
+One example of such field type would be [SEO]([[= user_doc =]]/search_engine_optimization/work_with_seo/), because it handles functionality that applies to all content items of the content type.
 You can use the anchor menu feature with other field types, including [custom ones](create_custom_generic_field_type.md).
 
 See the following example to learn how you can add a field type as an anchor menu.
@@ -31,16 +29,17 @@ ibexa:
 
 Where keys have the following meaning:
 
-- `field_type_identifier` - replace this key with an identifier of the field type that you want to make more prominent. In case of SEO, this key is `ibexa_seo`. 
+- `field_type_identifier` - replace this key with an identifier of the field type that you want to make more prominent.
+In case of SEO, this key is `ibexa_seo`.
 - `meta` - when this flag is set to `true`, it separates the field type from the **Field definitions** section and puts it in an anchor menu
 - `position` - decides about the field type's position on the content type edit screen and in the content item, in relation to other field types
 
-Additionally, setting `meta` to `true` adds a toggle for enabling or disabling the field type. 
+Additionally, setting `meta` to `true` adds a toggle for enabling or disabling the field type.
 In case of SEO, it adds the **Enable SEO for this content type** toggle.
-Enable the toggle to display the SEO section on the content item edit page. 
+Enable the toggle to display the SEO section on the content item edit page.
 
 ![SEO anchor menu](content_type_edit_screen_anchor_menu.png)
 
 !!! note
 
-    If you add multiple field types as anchor menus, they're automatically displayed as separate sections. 
+    If you add multiple field types as anchor menus, they're automatically displayed as separate sections.
diff --git a/docs/administration/back_office/customize_calendar.md b/docs/administration/back_office/customize_calendar.md
index 46df5d8c10..b3def31e15 100644
--- a/docs/administration/back_office/customize_calendar.md
+++ b/docs/administration/back_office/customize_calendar.md
@@ -75,9 +75,9 @@ To add an in-memory collection as an event source, create `src/Calendar/Holidays
 !!! note
 
     When creating the list of events, you must list all the `createEvent()` entities chronologically.
-    
+
     For example:
-    
+
     ``` php
     $collection = new EventCollection([
         $this->createEvent("Event 1", new DateTime("2024-01-01")),
diff --git a/docs/administration/back_office/subitems_list.md b/docs/administration/back_office/subitems_list.md
index 23de941093..9b4a2366c5 100644
--- a/docs/administration/back_office/subitems_list.md
+++ b/docs/administration/back_office/subitems_list.md
@@ -9,8 +9,7 @@ It provides an interface for listing the sub-items of any Location.
 
 !!! caution
 
-    If you want to load the Sub-items module, you need to load the JS code for it in your view,
-    as it's not available by default.
+    If you want to load the Sub-items module, you need to load the JS code for it in your view, as it's not available by default.
 
 ## Use sub-items list
 
@@ -47,7 +46,9 @@ const attrs = {
 
 ## Properties list
 
-The `<SubItemsModule />` module can handle additional properties. There are two types of properties: **required** and **optional**. All of them are listed below.
+The `<SubItemsModule />` module can handle additional properties.
+There are two types of properties: **required** and **optional**.
+All of them are listed below.
 
 ### Required props
 
@@ -106,5 +107,4 @@ Optionally, Sub-items module can take a following list of props:
 To add a Sub-items list on a page that does not have the (right) action sidebar, you need to do one of the following things:
 
 - add a `<div>` element with the `.ibexa-extra-actions-container` selector
-- change the selector in the Sub-items settings by sending the `languageContainerSelector` prop
-which takes the selector for the element that renders the `languageSelector`.
+- change the selector in the Sub-items settings by sending the `languageContainerSelector` prop which takes the selector for the element that renders the `languageSelector`.
diff --git a/docs/administration/configuration/configuration.md b/docs/administration/configuration/configuration.md
index 99ac169b26..c40c0b1a49 100644
--- a/docs/administration/configuration/configuration.md
+++ b/docs/administration/configuration/configuration.md
@@ -15,14 +15,12 @@ However, you can also use XML or PHP formats for configuration.
 ### Configuration files
 
 Configuration files are located in the `config` folder.
-Configuration is provided per package in the `config/packages` folder,
-and routes are defined per package in `config/routes`.
+Configuration is provided per package in the `config/packages` folder, and routes are defined per package in `config/routes`.
 
 `config/packages/ibexa.yaml` contains basic configuration.
 It stores, among others, [SiteAccess](multisite.md) information and content view config.
 
-Other configuration is provided in respective files, e.g. `config/packages/ibexa_admin_ui.yaml`,
-`config/packages/ibexa_http_cache.yaml`.
+Other configuration is provided in respective files, e.g. `config/packages/ibexa_admin_ui.yaml`, `config/packages/ibexa_http_cache.yaml`.
 
 Configuration can be made environment-specific using separate folders for each environment.
 These files contain additional settings and point to the general (not environment-specific) configuration that is applied in other cases.
@@ -57,8 +55,7 @@ You can define key/value pairs in your configuration files.
 Internally and by convention, keys follow a *dot syntax*, where the different segments follow your configuration hierarchy.
 Keys are usually prefixed by a *namespace* corresponding to your application. All kinds of values are accepted, including arrays and deep hashes.
 
-For configuration that is meant to be exposed to an end-user (or end-developer),
-it's usually a good idea to also [implement semantic configuration]([[= symfony_doc =]]/components/config/definition.html).
+For configuration that is meant to be exposed to an end-user (or end-developer), it's usually a good idea to also [implement semantic configuration]([[= symfony_doc =]]/components/config/definition.html).
 
 Note that you can also [implement SiteAccess-aware semantic configuration](siteaccess_aware_configuration.md).
 
diff --git a/docs/administration/configuration/dynamic_configuration.md b/docs/administration/configuration/dynamic_configuration.md
index c8a37b5e43..7e9cad798c 100644
--- a/docs/administration/configuration/dynamic_configuration.md
+++ b/docs/administration/configuration/dynamic_configuration.md
@@ -27,8 +27,7 @@ parameters:
     myapp.default.my_param: Default value
 ```
 
-Inside a controller, in `site_group` SiteAccess, you can use the parameters in the following way
-(note that the same applies for `hasParameter()`):
+Inside a controller, in `site_group` SiteAccess, you can use the parameters in the following way (the same applies for `hasParameter()`):
 
 ``` php
 $configResolver = $this->getConfigResolver();
@@ -77,7 +76,7 @@ You can also use the [autowire feature]([[= symfony_doc =]]/service_container/au
 
 !!! note
 
-    Do not store the retrieved config value unless you know what you're doing. 
+    Do not store the retrieved config value unless you know what you're doing.
     SiteAccess can change during code execution, which means you might work on the wrong value.
 
 ``` php
diff --git a/docs/administration/configuration/repository_configuration.md b/docs/administration/configuration/repository_configuration.md
index b0d0d59881..1c68fc64bb 100644
--- a/docs/administration/configuration/repository_configuration.md
+++ b/docs/administration/configuration/repository_configuration.md
@@ -30,8 +30,7 @@ ibexa:
     Database settings are supplied by [DoctrineBundle](https://github.com/doctrine/DoctrineBundle).
     As such, you can refer to [DoctrineBundle's documentation](https://github.com/doctrine/DoctrineBundle/blob/2.7.x/Resources/doc/configuration.rst#doctrine-dbal-configuration).
 
-If no Repository is specified for a SiteAccess or SiteAccess group,
-the first Repository defined under `ibexa.repositories` is used:
+If no Repository is specified for a SiteAccess or SiteAccess group, the first Repository defined under `ibexa.repositories` is used:
 
 ``` yaml
 ibexa:
@@ -59,9 +58,7 @@ But the following configuration would be invalid:
 - `ibexa.co` domain can use `ibexa_repo`
 - `ibexa.co/doc` **cannot** use `doc_repo`, as it's under the same domain.
 
-Invalid configuration causes problems for different parts of the system,
-for example back-end UI, REST interface and other non-SiteAccess-aware Symfony routes
-such as `/_fos_user_context_hash` used by [HTTP cache](http_cache.md).
+Invalid configuration causes problems for different parts of the system, for example back-end UI, REST interface, and other non-SiteAccess-aware Symfony routes such as `/_fos_user_context_hash` used by [HTTP cache](http_cache.md).
 
 ### Entity manager
 
@@ -83,8 +80,7 @@ ibexa:
                 prefix: Ibexa\Bundle\Core\Entity
 ```
 
-Refer to [DoctrineBundle documentation](https://symfony.com/doc/3.4/reference/configuration/doctrine.html)
-for more information.
+Refer to [DoctrineBundle documentation](https://symfony.com/doc/3.4/reference/configuration/doctrine.html) for more information.
 
 !!! note
 
@@ -119,8 +115,8 @@ doctrine:
 
 ibexa:
     repositories:
-        first_repository: 
-            storage: 
+        first_repository:
+            storage:
                 engine: legacy
                 connection: my_connection_name
                 config: {}
@@ -135,7 +131,7 @@ ibexa:
             search:
                 connection: my_second_connection_name
         another_repository:
-            storage: 
+            storage:
                 engine: legacy
                 connection: another_connection_name
                 config: {}
@@ -200,8 +196,7 @@ This limit is enforced on publishing a new version and only covers archived vers
 
     Don't set `default_version_archive_limit` too high.
     In Legacy storage engine you can see performance degradation if you store too many versions.
-    The default value of 5 is the recommended value, but the less content you have overall,
-    the more you can increase this to, for instance, 25 or even 50.
+    The default value of 5 is the recommended value, but the less content you have overall, the more you can increase this to, for instance, 25 or even 50.
 
 ### Removing versions on publication
 
@@ -218,8 +213,7 @@ ibexa:
 `remove_archived_versions_on_publish` is set to `true` by default.
 Set it to `false` if you have multiple older versions of content and need to avoid performance drops when publishing.
 
-When you set the value to `false`, run [`ibexa:content:cleanup-versions`](#removing-old-versions) periodically
-to make sure that content item versions that exceed the limit are removed.
+When you set the value to `false`, run [`ibexa:content:cleanup-versions`](#removing-old-versions) periodically to make sure that content item versions that exceed the limit are removed.
 
 ### Removing old versions
 
@@ -230,7 +224,7 @@ The command takes the following optional parameters:
 - `status` or `t` - status of versions to remove: `draft`, `archived` or `all`
 - `keep` or `k` - number of versions to keep
 - `user` or `u` - the User that the command is performed as. The User must have the `content/remove`, `content/read` and `content/versionread` policies. By default the `administrator` user is applied.
-- `excluded-content-types` - exclude versions of one or multiple content types from the cleanup procedure; separate multiple content types identifiers with the comma.
+- `excluded-content-types` - exclude versions of one or multiple content types from the cleanup procedure and separate multiple content types identifiers with the comma.
 
 `ibexa:content:cleanup-versions --status <status name> --keep <number of versions> --user <user name> --excluded-content-types article,blog_post`
 
@@ -269,8 +263,7 @@ ibexa:
 ## Content Scheduler snapshots
 
 Content Scheduler snapshots speed up the rendering of Content Scheduler blocks and reduce the space used in the database.
-By default, five snapshots are stored, but you can modify this number with the following configuration,
-depending on the complexity of the Content Scheduler blocks:
+By default, five snapshots are stored, but you can modify this number with the following configuration, depending on the complexity of the Content Scheduler blocks:
 
 ``` yaml
 parameters:
@@ -285,8 +278,7 @@ This enables you to use different settings for different Repositories.
 
 !!! tip "SiteAccess-aware configuration"
 
-    If you need to use different settings per SiteAccess, not per Repository,
-    see [SiteAccess-aware configuration](siteaccess_aware_configuration.md).
+    If you need to use different settings per SiteAccess, not per Repository, see [SiteAccess-aware configuration](siteaccess_aware_configuration.md).
 
 To do this, create a parser that implements `Ibexa\Bundle\Core\DependencyInjection\Configuration\RepositoryConfigParserInterface`:
 
diff --git a/docs/administration/content_organization/content_types.md b/docs/administration/content_organization/content_types.md
index 72a793e3ff..7aae698f9a 100644
--- a/docs/administration/content_organization/content_types.md
+++ b/docs/administration/content_organization/content_types.md
@@ -9,9 +9,9 @@ It defines what fields are available in the content item.
 
 ![Content types](admin_panel_content_types.png "Content types")
 
-For example, a new content type called *Article* can have fields such as title, author, body, image, etc.
+For example, a new content type called *Article* can have fields such as title, author, body, or image.
 Based on this content type, you can create any number of content items.
-content types are organized into groups.
+Content types are organized into groups.
 
 ![Content type groups](admin_panel_content_type_groups.png "Content type groups")
 
@@ -24,24 +24,33 @@ For a detailed overview of the content model, see [Content model overview](conte
 
 Each content type is characterized by a set of metadata which define the general behavior of its instances:
 
-**Name** – a user-friendly name that describes the content type. This name is used in the interface, but not internally by the system. It can consist of letters, digits, spaces and special characters; the maximum length is 255 characters. (Mandatory.)
+**Name** – a user-friendly name that describes the content type. This name is used in the interface, but not internally by the system.
+It can consist of letters, digits, spaces, and special characters (it's mandatory and the maximum length is 255 characters).
 
 !!! note
 
     Note that even if your content type defines a field intended as a name for the content item (for example, a title of an article or product name), do not confuse it with this Name, which is a piece of metadata, not a field.
 
-**Identifier** – an identifier for internal use in configuration files, templates, PHP code, etc. It must be unique, can only contain lowercase letters, digits and underscores; the maximum length is 50 characters. (Mandatory.)
+**Identifier** – an identifier for internal use in configuration files, templates, PHP code, etc. 
+It must be unique, can only contain lowercase letters, digits, and underscores (it's mandatory and the maximum length is 50 characters).
 
-**Description** – a detailed description of the content type. (Optional.)
+**Description** – a detailed description of the content type (optional).
 
-<a id="content-name-pattern"></a>**Content name pattern** – a pattern that defines what name a new content item based on this content type gets. The pattern usually consists of field identifiers that tell the system which fields it should use when generating the name of a content item. Each field identifier has to be surrounded with angle brackets. Text outside the angle brackets is included literally. If no pattern is provided, the system automatically uses the first field. (Optional.)
+<a id="content-name-pattern"></a>**Content name pattern** – a pattern that defines what name a new content item based on this content type gets.
+The pattern usually consists of field identifiers that tell the system which fields it should use when generating the name of a content item.
+Each field identifier has to be surrounded with angle brackets.
+Text outside the angle brackets is included literally.
+If no pattern is provided, the system automatically uses the first field (optional).
 
-**URL alias name pattern** – a pattern which controls how the virtual URLs of the Locations are generated when content items are created based on this content type. Note that only the last part of the virtual URL is affected. The pattern works in the same way as the content name pattern. Text outside the angle brackets is converted using the selected method of URL transformation. If no pattern is provided, the system automatically uses the name of the content item itself. (Optional.)
+**URL alias name pattern** – a pattern which controls how the virtual URLs of the Locations are generated when content items are created based on this content type.
+Only the last part of the virtual URL is affected.
+The pattern works in the same way as the content name pattern.
+Text outside the angle brackets is converted using the selected method of URL transformation.
+If no pattern is provided, the system automatically uses the name of the content item itself (optional).
 
 !!! tip "Changing URL alias and content name patterns"
 
-    If you change the content name pattern or the URL alias name pattern,
-    existing content items cannot be modified automatically.
+    If you change the content name pattern or the URL alias name pattern, existing content items cannot be modified automatically.
     The new pattern is only applied after you modify the content item and save a new version.
 
     The old URL aliases continue to redirect to the same content items.
@@ -50,13 +59,17 @@ Each content type is characterized by a set of metadata which define the general
 
 !!! note
 
-    This flag was added for convenience and only affects the interface. In other words, it doesn't control any actual low-level logic, it simply controls the way the graphical user interface behaves.
+    This flag was added for convenience and only affects the interface.
+    In other words, it doesn't control any actual low-level logic, it simply controls the way the graphical user interface behaves.
 
-**Sort children by default by** – rule for sorting sub-items. If the instances of this content type can serve as containers, their children are sorted according to what is selected here.
+**Sort children by default by** – rule for sorting sub-items.
+If the instances of this content type can serve as containers, their children are sorted according to what is selected here.
 
-**Sort children by default in order** – another rule for sorting sub-items. This decides the sort order for the criterion chosen above.
+**Sort children by default in order** – another rule for sorting sub-items.
+This decides the sort order for the criterion chosen above.
 
-<a id="default-content-availability"></a>**Make content available even with missing translations** – a flag which indicates if content items of this content type should be available even without a corresponding language version. See [Content availability](content_availability.md).
+<a id="default-content-availability"></a>**Make content available even with missing translations** – a flag which indicates if content items of this content type should be available even without a corresponding language version.
+See [Content availability](content_availability.md).
 
 ![Creating a new content type](admin_panel_new_content_type.png)
 
@@ -71,12 +84,13 @@ They determine what fields of what field types are included in all content items
 
 !!! note
 
-    You can assign each field defined in a content type to a group by selecting one of the groups in the Category drop-down. [Available groups can be configured in the content repository](repository_configuration.md).
+    You can assign each field defined in a content type to a group by selecting one of the groups in the Category drop-down.
+    [Available groups can be configured in the content repository](repository_configuration.md).
 
 !!! caution
 
     In case of content types containing many field types you should be aware of possible memory-related issues with publishing/editing.
-    they're caused by the limitation of how many `$_POST` input variables can be accepted.
+    They're caused by the limitation of how many `$_POST` input variables can be accepted.
 
     The easiest way to fix them is by increasing the `max_input_vars` value in the `php.ini` configuration file.
     Note that this solution isn't universally recommended and you're proceeding on your own risk.
@@ -87,8 +101,7 @@ They determine what fields of what field types are included in all content items
 
 ## Modifying content types
 
-A content type and its field definitions can be modified after creation,
-even if there are already content items based on it in the system.
+A content type and its field definitions can be modified after creation, even if there are already content items based on it in the system.
 When a content type is modified, each of its instances are changed as well.
 If a new field definition is added to a content type, this field appears (empty) in every relevant content item.
 If a field definition is deleted from the content type, all the corresponding fields are removed from content items of this type.
@@ -97,8 +110,7 @@ If a field definition is deleted from the content type, all the corresponding fi
 
 System content types are by default used for the File Uploads and removing them can cause errors.
 
-If you decide to remove a `file` or `image` content type, or change their identifiers,
-you need to change the configuration, so it reflects the available content types.
+If you decide to remove a `file` or `image` content type, or change their identifiers, you need to change the configuration, so it reflects the available content types.
 
 Example configuration:
 
diff --git a/docs/administration/content_organization/sections.md b/docs/administration/content_organization/sections.md
index e2371a55ca..7d65f7b7f0 100644
--- a/docs/administration/content_organization/sections.md
+++ b/docs/administration/content_organization/sections.md
@@ -4,23 +4,26 @@ description: Sections are used to divide content items in the tree.
 
 ## Sections
 
-Sections are used to divide content items in the tree into groups that are more easily manageable by content editors.
+Sections are used to divide content items in the tree into groups that are more manageable by content editors.
 Division into Sections allows you, among others, to set [permissions](permission_overview.md) for only a part of the tree.
 
 ![Sections screen](admin_panel_sections.png "Sections screen")
 
-Technically, a Section is a number, a name and an identifier.
+Technically, a Section is a number, a name, and an identifier.
 Content items are placed in Sections by being assigned the Section ID. One item can be in only one Section.
 
 When a new content item is created, its Section ID is set to the default Section (which is usually Standard).
-When the item is published it is assigned to the same Section as its parent. Because content must always be in a Section, unassigning happens by choosing a different Section to move it into.
+When the item is published it is assigned to the same Section as its parent.
+Because content must always be in a Section, unassigning happens by choosing a different Section to move it into.
 If a content item has multiple Location assignments then it is always the Section ID of the item referenced by the parent of the main Location that is used.
 In addition, if the main Location of a content item with multiple Location assignments is changed then the Section ID of that item is updated.
 
 When content is moved to a different Location, the item itself and all of its subtree are assigned to the Section of the new Location.
-It works only for copy and move; assigning a new Section to a parent content item does not affect the subtree, meaning that subtree cannot currently be updated this way.
+It works only for copy and move.
+Assigning a new Section to a parent content item does not affect the subtree, meaning that subtree cannot currently be updated this way.
 
-Sections can only be removed if no content items are assigned to them. Even then, it should be done carefully.
+Sections can only be removed if no content items are assigned to them.
+Even then, it should be done carefully.
 When a Section is deleted, it's only its definition itself that is removed.
 Other references to the Section remain and thus the system most likely loses consistency.
 
@@ -34,5 +37,4 @@ Section ID numbers aren't recycled. If a Section is removed, its ID number canno
 
 Registration form for your website is placed under this address: <yourdomain>/register.
 By default, new users created in this way are placed in the Guest accounts group.
-To give your users a possibility to register themselves, follow the instructions 
-on [enabling account registration](8_enable_account_registration.md).
\ No newline at end of file
+To give your users a possibility to register themselves, follow the instructions on [enabling account registration](8_enable_account_registration.md).
\ No newline at end of file
diff --git a/docs/administration/dashboard/configure_default_dashboard.md b/docs/administration/dashboard/configure_default_dashboard.md
index 7b3c181000..cbfbf89153 100644
--- a/docs/administration/dashboard/configure_default_dashboard.md
+++ b/docs/administration/dashboard/configure_default_dashboard.md
@@ -32,27 +32,29 @@ All the settings in the configuration are reflected in the back office.
 ## Container remote ID
 
 Defines starting location container for all the dashboards, including customized and predifined ones.
-You can see it in the Admin panel, **Dashboards** section, **Dashboards** folder in the content tree. In the **Technical details** tab, it is defined as **Location remote ID**.
+You can see it in the Admin panel, **Dashboards** section, **Dashboards** folder in the content tree.
+In the **Technical details** tab, it is defined as **Location remote ID**.
 
 ![Container remote ID](dashboard_container_remote_id.png)
 
 ## Default dashboard remote ID
 
-Specifies default predefined dashboard. This is the dashboard that all the users see as a starting dashboard in the back office.
+Specifies default predefined dashboard.
+All the users can see this dashboard as a starting dashboard in the back office.
 You can see it in the Admin panel, **Dashboards** section, **Default dashboard** folder inside of **Predefined dashboards** container in the content tree.
-In the **Technical details** tab, it is defined as **Location remote ID**.
+In the **Technical details** tab, it's defined as **Location remote ID**.
 
 ## Users container remote ID
 
 Defines a container for users folders, which contain all customized dashboards.
 You can see it in the Admin panel, **Dashboards** section, **User dashboards** folder inside of main **Dashboards** container in the content tree.
-In the **Technical details** tab, it is defined as **Location remote ID**.
+In the **Technical details** tab, it's defined as **Location remote ID**.
 
 ## Predefined container remote ID
 
 Defines a container that contains all predefined dashboards created by Administrator.
 You can see it in the Admin panel, **Dashboards** section, **Predefined dashboards** folder inside of main **Dashboards** container in the content tree.
-In the **Technical details** tab, it is defined as **Location remote ID**.
+In the **Technical details** tab, it's defined as **Location remote ID**.
 
 ## Section identifier
 
diff --git a/docs/administration/project_organization/architecture.md b/docs/administration/project_organization/architecture.md
index 89b12da3bb..6e95964a6d 100644
--- a/docs/administration/project_organization/architecture.md
+++ b/docs/administration/project_organization/architecture.md
@@ -4,10 +4,10 @@ description: Ibexa DXP architecture is structured in multiple layers connected b
 
 # Architecture
 
-[[= product_name =]] architecture is based on the philosophy to **use APIs** that is maintained in the long term. This **makes upgrades easier and provides lossless couplings** between all parts of the architecture, at the same time improving the migration capabilities of the system.
+[[= product_name =]] architecture is based on the philosophy to **use APIs** that is maintained in the long term.
+This **makes upgrades easier and provides lossless couplings** between all parts of the architecture, at the same time improving the migration capabilities of the system.
 
-The structure of an [[= product_name =]] app is based on the Symfony framework
-but content management functions rely on the public PHP API.
+The structure of an [[= product_name =]] app is based on the Symfony framework but content management functions rely on the public PHP API.
 Other applications integrate with [[= product_name =]] via REST API, which also relies on the public PHP API.
 
 ![Architecture](architecture.png "Architecture")
diff --git a/docs/administration/project_organization/bundles.md b/docs/administration/project_organization/bundles.md
index 0ca296614f..6c4ee0d029 100644
--- a/docs/administration/project_organization/bundles.md
+++ b/docs/administration/project_organization/bundles.md
@@ -10,15 +10,13 @@ You can [create bundles yourself](package_structure.md) or make use of available
 You can also reuse the bundles you create in other projects or share them with the community.
 
 Many [[= product_name =]] functionalities are provided through separate bundles included in the installation.
-You can see the bundles that are automatically installed with [[= product_name =]]
-in the respective `composer.json` files.
+You can see the bundles that are automatically installed with [[= product_name =]] in the respective `composer.json` files.
 For example, for [[= product_name_headless =]], see the [JSON file on GitHub](https://github.com/ibexa/headless/blob/master/composer.json).
 
 !!! caution "Deprecated legacy Commerce bundles"
 
-    As of [[= product_name =]] v4.4 all `ibexa/commerce` packages are deprecated. 
-    they're gradually replaced by their revamped counterparts and removed 
-    completely from the product in version v5.0.
+    As of [[= product_name =]] v4.4 all `ibexa/commerce` packages are deprecated.
+    they're gradually replaced by their revamped counterparts and removed completely from the product in version v5.0.
 
 ## Working with bundles
 
@@ -29,14 +27,13 @@ To learn how to create your own bundles, see [Symfony documentation on bundles](
 
 ### Overriding third-party bundles
 
-When you use an external bundle, you can override its parts, such as templates, controllers, etc.
+When you use an external bundle, you can override its parts, such as templates or controllers.
 To do so, make use of [Symfony's bundle override mechanism]([[= symfony_doc =]]/bundles/override.html).
-Note that when overriding files, the path inside your application has to correspond to the path inside the bundle.
+When overriding files, the path inside your application has to correspond to the path inside the bundle.
 
 ### Removing bundles
 
-To remove a bundle (either one you created yourself, or an out-of-the-box one that you do not need),
-see the [How to Remove a Bundle]([[= symfony_doc =]]/bundles/remove.html) instruction in Symfony doc.
+To remove a bundle (either one you created yourself, or an out-of-the-box one that you do not need), see the [How to Remove a Bundle]([[= symfony_doc =]]/bundles/remove.html) instruction in Symfony doc.
 
 ## Core packages
 
diff --git a/docs/administration/project_organization/project_organization.md b/docs/administration/project_organization/project_organization.md
index d8c0b01217..165042989e 100644
--- a/docs/administration/project_organization/project_organization.md
+++ b/docs/administration/project_organization/project_organization.md
@@ -6,13 +6,13 @@ description: An Ibexa DXP project follows Symfony's directory structure to organ
 
 [[= product_name =]] is a Symfony application and follows the project structure used by Symfony.
 
-You can see an example of organizing a simple project in the [companion repository](https://github.com/ezsystems/ezplatform-ee-beginner-tutorial/tree/v3-master) for the [Beginner tutorial](page_and_form_tutorial.md).
+You can see an example of organizing a project in the [companion repository](https://github.com/ezsystems/ezplatform-ee-beginner-tutorial/tree/v3-master) for the [Beginner tutorial](page_and_form_tutorial.md).
 
 ## PHP code
 
 The project's PHP code (controllers, event listeners, etc.) should be placed in the `src` folder.
 
-Reusable libraries should be packaged so that they can easily be managed using Composer.
+Reusable libraries should be packaged so that they can be managed using Composer.
 
 ## Templates
 
@@ -23,7 +23,6 @@ They can then be referenced in code without any prefix, for example `templates/
 ## Assets
 
 Project assets should go into the `assets` folder.
-
 They can be referenced as relative to the root, for example `assets/js/script.js` can be referenced as `js/script.js` from templates.
 
 All project assets are accessible through the `assets` path.
@@ -32,7 +31,7 @@ All project assets are accessible through the `assets` path.
 
     If you ever remove the `assets` folder manually, you need to dump translations before performing
     the `yarn encore <dev|prod>` command:
-    
+
     ```
     php bin/console bazinga:js-translation:dump assets --merge-domains
     ```
@@ -44,8 +43,7 @@ See [Configuration](configuration.md) for more information.
 
 ### Importing configuration from a bundle
 
-If you're keeping some of your code in a bundle, dealing with core bundle semantic configuration can be tedious
-if you maintain it in the main `config/packages/ibexa.yaml` configuration file.
+If you're keeping some of your code in a bundle, dealing with core bundle semantic configuration can be tedious if you maintain it in the main `config/packages/ibexa.yaml` configuration file.
 
 You can import configuration from a bundle by following the Symfony tutorial [How to Import Configuration Files/Resources]([[= symfony_doc =]]/service_container/import.html).
 
diff --git a/docs/administration/recent_activity/recent_activity.md b/docs/administration/recent_activity/recent_activity.md
index ab34820444..ad7e786ee5 100644
--- a/docs/administration/recent_activity/recent_activity.md
+++ b/docs/administration/recent_activity/recent_activity.md
@@ -15,7 +15,7 @@ To learn more about its back office usage and the actions logged by default, see
 With some configuration, you can customize the log length in the database or on screen.
 A command maintains the log size in database, it should be scheduled through CRON.
 
-- The configuration `ibexa.system.<scope>.activity_log.pagination.activity_logs_limit` sets the number of log items shown per page in the back office (default value: 25). 
+- The configuration `ibexa.system.<scope>.activity_log.pagination.activity_logs_limit` sets the number of log items shown per page in the back office (default value: 25).
 A log item is a group of entries, or an entry without group.
 - The configuration `ibexa.repositories.<repository>.activity_log.truncate_after_days` sets the number of days a log entry is kept before it's deleted by the `ibexa:activity-log:truncate` command (default value: 30 days).
 
@@ -60,11 +60,9 @@ This policy is required to view [activity log in user profile]([[= user_doc =]]/
     A username of the User who performs the action is logged.
     When acting through the web server, the User's IP address is also logged.
     Other access, such as console commands, doesn't log an IP.
-    Your Data Protection Officer or GDPR representative should be aware of this,
-    so they can ensure users are informed if needed, depending on your use case, jurisdiction, and company policy.
+    Your Data Protection Officer or GDPR representative should be aware of this, so they can ensure users are informed if needed, depending on your use case, jurisdiction, and company policy.
 
-    For example, if a content edition feature, such as reader's comments, is available in the front office,
-    the recent activity log records the front users' IPs.
+    For example, if a content edition feature, such as reader's comments, is available in the front office, the recent activity log records the front users' IPs.
 
 ## PHP API
 
@@ -208,7 +206,7 @@ Other actions are displayed after you click the **Show more** button.
 
 #### Display log entries
 
-To display your log entry, if your object's PHP class isn't already covered, you'll have to:
+To display your log entry, if your object's PHP class isn't already covered, you have to:
 
 - implement `ClassNameMapperInterface` to associate the class name with an identifier,
 - eventually create a `PostActivityListLoadEvent` subscriber if you need to load the object for the template,
diff --git a/docs/api/api.md b/docs/api/api.md
index 813a5edae7..6b0aa274b7 100644
--- a/docs/api/api.md
+++ b/docs/api/api.md
@@ -10,5 +10,5 @@ page_type: landing_page
 [[= cards([
     "api/rest_api/rest_api_usage/rest_api_usage",
     "api/php_api/php_api",
-    "api/graphql/graphql",
+    "api/graphql/graphql"
 ], columns=3) =]]
diff --git a/docs/api/graphql/graphql.md b/docs/api/graphql/graphql.md
index 13cab741aa..da5759be2c 100644
--- a/docs/api/graphql/graphql.md
+++ b/docs/api/graphql/graphql.md
@@ -20,13 +20,11 @@ php bin/console cache:clear
 ```
 
 YAML files with the schema are located in `config/graphql/types/ibexa`.
-They contain information about the domain objects and the fields
-you can [query](graphql_queries.md) and [operate on](graphql_operations.md).
+They contain information about the domain objects and the fields you can [query](graphql_queries.md) and [operate on](graphql_operations.md).
 
 ### Schema generation limitations
 
-GraphQL schema cannot be generated for names that do not follow the [GraphQL specification](http://spec.graphql.org/June2018/#sec-Names),
-for example names that start with a digit.
+GraphQL schema cannot be generated for names that do not follow the [GraphQL specification](http://spec.graphql.org/June2018/#sec-Names), for example names that start with a digit.
 
 This concerns image variations, content types, content type groups, product types, and field definition identifiers.
 
@@ -36,29 +34,25 @@ To find identifiers that aren't included in the schema, look for "Skipped schema
 
 ## Domain schema
 
-GraphQL for [[= product_name =]] is based on the content types (including product types), content type groups, and content items
-defined in the Repository.
+GraphQL for [[= product_name =]] is based on the content types (including product types), content type groups, and content items defined in the repository.
 
 For each content type the schema exposes a singular and plural field, e.g. `article` and `articles`.
-Use the singular field to query a single content item, and the plural to get a whole `Connection`
-(a list of content items that supports pagination).
+Use the singular field to query a single content item, and the plural to get a whole `Connection` (a list of content items that supports pagination).
 
 With the queries you can inspect:
 
-- the existing types 
+- the existing types
 - details of content types, and their fields in the context of developing your own application
 
-You can request additional content information such as the Section or Objects states,
-available under the `_info` field.
+You can request additional content information such as the Section or Objects states, available under the `_info` field.
 
 You can also query content type and content type group information through the `_info` and `_types` fields.
 
 ### Repository schema
 
-The repository schema, accessed through `_repository`, exposes the [[= product_name =]] Repository
-in a manner similar to the [Public PHP API](php_api.md).
+The repository schema, accessed through `_repository`, exposes the [[= product_name =]] repository in a manner similar to the [Public PHP API](php_api.md).
 
-The `_repository` field also enables you to query e.g. Object states configured for the Repository.
+The `_repository` field also enables you to query e.g. Object states configured for the repository.
 
 ### Custom schemas
 
@@ -69,8 +63,7 @@ You can also use your own [custom schema](graphql_customization.md#custom-schema
 GraphQL is SiteAccess-aware, but can have only one schema per installation.
 This means you cannot use GraphQL with multiple repositories.
 
-When you request a URL from a SiteAccess that is different than the current one,
-the API generates it for the content item's SiteAccess, with an absolute URL if necessary.
+When you request a URL from a SiteAccess that is different than the current one, the API generates it for the content item's SiteAccess, with an absolute URL if necessary.
 
 ## Authentication
 
@@ -79,8 +72,7 @@ You can get your session cookie by logging in through the interface or through a
 
 ### JWT authentication
 
-If you have [JWT authentication](development_security.md#jwt-authentication) enabled,
-you can use the following query to get your authentication token:
+If you have [JWT authentication](development_security.md#jwt-authentication) enabled, you can use the following query to get your authentication token:
 
 ```
 mutation CreateToken {
@@ -113,7 +105,7 @@ You can access GraphQL with `<yourdomain>/graphql`.
 The [GraphiQL interactive client](https://github.com/graphql/graphiql) is included in the installation.
 Access it through `<yourdomain>/graphiql`.
 
-Here you can run your queries and preview the results in an easy-to-read format.
+Here you can run your queries and preview the results in a readable format.
 
 ### Reference
 
diff --git a/docs/api/graphql/graphql_custom_ft.md b/docs/api/graphql/graphql_custom_ft.md
index e236c1f40d..c7f4b6920d 100644
--- a/docs/api/graphql/graphql_custom_ft.md
+++ b/docs/api/graphql/graphql_custom_ft.md
@@ -21,9 +21,8 @@ There are two ways of mapping a custom field type:
 - custom `FieldDefinitionMapper`
 
 You need to write a custom `FieldDefinitionMapper` if the field definition settings and constraints impact how it's mapped to GraphQL.
-For example, the selection field type has a "multiple" option. 
-If set to false, it accepts and returns a single value, 
-but if set to true, it accepts and returns an array of values.
+For example, the selection field type has a "multiple" option.
+If set to false, it accepts and returns a single value, but if set to true, it accepts and returns an array of values.
 
 If your field definition doesn't require additional clarifications, you can map it with configuration.
 
@@ -34,8 +33,10 @@ To map a custom field type with configuration use a compiler pass to modify a co
 It's a hash that maps a field type identifier (`ezstring`) to the following entries:
 
 - `value_type` - the GraphQL type values of the custom field. It can be a native type (string, int), or a custom type. If none is specified, string is used.
-- `value_resolver` - how values of this field are resolved and passed to the defined value type. If not specified, it receives the `Field` object for the field type: `field`.
-- `definition_type` - the GraphQL type the field definitions is mapped to. If not specified, it uses `FieldDefinition`.
+- `value_resolver` - how values of this field are resolved and passed to the defined value type.
+If not specified, it receives the `Field` object for the field type: `field`.
+- `definition_type` - the GraphQL type the field definitions is mapped to.
+If not specified, it uses `FieldDefinition`.
 
 Compiler pass example that should be placed in `src/DependencyInjection/Compiler`:
 
diff --git a/docs/api/graphql/graphql_customization.md b/docs/api/graphql/graphql_customization.md
index b710863475..6a2c6aa5c1 100644
--- a/docs/api/graphql/graphql_customization.md
+++ b/docs/api/graphql/graphql_customization.md
@@ -15,10 +15,11 @@ To do so, create a `config/graphql/types/Query.types.yaml` file. It is used as t
 In that file, add new fields that use any custom type or custom logic you require, based
 on [overblog/GraphQLBundle](https://github.com/overblog/GraphQLBundle).
 
-The custom schema should be created only after generating other schemas to avoid problems, especially if the custom schema depends on other schema elements. For example:
-`Type "Domain" inherited by "Query" not found.`.
+The custom schema should be created only after generating other schemas to avoid problems, especially if the custom schema depends on other schema elements.
+For example, `Type "Domain" inherited by "Query" not found.`.
 To avoid this problem during deployment, add the generated schemas to the repository.
-Update the schema in the event of any changes related to GraphQL as well as when changing the environment, for example from `dev` to `prod`.
+Update the schema in the event of any changes related to GraphQL and when changing the environment, for example from `dev` to `prod`.
+
 ### Configuration
 
 You can include the [[= product_name =]] schema in two ways: either through inheritance or composition.
@@ -91,7 +92,6 @@ SomethingPayload:
 ## Custom field name
 
 You can customize the name used by GraphQL as the content field name.
-
 Use this setting to avoid conflicts with field names that derive from a content type definition.
 
 ``` yaml
diff --git a/docs/api/graphql/graphql_operations.md b/docs/api/graphql/graphql_operations.md
index 1672be625b..b8de7a692b 100644
--- a/docs/api/graphql/graphql_operations.md
+++ b/docs/api/graphql/graphql_operations.md
@@ -70,7 +70,7 @@ Response:
 }
 ```
 
-Note that the input for updating a content item is the same as when creating it, but all fields are optional.
+The input for updating a content item is the same as when creating it, but all fields are optional.
 
 ## Deleting content
 
diff --git a/docs/api/graphql/graphql_queries.md b/docs/api/graphql/graphql_queries.md
index d9d67d5fb1..49106e66f6 100644
--- a/docs/api/graphql/graphql_queries.md
+++ b/docs/api/graphql/graphql_queries.md
@@ -10,8 +10,7 @@ You can query a single content item or a list of content items using fields defi
 
 ### Get a content item
 
-To get a specific content item by its content ID, Location ID, or URL alias, use its relevant singular field,
-for example `article`, `folder`, `image`, etc.:
+To get a specific content item by its content ID, Location ID, or URL alias, use its relevant singular field, for example `article`, `folder`, or `image`.
 
 ```
 {
@@ -106,7 +105,7 @@ When you do not specify a language, the response contains the most prioritized t
 
 ### Get a group of content items
 
-To get a list of all content items of a selected type, use the plural field, e.g. `articles`:
+To get a list of all content items of a selected type, use the plural field, for example, `articles`:
 
 ```
 {
@@ -765,8 +764,7 @@ You can paginate plural fields using `edges`:
 ```
 
 This query returns the first three articles, ordered by their publication date.
-If the current `Connection` (list of results) isn't finished yet and there are more items to read,
-`hasNextPage` is `true`.
+If the current `Connection` (list of results) isn't finished yet and there are more items to read, `hasNextPage` is `true`.
 
 For the `children` node, you can use the following pagination method:
 
diff --git a/docs/api/php_api/php_api.md b/docs/api/php_api/php_api.md
index 10ada13e14..7a85a1fa94 100644
--- a/docs/api/php_api/php_api.md
+++ b/docs/api/php_api/php_api.md
@@ -7,15 +7,14 @@ page_type: reference
 
 The [public PHP API](../php_api_reference/) enables you to interact with [[= product_name =]]'s Repository and content model from your PHP code.
 
-You can use it to create, read, update, manage, and delete all objects available in [[= product_name =]], namely
-content and related objects such as Sections, Locations, content types, languages, etc.
+You can use it to create, read, update, manage, and delete all objects available in [[= product_name =]], namely content and related objects such as Sections, Locations, content types, or languages.
 
 The PHP API is built on top of a layered architecture, including a persistence SPI that abstracts storage.
 Using the API ensures that your code is forward compatible with future releases based on other storage engines.
 
 ## Using API services
 
-The API provides access to Content, User, content types and other features through various services.
+The API provides access to Content, User, content types, and other features through various services.
 
 The full list of available services covers:
 
@@ -63,9 +62,7 @@ Those objects are divided into sub-namespaces, such as [`Content`](php_api_refer
 Each sub-namespace contains a set of value objects,
 such as [`Content\Content`](php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Content.html) or [`User\Role`](php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-User-Role.html).
 
-Value objects come with their own properties, such as `$content->id` or `$location->hidden`,
-as well as with methods that provide access to more related information,
-such as [`Content\Relation::getSourceContentInfo()`](php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Relation.html#method_getSourceContentInfo) or [`User\Role::getPolicies()`](php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-User-Role.html#method_getPolicies).
+Value objects come with their own properties, such as `$content->id` or `$location->hidden`, and with methods that provide access to more related information, such as [`Content\Relation::getSourceContentInfo()`](php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Relation.html#method_getSourceContentInfo) or [`User\Role::getPolicies()`](php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-User-Role.html#method_getPolicies).
 
 ### Creating and updating objects
 
@@ -74,19 +71,15 @@ To create and modify Repository values, use data structures, such as [`ContentSe
 
 ### Value info objects
 
-Some complex value objects have an `Info` counterpart,
-for example [`ContentInfo`](https://github.com/ibexa/core/blob/main/src/contracts/Repository/Values/Content/ContentInfo.php)
-for [`Content`](https://github.com/ibexa/core/blob/main/src/contracts/Repository/Values/Content/Content.php).
+Some complex value objects have an `Info` counterpart, for example [`ContentInfo`](https://github.com/ibexa/core/blob/main/src/contracts/Repository/Values/Content/ContentInfo.php) for [`Content`](https://github.com/ibexa/core/blob/main/src/contracts/Repository/Values/Content/Content.php).
 These objects provide you with lower-level information.
-For instance, `ContentInfo` contains `currentVersionNo` or `remoteId`,
-while `Content` enables you to retrieve fields, content type, or previous versions.
+For instance, `ContentInfo` contains `currentVersionNo` or `remoteId`, while `Content` enables you to retrieve fields, content type, or previous versions.
 
 !!! note
 
     The public PHP API value objects should not be serialized.
 
-    Serialization of value objects, for example, `Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo` /  `Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo` 
-    or `Ibexa\Contracts\Core\Repository\Values\Content\Location` results in memory limit exceeded error.
+    Serialization of value objects, for example, `Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo` /  `Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo` or `Ibexa\Contracts\Core\Repository\Values\Content\Location` results in memory limit exceeded error.
 
 
 ## Authentication
@@ -102,7 +95,7 @@ When using the PHP API, authentication is performed in three ways:
 ### Back office authentication
 
 When actions are performed through the back office, they're executed as the logged-in User.
-This User's permissions affects the behavior of the Repository.
+This User's permissions affects the behavior of the repository.
 The User may, for example, not be allowed to create content, or view a particular Section.
 
 ### Using `sudo()`
@@ -127,11 +120,9 @@ $hiddenLocation = $repository->sudo(function (Repository $repository) use ($loca
 ### Setting the Repository user
 
 In a command line script, the Repository runs as if executed by the anonymous user.
-While [using `sudo()`](#using-sudo) is the recommended option,
-you can also set the current user to a user with necessary permissions to achieve the same effect.
+While [using `sudo()`](#using-sudo) is the recommended option, you can also set the current user to a user with necessary permissions to achieve the same effect.
 
-In order to identify as a different user, you need to use the `UserService` together with `PermissionResolver`
-(in the example `admin` is the login of the administrator user):
+To identify as a different user, you need to use the `UserService` together with `PermissionResolver` (in the example `admin` is the login of the administrator user):
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/CreateContentCommand.php', 50, 52) =]]
@@ -139,10 +130,10 @@ In order to identify as a different user, you need to use the `UserService` toge
 
 !!! tip
 
-    [`Ibexa\Contracts\Core\Repository\PermissionService`](php_api_reference/classes/Ibexa-Contracts-Core-Repository-PermissionService.html) can be injected to have a Service which provides both `PermissionResolver` and `PermissionCriterionResolver`. It supports auto-wiring.    
+    [`Ibexa\Contracts\Core\Repository\PermissionService`](php_api_reference/classes/Ibexa-Contracts-Core-Repository-PermissionService.html) can be injected to have a Service which provides both `PermissionResolver` and `PermissionCriterionResolver`.
+    It supports auto-wiring.
 
-This isn't required in template functions or controller code,
-as the HTTP layer takes care of identifying the user, and automatically sets it in the repository.
+This isn't required in template functions or controller code, as the HTTP layer takes care of identifying the user, and automatically sets it in the repository.
 
 If you want to identify a user with their credentials instead, provide them in the following way:
 
@@ -158,8 +149,7 @@ Each API method may throw different exceptions, depending on what it does.
 
 It's good practice to cover every exception you expect to happen.
 
-For example if you're using a command which takes the Content ID as a parameter,
-the ID may either not exist, or the referenced content item may not be visible to the user.
+For example if you're using a command which takes the Content ID as a parameter, the ID may either not exist, or the referenced content item may not be visible to the user.
 
 Both cases should be covered with error messages:
 
@@ -177,12 +167,13 @@ try {
 
 [[= product_name =]] uses the [Symfony service container]([[= symfony_doc =]]/service_container.html) for dependency resolution.
 
-[Symfony dependency injection]([[= symfony_doc =]]/components/dependency_injection.html) ensures that any required services are available in your custom code
-(for example, controllers) when you inject them into the constructor.
+[Symfony dependency injection]([[= symfony_doc =]]/components/dependency_injection.html) ensures that any required services are available in your custom code (for example, controllers) when you inject them into the constructor.
 
-Symfony service container uses service tags to dedicate services to a specific purpose. they're usually used for extension points.
+Symfony service container uses service tags to dedicate services to a specific purpose.
+They're usually used for extension points.
 
-[[= product_name =]] exposes multiple features using service tags. For example, field types are tagged `ibexa.field_type`.
+[[= product_name =]] exposes multiple features using service tags.
+For example, field types are tagged `ibexa.field_type`.
 
 !!! tip
 
diff --git a/docs/api/rest_api/extending_rest_api/adding_custom_media_type.md b/docs/api/rest_api/extending_rest_api/adding_custom_media_type.md
index b276f35d66..b3889338d6 100644
--- a/docs/api/rest_api/extending_rest_api/adding_custom_media_type.md
+++ b/docs/api/rest_api/extending_rest_api/adding_custom_media_type.md
@@ -10,9 +10,10 @@ By default, this resource takes an `application/vnd.ibexa.api.Location+xml` (or
 The following example adds the handling of a new media type `application/app.api.Location+xml` (or `+json`) `Accept` header to obtain a different response using the same controller.
 
 You need the following elements:
-* A `ValueObjectVisitor` to create the new response corresponding to the new media type;
-* A `ValueObjectVisitorDispatcher` to have this `ValueObjectVisitor` used to visit the default controller result;
-* An `Output\Visitor` service associating this new `ValueObjectVisitorDispatcher` with the new media type.
+
+- `ValueObjectVisitor` - to create the new response corresponding to the new media type
+- `ValueObjectVisitorDispatcher` - to have this `ValueObjectVisitor` used to visit the default controller result
+- `Output\Visitor` - service associating this new `ValueObjectVisitorDispatcher` with the new media type
 
 !!! note
 
diff --git a/docs/api/rest_api/extending_rest_api/creating_new_rest_resource.md b/docs/api/rest_api/extending_rest_api/creating_new_rest_resource.md
index 857f62e7f5..d3de11e7f1 100644
--- a/docs/api/rest_api/extending_rest_api/creating_new_rest_resource.md
+++ b/docs/api/rest_api/extending_rest_api/creating_new_rest_resource.md
@@ -6,11 +6,11 @@ description: Extend REST API by creating a new resource.
 
 To create a new REST resource, you need to prepare:
 
-* The REST route leading to a controller action.
-* The controller and its action.
-* Optionally, one or several `InputParser` objects if the controller needs to receive a payload to treat, one or several value classes to represent this payload and potentially one or several new media types to type this payload in the `Content-Type` header.
-* Optionally, one or several new value classes to represent the controller action result, their `ValueObjectVisitor` to help the generator to turn this into XML or JSON and potentially one or several new media types to claim in the `Accept` header the desired value.
-* Optionally, the addition of this resource route to the REST root.
+- the REST route leading to a controller action
+- the controller and its action
+- one or several `InputParser` objects if the controller needs to receive a payload to treat, one or several value classes to represent this payload and potentially one or several new media types to type this payload in the `Content-Type` header (optional)
+- one or several new value classes to represent the controller action result, their `ValueObjectVisitor` to help the generator to turn this into XML or JSON and potentially one or several new media types to claim in the `Accept` header the desired value (optional)
+- the addition of this resource route to the REST root (optional)
 
 In the following example, you add a greeting resource to the REST API.
 It's available through `GET` and `POST` methods. `GET` sets default values while `POST` allows inputting custom values.
@@ -57,8 +57,8 @@ Having the REST controllers set as services enables using features such as the `
 
 A REST controller should:
 
-- return a value object and have a `Generator` and `ValueObjectVisitor`s producing the XML or JSON output;
-- extend `Ibexa\Rest\Server\Controller` to inherit utils methods and properties like `InputDispatcher` or `RequestParser`.
+- return a value object and have a `Generator` and `ValueObjectVisitor`s producing the XML or JSON output
+- extend `Ibexa\Rest\Server\Controller` to inherit utils methods and properties like `InputDispatcher` or `RequestParser`
 
 ``` php
 [[= include_file('code_samples/api/rest_api/src/Rest/Controller/DefaultController.php') =]]
@@ -101,7 +101,8 @@ services:
 [[= include_file('code_samples/api/rest_api/config/services.yaml', 43, 48) =]]
 ```
 
-Here, the media type is `application/vnd.ibexa.api.Greeting` plus a format. To have a different vendor than the default, you could create a new `Output\Generator` or hard-code it in the `ValueObjectVisitor` like in the [`RestLocation` example](adding_custom_media_type.md#new-restlocation-valueobjectvisitor).
+Here, the media type is `application/vnd.ibexa.api.Greeting` plus a format.
+To have a different vendor than the default, you could create a new `Output\Generator` or hard-code it in the `ValueObjectVisitor` like in the [`RestLocation` example](adding_custom_media_type.md#new-restlocation-valueobjectvisitor).
 
 ## InputParser
 
@@ -186,7 +187,9 @@ ibexa_rest:
                     href: 'router.generate("<resource_route_name>", {routeParameter: value})'
 ```
 
-The `router.generate` renders a URI based on the name of the route and its parameters. The parameter values can be a real value or a placeholder. For example, `'router.generate("ibexa.rest.load_location", {locationPath: "1/2"})'` results in `/api/ibexa/v2/content/locations/1/2` while `'router.generate("ibexa.rest.load_location", {locationPath: "{locationPath}"})'` gives `/api/ibexa/v2/content/locations/{locationPath}`.
+The `router.generate` renders a URI based on the name of the route and its parameters.
+The parameter values can be a real value or a placeholder.
+For example, `'router.generate("ibexa.rest.load_location", {locationPath: "1/2"})'` results in `/api/ibexa/v2/content/locations/1/2` while `'router.generate("ibexa.rest.load_location", {locationPath: "{locationPath}"})'` gives `/api/ibexa/v2/content/locations/{locationPath}`.
 This syntax is based on Symfony's [expression language]([[= symfony_doc =]]/components/expression_language/index.html), an extensible component that allows limited/readable scripting to be used outside the code context.
 
 In this example, `app.rest.greeting` is available in every SiteAccess (`default`):
diff --git a/docs/api/rest_api/rest_api_authentication.md b/docs/api/rest_api/rest_api_authentication.md
index c85cffd57e..f017b6733c 100644
--- a/docs/api/rest_api/rest_api_authentication.md
+++ b/docs/api/rest_api/rest_api_authentication.md
@@ -7,7 +7,7 @@ description: To authenticate REST API communication you can use session (default
 This page refers to [REST API reference](rest_api_reference/rest_api_reference.html), where you can find detailed information about
 REST API resources and endpoints.
 
-Five authentication methods are currently supported: session (default), JWT, basic, OAuth and client certificate (SSL).
+Five authentication methods are currently supported: session (default), JWT, basic, OAuth, and client certificate (SSL).
 
 You can only use one of those methods at the same time.
 
@@ -52,7 +52,7 @@ To create a session, execute the following REST request:
     Accept: application/vnd.ibexa.api.Session+xml
     Content-Type: application/vnd.ibexa.api.SessionInput+xml
     ```
-    
+
     ```xml
     <?xml version="1.0" encoding="UTF-8"?>
     <SessionInput>
@@ -60,14 +60,14 @@ To create a session, execute the following REST request:
       <password>publish</password>
     </SessionInput>
     ```
-    
+
     ```
     HTTP/1.1 201 Created
     Location: /user/sessions/go327ij2cirpo59pb6rrv2a4el2
     Set-Cookie: eZSESSID98defd6ee70dfb1dea416=go327ij2cirpo59pb6rrv2a4el2; domain=.example.net; path=/; expires=Wed, 13-Jan-2021 22:23:01 GMT; HttpOnly
     Content-Type: application/vnd.ibexa.api.Session+xml
     ```
-    
+
     ```xml
     <?xml version="1.0" encoding="UTF-8"?>
     <Session href="/user/sessions/sessionID" media-type="application/vnd.ibexa.api.Session+xml">
@@ -86,7 +86,7 @@ To create a session, execute the following REST request:
     Accept: application/vnd.ibexa.api.Session+json
     Content-Type: application/vnd.ibexa.api.SessionInput+json
     ```
-    
+
     ```json
     {
       "SessionInput": {
@@ -95,14 +95,14 @@ To create a session, execute the following REST request:
       }
     }
     ```
-    
+
     ```
     HTTP/1.1 201 Created
     Location: /user/sessions/go327ij2cirpo59pb6rrv2a4el2
     Set-Cookie: eZSESSID98defd6ee70dfb1dea416=go327ij2cirpo59pb6rrv2a4el2; domain=.example.net; path=/; expires=Wed, 13-Jan-2021 22:23:01 GMT; HttpOnly
     Content-Type: application/vnd.ibexa.api.Session+xml
     ```
-    
+
     ```json
     {
       "Session": {
@@ -121,8 +121,7 @@ To create a session, execute the following REST request:
 
 ##### Logging in with active session
 
-Logging in is very similar to session creation, with one important detail:
-the CSRF token obtained in the previous step is added to the new request through the `X-CSRF-Token` header.
+Logging in is similar to session creation, with one important detail: the CSRF token obtained in the previous step is added to the new request through the `X-CSRF-Token` header.
 
 === "XML"
 
@@ -134,7 +133,7 @@ the CSRF token obtained in the previous step is added to the new request through
     Cookie: eZSESSID98defd6ee70dfb1dea416=go327ij2cirpo59pb6rrv2a4el2
     X-CSRF-Token: 23lk.neri34ijajedfw39orj-3j93
     ```
-    
+
     ```xml
     <?xml version="1.0" encoding="UTF-8"?>
     <SessionInput>
@@ -142,12 +141,12 @@ the CSRF token obtained in the previous step is added to the new request through
       <password>publish</password>
     </SessionInput>
     ```
-    
+
     ```
     HTTP/1.1 200 OK
     Content-Type: application/vnd.ibexa.api.Session+xml
     ```
-    
+
     ```xml
     <?xml version="1.0" encoding="UTF-8"?>
     <Session href="user/sessions/go327ij2cirpo59pb6rrv2a4el2/refresh" media-type="application/vnd.ibexa.api.Session+xml">
@@ -168,7 +167,7 @@ the CSRF token obtained in the previous step is added to the new request through
     Cookie: eZSESSID98defd6ee70dfb1dea416=go327ij2cirpo59pb6rrv2a4el2
     X-CSRF-Token: 23lk.neri34ijajedfw39orj-3j93
     ```
-    
+
     ```xml
     {
       "SessionInput": {
@@ -177,12 +176,12 @@ the CSRF token obtained in the previous step is added to the new request through
       }
     }
     ```
-    
+
     ```
     HTTP/1.1 200 OK
     Content-Type: application/vnd.ibexa.api.Session+json
     ```
-    
+
     ```xml
     {
       "Session": {
@@ -214,8 +213,7 @@ Cookie: eZSESSID98defd6ee70dfb1dea416=go327ij2cirpo59pb6rrv2a4el2
 
 ##### CSRF token
 
-It can be important to keep the CSRF token (`csrfToken`) for the duration of the session,
-because you must send this token in every request that uses [unsafe HTTP methods](rest_requests.md#request-method) (others than the safe GET or HEAD or OPTIONS) when a session has been established.
+It can be important to keep the CSRF token (`csrfToken`) for the duration of the session, because you must send this token in every request that uses [unsafe HTTP methods](rest_requests.md#request-method) (others than the safe GET or HEAD or OPTIONS) when a session has been established.
 It should be sent with an `X-CSRF-Token` header.
 
 Only three built-in routes can accept unsafe methods without CSRF, the sessions routes starting with `/user/sessions` to create, refresh or delete a session.
@@ -270,8 +268,7 @@ See [JWT authentication](#jwt-authentication) or GraphQL.
 
 ### Usage example
 
-After you [configure JWT authentication](development_security.md#jwt-authentication) at least for REST,
-you can get the JWT token through the following request:
+After you [configure JWT authentication](development_security.md#jwt-authentication) at least for REST, you can get the JWT token through the following request:
 
 === "XML"
 
@@ -281,24 +278,24 @@ you can get the JWT token through the following request:
     Accept: application/vnd.ibexa.api.JWT+xml
     Content-Type: application/vnd.ibexa.api.JWTInput+xml
     ```
-    
+
     Provide the username and password in the request body:
-    
+
     ```xml
     <JWTInput>
         <username>admin</username>
         <password>publish</password>
     </JWTInput>
     ```
-    
+
     If credentials are valid, the server response contains a token:
-    
+
     ```xml
     <JWT media-type="application/vnd.ibexa.api.JWT+xml" token="eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9…-QBE4-6eKNjg"/>
     ```
-    
+
     You can then use this token in your request instead of username and password.
-    
+
     ```
     GET /content/locations/1/5/children
     Host: <yourdomain>
@@ -314,9 +311,9 @@ you can get the JWT token through the following request:
     Accept: application/vnd.ibexa.api.JWT+json
     Content-Type: application/vnd.ibexa.api.JWTInput+json
     ```
-    
+
     Provide the username and password in the request body:
-    
+
     ```json
     {
         "JWTInput": {
@@ -325,9 +322,9 @@ you can get the JWT token through the following request:
         }
     }
     ```
-    
+
     If credentials are valid, the server response contains a token:
-    
+
     ```json
     {
         "JWT": {
@@ -336,9 +333,9 @@ you can get the JWT token through the following request:
         }
     }
     ```
-    
+
     You can then use this token in your request instead of username and password.
-    
+
     ```
     GET /content/locations/1/5/children
     Host: <yourdomain>
@@ -378,8 +375,8 @@ If the installation has a dedicated host for REST, you can enable HTTP basic aut
 Basic authentication requires the username and password to be sent *(username:password)*, base64 encoded, with each request.
 For details, see [RFC 2617](https://datatracker.ietf.org/doc/html/rfc2617).
 
-Most HTTP client libraries as well as REST libraries support this method.
-[Creating content with binary attachments](rest_requests.md#creating-content-with-binary-attachments) has an example using basic authentication with [cURL](https://www.php.net/manual/en/book.curl.php) and its `CURLOPT_USERPWD`. 
+Most HTTP client libraries and REST libraries support this method.
+[Creating content with binary attachments](rest_requests.md#creating-content-with-binary-attachments) has an example using basic authentication with [cURL](https://www.php.net/manual/en/book.curl.php) and its `CURLOPT_USERPWD`.
 
 **Raw HTTP request with basic authentication**
 
diff --git a/docs/api/rest_api/rest_api_usage/rest_api_usage.md b/docs/api/rest_api/rest_api_usage/rest_api_usage.md
index f8334fe6ce..6bc9499dd0 100644
--- a/docs/api/rest_api/rest_api_usage/rest_api_usage.md
+++ b/docs/api/rest_api/rest_api_usage/rest_api_usage.md
@@ -1,16 +1,15 @@
 ---
-description: The REST API covers objects in the Ibexa DXP Repository with regular and custom HTTP methods, such as GET or PUBLISH, as well as HTTP headers.
+description: The REST API covers objects in the Ibexa DXP Repository with regular and custom HTTP methods, such as GET or PUBLISH, and HTTP headers.
 ---
 
 # REST API usage
 
-The REST API in [[= product_name =]] allows you to interact with an [[= product_name =]] installation using the HTTP protocol,
-following a [REST](https://en.wikipedia.org/wiki/Representational_state_transfer) interaction model.
+The REST API in [[= product_name =]] allows you to interact with an [[= product_name =]] installation using the HTTP protocol, following a [REST](https://en.wikipedia.org/wiki/Representational_state_transfer) interaction model.
 
 Each resource (URI) interacts with a part of the system (like content, users or search).
 Every interaction with the Repository than you can do from back office or using the [Public PHP API](php_api.md) can also be done using the REST API.
 
-The REST API uses HTTP methods (such as `GET` and `PUBLISH`), as well as HTTP headers to specify the type of request.
+The REST API uses HTTP methods (such as `GET` and `PUBLISH`), and HTTP headers to specify the type of request.
 
 ## URIs
 
@@ -58,7 +57,7 @@ curl -H "Accept: application/json" https://api.example.com/api/ibexa/v2/
 
 ### Country list
 
-Alongside regular Repository interactions, there is a REST service providing a list of countries with their names, [ISO-3166](https://en.wikipedia.org/wiki/ISO_3166) codes and International Dialing Codes (IDC). It could be useful when presenting a country options list from any application.
+Alongside regular Repository interactions, there is a REST service providing a list of countries with their names, [ISO-3166](https://en.wikipedia.org/wiki/ISO_3166) codes and International Dialing Codes (IDC). You can use it when presenting a country options list from any application.
 
 This country list's URI is `/services/countries`.
 
@@ -66,7 +65,7 @@ The ISO-3166 country codes can be represented as:
 
 - two-letter code (alpha-2) — recommended as the general purpose code
 - three-letter code (alpha-3) — related to the country name
-- three-digit numeric code (numeric-3) — useful if you need to avoid using Latin script
+- three-digit numeric code (numeric-3) — use it if you need to avoid using Latin script
 
 For details, see the [ISO-3166 glossary](https://www.iso.org/glossary-for-iso-3166.html).
 
diff --git a/docs/api/rest_api/rest_api_usage/rest_requests.md b/docs/api/rest_api/rest_api_usage/rest_requests.md
index d3f0314b68..cf59e50988 100644
--- a/docs/api/rest_api/rest_api_usage/rest_requests.md
+++ b/docs/api/rest_api/rest_api_usage/rest_requests.md
@@ -36,8 +36,7 @@ For method action details per resource, see the [REST API reference](../rest_api
 !!! note "Caution with custom HTTP methods"
 
     Using custom HTTP methods can cause issues with several HTTP proxies, network firewall/security solutions and simpler web servers.
-    To avoid issues with this, REST API allows you to set these using the HTTP header `X-HTTP-Method-Override` alongside the standard `POST` method
-    instead of using a custom HTTP method. For example: `X-HTTP-Method-Override: PUBLISH`
+    To avoid issues with this, REST API allows you to set these using the HTTP header `X-HTTP-Method-Override` alongside the standard `POST` method instead of using a custom HTTP method. For example: `X-HTTP-Method-Override: PUBLISH`
 
     If applicable, both methods are always mentioned in the specifications.
 
@@ -115,14 +114,14 @@ On top of methods, HTTP request headers allow you to personalize the request's b
 On every resource, you can use the `Accept` header to indicate which format you want to communicate in, JSON or XML.
 This header is also used to specify the response type you want the server to send when multiple types are available.
 
--   `Accept: application/vnd.ibexa.api.Content+xml` to get `Content` (full data, Fields included) as **[XML](https://www.w3.org/XML/)**
--   `Accept: application/vnd.ibexa.api.ContentInfo+json` to get `ContentInfo` (metadata only) as **[JSON](https://www.json.org/)**
+- `Accept: application/vnd.ibexa.api.Content+xml` to get `Content` (full data, Fields included) as **[XML](https://www.w3.org/XML/)**
+- `Accept: application/vnd.ibexa.api.ContentInfo+json` to get `ContentInfo` (metadata only) as **[JSON](https://www.json.org/)**
 
 Media types are also used with the [`Content-Type` header](rest_responses.md#content-type-header) to characterize a [request body](#request-body) or a [response body](rest_responses.md#response-body).
 See [Creating content with binary attachments](#creating-content-with-binary-attachments) below.
 Also see [Creating session](rest_api_authentication.md#creating-session) examples.
 
-If the resource only returns one media type, it's also possible to skip it and to just specify the format using `application/xml` or `application/json`.
+If the resource only returns one media type, it's also possible to skip it and to specify the format using `application/xml` or `application/json`.
 
 A response indicates `href`s to related resources and their media types.
 
@@ -143,18 +142,16 @@ The `X-Expected-User` header specifies the user needed for the request execution
 With this header, if the current username on server side isn't equal to `X-Expected-User` value, a `401 Unauthorized` error is returned.
 Without this header, the request is executed with the current user who might be unexpected (like the Anonymous user if a previous authentication has expired) and an ambiguous response might be returned as a success not informing about a wrong user.
 
-For example, it prevents a Content request to be executed with Anonymous user in the case of an expired authentication,
-and the response being a `200 OK` but missing content items due to access rights difference with the expected user.
+For example, it prevents a Content request to be executed with Anonymous user in the case of an expired authentication, and the response being a `200 OK` but missing content items due to access rights difference with the expected user.
 
 ## Request body
 
-You can pass some short scalar parameters in the URIs or as GET parameters, but other resources need heavier structured payloads passed in the request body,
-in particular the ones to create (`POST`) or update (`PATCH`) items.
+You can pass some short scalar parameters in the URIs or as GET parameters, but other resources need heavier structured payloads passed in the request body, in particular the ones to create (`POST`) or update (`PATCH`) items.
 In the [REST API reference](../rest_api_reference/rest_api_reference.html), request payload examples are given when needed.
 
 One example is the [creation of an authentication session](rest_api_authentication.md#establishing-session).
 
-When creating a content item, a special payload is needed if the ContentType has some [Image](imagefield.md) or [BinaryFile](binaryfilefield.md) Fields as files need to be attached. See the example of a [script uploading images](#creating-content-with-binary-attachments) below.
+When creating a content item, a special payload is needed if the content type has some [Image](imagefield.md) or [BinaryFile](binaryfilefield.md) Fields as files need to be attached. See the example of a [script uploading images](#creating-content-with-binary-attachments) below.
 
 When searching for content items (or Locations), the query grammar is also particular. See the [Search section](#search-views) below.
 
diff --git a/docs/api/rest_api/rest_api_usage/rest_responses.md b/docs/api/rest_api/rest_api_usage/rest_responses.md
index 09d91d80da..3e12e79d5f 100644
--- a/docs/api/rest_api/rest_api_usage/rest_responses.md
+++ b/docs/api/rest_api/rest_api_usage/rest_responses.md
@@ -25,7 +25,7 @@ For code details per resource, see the [REST API reference](../rest_api_referenc
 | `409` | Conflict               | The request is in conflict with another part of the repository (for example, trying to create a new item with an identifier already used).                                                                                                                  |
 | `415` | Unsupported Media Type | The request payload media type doesn't match the media type specified in the request header.                                                                                                                                                                |
 | `500` | Internal Server Error  | The server encountered an unexpected condition, usually an exception, which prevents it from fulfilling the request, like database down, permissions or configuration error.                                                                                |
-| `501` | Not Implemented        | Returned when the requested method hasn't yet been implemented. For [[= product_name =]], most of Users, User groups, content items, Locations and content types have been implemented. Some of their methods, as well as other features, may return a 501. |
+| `501` | Not Implemented        | Returned when the requested method hasn't yet been implemented. For [[= product_name =]], most of Users, User groups, content items, Locations and content types have been implemented. Some of their methods, and other features, may return a 501. |
 
 ## Response headers
 
diff --git a/docs/api/rest_api/rest_api_usage/testing_rest_api.md b/docs/api/rest_api/rest_api_usage/testing_rest_api.md
index 932252bad1..058827af62 100644
--- a/docs/api/rest_api/rest_api_usage/testing_rest_api.md
+++ b/docs/api/rest_api/rest_api_usage/testing_rest_api.md
@@ -32,14 +32,15 @@ Open a PHP shell in a terminal with <nobr>`php -a`</nobr> and copy-paste this co
 
 `$resource` URI should be edited to address the right domain.
 
-On a freshly installed [[= product_name =]], `52` is the Content ID of the home page. If necessary, substitute `52` with the Content ID of an item from your database.
+On a freshly installed [[= product_name =]], `52` is the Content ID of the home page.
+If necessary, substitute `52` with the content ID of an item from your database.
 
 For a content creation example using PHP, see [Creating content with binary attachments](rest_requests.md#creating-content-with-binary-attachments)
 
 ## JS
 
 The REST API can help you implement JavaScript / AJAX interaction.
-The following example of an AJAX call retrieves `ContentInfo` (that is, metadata) for a content item:
+The following example of an AJAX call retrieves `ContentInfo` (that is, metadata) for a content item.
 
 To test it, copy-paste this code into your browser console alongside a page from your website (to share the domain):
 
@@ -72,6 +73,7 @@ To test it, copy-paste this code into your browser console alongside a page from
     request.send();
     ```
 
-On a freshly installed [[= product_name =]], `52` is the Content ID of the home page. If necessary, substitute `52` with the Content ID of an item from your database.
+On a freshly installed [[= product_name =]], `52` is the Content ID of the home page.
+If necessary, substitute `52` with the Content ID of an item from your database.
 
 You can edit the `resource` URI to address another domain, but [cross-origin requests](rest_responses.md#cross-origin) must be allowed first.
diff --git a/docs/cdp/cdp_activation/cdp_activation.md b/docs/cdp/cdp_activation/cdp_activation.md
index c15223bb64..16027a89d7 100644
--- a/docs/cdp/cdp_activation/cdp_activation.md
+++ b/docs/cdp/cdp_activation/cdp_activation.md
@@ -13,5 +13,5 @@ Activation includes configuration, data export and adding Client-side Tracking.
 [[= cards([
     "cdp/cdp_activation/cdp_configuration",
     "cdp/cdp_activation/cdp_data_export",
-    "cdp/cdp_activation/cdp_add_clientside_tracking",
+    "cdp/cdp_activation/cdp_add_clientside_tracking"
 ], columns=3) =]]
\ No newline at end of file
diff --git a/docs/cdp/cdp_activation/cdp_add_clientside_tracking.md b/docs/cdp/cdp_activation/cdp_add_clientside_tracking.md
index 6abea51f78..ea1b6e829b 100644
--- a/docs/cdp/cdp_activation/cdp_add_clientside_tracking.md
+++ b/docs/cdp/cdp_activation/cdp_add_clientside_tracking.md
@@ -6,12 +6,11 @@ edition: experience
 # Add Client-side Tracking
 
 The final step is setting up a tracking script.
-It requires a head tracking script between the `<head></head>` tags on your website,
-a main script after the head script, and cookie consent.
+It requires a head tracking script between the `<head></head>` tags on your website, a main script after the head script, and cookie consent.
 For more information about setting up a tracking script, see [a tutorial in Raptor documentation](https://support.raptorsmartadvisor.com/hc/en-us/articles/9563346335004-Client-Side-Tracking).
 
 Now, you need to add a tracker to specific places in your website where you want to track users.
-For example, add this tracker to the Landing Page template to track user entrances.
+For example, add this tracker to the landing page template to track user entrances.
 
 ```js
 raptor.trackEvent('visit', ..., ...);
diff --git a/docs/commerce/cart/cart.md b/docs/commerce/cart/cart.md
index d2e2dbc35d..a744429c27 100644
--- a/docs/commerce/cart/cart.md
+++ b/docs/commerce/cart/cart.md
@@ -1,5 +1,5 @@
 ---
-description: The cart component covers adding items to the shopping cart, as well as previewing and modifying the cart information.
+description: The cart component covers adding items to the shopping cart, and previewing or modifying the cart information.
 edition: commerce
 ---
 
diff --git a/docs/commerce/checkout/checkout_api.md b/docs/commerce/checkout/checkout_api.md
index e1f037e350..0e7874f819 100644
--- a/docs/commerce/checkout/checkout_api.md
+++ b/docs/commerce/checkout/checkout_api.md
@@ -53,9 +53,7 @@ You can update the collected data after the checkout is created.
 The data is stored within the `CheckoutInterface::context` object. 
 The last update time and status are also stored. 
 
-To update the checkout, use the `CheckoutServiceInterface::updateCheckout` method 
-and provide it with the `CheckoutUpdateStruct` struct that contains data collected at each 
-step of the workflow, as well as a transition name to identify what step follows. 
+To update the checkout, use the `CheckoutServiceInterface::updateCheckout` method and provide it with the `CheckoutUpdateStruct` struct that contains data collected at each step of the workflow, and a transition name to identify what step follows.
 
 All data is placed in session storage.
 
diff --git a/docs/commerce/checkout/customize_checkout.md b/docs/commerce/checkout/customize_checkout.md
index 5b6fe3fa5e..7768363048 100644
--- a/docs/commerce/checkout/customize_checkout.md
+++ b/docs/commerce/checkout/customize_checkout.md
@@ -45,7 +45,7 @@ that allows users to select their seats.
 ### Define workflow
 
 You can create workflow definitions under the `framework.workflows` [configuration key](configuration.md#configuration-files). 
-Each workflow definition consists of a series of steps as well as a series of transitions between the steps. 
+Each workflow definition consists of a series of steps and a series of transitions between the steps. 
 
 To create a new workflow, for example, `seat_selection_checkout`, use the default workflow that comes with the storefront module as a basis,
 and add a `seat_selected` step.
@@ -165,7 +165,7 @@ To create a one page checkout, define a workflow that has two steps, `initialize
 ### Create controller
 
 Add a regular Symfony controller in project code, which reuses classes provided by the application.
-Within the controller, create a form that contains all the necessary fields, such as the shipping and billing addresses, as well as shipping and billing methods.
+Within the controller, create a form that contains all the necessary fields, such as the shipping and billing addresses, together with shipping and billing methods.
 
 In the `src/Controller/Checkout` folder, create a file that resembles the following example:
 
diff --git a/docs/commerce/checkout/reorder.md b/docs/commerce/checkout/reorder.md
index b3d0d9d888..8a557fce59 100644
--- a/docs/commerce/checkout/reorder.md
+++ b/docs/commerce/checkout/reorder.md
@@ -43,7 +43,7 @@ Below, you can find a few examples that demonstrate how you can modify this feat
 ### Customize reorder
 
 You can modify workflow under the `framework.workflows` [configuration key](configuration.md#configuration-files).
-Each workflow definition consists of a series of steps as well as a series of transitions between the steps.
+Each workflow definition consists of a series of steps and a series of transitions between the steps.
 
 Below example shows how to set up `can_be_reordered` flag for specific order statuses.
 
diff --git a/docs/commerce/order_management/order_management_api.md b/docs/commerce/order_management/order_management_api.md
index 58ac2b745f..1323faf780 100644
--- a/docs/commerce/order_management/order_management_api.md
+++ b/docs/commerce/order_management/order_management_api.md
@@ -43,8 +43,7 @@ It follows the same search query pattern as other APIs:
 
 ## Create order
 
-To create an order, use the `OrderService::createOrder` method and provide 
-it with the `Ibexa\Contracts\OrderManagement\Value\OrderCreateStruct` object that contains a list of products, purchased quantities, product and total prices, as well as tax amounts.
+To create an order, use the `OrderService::createOrder` method and provide it with the `Ibexa\Contracts\OrderManagement\Value\OrderCreateStruct` object that contains a list of products, purchased quantities, product, total prices, and tax amounts.
 
 ``` php
 [[= include_file('code_samples/api/commerce/src/Command/OrderCommand.php', 97, 108) =]]
diff --git a/docs/commerce/payment/payment.md b/docs/commerce/payment/payment.md
index 269ae27d96..4ea3b52057 100644
--- a/docs/commerce/payment/payment.md
+++ b/docs/commerce/payment/payment.md
@@ -1,12 +1,12 @@
 ---
-description: The payment component covers defining and managing payment methods as well as managing payments and their lifecycle.
+description: The payment component covers defining and managing payment methods, together with managing payments and their lifecycle.
 edition: commerce
 ---
 
 # Payment
 
 With the Payment component users can define and manage payment methods, create and manage payments, search for payment methods and payments, and filter payment search results.
-Depending on their role, users can also enable or disable payment methods, modify payment information, as well as cancel payments.
+Depending on their role, users can also enable or disable payment methods, modify payment information, and cancel payments.
 
 Available payment method types:
 
diff --git a/docs/commerce/shipping_management/shipping_management.md b/docs/commerce/shipping_management/shipping_management.md
index 611efe3c54..07e785ab38 100644
--- a/docs/commerce/shipping_management/shipping_management.md
+++ b/docs/commerce/shipping_management/shipping_management.md
@@ -1,11 +1,11 @@
 ---
-description: The shipping component covers defining and managing shipping methods as well as managing shipments and their lifecycle.
+description: The shipping component covers defining and managing shipping methods, together with managing shipments and their lifecycle.
 edition: commerce
 ---
 
 # Shipping
 
-The shipping component enables users to define and manage shipping methods of different types, as well as create and manage shipments, search for shipments and filter search results. 
+The shipping component enables users to define and manage shipping methods of different types, create and manage shipments, search for shipments, and filter search results.
 Depending on their role, users can also enable or disable shipping methods, change status of shipments, and cancel shipments.
 
 !!! note "Shipping method types"
diff --git a/docs/content_management/content_api/browsing_content.md b/docs/content_management/content_api/browsing_content.md
index d3ce0981a3..8cdcadcf01 100644
--- a/docs/content_management/content_api/browsing_content.md
+++ b/docs/content_management/content_api/browsing_content.md
@@ -1,5 +1,5 @@
 ---
-description: Use PHP API to get content items and their information, as well as content Fields, Location, and others.
+description: Use PHP API to get content items and their information, content Fields, Location, and others.
 ---
 
 # Browsing and viewing content
@@ -21,8 +21,7 @@ The service should be [injected into the constructor of your command or controll
 ### ContentInfo
 
 Basic content metadata is available through [`ContentInfo`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-ContentInfo.html) objects and their properties.
-This value object provides primitive fields, such as `contentTypeId`, `publishedDate`, or `mainLocationId`,
-as well as methods for retrieving selected properties.
+This value object provides primitive fields, such as `contentTypeId`, `publishedDate`, or `mainLocationId`, and methods for retrieving selected properties.
 
 You can also use it to request other Content-related value objects from various services:
 
diff --git a/docs/content_management/content_api/creating_content.md b/docs/content_management/content_api/creating_content.md
index 403ce8978c..c8c381a5ad 100644
--- a/docs/content_management/content_api/creating_content.md
+++ b/docs/content_management/content_api/creating_content.md
@@ -45,8 +45,7 @@ the `ContentCreateStruct` is slightly more complex than in the previous example:
 [[= include_file('code_samples/api/public_php_api/src/Command/CreateImageCommand.php', 56, 69) =]]
 ```
 
-Value of the Image field type contains the path to the image file, as well as other basic information
-based on the input file.
+Value of the Image field type contains the path to the image file and other basic information based on the input file.
 
 ### Creating content with RichText
 
diff --git a/docs/content_management/content_api/managing_content.md b/docs/content_management/content_api/managing_content.md
index 28c96b97a3..4bb52490ba 100644
--- a/docs/content_management/content_api/managing_content.md
+++ b/docs/content_management/content_api/managing_content.md
@@ -1,5 +1,5 @@
 ---
-description: PHP API enables managing content Locations, content types, as well as content in Trash and Calendar events.
+description: PHP API enables managing content Locations, content types, content in Trash, and Calendar events.
 ---
 
 # Managing content
@@ -213,7 +213,7 @@ You can process the events in a collection using the `find(Closure $predicate)`,
 
 You can perform a calendar action (e.g. reschedule or unschedule calendar events) using the `CalendarServiceInterface::executeAction()` method.
 You must pass an `Ibexa\Contracts\Calendar\EventAction\EventActionContext` instance as argument.
-`EventActionContext` defines events on which the action is performed, as well as action-specific parameters e.g. a new date:
+`EventActionContext` defines events on which the action is performed, and action-specific parameters, for example, a new date:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/CalendarCommand.php', 59, 61) =]]
diff --git a/docs/content_management/content_management_api/bookmark_api.md b/docs/content_management/content_management_api/bookmark_api.md
index 7411ed8d09..f85d0e0cb2 100644
--- a/docs/content_management/content_management_api/bookmark_api.md
+++ b/docs/content_management/content_management_api/bookmark_api.md
@@ -1,5 +1,5 @@
 ---
-description: You can use the PHP API to view the bookmark list, as well as add and remove content from it.
+description: You can use the PHP API to view the bookmark list, and add or remove content from it.
 ---
 
 # Bookmark API
diff --git a/docs/content_management/content_management_api/section_api.md b/docs/content_management/content_management_api/section_api.md
index 317a1c6b4b..cf1baca9e2 100644
--- a/docs/content_management/content_management_api/section_api.md
+++ b/docs/content_management/content_management_api/section_api.md
@@ -1,5 +1,5 @@
 ---
-description: PHP API enables you to create Sections, assign content to them as well as get various information about the Section.
+description: PHP API enables you to create Sections, assign content to them, and get various information about the Section.
 ---
 
 # Section API
diff --git a/docs/content_management/content_management_guide.md b/docs/content_management/content_management_guide.md
index efa1dc185a..81944eb58f 100644
--- a/docs/content_management/content_management_guide.md
+++ b/docs/content_management/content_management_guide.md
@@ -79,9 +79,9 @@ For a complete list of available field types, see [field type reference](field_t
 Once you use a field type to design and build a content type definition, and define its settings, it becomes a Field.
 
 Fields can be as simple as Name, based on a Text line field type, or as complex as Page, 
-based on a Landing Page field type, with multiple options to set and choose from:
+based on a landing page field type, with multiple options to set and choose from:
 
-![Landing Page Field settings](img/fields.png)
+![Landing page field settings](img/fields.png)
 
 ### Content types
 
@@ -150,14 +150,14 @@ Editors can compare different translations of the same content items with the Co
 
 #### Relations
 
-A [relation](content_relations.md) can exist between any two content items in the content tree. 
-For example, blog posts featured in the website's main page are in a relation with the page that they're embedded in. 
+A [relation](content_relations.md) can exist between any two content items in the content tree.
+For example, blog posts featured in the website's main page are in a relation with the page that they're embedded in.
 Or, instead of direct attachments, an article can use images that are separate content items outside the article and are referenced through a relation.
 
 ## Content arrangement
 
-In [[= product_name =]], content items can be moved and copied between branches of the content tree. 
-These operations, like in your computer’s file system, can apply both to individual content items as well as folders or groups.
+In [[= product_name =]], content items can be moved and copied between branches of the content tree.
+These operations, like in your computer’s file system, can apply both to individual content items and folders or groups.
 
 ![Content organization operations](img/content_arrangement.png)
 
diff --git a/docs/content_management/content_model.md b/docs/content_management/content_model.md
index a56a99b03b..429b5ac338 100644
--- a/docs/content_management/content_model.md
+++ b/docs/content_management/content_model.md
@@ -52,10 +52,10 @@ It's set by the system the first time the content item is published.
 The ownership of an item cannot be modified and doesn't change even if the owner is removed from the system.
 
 **`modificationDate`** - date and time when the content item was last modified.
-This is set by the system and cannot be modified manually, but changes every time the item is published again.
+It's set by the system and cannot be modified manually, but changes every time the item is published again.
 
 **`publishedDate`** - date and time when the content item was published for the first time.
-This is set by the system and cannot be modified.
+It's set by the system and cannot be modified.
 
 **`alwaysAvailable`** - indicates if the content item is shown in the main language when it's not present in another requested language.
 It's [set per content type](content_availability.md).
@@ -94,17 +94,16 @@ Validation depends on the settings of a particular field type. It cannot be turn
 
 Aside from the field type, the field definition in a content type provides the following information:
 
-**Name** – a user-friendly name that describes the field. This name is used in the interface, but not internally by the system. It can consist of letters, digits, spaces and special characters; the maximum length is 255 characters. If no name is provided, a unique one is automatically generated.
+**Name** – a user-friendly name that describes the field. This name is used in the interface, but not internally by the system. It can consist of letters, digits, spaces, and special characters (the maximum length is 255 characters). If no name is provided, a unique one is automatically generated.
 
-**Identifier** – an identifier for internal use in configuration files, templates, PHP code, etc. It can only contain lowercase letters, digits and underscores; the maximum length is 50 characters. This identifier is also used in name patterns for the content type.
+**Identifier** – an identifier for internal use in configuration files, templates, PHP code, etc. It can only contain lowercase letters, digits and underscores (the maximum length is 50 characters). This identifier is also used in name patterns for the content type.
 
 **Description** – a detailed description of the field.
 
 **Required** – a flag which indicates if the field is required for the system to accept the content item. By default, if a field is flagged as Required, a user isn't able to publish a content item without filling in this field.
 
 !!! note
-    You can use the `ContentService::validate()` method to decide whether the required fields or whole content items are checked for 
-    completeness at other stages of the editing process.
+    You can use the `ContentService::validate()` method to decide whether the required fields or whole content items are checked for completeness at other stages of the editing process.
 
     The Required flag is in no way related to field validation. A field's value is validated whether the field is set as required or not.
 
@@ -112,9 +111,9 @@ Aside from the field type, the field definition in a content type provides the f
 
 The Searchable flag isn't available for some fields, because some field types do not allow searching through their values.
 
-**[Translatable](languages.md)** – a flag which indicates if the value of the field can be translated. This is independent of the field type, which means that even fields such as "Float" or "Image" can be set as translatable.
+**[Translatable](languages.md)** – a flag which indicates if the value of the field can be translated. It's independent of the field type, which means that even fields such as "Float" or "Image" can be set as translatable.
 
-Depending on the field type, there may also be other, specific information to fill in. For example, the "Country" field type allows you to select the default country, as well as to allow selecting multiple countries at the same time.
+Depending on the field type, there may also be other, specific information to fill in. For example, the "Country" field type allows you to select the default country, and to allow selecting multiple countries at the same time.
 
 ![Diagram of content model](content_model_diagram.png)
 
diff --git a/docs/content_management/data_migration/data_migration.md b/docs/content_management/data_migration/data_migration.md
index 8c5441b88d..816194eede 100644
--- a/docs/content_management/data_migration/data_migration.md
+++ b/docs/content_management/data_migration/data_migration.md
@@ -9,8 +9,7 @@ Data migration allows exporting and importing selected data from an [[= product_
 
 [*Exporting*](exporting_data.md) data consists in saving selected repository information in YAML format.
 [*Importing*](importing_data.md) reads migration YAML files and creates or modifies repository content based on them.
-You can migrate your repository data, that is content items, as well as content types, languages, Object states, Sections, and so on,
-between installations.
+Between installation, you can migrate your repository data, for example, content items, content types, languages, object states, or sections.
 
 You can use migrations in projects that require the same data to be present across multiple instances.
 They can be useful for project templates. Migrations are able to store shared data, so they can be applied for each new project you start,
diff --git a/docs/content_management/data_migration/exporting_data.md b/docs/content_management/data_migration/exporting_data.md
index 2e193c6315..d2969cac0e 100644
--- a/docs/content_management/data_migration/exporting_data.md
+++ b/docs/content_management/data_migration/exporting_data.md
@@ -71,12 +71,12 @@ For example, you could:
 
 - Remove `references` if you don't intend to store IDs for future use (see [migration references](managing_migrations.md#references))
 - Remove `publicationDate`, `modificationDate`, `locationRemoteId`,
-  as those are generated if not passed (just like in PHP API)
+  as those are generated if not passed (like in PHP API)
 - Add [`actions`](data_migration_actions.md)
 - Add fields for other languages present in the system.
 
 Similarly, you can create update and delete operations.
-they're particularly useful combined with `match-property`.
+They're particularly functional combined with `match-property`.
 This option is automatically added as part of `match` expression in the update/delete migration:
 
 ``` bash
@@ -128,7 +128,7 @@ php bin/console ibexa:migrations:generate --type=content_type --mode=update --ma
 
 ```
 
-Note that you should test your migrations. See [Importing data](importing_data.md).
+You should test your migrations. See [Importing data](importing_data.md).
 
 !!! tip
 
diff --git a/docs/content_management/data_migration/importing_data.md b/docs/content_management/data_migration/importing_data.md
index a2316b1a09..8dfe1c67ee 100644
--- a/docs/content_management/data_migration/importing_data.md
+++ b/docs/content_management/data_migration/importing_data.md
@@ -278,7 +278,7 @@ enabling swift file migration regardless of storage (local, DFS).
 The following example shows how to create a role.
 A role requires the `identifier` metadata key.
 
-For each policy assigned to the role, you select the module and function, with optional Limitations.
+For each policy assigned to the role, you select the module and function, with optional limitations.
 
 The following example shows the creation of a `Contributor` role:
 
diff --git a/docs/content_management/field_types/field_type_reference/imagefield.md b/docs/content_management/field_types/field_type_reference/imagefield.md
index 0f2c65c352..6b2b20a569 100644
--- a/docs/content_management/field_types/field_type_reference/imagefield.md
+++ b/docs/content_management/field_types/field_type_reference/imagefield.md
@@ -140,7 +140,7 @@ Image Fields within REST are exposed by the `application/vnd.ibexa.api.Content`
 </field>
 ```
 
-Children of the `fieldValue` node list the general properties of the Field's original image (`fileSize`, `fileName`, `inputUri`, etc.), as well as variations. For each variation, a URI is provided. Requested through REST, this resource generates the variation if it doesn't exist yet, and list the variation details:
+Children of the `fieldValue` node list the general properties of the Field's original image (`fileSize`, `fileName`, `inputUri`, etc.), and its variations. For each variation, a URI is provided. Requested through REST, this resource generates the variation if it doesn't exist yet, and list the variation details:
 
 ``` xml
 <ContentImageVariation media-type="application/vnd.ibexa.api.ContentImageVariation+xml" href="/api/ibexa/v2/content/binary/images/240-1480/variations/tiny">
diff --git a/docs/content_management/field_types/type_and_value.md b/docs/content_management/field_types/type_and_value.md
index 760fde1629..cd2f40ee22 100644
--- a/docs/content_management/field_types/type_and_value.md
+++ b/docs/content_management/field_types/type_and_value.md
@@ -47,7 +47,7 @@ The type is asked to validate the settings (provided by the user) before the pub
 
 As in `validateFieldSettings()`, this method verifies that the given validator configuration complies to the schema provided by `getValidatorConfigurationSchema()`.
 
-It's important to note that the schema definitions of the field type can be both of arbitrary and serializable format. It's highly recommended to use a simple hash structure.
+It's important to know that the schema definitions of the field type can be both of arbitrary and serializable format. It's highly recommended to use a simple hash structure.
 
 !!! note
 
@@ -91,7 +91,7 @@ It's based on the field type settings and validator configuration and stored in
 
 ### Serialization
 
-When [REST API](rest_api_usage.md) is used, conversion needs to be done for field type values, settings and validator configurations. These are converted to and from a simple hash format that can be encoded in REST payload. As conversion needs to be done both when transmitting and receiving data through REST, field type implements the following pairs of methods:
+When [REST API](rest_api_usage.md) is used, conversion needs to be done for field type values, settings, and validator configurations. These are converted to and from a simple hash format that can be encoded in REST payload. As conversion needs to be done both when transmitting and receiving data through REST, field type implements the following pairs of methods:
 
 |Method|Description|
 |------|-----------|
@@ -107,7 +107,7 @@ When [REST API](rest_api_usage.md) is used, conversion needs to be done for fiel
 ## Registration
 
 The field type must be registered in `config/services.yml`:
- 
+
 ``` yaml
 services:
     Ibexa\FieldTypeMatrix\FieldType\Type:
@@ -126,8 +126,7 @@ If you need to inject other services into your Type class, skip using the `paren
 Like most API components, field types use the [Symfony service tag mechanism]([[= symfony_doc =]]/service_container/tags.html).
 
 A service can be assigned one or several tags, with specific parameters.
-When the [service container](php_api.md#service-container) is compiled into a PHP file, 
-tags are read by `CompilerPass` implementations that add extra handling for tagged services.
+When the [service container](php_api.md#service-container) is compiled into a PHP file, tags are read by `CompilerPass` implementations that add extra handling for tagged services.
 Each service tagged as `ibexa.field_type` is added to a [registry](https://martinfowler.com/eaaCatalog/registry.html) using the `alias` key as its unique `fieldTypeIdentifier` e.g. `ezstring`.
 Each field type must also inherit from the abstract `ibexa.field_type` service.
 This ensures that the initialization steps shared by all field types are executed.
@@ -168,8 +167,7 @@ The settings are mapped into Symfony forms via the [FormMapper](form_and_templat
 
 !!! note
 
-    You can store field type settings internally, or, when the schema becomes 
-    too complex, move them to [external storage](field_type_storage.md#storing-field-type-settings-externally).
+    You can store field type settings internally, or, when the schema becomes too complex, move them to [external storage](field_type_storage.md#storing-field-type-settings-externally).
 
 ## Extensibility points
 
diff --git a/docs/content_management/images/fastly_io.md b/docs/content_management/images/fastly_io.md
index 6d9d518cf2..4ec1bcf606 100644
--- a/docs/content_management/images/fastly_io.md
+++ b/docs/content_management/images/fastly_io.md
@@ -76,7 +76,7 @@ that they should reflect variations in your original setup.
 The built-in image optimizer serves as backup to Fastly IO in case of misconfiguration,
 so it needs to be able to serve the same image variations.
 
-Fastly IO image filters aren't compatible with our built-in filters,
+Fastly IO image filters aren't compatible with [[= product_name_base =]] built-in filters,
 so you aren't able to reflect your original filters accurately with Fastly.
 The script below helps you find replacement filters within Fastly configuration for the basic filters.
 For more optimization options on Fastly side, see [Fastly IO reference](https://developer.fastly.com/reference/io/).
diff --git a/docs/content_management/images/images.md b/docs/content_management/images/images.md
index 7039e57368..4ccbc325fa 100644
--- a/docs/content_management/images/images.md
+++ b/docs/content_management/images/images.md
@@ -7,41 +7,33 @@ description: Manage image assets by using DAM systems, configuring image variati
 Images are an integral part of any website.
 They can serve as decoration and convey information.
 
-In [[= product_name =]], you can reuse them, normalize their file names, generate 
-different size variations, resize images programmatically, or even define 
-placeholders for missing ones.  
+In [[= product_name =]], you can reuse them, normalize their file names, generate different size variations, resize images programmatically, or even define placeholders for missing ones.
 
 ## Images from DAM systems
 
-If your installation is connected to a DAM system, you can use images directly 
-from a DAM system in your content.
+If your installation is connected to a DAM system, you can use images directly from a DAM system in your content.
 
-Specific [DAM configuration](add_image_asset_from_dam.md#dam-configuration) depends on 
-the system that the installation uses.
+Specific [DAM configuration](add_image_asset_from_dam.md#dam-configuration) depends on the system that the installation uses.
 
 ## Reuse images
 
-You can store images in the media library as independent content items of 
-a generic Image [content type](content_types.md) to reuse them across the system.
+You can store images in the media library as independent content items of a generic Image [content type](content_types.md) to reuse them across the system.
 You do this by uploading images to an [ImageAsset](imageassetfield.md) field type.
 
-For an ImageAsset field to be reused, you must publish it. 
-Only then is notification triggered, which states that an image has been published 
-under the Location and can now be reused.
-After you establish a media library, you can create [Relations](content_relations.md) between the 
-image content item and the main content item that uses it.
+For an ImageAsset field to be reused, you must publish it.
+Only then is notification triggered, which states that an image has been published under the location and can now be reused.
+After you establish a media library, you can create [Relations](content_relations.md) between the image content item and the main content item that uses it.
 
 ## Normalizing image file names
 
-If you use image files with unprintable UTF-8 characters in file names, you may 
-come across a problem with images not displaying.
+If you use image files with unprintable UTF-8 characters in file names, you may come across a problem with images not displaying.
 Run the following command to normalize image file names:
 
 ``` bash
 php bin/console ibexa:images:normalize-paths
 ```
 
-Next, clear the cache: 
+Next, clear the cache:
 
 ```bash
 php bin/console cache:clear
@@ -55,44 +47,32 @@ php bin/console liip:imagine:cache:remove
 
 ## Configuring image variations
 
-With [image variations](image_variations.md) (image aliases) you can define and use different versions 
-of the same image. 
-You generate variations based on [filters](image_variations.md#available-variation-filters) that modify aspects such as size 
-and proportions, quality or effects.
-
-Image variations are generated with [LiipImagineBundle](https://github.com/liip/LiipImagineBundle), by using the underlying 
-[Imagine library](https://imagine.readthedocs.io/en/latest/). 
-The LiipImagineBundle bundle supports GD (default), Imagick or Gmagick PHP 
-extensions, and enables you to define flexible filters in PHP. 
-Image files are stored by using the `IOService,` and are completely independent 
-from the Image field type. 
+With [image variations](image_variations.md) (image aliases) you can define and use different versions of the same image.
+You generate variations based on [filters](image_variations.md#available-variation-filters) that modify aspects such as size and proportions, quality or effects.
+
+Image variations are generated with [LiipImagineBundle](https://github.com/liip/LiipImagineBundle), by using the underlying [Imagine library](https://imagine.readthedocs.io/en/latest/). 
+The LiipImagineBundle bundle supports GD (default), Imagick or Gmagick PHP extensions, and enables you to define flexible filters in PHP. 
+Image files are stored by using the `IOService,` and are completely independent from the Image field type.
 they're generated only once and cleared on demand, for example, on content removal).
 
-LiipImagineBundle only works on image blobs, so no command line tool is needed. 
+LiipImagineBundle only works on image blobs, so no command line tool is needed.
 For more information, see the [bundle's documentation](https://symfony.com/bundles/LiipImagineBundle/current/configuration.html).
 
 !!! caution "Code injection in image EXIF"
 
-    EXIF metadata of an image may contain for example, HTML, JavaScript, 
-    or PHP code. 
-    [[= product_name =]] is itself does not parse EXIF metadata, but third-party 
-    bundles must be secured against this eventuality. 
-    Images must be treated like any other user-submitted data - make sure that 
-    metadata is properly escaped before use.
+    EXIF metadata of an image may contain for example, HTML, JavaScript, or PHP code. 
+    [[= product_name =]] is itself does not parse EXIF metadata, but third-party bundles must be secured against this eventuality.
+    Images must be treated like any other user-submitted data - make sure that metadata is properly escaped before use.
 
 ### Image URL resolution
 
-You can use LiipImagine's `liip:imagine:cache:resolve` command to resolve the path 
-to image variations that are generated from the original image, with one or more 
-paths as arguments. 
-Paths to repository images must be relative to the `var/<site>/storage/images` 
-directory, for example: `7/4/2/0/247-1-eng-GB/test.jpg`.
+You can use LiipImagine's `liip:imagine:cache:resolve` command to resolve the path to image variations that are generated from the original image, with one or more paths as arguments.
+Paths to repository images must be relative to the `var/<site>/storage/images` directory, for example: `7/4/2/0/247-1-eng-GB/test.jpg`.
 For more information, see [LiipImagineBundle documentation](https://symfony.com/bundles/LiipImagineBundle/current/basic-usage.html#resolve-with-the-console).
 
 ## Resizing images
 
-You can resize all original images of a chosen content type with the following 
-command.
+You can resize all original images of a chosen content type with the following command.
 
 ``` bash
 php bin/console ibexa:images:resize-original <Field identifier> <content type identifier>  -f <variation name>
@@ -112,11 +92,9 @@ php bin/console ibexa:images:resize-original image photo -f small_image
 
 You can also pass two additional parameters:
 
-- `iteration-count` is the number of images to be recreated in a single iteration, 
-  to reduce memory use. 
+- `iteration-count` is the number of images to be recreated in a single iteration, to reduce memory use.
   The default value is `25`.
-- `user` is the identifier of a User with proper permission who performs 
-  the operation (`read`, `versionread`, `edit` and `publish`). 
+- `user` is the identifier of a User with proper permission who performs the operation (`read`, `versionread`, `edit` and `publish`).
   The default value is `admin`.
 
 !!! caution
@@ -125,15 +103,10 @@ You can also pass two additional parameters:
 
 ## Generating placeholder images
 
-With a placeholder generator you can download or generate placeholder images for 
-any missing image. 
-It proves useful when you're working on an existing database and are unable to 
-download uploaded images to your local development environment, due to, for 
-example, a large size of files.
+With a placeholder generator you can download or generate placeholder images for any missing image.
+It proves useful when you're working on an existing database and are unable to download uploaded images to your local development environment, due to, for example, a large size of files.
 
-If the original image cannot be resolved, the `PlaceholderAliasGenerator::getVariation` 
-method generates a placeholder by delegating it to the implementation of the 
-`PlaceholderProvider` interface, and saves it under the original path.
+If the original image cannot be resolved, the `PlaceholderAliasGenerator::getVariation` method generates a placeholder by delegating it to the implementation of the `PlaceholderProvider` interface, and saves it under the original path.
 
 In [[= product_name =]], there are two implementations of the `PlaceholderProvider` interface:
 
@@ -146,8 +119,7 @@ In [[= product_name =]], there are two implementations of the `PlaceholderProvid
 
 ### GenericProvider
 
-The [`GenericProvider`](https://github.com/ibexa/core/blob/main/src/bundle/Core/Imagine/PlaceholderProvider.php) package generates placeholders 
-with basic information about the original image (see [example 1](#configuration-examples)).
+The [`GenericProvider`](https://github.com/ibexa/core/blob/main/src/bundle/Core/Imagine/PlaceholderProvider.php) package generates placeholders with basic information about the original image (see [example 1](#configuration-examples)).
 
 ![Placeholder image GenericProvider](placeholder_info.jpg "Example of a generic placeholder image")
 
@@ -164,8 +136,7 @@ with basic information about the original image (see [example 1](#configuration-
 
 ### RemoteProvider
 
-With the [`RemoteProvider`](https://github.com/ibexa/core/blob/main/src/bundle/Core/Imagine/PlaceholderProvider/RemoteProvider.php) you can download 
-placeholders from:
+With the [`RemoteProvider`](https://github.com/ibexa/core/blob/main/src/bundle/Core/Imagine/PlaceholderProvider/RemoteProvider.php) you can download placeholders from:
 
  - remote sources, for example, <http://placekitten.com> (see [example 2](#configuration-examples))
  - live version of a site (see [example 3](#configuration-examples))
@@ -179,9 +150,8 @@ placeholders from:
 
 ### Semantic configuration
 
-Placeholder generation can be configured for each [`binary_handler`](file_management.md#handling-binary-files) under the 
-`ibexa.image_placeholder` [configuration key](configuration.md#configuration-files):
- 
+Placeholder generation can be configured for each [`binary_handler`](file_management.md#handling-binary-files) under the `ibexa.image_placeholder` [configuration key](configuration.md#configuration-files):
+
 ```yaml
 ibexa:
     # ...
@@ -191,8 +161,7 @@ ibexa:
             options:  <CONFIGURATION>
 ```
 
-If there is no configuration assigned to the `binary_handler`, the placeholder 
-generation is disabled.
+If there is no configuration assigned to the `binary_handler`, the placeholder generation is disabled.
 
 ##### Configuration examples:
 
@@ -216,20 +185,15 @@ generation is disabled.
 
 ## Support for SVG images
 
-You cannot store SVG images in [[= product_name =]] by using the Image or 
-ImageAsset field type.
-However, you can work things around by relying on the File field type and implementing 
-a custom extension that lets you display and download files in your templates.
+You cannot store SVG images in [[= product_name =]] by using the Image or ImageAsset field type.
+However, you can work things around by relying on the File field type and implementing a custom extension that lets you display and download files in your templates.
 
 !!! caution
 
-    SVG images may contain JavaScript, so they may introduce XSS or other security 
-    vulnerabilities.
-    Make sure end users aren't allowed to upload SVG images, and be restrictive 
-    about which editors are allowed to do so.
+    SVG images may contain JavaScript, so they may introduce XSS or other security vulnerabilities.
+    Make sure end users aren't allowed to upload SVG images, and be restrictive about which editors are allowed to do so.
 
-First, enable adding SVG files to content by removing them from the blacklist 
-of allowed MIME types.
+First, enable adding SVG files to content by removing them from the blacklist of allowed MIME types.
 
 To do it, overwrite `ibexa.site_access.config.default.io.file_storage.file_type_blacklist` defined in `Core/Resources/config/default_settings.yml` so that `svg` is removed from the blacklist.
 You can do it per SiteAccess or SiteAccess group by using [SiteAccess-aware configuration](siteaccess_aware_configuration.md).
@@ -267,9 +231,7 @@ Now you can load SVG files in your templates by using generated links and a newl
 
 JPEG images are optimized using the ImageMagic library, which is available out of the box.
 
-If you use other formats, such a PNG, SVG, GIF or WEBP, and you use the Image Editor,
-to prevent images increasing in size when you modify them in the editor,
-you need to install additional image handling libraries.
+If you use other formats, such a PNG, SVG, GIF, or WEBP, and you use the Image Editor, to prevent images increasing in size when you modify them in the editor, you need to install additional image handling libraries.
 
 |Image format|Library|
 |---|---|
@@ -287,11 +249,9 @@ sudo apt-get install optipng
 
 ## Embedding images in Rich Text
 
-The [RichText](richtextfield.md) field allows you to embed other 
-content items within the field.
+The [RichText](richtextfield.md) field allows you to embed other content items within the field.
 
-Content items that are identified as images are rendered in the Rich Text field 
-by using a dedicated template.
+Content items that are identified as images are rendered in the Rich Text field by using a dedicated template.
 
 You can determine content types that are treated as images and rendered.
 You do this by overriding the `ibexa.content_view.image_embed_content_types_identifiers` parameter, for example:
diff --git a/docs/content_management/rich_text/online_editor_guide.md b/docs/content_management/rich_text/online_editor_guide.md
index 64a343ade0..b4f4d76f4e 100644
--- a/docs/content_management/rich_text/online_editor_guide.md
+++ b/docs/content_management/rich_text/online_editor_guide.md
@@ -7,7 +7,7 @@ description: Learn how to use the Online Editor, a tool that allows you to edit
 ## What is Online Editor
 
 Online Editor is the interface for editing RichText Fields in any content item in [[= product_name =]].
-It offers standard editing capabilities as well as extensibility points to customize the editing experience and the available elements.
+It offers standard editing capabilities and extensibility points to customize the editing experience and the available elements.
 
 Online Editor is based on [CKEditor 5](https://ckeditor.com/ckeditor-5/).
 
@@ -25,9 +25,8 @@ To start using it, create any content item with a RichText Field
 
 ### Rich Text editor
 
-Online Editor covers all fundamental formatting options for rich text, 
-such as headings, lists, tables, inline text formatting, anchors and links. 
-It also allows embedding other content from the repository, as well as from Facebook, Twitter or YouTube.
+Online Editor covers all fundamental formatting options for rich text, such as headings, lists, tables, inline text formatting, anchors, and links. 
+It also allows embedding other content from the repository, but also from Facebook, Twitter, or YouTube.
 
 #### Links
 
@@ -47,9 +46,12 @@ For more information, see [Distraction free mode]([[= user_doc =]]/content_manag
 Custom tags are customizable RichText elements for which you can specify attributes 
 and render them with custom templates.
 
-Custom tags can be created by means of specifying two things only: 
-YAML configuration and relevant Twig templates.
-The YAML configuration defines a custom tag’s attributes and the template used to render it, as well as where in the toolbar the tag is available.
+Custom tags can be created by means of specifying two things only:
+
+- YAML configuration
+- relevant Twig templates
+
+The YAML configuration defines a custom tag’s attributes, the template used to render it, and where in the toolbar the tag is available.
 
 See [Extend Online Editor](extend_online_editor.md#configure-custom-tags) for a full example.
 
@@ -95,9 +97,10 @@ The range of available text elements can be extended by offering custom elements
 Custom formatting options can be offered either as custom CSS classes that editors can add to specific elements, 
 or as custom styles which can have their own templates.
 
-More extensive customization is available via custom tags: 
-completely custom RichText elements that you can fully configure, 
-as well as custom CKEditor 5 plugins.
+More extensive customization is available via custom tags:
+
+- completely custom RichText elements that you can fully configure
+- custom CKEditor 5 plugins
 
 ## Use cases
 
diff --git a/docs/content_management/url_management/url_management.md b/docs/content_management/url_management/url_management.md
index 8c815a71b1..d55a523a8b 100644
--- a/docs/content_management/url_management/url_management.md
+++ b/docs/content_management/url_management/url_management.md
@@ -71,7 +71,7 @@ ibexa:
                     	batch_size: 64
                     https:
                     	enabled: true
-                    	ignore_certificate: false             
+                    	ignore_certificate: false
                     mailto:
                     	enabled: false
 ```
@@ -137,20 +137,17 @@ The `scheme` attribute is mandatory and has to correspond to the name of the pro
 ## URL aliases
 
 You can define URL aliases for individual content items, for example, when you reorganize the content, and want to provide users with continuity.
-For each URL alias definition the history of changes is preserved, so that users who have bookmarked the URL addresses of content items can still find he information they desire.
+For each URL alias definition the history of changes is preserved, so that users who have bookmarked the URL addresses of content items can still find the information they desire.
 
 !!! note
 
-    Make sure that you correctly define languages used by the site in the configuration 
-    (under the `ibexa.system.<scope>.languages` key). 
-    Otherwise, redirections for the renamed Content with translations in multiple
-    languages may fail to work properly.
+    Make sure that you correctly define languages used by the site in the configuration (under the `ibexa.system.<scope>.languages` key).
+    Otherwise, redirections for the renamed Content with translations in multiple languages may fail to work properly.
 
 !!! caution "Legacy storage engine limitation"
 
-    The [Legacy storage engine](field_type_storage.md#legacy-storage-engine) does not archive URL aliases, which initially 
-    had the same name in multiple languages. 
-    For more information, see [the Jira ticket](https://issues.ibexa.co/browse/EZP-31818). 
+    The [Legacy storage engine](field_type_storage.md#legacy-storage-engine) does not archive URL aliases, which initially had the same name in multiple languages.
+    For more information, see [the Jira ticket](https://issues.ibexa.co/browse/EZP-31818).
 
 URL aliases aren't SiteAccess-aware. When creating an alias, you can select a SiteAccess to base it on.
 If the SiteAccess root path (configured in `content.tree_root.location_id`) is different than the default,
diff --git a/docs/customer_management/cp_page_builder.md b/docs/customer_management/cp_page_builder.md
index e280bb0261..9e92a6550e 100644
--- a/docs/customer_management/cp_page_builder.md
+++ b/docs/customer_management/cp_page_builder.md
@@ -69,7 +69,7 @@ ibexa:
                     - custom_portal
 ```
 
-Now, you can go to your Customer Portal Landing Page and edit it in Page Builder.
+Now, you can go to your Customer Portal landing page and edit it in Page Builder.
 
 ![Edit Customer Portal in Page Builder](img/cp_edit_in_page_builder.png)
 
diff --git a/docs/ibexa_engage/create_campaign.md b/docs/ibexa_engage/create_campaign.md
index 5ac8930805..e76f92e8db 100644
--- a/docs/ibexa_engage/create_campaign.md
+++ b/docs/ibexa_engage/create_campaign.md
@@ -22,7 +22,7 @@ For more information about publication channels, see [Publication channel]([[= u
 
 ## Use Campaign block in Page Builder
 
-You can add [Campaign block]([[= user_doc =]]/content_management/block_reference/#campaign-block) in Page Builder to display campaign on the Landing Page.
+You can add [Campaign block]([[= user_doc =]]/content_management/block_reference/#campaign-block) in Page Builder to display campaign on the landing page.
 
 To select campaign, go to **Properties** tab. From the **Campaign** drop-down, choose campaign.
 This list includes all campaigns available on user's Qualifio account which are active or scheduled to launch in the future.
diff --git a/docs/ibexa_products/ibexa_headless.md b/docs/ibexa_products/ibexa_headless.md
index 22dd6df4d2..89f4fbed80 100644
--- a/docs/ibexa_products/ibexa_headless.md
+++ b/docs/ibexa_products/ibexa_headless.md
@@ -10,7 +10,7 @@ description: Get to know Ibexa Headless - an edition that focuses on content man
 The Headless edition of [[= product_name =]] focuses on content management.
 It provides tools to collaboratively create content, and interfaces (API) to distribute this content.
 
-Multilingual, multichannel, extensible, [[= product_name_headless =]] is an advanced Content Management Framework (CMF), a Product Information Management (PIM) platform, as well as a Digital Asset Management (DAM) repository.
+Multilingual, multichannel, extensible, [[= product_name_headless =]] is an advanced Content Management Framework (CMF), a Product Information Management (PIM) platform, and a Digital Asset Management (DAM) repository.
 It's provided without a default front office, but with a complete back office and several APIs to manage and access content.
 
 ![Ibexa Headless](ibexa_headless.png)
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
index c740b9fcdd..e1b32f1328 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
@@ -27,7 +27,7 @@ and updated in the background when someone requests them.
 Current content tags (and when the system purges on them):
 
 - Content: `c<content-id>` - Purged on all smaller or larger changes to content (including its metadata, fields and Locations).
-- Content Version: `cv<content-id>` - Purged when any version of Content is changed (for example, a draft is created or removed).
+- Content version: `cv<content-id>` - Purged when any version of Content is changed (for example, a draft is created or removed).
 - Content type: `ct<content-type-id>` - Used when the content type changes, affecting content of its type.
 - Location: `l<location-id>` - Used for clearing all cache relevant for a given Location.
 - Parent Location: `pl<[parent-]location-id>` - Used for clearing all children of a Location (`pl<location-id>`), or all siblings (`pl<parent-location-id>`).
@@ -60,9 +60,8 @@ Examples:
 
 ### Troubleshooting - Cache header too long errors
 
-In case of complex content, for example, Pages with many blocks, or RichText with a lot of embeds/links, 
-you can encounter problems with too long cache header on responses. 
-It happens because necessary cache entries may not be tagged properly. 
+In case of complex content, for example, Pages with many blocks, or RichText with a lot of embeds/links, you can encounter problems with too long cache header on responses.
+It happens because necessary cache entries may not be tagged properly.
 You may also see `502 Headers too long` errors, and webserver refusing to serve the page.
 
 You can solve this issue in one of the following ways:
@@ -89,15 +88,14 @@ Apache has a [hard](https://github.com/apache/httpd/blob/5f32ea94af5f1e7ea68d6fc
 
 #### B. Limit tags header output by system
 
-1\. For inline rendering just displaying the content name, image attribute, and/or link, it would be enough to:
+1\. For inline rendering displaying the content name, image attribute, and/or link, it would be enough to:
 
 - Look into how many inline (non ESI) render calls for content rendering you're doing, and see if you can organize it differently.
 - Consider inlining the views not used elsewhere in the given template and [tagging the response in Twig](#response-tagging-in-templates) with "relation" tags.
     - (Optional) You can set reduced cache TTL for the given view, to reduce the risk of stale cache on subtree operations affecting the inlined content.
 
-2\. You can opt in to set a max length parameter (in bytes) and corresponding ttl (in seconds) 
-for cases when the limit is reached. The system logs a warning where the limit is reached, and when needed, you can optimize 
-these cases as described above.
+2\. You can opt in to set a max length parameter (in bytes) and corresponding ttl (in seconds) for cases when the limit is reached.
+The system logs a warning where the limit is reached, and when needed, you can optimize these cases as described above.
 
 ```yaml
 parameters:
@@ -122,19 +120,19 @@ If the given content has several Locations, you can see several `l<location-id>`
 !!! note "How response tagging for ContentView is done internally"
 
     In `ibexa/http-cache` there is a dedicated response listener `HttpCacheResponseSubscriber` that checks if:
-    
+
     - the response has attribute `view`
     - the view implements `Ibexa\Core\MVC\Symfony\View\CachableView`
     - cache isn't disabled on the individual view
 
     If that checks out, the response is adapted with the following:
-    
+
     - `ResponseCacheConfigurator` applies SiteAccess settings for enabled/disabled cache and default TTL.
     - `DispatcherTagger` dispatches the built-in ResponseTaggers which generate the tags as described above.
 
 ### ResponseConfigurator
 
-A `ReponseCacheConfigurator` configures an HTTP Response object, makes the response public, adds tags and sets the shared max age. 
+A `ReponseCacheConfigurator` configures an HTTP Response object, makes the response public, adds tags, and sets the shared max age. 
 It's provided to `ReponseTaggers` that use it to add the tags to the response.
 
 The `ConfigurableResponseCacheConfigurator` (`Ibexa\HttpCache\ResponseConfigurator\ConfigurableResponseCacheConfigurator`) follows the `view_cache` configuration and only enables cache if it's enabled in the configuration.
@@ -288,9 +286,7 @@ In the event when a new version of `Child` is published, the following keys are
 - `l20`, because cache for parent of `[Child]` should be purged
 - `pl20`, because cache for siblings of `[Child]` should be purged
 
-In summary, HTTP Cache for any location representing `[Child]`, any Content that relates to the Content `[Child]`, the 
-location for `[Child]`, any children of `[Child]`, any Location that relates to the Location `[Child]`, location for
-`[Parent1]`, any children on `[Parent1]`.
+In summary, HTTP Cache for any location representing `[Child]`, any Content that relates to the Content `[Child]`, the location for `[Child]`, any children of `[Child]`, any Location that relates to the Location `[Child]`, location for `[Parent1]`, any children on `[Parent1]`.
 Effectively, in this example HTTP cache for `[Parent1]` and `[Child]` is cleared.
 
 
@@ -370,13 +366,12 @@ cases does the job. But if you need to change the varnish configuration to make
 that .vcl code for Varnish V6.x doesn't likely work as-is on Fastly.
 
 This section describes to how to debug problems related to HTTP cache. 
-	In order to that, you must be able to look both at
-	responses and headers [[= product_name =]] sends to HTTP cache, and not so much at responses and headers
+	You must be able to look both at responses and headers [[= product_name =]] sends to HTTP cache, and not so much at responses and headers
 	the HTTP cache sends to the client (web browser).
 	It means you must be able to send requests to your origin (web server) that do not go through Varnish or Fastly.
-	If you run Nginx and Varnish on premise, you should know what host and port number both Varnish and Nginx runs on. If you
-	perform tests on Fastly enabled environment on [[= product_name_cloud =]] provided by Platform.sh, you need to use the Platform.sh
-	Dashboard to obtain the endpoint for Nginx.
+	If you run Nginx and Varnish on premise, you should know what host and port number both Varnish and Nginx runs on.
+  If you perform tests on Fastly enabled environment on [[= product_name_cloud =]] provided by Platform.sh, you need to use the Platform.sh
+	dashboard to obtain the endpoint for Nginx.
 
 The following example shows how to debug and check why Fastly does not cache the front page properly. 
 If you run the command multiple times:
@@ -418,10 +413,8 @@ You can also use the [Ibexa Cloud CLI](https://cli.ibexa.co/) (which has the sam
 
 #### Finding Nginx endpoint on dedicated cloud
 
-If you have a dedicated 3-node cluster on Platform.sh, the procedure for getting the endpoint to environments that are 
-located on that cluster (`production` and sometimes also `staging`) is slightly different.
-In the **URLs** drop-down in the Platform.sh dashboard, find the route that has the format 
-`somecontent.[clusterid].ent.platform.sh/`, for example, `myenvironment.abcdfg2323.ent.platform.sh/`
+If you have a dedicated 3-node cluster on Platform.sh, the procedure for getting the endpoint to environments that are located on that cluster (`production` and sometimes also `staging`) is slightly different.
+In the **URLs** drop-down in the Platform.sh dashboard, find the route that has the format `somecontent.[clusterid].ent.platform.sh/`, for example, `myenvironment.abcdfg2323.ent.platform.sh/`
 
 The endpoint in case has the format `c.[clusterid].ent.platform.sh`, for example, `c.asddfs2323.ent.platform.sh/`
 Next, use nslookup to find the IP:
diff --git a/docs/infrastructure_and_maintenance/clustering/clustering.md b/docs/infrastructure_and_maintenance/clustering/clustering.md
index 690ed7e5ec..a15134289f 100644
--- a/docs/infrastructure_and_maintenance/clustering/clustering.md
+++ b/docs/infrastructure_and_maintenance/clustering/clustering.md
@@ -13,9 +13,7 @@ The parts illustrate the different roles needed for a successful cluster setup.
 
 ![Server setup for clustering](server_setup.png)
 
-The number of web servers, Memcached/Redis, Solr, Varnish, Database and NFS servers,
-as well as whether some servers play several of these roles (typically running Memcached/Redis across the web server)
-is up to you and your performance needs.
+The number of web servers, Memcached/Redis, Solr, Varnish, Database, and NFS servers, but also whether some servers play several of these roles (typically running Memcached/Redis across the web server), is up to you and your performance needs.
 
 The minimal requirements are:
 
diff --git a/docs/infrastructure_and_maintenance/environments.md b/docs/infrastructure_and_maintenance/environments.md
index 16ef74f22e..7753ee0d8f 100644
--- a/docs/infrastructure_and_maintenance/environments.md
+++ b/docs/infrastructure_and_maintenance/environments.md
@@ -1,11 +1,11 @@
 ---
-description: In Ibexa DXP you can use environment provided by Symfony in virtual host configuration, as well as to create custom environments.
+description: In Ibexa DXP you can use environment provided by Symfony in virtual host configuration, and to create custom environments.
 ---
 
 # Environments
 
 Environment configuration is provided by Symfony. [[= product_name =]] additionally enables you to specify environments in virtual host configuration.
-You can configure several environments, such as production, development or staging. You can have different configuration sets for each of them.
+You can configure several environments, such as production, development, or staging. You can have different configuration sets for each of them.
 
 !!! tip
 
diff --git a/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md b/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md
index 9682427a07..b5ca18fd9e 100644
--- a/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md
+++ b/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md
@@ -4,8 +4,7 @@ description: See how you can resolve common issues and report a Customer Support
 
 # Support and maintenance FAQ
 
-This page contains answers to most common questions and tips around support and maintenance,
-as well as references to important parts of the documentation and tools useful for developers in their daily work.
+This page contains answers to most common questions and tips around support and maintenance, references to important parts of the documentation, and tools for developers in their daily work.
 
 #### What information should I specify when creating a Customer Support ticket?
 
diff --git a/docs/permissions/permission_use_cases.md b/docs/permissions/permission_use_cases.md
index 80959fd60f..7654d8c5e9 100644
--- a/docs/permissions/permission_use_cases.md
+++ b/docs/permissions/permission_use_cases.md
@@ -39,7 +39,7 @@ To create and publish content, users must additionally have the following polici
 - `content/edit`
 - `content/publish`
 
-This also lets the user copy and move content, as well as add new Locations to a content item (but not remove them).
+This also lets the user copy and move content, and add new Locations to a content item (but not remove them).
 
 ## Move content
 
diff --git a/docs/personalization/personalization_guide.md b/docs/personalization/personalization_guide.md
index 49978e7000..30fed7bf76 100644
--- a/docs/personalization/personalization_guide.md
+++ b/docs/personalization/personalization_guide.md
@@ -91,8 +91,7 @@ Create websites with content targeted at your customers. Deliver your visitors r
 
 ### Reduce clutter and improve customer retention
 
-Help users find content of their interest quicker,
-use words to appeal to individual customers, as well as segments.
+Help users find content of their interest quicker, use words to appeal to individual customers and segments.
 Enrich customer data by integrating [[= product_name_base =]] Personalization with other systems such as ERP, CRMs.
 Track user’s scenarios and develop strategies that match your strategies and improve engagement.
 ### Satisfy customer expectations
diff --git a/docs/pim/add_remote_pim_support.md b/docs/pim/add_remote_pim_support.md
index f9f9ae42f8..ef537b0273 100644
--- a/docs/pim/add_remote_pim_support.md
+++ b/docs/pim/add_remote_pim_support.md
@@ -47,7 +47,7 @@ ibexa:
 !!! note "Enabling the remote PIM support"
 
     By default, the `ibexa.repositories.<repository_name>.product_catalog.engine.type` key is set to `local`, which informs [[= product_name =]] that the built-in PIM solution is used.
-    By changing this setting, as well as changing the `ibexa.repositories.<repository_name>.product_catalog.engine` setting from `default` to your custom value, you inform [[= product_name =]] that you're using a remote PIM.
+    By changing this setting and the `ibexa.repositories.<repository_name>.product_catalog.engine` setting from `default` to your custom value, you inform [[= product_name =]] that you're using a remote PIM.
 
 ## Install Remote PIM example package
 
diff --git a/docs/pim/pim_guide.md b/docs/pim/pim_guide.md
index 739b368988..53c5b574e6 100644
--- a/docs/pim/pim_guide.md
+++ b/docs/pim/pim_guide.md
@@ -6,9 +6,7 @@ description: The PIM product guide provides a full description of the features a
 
 ## What is PIM
 
-PIM is a Product Information Management module that lets you create, configure and
-manage products, their specifications, assets, variants and prices, 
-as well as group products into categories and catalogs.
+PIM is a Product Information Management module that lets you create, configure and manage products, their specifications, assets, variants, and prices, but also group products into categories and catalogs.
 
 ## Availability
 
diff --git a/docs/pim/products.md b/docs/pim/products.md
index 16dc76952c..b5f7b40bd1 100644
--- a/docs/pim/products.md
+++ b/docs/pim/products.md
@@ -4,8 +4,7 @@ description: Products in the PIM are characterized by attributes describing thei
 
 # Products
 
-Products are a special type of content that contains typical content Fields
-as well as additional product information.
+Products are a special type of content that contains typical content Fields and additional product information.
 
 Each product belongs to a product type (similar to how a content item belongs to a content type).
 
diff --git a/docs/release_notes/ez_platform_v1.11.0.md b/docs/release_notes/ez_platform_v1.11.0.md
index db7752f8ec..e617cfcca2 100644
--- a/docs/release_notes/ez_platform_v1.11.0.md
+++ b/docs/release_notes/ez_platform_v1.11.0.md
@@ -33,7 +33,7 @@ This has been made possible by initial legacy contribution from [@peterkeung](ht
 
 #### Collection block
 
-New Collection block is available in the Landing Page editor.
+New Collection block is available in the landing page editor.
 It enables you to manually select a set of content items to be displayed.
 
 ![Collection block options with three content items selected](collection_block.png)
diff --git a/docs/release_notes/ez_platform_v1.7.0_lts.md b/docs/release_notes/ez_platform_v1.7.0_lts.md
index 51b1895d8d..e1fc90c844 100644
--- a/docs/release_notes/ez_platform_v1.7.0_lts.md
+++ b/docs/release_notes/ez_platform_v1.7.0_lts.md
@@ -20,7 +20,10 @@ With the LTS release, the [new product naming](http://ez.no/Blog/eZ-Announces-Na
 
 ### eZ Platform (Open Source)
 
--   **i18n! Internationalization of the eZ Platform** User Interface is now possible. The new system selects the language to use based on the browser settings of the end user. The system makes it possible to create translations for eZ Platform UI. Studio internationalization, as well as translations ready to use are shipped in further releases. Community members are more than welcome to contribute to the translation process.
+-   **i18n! Internationalization of the eZ Platform** User Interface is now possible. The new system selects the language to use based on the browser settings of the end user.
+The system makes it possible to create translations for eZ Platform UI.
+Studio internationalization and translations ready to use are shipped in further releases.
+Community members are more than welcome to contribute to the translation process.
     ![](i18n.png)
 
 <!-- -->
@@ -29,7 +32,7 @@ With the LTS release, the [new product naming](http://ez.no/Blog/eZ-Announces-Na
 
 ![](udwre.png)
 
--   The Admin Panel now provides a way to get a very clean **digest view of content types** configured in the system, with the ability to clearly get access to properties and field definitions.
+-   The Admin Panel now provides a way to get a clean **digest view of content types** configured in the system, with the ability to clearly get access to properties and field definitions.
 
 ![](contenttypeviews.png)
 
@@ -65,15 +68,17 @@ With the LTS release, the [new product naming](http://ez.no/Blog/eZ-Announces-Na
 
 ### eZ Platform Enterprise Edition (with Studio)
 
--   You can now use our eZ Personalization service to create highly personalized landing pages. The Studio **Personalization Block** available out of the box lets the editor simply create a block that renders a list of content items personalized to each and every visitor. The interface lets the editor decide which of the Personalization scenarios configured in the eZ Personalization back end should be used, as well as the template to be used for rendering.
+- You can now use eZ Personalization service to create highly personalized landing pages.
+The Studio **Personalization Block** available out of the box lets the editor create a block that renders a list of content items personalized to each and every visitor.
+The interface lets the editor decide which of the Personalization scenarios configured in the eZ Personalization back end, and also the template for rendering, should be used.
 
 ![](personalizationblock.png)
 
--   You can now take advantage of the **Date-Based Publishing** feature – when editing a draft, instead of publishing the content immediately you can select the date and time at which it's automatically published. All your content scheduled to be published are accessible in a dedicated widget on the dashboard.
+- You can now take advantage of the **Date-Based Publishing** feature – when editing a draft, instead of publishing the content immediately you can select the date and time at which it's automatically published. All your content scheduled to be published are accessible in a dedicated widget on the dashboard.
 
 ![](future_publication_window.png)
 
--   Create forms in your Landing Page using the **Form Builder**. A special Form Block allows you to add forms with different types of fields to the Landing Page. This system has been designed to be extended, so that you can create your own form fields. The system also provide an interface to access the data that has been collected, and download it as CSV files.
+- Create forms in your landing page using the **Form Builder**. A special Form Block allows you to add forms with different types of fields to the landing page. This system has been designed to be extended, so that you can create your own form fields. The system also provide an interface to access the data that has been collected, and download it as CSV files.
 
 ![](form-builder-1.png)
 
diff --git a/docs/release_notes/ez_platform_v1.8.0.md b/docs/release_notes/ez_platform_v1.8.0.md
index 5ac63c0465..d98504e5a1 100644
--- a/docs/release_notes/ez_platform_v1.8.0.md
+++ b/docs/release_notes/ez_platform_v1.8.0.md
@@ -29,7 +29,7 @@ If you're looking for the Long Term Support (LTS) release, see[ https://ezplatf
 
 #### Under the Hood
 
--   New opt-in approach to HttpCache to improve usability as well as performance by means of:
+-   New opt-in approach to HttpCache to improve usability and performance by means of:
     -   Cache multi-tagging: allowing you to tag pages with a path, location, type, parent, etc. so the repository can clear cache in a more targeted, accurate, and flexible way, getting rid of any "clear all" situations on complex operations.
     -   For Varnish this uses [xkey](https://github.com/varnish/varnish-modules/blob/master/docs/vmod_xkey.rst) instead of BAN, enabling greater performance by allowing you to control grace time.
     -   This also places HttpCache in a separate repo, allowing it to grow independently: see <https://github.com/ezsystems/ezplatform-http-cache>
diff --git a/docs/release_notes/ez_platform_v1.9.0.md b/docs/release_notes/ez_platform_v1.9.0.md
index 7a6b366e13..7ff62bd851 100644
--- a/docs/release_notes/ez_platform_v1.9.0.md
+++ b/docs/release_notes/ez_platform_v1.9.0.md
@@ -40,7 +40,7 @@ In version 1.8 we introduced a new Content Browser in the Universal Discovery Wi
 
 ### eZ Platform Enterprise Edition - Studio
 
--   It's now possible to configure Landing Page blocks used by the Landing Page editor in a simpler way. The configuration is done in a YAML file (see <https://issues.ibexa.co/browse/EZEE-1421>)
+-   It's now possible to configure landing page blocks used by the landing page editor in a simpler way. The configuration is done in a YAML file (see <https://issues.ibexa.co/browse/EZEE-1421>)
 -   *..lots of other bug fixes and smaller improvements..*
 
 ### eZ Platform Enterprise Edition - Studio Demo
diff --git a/docs/release_notes/ez_platform_v2.2.0.md b/docs/release_notes/ez_platform_v2.2.0.md
index 16dada0406..133c5cddaa 100644
--- a/docs/release_notes/ez_platform_v2.2.0.md
+++ b/docs/release_notes/ez_platform_v2.2.0.md
@@ -12,13 +12,13 @@
 
 ### Page Builder
 
-This version introduces the **Page Builder** which replaces the Landing Page editor from earlier versions.
+This version introduces the **Page Builder** which replaces the landing page editor from earlier versions.
 
 ![Page Builder](2.2_page_builder.png)
 
 !!! note
 
-    The Page Builder does not offer all blocks that Landing Page editor did.
+    The Page Builder does not offer all blocks that landing page editor did.
     The removed blocks include Schedule and Form blocks.
     They will be included again in a future release.
 
@@ -27,7 +27,7 @@ This version introduces the **Page Builder** which replaces the Landing Page edi
 
 #### Modifying the Page content type
 
-You can edit the new Page content type by adding Fields, as well as create new content types with the Page field type.
+You can edit the new Page content type by adding Fields and create new content types with the Page field type.
 
 ![Editing Fields in Page Builder](2.2_page_builder_edit_fields.png)
 
@@ -41,7 +41,7 @@ In the Page block config you can now specify the CSS class with its own style fo
 
     Refer to [Updating eZ Platform](https://doc.ibexa.co/en/2.5/updating/5_update_2.2) for a database update script.
 
-    To update to 2.2 with existing Content you need a [dedicated script for converting the Landing Page into the new Page](https://doc.ibexa.co/en/2.5/updating/5_update_2.2/#migrate-landing-pages).
+    To update to 2.2 with existing Content you need a [dedicated script for converting the landing page into the new Page](https://doc.ibexa.co/en/2.5/updating/5_update_2.2/#migrate-landing-pages).
 
 ### Bookmarks
 
diff --git a/docs/release_notes/ez_platform_v2.5.md b/docs/release_notes/ez_platform_v2.5.md
index 40aac81bba..0f427fea50 100644
--- a/docs/release_notes/ez_platform_v2.5.md
+++ b/docs/release_notes/ez_platform_v2.5.md
@@ -253,7 +253,7 @@ This section provides a list of deprecated features to be removed in eZ Platform
 
 ### Configuration through `ezplatform`
 
-In YAML configuration, you can now use `ezplatform` as well as `ezpublish` as the main configuration key.
+In YAML configuration, you can now use `ezplatform` and `ezpublish` as the main configuration key.
 
 ### API improvements
 
diff --git a/docs/release_notes/ez_platform_v3.0_deprecations.md b/docs/release_notes/ez_platform_v3.0_deprecations.md
index d37251e092..682564dd87 100644
--- a/docs/release_notes/ez_platform_v3.0_deprecations.md
+++ b/docs/release_notes/ez_platform_v3.0_deprecations.md
@@ -12,11 +12,7 @@ This page lists backwards compatibility breaks and deprecations introduced in eZ
 ## Symfony 5
 
 v3.0 now uses Symfony 5 instead of Symfony 3.
-Refer to [Symfony changelog for 4.0](https://github.com/symfony/symfony/blob/master/CHANGELOG-4.0.md)
-and [for 5.0](https://github.com/symfony/symfony/blob/master/CHANGELOG-5.0.md)
-as well as [Symfony upgrade guides for 4.0](https://github.com/symfony/symfony/blob/master/UPGRADE-4.0.md)
-and [for 5.0](https://github.com/symfony/symfony/blob/master/UPGRADE-5.0.md)
-to learn about all changes it entails.
+Refer to [Symfony changelog for 4.0](https://github.com/symfony/symfony/blob/master/CHANGELOG-4.0.md), [for 5.0](https://github.com/symfony/symfony/blob/master/CHANGELOG-5.0.md), [Symfony upgrade guides for 4.0](https://github.com/symfony/symfony/blob/master/UPGRADE-4.0.md), and [for 5.0](https://github.com/symfony/symfony/blob/master/UPGRADE-5.0.md) to learn about all changes it entails.
 
 See [v3.0 project update](adapt_code_to_v3.md) for the steps you need to take to update your project to Symfony 5.
 See also [full requirements for installing eZ Platform](https://doc.ibexa.co/en/latest/getting_started/requirements).
diff --git a/docs/release_notes/ez_platform_v3.1.md b/docs/release_notes/ez_platform_v3.1.md
index 7549071af4..8aa9a118c6 100644
--- a/docs/release_notes/ez_platform_v3.1.md
+++ b/docs/release_notes/ez_platform_v3.1.md
@@ -33,16 +33,16 @@ This release of eZ Platform introduces the following new features:
     You can now define the parent Location for every new site in the template configuration.
 
     For more information about defining parent Location, see [Configure parent Location](https://doc.ibexa.co/en/latest/guide/multisite/site_factory_configuration/#parent-location).
-    
+
     ### Elasticsearch
-    
+
     You can now use [Elasticsearch](https://www.elastic.co/) in your eZ Platform installation
     through the `PlatformElasticSearchEngineBundle`.
-    
+
     See [Elasticsearch documentation](https://doc.ibexa.co/en/latest/guide/search/elastic) to learn how to set up, configure and user Elasticsearch with eZ Platform.
-    
+
     ### Page Builder
-    
+
     You can now filter elements in the sidebar during site creation process to get to the desired blocks faster.
 
     ![](3_1_filter_elements.png)
@@ -51,21 +51,22 @@ This release of eZ Platform introduces the following new features:
 
     The new [field group limitation](https://doc.ibexa.co/en/latest/guide/limitation_reference/#field-group-limitation)
     enables you to control who can edit content fields per field group.
-    
+
     ### Version comparison
-    
+
     You can now compare additional fields in version comparison of content item:
-    
+
     - Content Relation and Content Relations
     - Image Asset and Image
     - Matrix
     - Media
-    
+
     For overview of additional fields, see [User documentation on Comparing versions]([[= user_doc =]]/publishing/publishing/#comparing-versions).
     
 ### URL management UI
 
-You can now manage URL addresses and URL wildcards with a comfortable user interface that is available in the back office. You can create, modify and delete URL wildcards, as well as decide if the user should be redirected to the new address on clicking the link.
+You can now manage URL addresses and URL wildcards with a comfortable user interface that is available in the back office.
+You can create, modify or delete URL wildcards, and decide if the user should be redirected to the new address on clicking the link.
 
 !!! note
 
@@ -134,9 +135,9 @@ You can now have a Service that provides both `PermissionResolver` and `Permissi
 
 ## Behavior changes
 
-### Landing Page drafts
+### Landing page drafts
 
-When you start creating a Landing Page, a new draft is now automatically created.
+When you start creating a landing page, a new draft is now automatically created.
 
 ## Deprecations
 
diff --git a/docs/release_notes/ibexa_dxp_v3.2.md b/docs/release_notes/ibexa_dxp_v3.2.md
index c9f858274b..319a06c776 100644
--- a/docs/release_notes/ibexa_dxp_v3.2.md
+++ b/docs/release_notes/ibexa_dxp_v3.2.md
@@ -50,8 +50,7 @@ depending on the Segments they belong to.
 
 You can [configure Segments](https://doc.ibexa.co/en/latest/guide/admin_panel/#segments) in the back office.
 
-[Segmentation API](https://doc.ibexa.co/en/latest/api/public_php_api_managing_users/#segments) enables you to create and edit Segments and Segment Groups,
-as well as assign Users to Segments.
+[Segmentation API](https://doc.ibexa.co/en/latest/api/public_php_api_managing_users/#segments) enables you to create and edit Segments and Segment Groups, and assign Users to Segments.
 
 ### Twig helpers for content rendering
 
diff --git a/docs/release_notes/ibexa_dxp_v4.2.md b/docs/release_notes/ibexa_dxp_v4.2.md
index 105b6fdc2b..64e9093a95 100644
--- a/docs/release_notes/ibexa_dxp_v4.2.md
+++ b/docs/release_notes/ibexa_dxp_v4.2.md
@@ -67,7 +67,7 @@ The system automatically generates variants for the attribute values you select.
 
 ![Generating product variants](4.2_product_variants_generate.png)
 
-You can set prices, including custom pricing, as well as availability and stock for each variant separately.
+You can set prices, including custom pricing, availability, and stock for each variant separately.
 
 ### Product assets
 
diff --git a/docs/release_notes/ibexa_dxp_v4.3.md b/docs/release_notes/ibexa_dxp_v4.3.md
index d1924b1e7d..3f8bc46a66 100644
--- a/docs/release_notes/ibexa_dxp_v4.3.md
+++ b/docs/release_notes/ibexa_dxp_v4.3.md
@@ -73,8 +73,7 @@ From product's Completeness tab you can now jump directly to editing the product
 
 #### Catalog filters
 
-In catalogs, you can now [configure default filters](https://doc.ibexa.co/en/master/pim/pim_configuration/#catalog-filters) that are always added to a catalog,
-as well as define filter order and group custom filters.
+In catalogs, you can now [configure default filters](https://doc.ibexa.co/en/master/pim/pim_configuration/#catalog-filters) that are always added to a catalog, define filter order, and group custom filters.
 Built-in filters are also divided into groups now for easier browsing.
 
 Filtering by the Color attribute is now possible.
diff --git a/docs/release_notes/ibexa_dxp_v4.5.md b/docs/release_notes/ibexa_dxp_v4.5.md
index f06dc7cdd1..aa236f5463 100644
--- a/docs/release_notes/ibexa_dxp_v4.5.md
+++ b/docs/release_notes/ibexa_dxp_v4.5.md
@@ -29,17 +29,17 @@ Modules can interact with each other, for example, to decrease stock as a result
 
 #### Order management
 
-With order management in place, it's now possible to create orders, configure and customize the order processing workflow, as well as manage orders by using the APIs. 
+With order management in place, it's now possible to create orders, configure and customize the order processing workflow, and manage orders by using the APIs. 
 
 New screens added to the back office user interface let [[= product_name =]] users search for orders and filter search results. 
-Users can also review order details and completion status, as well as cancel orders.
+Users can also review order details and completion status, and cancel orders.
 
 ![The order list screen](img/4.5_order_list.png "The order list screen")
 
 #### Payment
 
 The all-new Payment module brings a possibility of tracking payment progress and defining a custom payment processing workflow. 
-New back office screens allow users to search for payment methods and payments, as well as define, enable and disable offline payment methods.
+New back office screens allow users to search for payment methods and payments, and also define, enable, and disable offline payment methods.
 
 Additionally, new APIs are available, which can be used for managing payment methods and payments.
 
@@ -47,7 +47,8 @@ Additionally, new APIs are available, which can be used for managing payment met
 
 #### Shipping
 
-With the arrival of the Shipping module, it's now possible to define and manage shipping methods of different types, together with their related costs, on a dedicated back office screen, as well as configure and customize the shipment workflow.
+With the arrival of the Shipping module, it's now possible to define and manage shipping methods of different types, together with their related costs, on a dedicated back office screen.
+You can now also configure and customize the shipment workflow.
 
 New APIs enable managing shipping methods and payments, while an extension point can be used to expand the default list of shipping method types. 
 
diff --git a/docs/release_notes/ibexa_dxp_v4.6.md b/docs/release_notes/ibexa_dxp_v4.6.md
index 182732e9ff..5586d64a0a 100644
--- a/docs/release_notes/ibexa_dxp_v4.6.md
+++ b/docs/release_notes/ibexa_dxp_v4.6.md
@@ -180,7 +180,7 @@ Also, content type icons have changed slightly.
 
 ### Ibexa Image picker
 
-Editors can now use a Digital Asset Management platform that enables storing media assets in a central location, as well as organizing, distributing, and sharing them across many channels.
+Editors can now use a Digital Asset Management platform that enables storing media assets in a central location, organizing, distributing, and sharing them across many channels.
 
 For more information, see [Ibexa DAM](https://doc.ibexa.co/projects/userguide/en/master/dam/ibexa_dam/).
 
diff --git a/docs/resources/new_in_doc.md b/docs/resources/new_in_doc.md
index 6d0093ab8b..abd528171f 100644
--- a/docs/resources/new_in_doc.md
+++ b/docs/resources/new_in_doc.md
@@ -485,23 +485,15 @@ This page contains recent highlights and notable changes in [[= product_name =]]
 
 ### Payment
 
-- [Payment management](https://doc.ibexa.co/en/master/commerce/payment/payment/),
-including [configuring payment workflow](https://doc.ibexa.co/en/master/commerce/payment/configure_payment/),
-as well as [payment](https://doc.ibexa.co/en/master/commerce/payment/payment_api/)
-and [payment method PHP API](https://doc.ibexa.co/en/master/commerce/payment/payment_method_api/).
+- [Payment management](https://doc.ibexa.co/en/master/commerce/payment/payment/), including [configuring payment workflow](https://doc.ibexa.co/en/master/commerce/payment/configure_payment/), [payment](https://doc.ibexa.co/en/master/commerce/payment/payment_api/), and [payment method PHP API](https://doc.ibexa.co/en/master/commerce/payment/payment_method_api/).
 
 ### Orders
 
-- [Order management](https://doc.ibexa.co/en/master/commerce/order_management/order_management/),
-including [configuring order workflow](https://doc.ibexa.co/en/master/commerce/order_management/configure_order_management/)
-and [Orders REST API reference](https://doc.ibexa.co/en/master/api/rest_api/rest_api_reference/rest_api_reference.html#orders).
+- [Order management](https://doc.ibexa.co/en/master/commerce/order_management/order_management/), including [configuring order workflow](https://doc.ibexa.co/en/master/commerce/order_management/configure_order_management/) and [Orders REST API reference](https://doc.ibexa.co/en/master/api/rest_api/rest_api_reference/rest_api_reference.html#orders).
 
 ### Shipping
 
-- [Shipping management](https://doc.ibexa.co/en/master/commerce/shipping_management/shipping_management/),
-including [configuring shipment workflow](https://doc.ibexa.co/en/master/commerce/shipping_management/configure_shipment/),
-as well as [shipment](https://doc.ibexa.co/en/master/commerce/shipping_management/shipment_api/)
-and [shipping method PHP API](https://doc.ibexa.co/en/master/commerce/shipping_management/shipping_method_api/).
+- [Shipping management](https://doc.ibexa.co/en/master/commerce/shipping_management/shipping_management/), including [configuring shipment workflow](https://doc.ibexa.co/en/master/commerce/shipping_management/configure_shipment/), [shipment](https://doc.ibexa.co/en/master/commerce/shipping_management/shipment_api/), and [shipping method PHP API](https://doc.ibexa.co/en/master/commerce/shipping_management/shipping_method_api/).
 
 ### Search
 
@@ -548,10 +540,7 @@ and [extend Storefront](https://doc.ibexa.co/en/master/commerce/storefront/exten
 
 ### Checkout
 
-- [Checkout](https://doc.ibexa.co/en/master/commerce/checkout/checkout/) documentation,
-including how to [configure checkout](https://doc.ibexa.co/en/master/commerce/checkout/configure_checkout/).
-Description of main [PHP API methods](https://doc.ibexa.co/en/master/commerce/checkout/checkout_api/)
-as well as [checkout-related Twig functions](https://doc.ibexa.co/en/master/templating/twig_function_reference/checkout_twig_functions/).
+- [Checkout](https://doc.ibexa.co/en/master/commerce/checkout/checkout/) documentation, including [how to configure checkout](https://doc.ibexa.co/en/master/commerce/checkout/configure_checkout/), description of main [PHP API methods](https://doc.ibexa.co/en/master/commerce/checkout/checkout_api/), and [checkout-related Twig functions](https://doc.ibexa.co/en/master/templating/twig_function_reference/checkout_twig_functions/).
 
 ### Other
 
diff --git a/docs/search/search_engines/elastic_search/configure_elastic_search.md b/docs/search/search_engines/elastic_search/configure_elastic_search.md
index 9845452c1f..2553deffe5 100644
--- a/docs/search/search_engines/elastic_search/configure_elastic_search.md
+++ b/docs/search/search_engines/elastic_search/configure_elastic_search.md
@@ -33,8 +33,7 @@ ibexa_elasticsearch:
         default_connection: <connection_name>
     ```
 
-Now, you need to decide whether to add a cluster that you administer and manage yourself, or use a cloud
-solution from Elastic, as well as configure additional parameters.
+Now, you need to decide whether to add a cluster that you administer and manage yourself, or use a cloud solution from Elastic, and configure additional parameters.
 
 If you want to connect by using a cluster, follow the instructions below in the [Cluster](#configure-clustering) section.
 If you want to use Elasticsearch Cloud, skip to [Elasticsearch Cloud](#configure-elasticsearch-cloud) section.
diff --git a/docs/templating/layout/add_breadcrumbs.md b/docs/templating/layout/add_breadcrumbs.md
index f1cfcde821..b1bd64f592 100644
--- a/docs/templating/layout/add_breadcrumbs.md
+++ b/docs/templating/layout/add_breadcrumbs.md
@@ -6,8 +6,7 @@ description: Add and render a breadcrumbs element on your site.
 
 To add breadcrumbs to your website, first prepare a general layout template in a `templates/themes/<theme_name>/pagelayout.html.twig` file.
 
-This template can contain things such as header, menu, footer, as well as [assets](assets.md) for the whole site,
-and all other templates [extend](templates.md#connecting-templates) it.
+This template can contain things such as header, menu, footer, and [assets](assets.md) for the whole site, and all other templates [extend](templates.md#connecting-templates) it.
 
 Then, to render breadcrumbs, create a `BreadcrumbController.php` file in `src/Controller`:
 
diff --git a/docs/templating/layout/add_navigation_menu.md b/docs/templating/layout/add_navigation_menu.md
index ab1245d479..31d403ecb1 100644
--- a/docs/templating/layout/add_navigation_menu.md
+++ b/docs/templating/layout/add_navigation_menu.md
@@ -6,8 +6,7 @@ description: Enrich you site front with a menu displaying selected content items
 
 To add a navigation menu to your website, prepare a general layout template in a `templates/themes/<theme_name>/pagelayout.html.twig` file.
 
-This template can contain things such as header, menu, footer, as well as [assets](assets.md) for the whole site,
-and all other templates [extend](templates.md#connecting-templates) it.
+This template can contain things such as header, menu, footer, and [assets](assets.md) for the whole site, and all other templates [extend](templates.md#connecting-templates) it.
 
 To select items that should be rendered in the menu, you can use one of the following ways:
 
diff --git a/docs/templating/templates/templates.md b/docs/templating/templates/templates.md
index 2b8000627a..71081dd0fb 100644
--- a/docs/templating/templates/templates.md
+++ b/docs/templating/templates/templates.md
@@ -40,8 +40,7 @@ The parent template (in this case, `pagelayout.html.twig`) must leave a place fo
 
 ## Template variables
 
-In templates, you can use variables related to the current content item,
-as well as general variables related to the current view and general application settings.
+In templates, you can use variables related to the current content item, and general variables related to the current view and general application settings.
 
 [[= include_file('docs/snippets/rendering_dump_variable.md') =]]
 
diff --git a/docs/templating/twig_function_reference/checkout_twig_functions.md b/docs/templating/twig_function_reference/checkout_twig_functions.md
index ad0a5b9ee5..70060af672 100644
--- a/docs/templating/twig_function_reference/checkout_twig_functions.md
+++ b/docs/templating/twig_function_reference/checkout_twig_functions.md
@@ -6,8 +6,7 @@ page_type: reference
 
 # Checkout Twig functions
 
-You can use checkout Twig functions to get information about the checkout process, 
-as well as total values related to cart and cart items.
+You can use checkout Twig functions to get information about the checkout process, and total values related to cart and cart items.
 
 ### `ibexa_checkout_step_label()`
 
diff --git a/docs/templating/twig_function_reference/field_twig_functions.md b/docs/templating/twig_function_reference/field_twig_functions.md
index b941a71846..0a8e3ca08d 100644
--- a/docs/templating/twig_function_reference/field_twig_functions.md
+++ b/docs/templating/twig_function_reference/field_twig_functions.md
@@ -1,39 +1,39 @@
 ---
-description: Field Twig function enable rendering content Fields, their values and their information.
+description: Field Twig function enable rendering content fields, their values and their information.
 page_type: reference
 ---
 
 # Field Twig functions
 
-Field Twig functions render specific Fields of a content item
+Field Twig functions render specific fields of a content item
 and provide information about them.
 
-- [`ibexa_render_field()`](#ibexa_render_field) renders the selected Field of a content item.
-- [`ibexa_field_value()`](#ibexa_field_value) returns the Field value object.
-- [`ibexa_field()`](#ibexa_field) returns the Field object.
+- [`ibexa_render_field()`](#ibexa_render_field) renders the selected field of a content item.
+- [`ibexa_field_value()`](#ibexa_field_value) returns the field value object.
+- [`ibexa_field()`](#ibexa_field) returns the field object.
 
 `ibexa_field()` returns the *Field object*, and `ibexa_field_value()` returns the *Field's raw value*.
-`ibexa_render_field()` is the Twig function intended for rendering the Field on the front page.
+`ibexa_render_field()` is the Twig function intended for rendering the field on the front page.
 
-You can get additional information about a Field by using the following Twig functions:
+You can get additional information about a field by using the following Twig functions:
 
-- [`ibexa_field_name()`](#ibexa_field_name) returns the name of a content item's Field.
-- [`ibexa_field_description()`](#ibexa_field_description) returns the description of a content item's Field.
-- [`ibexa_field_is_empty()`](#ibexa_field_is_empty) returns Boolean information whether a Field of a content item is empty.
-- [`ibexa_field_group_name()`](#ibexa_field_group_name) returns a human-readable name of the Field group.
-- [`ibexa_has_field()`](#ibexa_has_field) checks whether a Field is present in the content item.
+- [`ibexa_field_name()`](#ibexa_field_name) returns the name of a content item's field.
+- [`ibexa_field_description()`](#ibexa_field_description) returns the description of a content item's field.
+- [`ibexa_field_is_empty()`](#ibexa_field_is_empty) returns Boolean information whether a field of a content item is empty.
+- [`ibexa_field_group_name()`](#ibexa_field_group_name) returns a human-readable name of the field group.
+- [`ibexa_has_field()`](#ibexa_has_field) checks whether a field is present in the content item.
 
 
 ## Field rendering
 
 ### `ibexa_render_field()`
 
-`ibexa_render_field()` renders the selected Field of a content item.
-The Field is rendered with the default template, but you can optionally pass a different template as parameter as well.
+`ibexa_render_field()` renders the selected field of a content item.
+The field is rendered with the default template, but you can optionally pass a different template as parameter as well.
 
 | Argument | Type | Description |
 | ------ | ----- | ----- |
-| `content` | `Ibexa\Contracts\Core\Repository\Values\Content\Content` | Content item the Field belongs to. |
+| `content` | `Ibexa\Contracts\Core\Repository\Values\Content\Content` | Content item the field belongs to. |
 | `fieldDefinitionIdentifier` | `string` | Field identifier. |
 | `params` | `hash` | (optional) Hash of parameters passed to the template block. |
 
@@ -53,8 +53,8 @@ The Field is rendered with the default template, but you can optionally pass a d
 
 You can pass the following parameters to `ibexa_render_field()`:
 
-- `lang` - language to render the Field in (overrides the current language), must be a valid locale in xxx-YY format
-- `template` - Field template to use
+- `lang` - language to render the field in (overrides the current language), must be a valid locale in xxx-YY format
+- `template` - field template to use
 - `attr` - hash of HTML attributes to add to the tag
 - parameters - arbitrary parameters to pass to the template block.
 Some field types, like the [MapLocation field type](maplocationfield.md), expect specific parameters.
@@ -73,17 +73,17 @@ Some field types, like the [MapLocation field type](maplocationfield.md), expect
 
 ### `ibexa_field_value()`
 
-`ibexa_field_value()` returns the Field value object.
+`ibexa_field_value()` returns the field value object.
 
-The function returns the value of the Field only.
-To render the Field with default or custom templates, use [`ibexa_render_field()`](#ibexa_render_field) instead.
+The function returns the value of the field only.
+To render the field with default or custom templates, use [`ibexa_render_field()`](#ibexa_render_field) instead.
 If the content item does not have a translation in the prioritized or passed language,
 the function returns the value in the main language.
 
 | Argument | Type | Description |
 |-----|------|-----|
-| `content`| `Ibexa\Contracts\Core\Repository\Values\Content\Content` | Content item the Field belongs to.|
-| `fieldDefIdentifier` | `string` | Identifier of the Field. |
+| `content`| `Ibexa\Contracts\Core\Repository\Values\Content\Content` | Content item the field belongs to.|
+| `fieldDefIdentifier` | `string` | Identifier of the field. |
 | `forcedLanguage`  | `string` | (optional) Language to use (for example, "fre-FR"). |
 
 ``` html+twig
@@ -92,18 +92,18 @@ the function returns the value in the main language.
 
 ### `ibexa_field()`
 
-`ibexa_field()` returns the Field object.
-The Field gives you access to the Field value, as well as the Field's definition identifier and field type identifier.
+`ibexa_field()` returns the field object.
+The field gives you access to the field value, the field's definition identifier, and field type identifier.
 If the content item does not have a translation in the prioritized or passed language,
-the function returns the Field object in the main language.
+the function returns the field object in the main language.
 
 | Argument | Type | Description |
 |-------|------|------|
-| `content`| `Ibexa\Contracts\Core\Repository\Values\Content\Content` | Content item the Field belongs to.|
-| `fieldDefIdentifier` | `string` | Identifier of the Field. |
+| `content`| `Ibexa\Contracts\Core\Repository\Values\Content\Content` | Content item the field belongs to.|
+| `fieldDefIdentifier` | `string` | Identifier of the field. |
 | `forcedLanguage` | `string` | {optional) Language to use (for example, "fre-FR"). |
 
-You can access the Field's value by using `(ibexa_field(content, 'my_field').value)`,
+You can access the field's value by using `(ibexa_field(content, 'my_field').value)`,
 but it's recommended to use the dedicated [`ibexa_field_value()`](#ibexa_field_value) function for this.
 
 You can use `ibexa_field()` to access the field type identifier:
@@ -116,7 +116,7 @@ You can use `ibexa_field()` to access the field type identifier:
 
 ### `ibexa_field_name()`
 
-`ibexa_field_name()` returns the name of a content item's Field.
+`ibexa_field_name()` returns the name of a content item's field.
 
 The function uses prioritized languages from SiteAccess settings unless you pass another language as `forcedLanguage`.
 If the content item does not have a translation in the prioritized or passed language,
@@ -124,8 +124,8 @@ the function returns the name in the main language.
 
 | Argument | Type | Description |
 |---------------|------|-------------|
-| `content` | `Ibexa\Contracts\Core\Repository\Values\Content\Content` or `Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo` | Content item the Field belongs to. |
-| `fieldDefIdentifier` | `string` | Identifier of the Field. |
+| `content` | `Ibexa\Contracts\Core\Repository\Values\Content\Content` or `Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo` | Content item the field belongs to. |
+| `fieldDefIdentifier` | `string` | Identifier of the field. |
 | `forcedLanguage` | `string` | (optional) Language to use (for example, `fre-FR`). |
 
 
@@ -137,7 +137,7 @@ the function returns the name in the main language.
 
 ### `ibexa_field_description()`
 
-`ibexa_field_description()` returns the description of a content item's Field.
+`ibexa_field_description()` returns the description of a content item's field.
 
 The function uses prioritized languages from SiteAccess settings unless you pass another language as `forcedLanguage`.
 If the content item does not have a translation in the prioritized or passed language,
@@ -145,8 +145,8 @@ the function returns the description in the main language.
 
 | Argument | Type | Description |
 |---------------|------|-------------|
-| `content` | `Ibexa\Contracts\Core\Repository\Values\Content\Content` or `Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo` | Content item the Field belongs to. |
-| `fieldDefIdentifier` | `string` | Identifier of the Field. |
+| `content` | `Ibexa\Contracts\Core\Repository\Values\Content\Content` or `Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo` | Content item the field belongs to. |
+| `fieldDefIdentifier` | `string` | Identifier of the field. |
 | `forcedLanguage` | `string` | (optional) Language to use (for example, `fre-FR`). |
 
 ``` html+twig
@@ -157,12 +157,12 @@ the function returns the description in the main language.
 
 ### `ibexa_field_is_empty()`
 
-`ibexa_field_is_empty()` returns Boolean information whether a given Field of a content item is empty.
+`ibexa_field_is_empty()` returns Boolean information whether a given field of a content item is empty.
 
 | Argument | Type | Description |
 |---------------|------|-------------|
-| `content` | `Ibexa\Contracts\Core\Repository\Values\Content\Content` or `Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo` | Content item the Field belongs to. |
-| `fieldDefIdentifier` | `string` | Identifier of the Field. |
+| `content` | `Ibexa\Contracts\Core\Repository\Values\Content\Content` or `Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo` | Content item the field belongs to. |
+| `fieldDefIdentifier` | `string` | Identifier of the field. |
 | `forcedLanguage` | `string` | (optional) Language to use (for example, `fre-FR`). |
 
 ``` html+twig
@@ -171,7 +171,7 @@ the function returns the description in the main language.
 
 #### Examples
 
-For example, use `ibexa_field_is_empty()` to check whether a Field is empty or filled before rendering it:
+For example, use `ibexa_field_is_empty()` to check whether a field is empty or filled before rendering it:
 
 ``` html+twig
 {% if not ibexa_field_is_empty(content, 'image') %}
@@ -181,7 +181,7 @@ For example, use `ibexa_field_is_empty()` to check whether a Field is empty or f
 
 ### `ibexa_field_group_name()`
 
-`ibexa_field_group_name()` returns a human-readable name of a Field group.
+`ibexa_field_group_name()` returns a human-readable name of a field group.
 
 | Argument | Type | Description |
 |---------------|------|-------------|
@@ -194,12 +194,12 @@ For example, use `ibexa_field_is_empty()` to check whether a Field is empty or f
 
 ### `ibexa_has_field()`
 
-`ibexa_has_field()` returns Boolean information whether a Field is present in the content item.
+`ibexa_has_field()` returns Boolean information whether a field is present in the content item.
 
 | Argument | Type | Description |
 |---------------|------|-------------|
-| `content` | `Ibexa\Contracts\Core\Repository\Values\Content\Content` | Content item the Field may belong to. |
-| `fieldDefIdentifier` | `string` | Identifier of the Field. |
+| `content` | `Ibexa\Contracts\Core\Repository\Values\Content\Content` | Content item the field may belong to. |
+| `fieldDefIdentifier` | `string` | Identifier of the field. |
 
 ``` html+twig
 {% if ibexa_has_field(content, 'existing') %}
diff --git a/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md b/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
index a479c7edcb..fd183c140f 100644
--- a/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
+++ b/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
@@ -23,9 +23,9 @@ Go to the front page of your website (`<yourdomain>`). You can see that it looks
 
 Log in to the back office. Go to **Content Structure**.
 The **Ibexa Digital Experience Platform** content item is the first page that is shown to the visitor.
-Here you can check what content type it belongs to: it's a Landing Page.
+Here you can check what content type it belongs to: it's a landing page.
 
-![Ibexa Digital Experience Platform is a Landing Page](enterprise_tut_home_is_an_lp.png)
+![Ibexa Digital Experience Platform is a landing page](enterprise_tut_home_is_an_lp.png)
 
 The page contains one Code block and is displayed without any template.
 Click Edit to enter a mode that enables you to work with Pages.
@@ -61,7 +61,7 @@ First create a new file for layout configuration, `config/packages/ibexa_fieldty
     For a detailed description of creating a Page layout, see [Page layouts](render_page.md#render-a-layout).
 
 The `sidebar` (line 3) is the internal key of the layout. `name` (line 5) is displayed in the interface when the user selects a layout.
-The `thumbnail` (line 7) points to an image file that is shown when creating a new Landing Page next to the name.
+The `thumbnail` (line 7) points to an image file that is shown when creating a new landing page next to the name.
 Use the [supplied thumbnail file](https://github.com/ibexa/documentation-developer/blob/master/code_samples/tutorials/page_tutorial_starting_point/public/assets/images/layouts/sidebar.png) and place it in the `public/assets/images/layouts/` folder.
 
 The `template` (line 8) points to the Twig file containing the template for this layout.
diff --git a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
index 8b21185699..ee8bfe3b73 100644
--- a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
+++ b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
@@ -54,9 +54,9 @@ doctrine:
 
 Also make the corresponding change in `app/config/dfs/dfs.yml`.
 
-#### Migrate Landing Pages
+#### Migrate landing pages
 
-To update to v2.2 with existing Landing Pages, you need to use a dedicated script.
+To update to v2.2 with existing landing pages, you need to use a dedicated script.
 The script is contained in the `ezplatform-page-migration` bundle and **works since version v2.2.2**.
 To use the script:
 
@@ -66,32 +66,32 @@ To use the script:
 
 !!! tip
 
-    This script uses the layout defined in your Landing Page.
+    This script uses the layout defined in your landing page.
     To migrate successfully, you need to copy your zone configuration
     from `ez_systems_landing_page_field_type` under `ezplatform_page_fieldtype` in the new config.
     Otherwise the script encounters errors.
 
 You can remove the bundle after the migration is complete.
 
-The `ezplatform:page:migrate` command migrates Landing Pages created in eZ Platform v1.x, v2.0 and v2.1 to new Pages.
+The `ezplatform:page:migrate` command migrates landing pages created in eZ Platform v1.x, v2.0 and v2.1 to new Pages.
 The operation is transactional and rolls back in case of errors.
 
 !!! caution "Avoid exception when migrating from eZ Publish"
 
-    If you [migrated to v1.13 from eZ Publish](migrating_from_ez_publish.md), and want to upgrade to v2.5, an exception occurs when you run the `bin/console ezplatform:page:migrate` command and the database contains internal drafts of Landing Pages. 
+    If you [migrated to v1.13 from eZ Publish](migrating_from_ez_publish.md), and want to upgrade to v2.5, an exception occurs when you run the `bin/console ezplatform:page:migrate` command and the database contains internal drafts of landing pages. 
     
     To avoid this exception, you must first [remove all internal drafts before you migrate](migrating_from_ez_publish.md#migration_exception). 
 
 ##### Block migration
 
-In v2.2 Page Builder does not offer all blocks that Landing Page editor did. The removed blocks include Keyword, Schedule, and Form blocks.
+In v2.2 Page Builder does not offer all blocks that landing page editor did. The removed blocks include Keyword, Schedule, and Form blocks.
 The Places block has been removed from the clean installation and is only available in the demo out of the box.
 If you use this block in your site, re-apply its configuration based on the [demo](https://github.com/ezsystems/ezplatform-ee-demo/blob/v2.2.2/app/config/blocks.yml).
 
 Later versions of Page Builder come with a Content Scheduler block and new Form Blocks, but migration of Schedule blocks to Content Scheduler blocks and of Form Blocks isn't supported. 
 
 If there are missing block definitions, such as Form Block or Schedule Block,
-you have an option to continue, but migrated Landing Pages come without those blocks.
+you have an option to continue, but migrated landing pages come without those blocks.
 
 !!! tip
 
@@ -112,7 +112,7 @@ See [documentation](render_page.md#render-a-layout) for an example on usage of t
 
 ###### Migrate custom blocks
 
-Landing Page blocks (from v2.1 and earlier) were defined using a class implementing `EzSystems\LandingPageFieldTypeBundle\FieldType\LandingPage\Model\AbstractBlockType`. 
+Landing page blocks (from v2.1 and earlier) were defined using a class implementing `EzSystems\LandingPageFieldTypeBundle\FieldType\LandingPage\Model\AbstractBlockType`. 
 In Page Builder (from v2.2 onwards), this interface is no longer present. Instead the logic of your block must be implemented in a [Listener](page_blocks.md#block-events).
 Typically, what you previously would do in `getTemplateParameters()`, you'll now do in the `onBlockPreRender()` event handler.
 
@@ -120,7 +120,7 @@ The definition of block parameters has to be moved from `createBlockDefinition()
 
 For more information about how custom blocks are implemented in Page Builder, have a look at [Creating custom Page blocks](create_custom_page_block.md) for your custom blocks.
 
-For the migration of blocks from Landing Page to Page Builder, you'll need to provide a converter for attributes of custom blocks. For simple blocks you can use `\EzSystems\EzPlatformPageMigration\Converter\AttributeConverter\DefaultConverter`.
+For the migration of blocks from landing page to Page Builder, you'll need to provide a converter for attributes of custom blocks. For simple blocks you can use `\EzSystems\EzPlatformPageMigration\Converter\AttributeConverter\DefaultConverter`.
 Custom converters must implement the `\EzSystems\EzPlatformPageMigration\Converter\AttributeConverter\ConverterInterface` interface.
 `convert()` parses XML `\DOMNode $node` and return an array of `\EzSystems\EzPlatformPageFieldType\FieldType\LandingPage\Model\Attribute` objects.
 
@@ -139,10 +139,10 @@ This converter is only needed when running the `ezplatform:page:migrate` script
 
 ###### Page migration example
 
-Below is an example how to migrate a Landing Page Layout and Block to new Page Builder. The code is based on the Random block 
+Below is an example how to migrate a landing page Layout and Block to new Page Builder. The code is based on the Random block 
 defined in the [Enterprise Beginner tutorial](page_and_form_tutorial.md)
 
-??? tip "Landing Page code"
+??? tip "Landing page code"
 
     `app/Resources/views/layouts/sidebar.html.twig`:
 
@@ -680,7 +680,7 @@ You can find it in https://github.com/ezsystems/ezplatform-ee-installer/blob/2.3
 !!! caution "Form (ezform) field type"
 
     After the update, in order to create forms, you have to add a new content type (for example, named "Form") that contains `Form` field (this content type can contain other fields
-    as well). After that you can use forms inside Landing Pages via Embed block.
+    as well). After that you can use forms inside landing pages via Embed block.
 
 ### C. Update to v2.4
 
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish.md b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish.md
index 2f56258057..831f207988 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish.md
@@ -46,7 +46,7 @@ See Upgrade documentation on how to perform the actual upgrade: [Upgrade (eZ Pub
 
 !!! caution "Avoid exception when migrating the database"
 
-    If you plan to migrate from from eZ Publish through eZ Publish Platform 5.4 to eZ Platform and further, an exception may occur when you try to migrate the database while it contains internal drafts of Landing Pages.
+    If you plan to migrate from from eZ Publish through eZ Publish Platform 5.4 to eZ Platform and further, an exception may occur when you try to migrate the database while it contains internal drafts of landing pages.
     This can happen because such drafts do not have an expected row in the `ezcontentobject_name` table.<a id="migration_exception"></a> 
     
     To avoid this exception, you must remove all internal drafts before you migrate. 
diff --git a/mkdocs.yml b/mkdocs.yml
index 071875f83f..7b6f8b728c 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -34,7 +34,7 @@ nav:
         - Page and Form tutorial:
             - Page and Form tutorial: tutorials/page_and_form_tutorial/page_and_form_tutorial.md
             - 1. Get a starter website: tutorials/page_and_form_tutorial/1_get_a_starter_website.md
-            - 2. Prepare the Landing Page: tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
+            - 2. Prepare the landing page: tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
             - 3. Use existing blocks: tutorials/page_and_form_tutorial/3_use_existing_blocks.md
             - 4. Create a custom block: tutorials/page_and_form_tutorial/4_create_a_custom_block.md
             - 5. Create a newsletter form: tutorials/page_and_form_tutorial/5_create_newsletter_form.md

From 44e02298b9399937116d424b53347e80e92bb605 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Fri, 11 Oct 2024 14:54:05 +0200
Subject: [PATCH 11/77] Fixes

---
 .../configuration/configuration.md            |  2 +-
 .../configuration/dynamic_configuration.md    |  2 +-
 .../content_organization/content_types.md     |  4 +-
 docs/api/graphql/graphql_operations.md        |  2 +-
 docs/cdp/cdp.md                               |  9 +-
 docs/cdp/cdp_activation/cdp_data_export.md    | 20 ++--
 docs/cdp/cdp_data_customization.md            | 10 +-
 docs/cdp/cdp_data_export_schedule.md          |  4 +-
 docs/cdp/cdp_guide.md                         | 46 +++++----
 docs/cdp/cdp_installation.md                  | 11 +--
 docs/commerce/cart/cart.md                    | 43 +++-----
 docs/commerce/cart/cart_api.md                | 33 +++----
 docs/commerce/cart/quick_order.md             |  6 +-
 docs/commerce/checkout/checkout.md            | 36 +++----
 docs/commerce/checkout/checkout_api.md        | 19 ++--
 docs/commerce/checkout/configure_checkout.md  | 20 ++--
 docs/commerce/checkout/customize_checkout.md  | 28 +++---
 docs/commerce/checkout/reorder.md             |  4 +-
 .../configure_order_management.md             | 15 ++-
 .../order_management/order_management_api.md  |  8 +-
 .../content_api/browsing_content.md           |  2 +-
 .../content_management_api/section_api.md     |  2 +-
 .../content_management_guide.md               | 98 ++++++++-----------
 .../field_type_reference/binaryfilefield.md   |  4 +-
 .../field_type_reference/imagefield.md        |  2 +-
 .../field_type_reference/mediafield.md        |  2 +-
 .../field_type_reference/pagefield.md         |  2 +-
 .../field_type_reference/richtextfield.md     |  2 +-
 .../field_types/field_type_search.md          |  2 +-
 .../field_types/field_type_storage.md         | 16 +--
 .../field_types/field_types.md                |  8 +-
 .../pages/page_block_attributes.md            |  2 +-
 .../cache/http_cache/content_aware_cache.md   | 16 +--
 .../cache/http_cache/context_aware_cache.md   |  4 +-
 .../cache/persistence_cache.md                |  4 +-
 .../security/development_security.md          |  2 +-
 .../security/security_checklist.md            |  3 +-
 .../support_and_maintenance_faq.md            |  5 +-
 docs/multisite/languages/languages.md         |  2 +-
 docs/release_notes/ez_platform_v1.11.0.md     |  2 +-
 docs/release_notes/ez_platform_v2.0.0.md      |  2 +-
 docs/release_notes/ez_platform_v2.2.0.md      |  2 +-
 docs/release_notes/ez_platform_v2.4.md        |  4 +-
 docs/release_notes/ez_platform_v2.5.md        |  3 +-
 .../configure_elastic_search.md               |  2 +-
 .../3_customize_the_front_page.md             |  4 +-
 .../beginner_tutorial/7_embed_content.md      |  4 +-
 .../4_introduce_a_template.md                 |  4 +-
 .../from_1.x_2.x/update_db_to_2.5.md          |  4 +-
 .../from_2.5/adapt_code_to_v3.md              |  8 +-
 .../from_4.3/update_from_4.3_old_commerce.md  |  2 +-
 .../migrating_from_ez_publish_platform.md     |  8 +-
 docs/users/customer_groups.md                 |  4 +-
 53 files changed, 249 insertions(+), 304 deletions(-)

diff --git a/docs/administration/configuration/configuration.md b/docs/administration/configuration/configuration.md
index c40c0b1a49..725bf43707 100644
--- a/docs/administration/configuration/configuration.md
+++ b/docs/administration/configuration/configuration.md
@@ -57,7 +57,7 @@ Keys are usually prefixed by a *namespace* corresponding to your application. Al
 
 For configuration that is meant to be exposed to an end-user (or end-developer), it's usually a good idea to also [implement semantic configuration]([[= symfony_doc =]]/components/config/definition.html).
 
-Note that you can also [implement SiteAccess-aware semantic configuration](siteaccess_aware_configuration.md).
+You can also [implement SiteAccess-aware semantic configuration](siteaccess_aware_configuration.md).
 
 For example:
 
diff --git a/docs/administration/configuration/dynamic_configuration.md b/docs/administration/configuration/dynamic_configuration.md
index 7e9cad798c..33e22fb6ca 100644
--- a/docs/administration/configuration/dynamic_configuration.md
+++ b/docs/administration/configuration/dynamic_configuration.md
@@ -11,7 +11,7 @@ Dynamic configuration is handled by a ConfigResolver.
 It exposes the `hasParameter()` and `getParameter()` methods.
 You can use them to check the different *scopes* available for a given *namespace* to find the appropriate parameter.
 
-In order to work with the ConfigResolver, your dynamic settings must have the following name format: `<namespace>.<scope>.parameter.name`.
+To work with the ConfigResolver, your dynamic settings must have the following name format: `<namespace>.<scope>.parameter.name`.
 
 ``` yaml
 parameters:
diff --git a/docs/administration/content_organization/content_types.md b/docs/administration/content_organization/content_types.md
index 7aae698f9a..f992190b15 100644
--- a/docs/administration/content_organization/content_types.md
+++ b/docs/administration/content_organization/content_types.md
@@ -29,7 +29,7 @@ It can consist of letters, digits, spaces, and special characters (it's mandator
 
 !!! note
 
-    Note that even if your content type defines a field intended as a name for the content item (for example, a title of an article or product name), do not confuse it with this Name, which is a piece of metadata, not a field.
+    Even if your content type defines a field intended as a name for the content item (for example, a title of an article or product name), do not confuse it with this Name, which is a piece of metadata, not a field.
 
 **Identifier** – an identifier for internal use in configuration files, templates, PHP code, etc. 
 It must be unique, can only contain lowercase letters, digits, and underscores (it's mandatory and the maximum length is 50 characters).
@@ -93,7 +93,7 @@ They determine what fields of what field types are included in all content items
     They're caused by the limitation of how many `$_POST` input variables can be accepted.
 
     The easiest way to fix them is by increasing the `max_input_vars` value in the `php.ini` configuration file.
-    Note that this solution isn't universally recommended and you're proceeding on your own risk.
+    This solution isn't universally recommended and you're proceeding on your own risk.
 
     Setting the limit inappropriately may damage your project or cause other issues.
     You may also experience performance problems with such large content types, in particular when you have many content items.
diff --git a/docs/api/graphql/graphql_operations.md b/docs/api/graphql/graphql_operations.md
index b8de7a692b..4bac2e3dd1 100644
--- a/docs/api/graphql/graphql_operations.md
+++ b/docs/api/graphql/graphql_operations.md
@@ -153,7 +153,7 @@ curl -v -X POST \
 
 !!! note "Authentication"
 
-    Note that the example above requires you to set your authentication cookie in the `$AUTH_COOKIE` variable.
+    The example above requires you to set your authentication cookie in the `$AUTH_COOKIE` variable.
     See [Authentication](graphql.md#authentication) for more information.
 
 ### Uploading multiple files
diff --git a/docs/cdp/cdp.md b/docs/cdp/cdp.md
index 8e8127dd80..5c77b73db5 100644
--- a/docs/cdp/cdp.md
+++ b/docs/cdp/cdp.md
@@ -7,8 +7,7 @@ edition: experience
 
 ## What is Ibexa CDP
 
-[[= product_name_cdp =]] helps you solve one of the hardest challenges facing business world today:
-building unique experiences for your customers.
+[[= product_name_cdp =]] helps you solve one of the hardest challenges facing business world today: building unique experiences for your customers.
 With [[= product_name_cdp =]] you're able to track and aggregate data of your customers' activity on multiple channels.
 It allows you to create individual customer profiles that enable you to personalize their experience on your platform.
 
@@ -16,10 +15,8 @@ It allows you to create individual customer profiles that enable you to personal
 
 ## How it works
 
-[[= product_name_cdp =]] unifies customer data across your organization
-to help you activate your users and provide them with real-time engagement.
-With defined audiences you can target your user segments at the right time,
-through the most used channel, with the relevant message, content, or products.
+[[= product_name_cdp =]] unifies customer data across your organization to help you activate your users and provide them with real-time engagement.
+With defined audiences you can target your user segments at the right time, through the most used channel, with the relevant message, content, or products.
 
 The customer data are collected through the system of trackers embedded in different parts of your page.
 For more information on activation and trackers, see [CDP activation documentation](cdp_activation.md).
diff --git a/docs/cdp/cdp_activation/cdp_data_export.md b/docs/cdp/cdp_activation/cdp_data_export.md
index fe47a1f23b..bf7614765d 100644
--- a/docs/cdp/cdp_activation/cdp_data_export.md
+++ b/docs/cdp/cdp_activation/cdp_data_export.md
@@ -11,14 +11,12 @@ It takes you to a Dataflow Creator, where in five steps you can set up a data st
 
 ## General Information
 
-In the **General Information** section, specify dataflow name,
-choose **Stream File** as a source of user data and **CDP** as a destination,
-where they're sent for processing.
-Currently, only Stream File transport is supported and can be initialized from the configuration. 
+In the **General Information** section, specify dataflow name, choose **Stream File** as a source of user data and **CDP** as a destination, where they're sent for processing.
+Currently, only Stream File transport is supported and can be initialized from the configuration.
 
 ## Download
 
-In the **Download** section, select **Stream file**. 
+In the **Download** section, select **Stream file**.
 Copy generated steam ID and paste it into the configuration file under `stream_id`.
 It allows you to establish a datastream from the Streaming API into the Data Manager.
 
@@ -67,7 +65,7 @@ At this point, you can map **email** to **email** and **id** to **integer**  fie
 
 Next, select **Create schema based on the downloaded columns**.
 It moves you to Schema Creator.
-There, choose **PersonalData** as a parent and name the schema. 
+There, choose **PersonalData** as a parent and name the schema.
 
 ![Create new schema](cdp_create_new_schema.png)
 
@@ -75,8 +73,7 @@ Next, select all the columns and set Person Identifier as **userid**.
 
 ![Person Identifier](cdp_person_identifier.png)
 
-If you used PersonData or Catalog type schemas, the system requires
-specifying the Write Mode that is applied to them.
+If you used PersonData or Catalog type schemas, the system requires specifying the Write Mode that is applied to them.
 
 **Append** (default one) allows new data to overwrite the old one but leaves existing entries unaffected.
 All entries are stored in the dataset, unchanged by updating dataflow.
@@ -121,9 +118,12 @@ Specify name of your activation, select `userid` as **Person Identifier** and cl
 
 Next, you can fill in **Ibexa information** they must match the ones provided in the YAML configuration:
 
-- **Client Secret** and **Client ID** - are used to authenticate against Webhook endpoint. In the configuration they're taken from environment variables in `.env` file.
+- **Client Secret** and **Client ID** - are used to authenticate against Webhook endpoint.
+In the configuration they're taken from environment variables in `.env` file.
+
+- **Segment Group Identifier** - identifier of the segment group in [[= product_name =]].
+It points to a segment group where all the CDP audiences are stored.
 
-- **Segment Group Identifier** - identifier of the segment group in [[= product_name =]]. It points to a segment group where all the CDP audiences are stored.
 - **Base URL** - URL of your instance with added `/cdp/webhook` at the end.
 
 ![Ibexa Information - Activation](cdp_activation_ibexa_info.png)
diff --git a/docs/cdp/cdp_data_customization.md b/docs/cdp/cdp_data_customization.md
index e2a371c484..25f722c89b 100644
--- a/docs/cdp/cdp_data_customization.md
+++ b/docs/cdp/cdp_data_customization.md
@@ -11,10 +11,10 @@ It casts their `Value` object to string, thanks to `\Stringable` implementation.
 ​
 ## Export field types
 ​
-Field types are exported with metadata, for example, ID, Field Definition name, type, value. 
-You can also provide your own `\Ibexa\Contracts\Cdp\Export\Content\FieldProcessorInterface` instance to extend metadata. 
-The provided implementation has to be defined as a service and tagged with `ibexa.cdp.export.content.field_processor`. 
-Additionally, you can specify `priority` to override the default behavior. 
+Field types are exported with metadata, for example, ID, Field Definition name, type, or value.
+You can also provide your own `\Ibexa\Contracts\Cdp\Export\Content\FieldProcessorInterface` instance to extend metadata.
+The provided implementation has to be defined as a service and tagged with `ibexa.cdp.export.content.field_processor`.
+Additionally, you can specify `priority` to override the default behavior.
 All system Field Processors use `-100` priority, and any higher priority value overrides them.
 
 The interface is plain and has two methods that you need to provide:
@@ -65,7 +65,7 @@ custom_fieldtype.cdp.export.field_processor:
 ## Export field type values
 ​
 To customize export of field type values, provide your own `\Ibexa\Contracts\Cdp\Export\Content\FieldValueProcessorInterface` instance.
-New implementation has to be registered as a service manually or by using autoconfiguration. 
+New implementation has to be registered as a service manually or by using autoconfiguration.
 The service has to use the tag `ibexa.cdp.export.content.field_value_processor`.
 You can also provide `priority` property to override other Field Value Processors.
 ​
diff --git a/docs/cdp/cdp_data_export_schedule.md b/docs/cdp/cdp_data_export_schedule.md
index 3e277bca91..7102d57bc7 100644
--- a/docs/cdp/cdp_data_export_schedule.md
+++ b/docs/cdp/cdp_data_export_schedule.md
@@ -7,7 +7,7 @@ edition: experience
 
 ## Configuration key
 
-Configuration in [[= product_name_cdp =]] allows you to automate the process of exporting Content, Users and Products.
+Configuration in [[= product_name_cdp =]] allows you to automate the process of exporting content, users, and products.
 An `ibexa_cdp.data_export` [configuration key](configuration.md#configuration-files) looks as below:
 
 ```yaml
@@ -37,7 +37,7 @@ ibexa_cdp:
                     options: '--stream-id=00000000-00000000-00000000-00000000 --product-type=computer --no-draft'
 ```
 
-Under the `schedule` setting you can find separate sections for exporting User, Content, and Product. 
+Under the `schedule` setting you can find separate sections for exporting user, content, and product.
 Structure of each section is exactly the same and includes `interval` and `options` elements:
 
 - `interval` - sets the frequency of the command invoke, for example, '*/30 * * * *' means "every 30 minutes", '0 */12 * * *' means "every 12th hour".
diff --git a/docs/cdp/cdp_guide.md b/docs/cdp/cdp_guide.md
index b3241fa1b5..71ab5229d8 100644
--- a/docs/cdp/cdp_guide.md
+++ b/docs/cdp/cdp_guide.md
@@ -11,9 +11,10 @@ edition: experience
 By using [[= product_name_cdp =]] you can monitor and compile data about your customers' activity on multiple channels.
 It also allows you to create individual customer profiles so you can customize their experience on your platform.
 
-With [[= product_name_cdp =]] you can store and manage large volumes of customer data in a structured manner. This central data storage supports business growth with a scalable infrastructure, helping to futureproof your business.
+With [[= product_name_cdp =]] you can store and manage large volumes of customer data in a structured manner.
+This central data storage supports business growth with a scalable infrastructure, helping to futureproof your business.
 You can get customer data from both online and offline data sources.
-It includes first, second, and third-party data from multiple sources such as transactional systems, website tracking and behavior, POS, CRM, and others.
+It includes first, second, and third-party data from multiple sources such as transactional systems, website tracking, and behavior, POS, CRM, and others.
 
 ## Availability
 
@@ -21,7 +22,8 @@ It includes first, second, and third-party data from multiple sources such as tr
 
 ## How does Ibexa CDP work
 
-[[= product_name_cdp =]] unifies customer data throughout your whole organization. It helps you activate your users and give them real-time interaction.
+[[= product_name_cdp =]] unifies customer data throughout your whole organization.
+It helps you activate your users and give them real-time interaction.
 You can target certain user segments with the appropriate message, content, or products at the right time through the most used channels by using specified audiences.
 Customer data is gathered through a system of trackers embedded in various areas of your website.
 
@@ -29,14 +31,18 @@ Customer data is gathered through a system of trackers embedded in various areas
 
 ### Installation and configuration
 
-To start using [[= product_name_cdp =]], first you need to contact your sales representative, who provides you with a link to [register your [[= product_name_cdp =]] account](https://doc.ibexa.co/en/latest/cdp/cdp_installation/#register-in-ibexa-cdp-dashboard). When you're done with registration process, you'll be able to access a separate instance with the data needed to configure, activate, and use this feature.
+To start using [[= product_name_cdp =]], first you need to contact your sales representative, who provides you with a link to [register your [[= product_name_cdp =]] account](https://doc.ibexa.co/en/latest/cdp/cdp_installation/#register-in-ibexa-cdp-dashboard).
+When you're done with registration process, you're able to access a separate instance with the data needed to configure, activate, and use this feature.
 
-After your account is created, you can [download and install the [[= product_name_cdp =]] package](https://doc.ibexa.co/en/latest/cdp/cdp_installation/#install-cdp-package) that is opt-in and needs to be downloaded separately. Last step is to go through the [configuration process](https://doc.ibexa.co/en/latest/cdp/cdp_activation/cdp_configuration/).
+After your account is created, you can [download and install the [[= product_name_cdp =]] package](https://doc.ibexa.co/en/latest/cdp/cdp_installation/#install-cdp-package) that is opt-in and needs to be downloaded separately.
+Last step is to go through the [configuration process](https://doc.ibexa.co/en/latest/cdp/cdp_activation/cdp_configuration/).
 
 ### Customer profile
 
-In [[= product_name_cdp =]] you can build 360° customer profiles. It unifies customer data from different sources to help you understand your prospects and customer needs.
-After you get customer data, you can unify and match customer profiles based on their preferences and habits. You can create and analyze complete, 360° customer profiles based on demographics, interactions, behaviors, and transactional data.
+In [[= product_name_cdp =]] you can build 360° customer profiles.
+It unifies customer data from different sources to help you understand your prospects and customer needs.
+After you get customer data, you can unify and match customer profiles based on their preferences and habits.
+You can create and analyze complete, 360° customer profiles based on demographics, interactions, behaviors, and transactional data.
 This approach helps you create a single customer view.
 
 ![Customer profile](img/customer_profile.png)
@@ -47,7 +53,8 @@ To create a personalized customer experience, you need to group your clients int
 [[= product_name =]] comes with a ready solution - segment groups.
 Segment group information is reused by various [[= product_name =]] functionalities, such as [Personalization](personalization_guide.md) or content targeting.
 
-You can [create a segment group](https://doc.ibexa.co/projects/userguide/en/latest/personalization/segment_management/) in the back office of [[= product_name =]]. It serves as a container for all segments data generated by [[= product_name_cdp =]].
+You can [create a segment group](https://doc.ibexa.co/projects/userguide/en/latest/personalization/segment_management/) in the back office of [[= product_name =]].
+It serves as a container for all segments data generated by [[= product_name_cdp =]].
 When you create a segment group, you need to provide its name and identifier.
 Be careful while doing so, as after you create the segment group in the back office and connect it to [[= product_name_cdp =]], you cannot change it in any way, including edit its name.
 
@@ -57,14 +64,16 @@ Remember to add a segment group identifier to the configuration, under the `segm
 
 ### Data export
 
-Configuration in [[= product_name_cdp =]] allows you to automate the process of exporting Content, Users, and Products.
-An `ibexa_cdp.data_export` [configuration key](https://doc.ibexa.co/en/latest/cdp/cdp_data_export_schedule/#configuration-key) includes the `schedule` setting where you can find separate sections for exporting User, Content, and Product. Structure of each section is exactly the same and includes `interval` and `options` elements:
+Configuration in [[= product_name_cdp =]] allows you to automate the process of exporting content, users, and products.
+An `ibexa_cdp.data_export` [configuration key](https://doc.ibexa.co/en/latest/cdp/cdp_data_export_schedule/#configuration-key) includes the `schedule` setting where you can find separate sections for exporting user, content, and product.
+Structure of each section is exactly the same and includes `interval` and `options` elements:
 
-- `interval` - sets the frequency of the command invoke using cron expressions, for example, '*/30 * * * *' means "every 30 minutes", '0 */12 * * *' means "every 12th hour".
+- `interval` - sets the frequency of the command invoke using cron expressions, for example, '*/30 * * * *' means "every 30 minutes", '0 */12 * * *' means "every 12th hour"
 
-- `options` - allows you to add arguments that have to be passed to the export command.
+- `options` - allows you to add arguments that have to be passed to the export command
 
-This configuration allows you to provide multiple export workflows with parameters. It's important, because all the types of content/product must have their own parameters on the CDP side, where each has a different Stream ID key and different required values configured per data source.
+This configuration allows you to provide multiple export workflows with parameters.
+It's important, because all the types of content/product must have their own parameters on the CDP side, where each has a different Stream ID key and different required values configured per data source.
 
 Regarding data export, currently, only Stream File transport is supported and can be initialized from the configuration.
 
@@ -72,8 +81,9 @@ For more information, see [CDP data export](https://doc.ibexa.co/en/latest/cdp/c
 
 ### Data customization
 
-​You can customize Content and Product data exported to [[= product_name_cdp =]] and control what field type information you want to export.
-With [[= product_name_cdp =]], you can export field types and field type values. they're exported with metadata and attributes, for example, ID, Field Definition name, type, value.
+​You can customize content and product data exported to [[= product_name_cdp =]] and control what field type information you want to export.
+With [[= product_name_cdp =]], you can export field types and field type values.
+They're exported with metadata and attributes, for example, ID, Field Definition name, type, or value.
 
 For more information, see [data customization](https://doc.ibexa.co/en/latest/cdp/cdp_data_customization/#data-customization) documentation in Developer Documentation.
 
@@ -86,7 +96,8 @@ For more information, see [CDP add client-side tracking](https://doc.ibexa.co/en
 
 In the Audience Builder, you can create audiences - groups of users that meet the assumed conditions.
 You can choose specific conditions: `did`, `did not`, or `have`.
-The conditions `did` and `did not` allow you to use events like buy, visit or add to a cart from online tracking. The  `have` conditions are tied to personal characteristics and can be used to track the sum of all buys or top-visited categories.
+The conditions `did` and `did not` allow you to use events like buy, visit or add to a cart from online tracking.
+The  `have` conditions are tied to personal characteristics and can be used to track the sum of all buys or top-visited categories.
 
 You can also connect created audiences to the activations.
 
@@ -111,7 +122,8 @@ Create user groups - audiences - based on conditions and events.
 
 ### Data export
 
-Export data regarding Content, Users, and Products. Data export includes automatic file mapping.
+Export data regarding content, users, and products.
+Data export includes automatic file mapping.
 Analyze customer data, track campaigns, and discover the most effective strategies to boost performance.
 
 ### Data customization
diff --git a/docs/cdp/cdp_installation.md b/docs/cdp/cdp_installation.md
index e5c1923588..3b34652a83 100644
--- a/docs/cdp/cdp_installation.md
+++ b/docs/cdp/cdp_installation.md
@@ -6,14 +6,12 @@ edition: experience
 # Ibexa CDP installation
 
 There are three steps required to install [[= product_name_cdp =]].
-First, you need to register your [[= product_name_cdp =]] account, then you can download a CDP package and update the configuration. 
+First, you need to register your [[= product_name_cdp =]] account, then you can download a CDP package and update the configuration.
 
 ## Register in Ibexa CDP dashboard
 
-If you decide to acquire [[= product_name_cdp =]] contact your sales representative,
-they provide you with a registration link to [[= product_name_cdp =]].
-After registration, you get access to a separate instance
-where you can find data required for configuring, activating and using this feature.
+If you decide to acquire [[= product_name_cdp =]] contact your sales representative, they provide you with a registration link to [[= product_name_cdp =]].
+After registration, you get access to a separate instance where you can find data required for configuring, activating, and using this feature.
 
 ## Install CDP package
 
@@ -26,8 +24,7 @@ composer require ibexa/cdp
 ```
 
 Flex installs and activate the package.
-After an installation process is finished, go to `config/packages/security.yaml`
-and uncomment `ibexa_cdp` rule.
+After an installation process is finished, go to `config/packages/security.yaml` and uncomment `ibexa_cdp` rule.
 
 ```yaml
 ibexa_cdp:
diff --git a/docs/commerce/cart/cart.md b/docs/commerce/cart/cart.md
index a744429c27..6d08175bca 100644
--- a/docs/commerce/cart/cart.md
+++ b/docs/commerce/cart/cart.md
@@ -5,10 +5,8 @@ edition: commerce
 
 # Cart
 
-The cart component is a foundation of the Commerce offering delivered as part 
-of [[= product_name =]].
-It covers actions related to the creation and handling of a list of products 
-that the buyer intends to purchase.
+The cart component is a foundation of the Commerce offering delivered as part of [[= product_name_com =]].
+It covers actions related to the creation and handling of a list of products that the buyer intends to purchase.
 
 The component exposes the following:
 
@@ -27,42 +25,34 @@ Cart constructor takes the following arguments:
 
 ## Cart data handling
 
-Cart data is handled by two storages, depending on whether the buyer is anonymous 
-or has been authenticated.
-Information that relates to anonymous users is stored in the PHP session, while 
-registered user data is stored in a database.
+Cart data is handled by two storages, depending on whether the buyer is anonymous or has been authenticated.
+Information that relates to anonymous users is stored in the PHP session, while registered user data is stored in a database.
 
-By default, anonymous users can add items to cart, but to display the cart view, 
-they have to log in and transition into an authenticated user.
+By default, anonymous users can add items to cart, but to display the cart view, they have to log in and transition into an authenticated user.
 
 !!! note 
 
-    For information about roles and permissions that control access to the cart, 
-    see [Permission use cases](permission_use_cases.md#commerce).
+    For information about roles and permissions that control access to the cart, see [Permission use cases](permission_use_cases.md#commerce).
 
 ### Cart data merging
 
-When a buyer browses the storefront anonymously and fills the cart with items, 
-anonymous cart data is stored in the PHP session storage.
-Then, when an anonymous user logs into the storefront, cart data from the PHP session 
-storage is persisted and merged with any cart information that might already exist in the database for this authenticated user.
+When a buyer browses the storefront anonymously and fills the cart with items, anonymous cart data is stored in the PHP session storage.
+Then, when an anonymous user logs into the storefront, cart data from the PHP session storage is persisted and merged with any cart information that might already exist in the database for this authenticated user.
 
 If no previous cart data exists, a new cart is created.
 
 ### Cart data validation
 
-When a buyer tries to add products to the cart, increase cart item quantity or proceed to checkout, the cart component performs cart item validation and checks whether:
+When a buyer tries to add products to the cart, increase cart item quantity, or proceed to checkout, the cart component performs cart item validation and checks whether:
 
-- the product is available 
-- the requested quantity of product is available 
-- the product is available at a price in the currency selected for the cart 
+- the product is available
+- the requested quantity of product is available
+- the product is available at a price in the currency selected for the cart
 
 ## Front-end perspective
 
-From the front-end perspective, the cart consists of a main `Cart` object 
-and several widgets.
-`Cart` is a standalone JavaScript object that manages cart data and has no user interface, 
-while widgets consist of JavaScript code and accompanying Twig templates.
+From the front-end perspective, the cart consists of a main `Cart` object and several widgets.
+`Cart` is a standalone JavaScript object that manages cart data and has no user interface, while widgets consist of JavaScript code and accompanying Twig templates.
 
 ### Cart service object
 
@@ -85,10 +75,9 @@ document.body.addEventListener(
 );
 ```
 
-### Cart service 
+### Cart service
 
-The Cart package provides `Ibexa\Contracts\Cart\CartServiceInterface` Symfony service, 
-which is the entrypoint for calling the [backend API](cart_api.md).
+The Cart package provides `Ibexa\Contracts\Cart\CartServiceInterface` Symfony service, which is the entrypoint for calling the [backend API](cart_api.md).
 
 You can import the service using the following code:
 
diff --git a/docs/commerce/cart/cart_api.md b/docs/commerce/cart/cart_api.md
index a849759cd6..575d0246e2 100644
--- a/docs/commerce/cart/cart_api.md
+++ b/docs/commerce/cart/cart_api.md
@@ -40,8 +40,7 @@ It follows the same search Query pattern as other APIs:
 
 ## Create cart
 
-To create a cart, use the `CartServiceInterface::createCart` method and provide 
-it with `Ibexa\Contracts\Cart\Value\CartCreateStruct` that contains metadata (name, currency, owner):
+To create a cart, use the `CartServiceInterface::createCart` method and provide it with `Ibexa\Contracts\Cart\Value\CartCreateStruct` that contains metadata (name, currency, owner):
 
 ``` php
 [[= include_file('code_samples/api/commerce/src/Command/CartCommand.php', 8, 9) =]]
@@ -53,8 +52,7 @@ it with `Ibexa\Contracts\Cart\Value\CartCreateStruct` that contains metadata (na
 ## Update cart metadata
 
 You can update cart metadata after the cart is created. 
-You could do it to support a scenario when, for example, the user changes a currency 
-and the cart should recalculate all item prices to a new currency. 
+You could do it to support a scenario when, for example, the user changes a currency and the cart should recalculate all item prices to a new currency. 
 To update cart metadata, use the `CartServiceInterface::updateCartMetadata` method:
 
 ``` php
@@ -79,8 +77,7 @@ $cart = $cartService->updateCartMetadata($cart, $updateMetadataStruct);
 
 ## Delete cart
 
-To delete a cart permanently, use the `CartServiceInterface::deleteCart` method 
-and pass the `CartInterface` object:
+To delete a cart permanently, use the `CartServiceInterface::deleteCart` method and pass the `CartInterface` object:
 
 ``` php
 [[= include_file('code_samples/api/commerce/src/Command/CartCommand.php', 88, 89) =]]
@@ -89,8 +86,7 @@ and pass the `CartInterface` object:
 
 ## Empty cart
 
-To remove all products from the cart in a single operation, use the 
-`CartServiceInterface::emptyCart` method:
+To remove all products from the cart in a single operation, use the `CartServiceInterface::emptyCart` method:
 
 ``` php
 [[= include_file('code_samples/api/commerce/src/Command/CartCommand.php', 88, 89) =]]
@@ -99,12 +95,10 @@ To remove all products from the cart in a single operation, use the
 
 ## Check cart validity
 
-Items in cart can become invalid, for example, when item price is unavailable 
-in cart currency, or the product is no longer available. 
+Items in cart can become invalid, for example, when item price is unavailable in cart currency, or the product is no longer available. 
 To prevent checking out a cart with invalid items, check cart validity first. 
 To validate the cart, use the `CartServiceInterface::validateCart` method. 
-Validation is done with help from the `symfony/validator` component, and the method 
-returns a `Symfony\Component\Validator\ConstraintViolationListInterface` object.
+Validation is done with help from the `symfony/validator` component, and the method returns a `Symfony\Component\Validator\ConstraintViolationListInterface` object.
 
 ``` php
 [[= include_file('code_samples/api/commerce/src/Command/CartCommand.php', 88, 89) =]]
@@ -113,8 +107,7 @@ returns a `Symfony\Component\Validator\ConstraintViolationListInterface` object.
 
 ## Add entry to cart
 
-To add entries (products) to the cart, create an `Ibexa\Contracts\Cart\Value\EntryAddStruct`, 
-where you specify the requested quantity of the product.
+To add entries (products) to the cart, create an `Ibexa\Contracts\Cart\Value\EntryAddStruct`, where you specify the requested quantity of the product.
 Then pass it to the `CartServiceInterface::addEntry` method: 
 
 ``` php
@@ -140,8 +133,7 @@ To remove an entry from the cart, use the `CartServiceInterface::removeEntry` me
 ## Update entry metadata
 
 Entries have their own metadata, for example, quantity. 
-To change entry metadata, use the `CartServiceInterface::updateEntry` method 
-and provide it with `Ibexa\Contracts\Cart\Value\EntryUpdateStruct`.
+To change entry metadata, use the `CartServiceInterface::updateEntry` method and provide it with `Ibexa\Contracts\Cart\Value\EntryUpdateStruct`.
 
 ``` php
 [[= include_file('code_samples/api/commerce/src/Command/CartCommand.php', 12, 13) =]]
@@ -170,9 +162,8 @@ $createStruct->setContext(new ArrayMap([
 $cart = $cartService->createCart($createStruct);
 ```
 
-In the above example, you create a cart using the `CartCreateStruct`,
-and set the context data using the `setContext` method.
-You've also added "X1MF7699" coupon code as context data to the cart.
+In the above example, you create a cart using the `CartCreateStruct`, and set the context data using the `setContext` method.
+You also add "X1MF7699" coupon code as context data to the cart.
 
 ### Adding context data to cart entry
 
@@ -189,11 +180,11 @@ $entryAddStruct->setContext(new ArrayMap([
 
 In the above example, you create a cart entry using the `EntryAddStruct`.
 The `setContext` method allows you to attach context data to the cart entry.
-In this case, you've attached a "tshirt_text" attribute to the cart entry, which might represent custom text for a T-shirt.
+In this case, you attach a "tshirt_text" attribute to the cart entry, which might represent custom text for a T-shirt.
 
 ## Merge carts
 
-To combine the contents of multiple shopping carts into a target cart, use the `CartServiceInterface::mergeCarts` method. 
+To combine the contents of multiple shopping carts into a target cart, use the `CartServiceInterface::mergeCarts` method.
 This operation is helpful when you want to consolidate items from a reorder cart and a current cart into a single order.
 
 ```php
diff --git a/docs/commerce/cart/quick_order.md b/docs/commerce/cart/quick_order.md
index d2660f1d2a..ec1b5ae68d 100644
--- a/docs/commerce/cart/quick_order.md
+++ b/docs/commerce/cart/quick_order.md
@@ -19,7 +19,7 @@ Customers can use one or both of the following methods to specify products and p
 
 2\. Provides products' SKU and quantity. At this point, no validation is provided.
 
-![Customer enters individual products](img/quick_order_list.png) 
+![Customer enters individual products](img/quick_order_list.png)
 
 3\. Customer clicks **Add to cart** to add items to the cart and finish an ordering process.
 
@@ -31,7 +31,7 @@ Customers can use one or both of the following methods to specify products and p
 
 2\. Downloads a sample file from **Add your order** section.
 
-3\. Uses the template to fill in their order with products' SKU and quantity. 
+3\. Uses the template to fill in their order with products' SKU and quantity.
 
 4\. Uploads the filled in quick order file back to the system by drag and drop or file selection.
 
@@ -39,7 +39,7 @@ Customers can use one or both of the following methods to specify products and p
 
 ![Customer uploads list of products](img/quick_order_add_order.png)
 
-6\. Customer clicks **Add to cart** to add items to the cart and finish an ordering process. 
+6\. Customer clicks **Add to cart** to add items to the cart and finish an ordering process.
 
 7\. In the cart section, the file format and provided data are validated, the availability of the entered product is checked, and the customer is informed if any of them is unavailable or quantity is insufficient.
 
diff --git a/docs/commerce/checkout/checkout.md b/docs/commerce/checkout/checkout.md
index bf2c21d652..9b51c09105 100644
--- a/docs/commerce/checkout/checkout.md
+++ b/docs/commerce/checkout/checkout.md
@@ -5,18 +5,14 @@ edition: commerce
 
 # Checkout
 
-Checkout is a crucial component of the Commerce offering delivered as part 
-of [[= product_name =]].
-In a course of a multi-step process, it collects necessary transaction data, such 
-as billing and shipping addresses, and payment and shipping information.
+Checkout is a crucial component of the Commerce offering delivered as part of [[= product_name_com =]].
+In a course of a multi-step process, it collects necessary transaction data, such as billing and shipping addresses, and payment and shipping information.
 
-From the front-end perspective, it's a reusable component that provides access 
-to the workflow and allows buyers to place an order for cart items.
+From the front-end perspective, it's a reusable component that provides access to the workflow and allows buyers to place an order for cart items.
 
 ![Address selection stage](checkout.png "Checkout stages")
 
-Depending on the model of shopping process that you need to use, the checkout 
-process can range between a straightforward and extremely complicated one. 
+Depending on the model of shopping process that you need to use, the checkout process can range between a straightforward and extremely complicated one. 
 To allow for this variation, the component is highly configurable and extensible:
 
 - Like the editorial workflow, it relies on [Symfony Workflow]([[= symfony_doc =]]/components/workflow.html) 
@@ -24,23 +20,17 @@ To allow for this variation, the component is highly configurable and extensible
 - It exposes Twig functions used for checkout rendering
 
 In a default implementation, users go through a series of steps.
-They first select a billing and shipping address, then select shipping and payment 
-methods, later they review summary and confirm their choices, to finally receive 
-a simulated order confirmation.
+They first select a billing and shipping address, then select shipping and payment methods, later they review summary and confirm their choices, to finally receive a simulated order confirmation.
 
-Until the checkout process is complete, at any point of the process, users can 
-go back to the cart and modify cart information, for example, cart item quantities.
-They can also navigate back and forth between checkout steps, with an exception 
-of the "Checkout complete" step, which always ends the process.
+Until the checkout process is complete, at any point of the process, users can go back to the cart and modify cart information, for example, cart item quantities.
+They can also navigate back and forth between checkout steps, with an exception of the "Checkout complete" step, which always ends the process.
 
 You can modify these steps according to your needs.
 For more information, see [Configure checkout](configure_checkout.md).
 
-## Shipping and billing address assignment logic 
+## Shipping and billing address assignment logic
 
-As far as shipping details are concerned, checkout can behave differently, depending 
-on whether the buyer is a corporate account member, a registered customer, or 
-an individual.
+As far as shipping details are concerned, checkout can behave differently, depending on whether the buyer is a corporate account member, a registered customer, or an individual.
 
 - Corporate account members can see a company's billing address, and several shipping addresses to pick from, as predefined in the company profile.
 - Registered customers are able see and modify the addresses that they defined at registration
@@ -50,19 +40,19 @@ For more information about shipping and billing addresses, see [Configure checko
 
 ## Virtual Products checkout
 
-Virtual product is a special type of a [product](products.md). Virtual products are non-tangible items such as memberships, services, warranties. 
+Virtual product is a special type of a [product](products.md). Virtual products are non-tangible items such as memberships, services, warranties.
 They can be sold individually, or as part of a product bundle.
 
 Virtual products don’t require shipment when they're purchased individually.
-While purchasing virtual product, you only have to fill in the billing address and select relevant payment method. 
+While purchasing virtual product, you only have to fill in the billing address and select relevant payment method.
 
 ![`Virtual product purchasing`](virtual_product_purchase.png "Virtual product purchasing")
 
 ## Reorder
 
 Reorder functions as the variant for the checkout workflow and is accessible solely to logged-in users.
-It initiates from the user's order history, where they can click **Reorder** and trigger the flow. 
-Next, the user is moved to cart where the system validates the order against existing stock.  
+It initiates from the user's order history, where they can click **Reorder** and trigger the flow.
+Next, the user is moved to cart where the system validates the order against existing stock.
 If everything is available, customer can move to payment and summary.
 The system pre-fills address, shipping method, and payment details using information from the past order.
 
diff --git a/docs/commerce/checkout/checkout_api.md b/docs/commerce/checkout/checkout_api.md
index 0e7874f819..3393fd2c82 100644
--- a/docs/commerce/checkout/checkout_api.md
+++ b/docs/commerce/checkout/checkout_api.md
@@ -8,15 +8,12 @@ edition: commerce
 To get checkouts and manage them, use the `Ibexa\Contracts\Checkout\CheckoutServiceInterface` interface.
 
 With `CheckoutServiceInterface`, you manipulate checkouts that are stored in sessions. 
-Checkouts are containers for the `Ibexa\Contracts\Cart\Value\CartInterface` object 
-and all the data provided at each step of the [configurable checkout process](configure_checkout.md). 
+Checkouts are containers for the `Ibexa\Contracts\Cart\Value\CartInterface` object and all the data provided at each step of the [configurable checkout process](configure_checkout.md). 
 
 The checkout process relies on Symfony Workflow, and you can customize each of its steps. 
-Each checkout step has its own controller that allows adding forms and external API calls 
-that process data and pass them to `CheckoutService`. 
+Each checkout step has its own controller that allows adding forms and external API calls that process data and pass them to `CheckoutService`. 
 Completing a step results in submitting a form and updating the current checkout object. 
-At this point Symfony Workflow advances, the next controller takes over, and the 
-whole process continues.
+At this point Symfony Workflow advances, the next controller takes over, and the whole process continues.
 
 From the developer's perspective, checkouts are referenced with an UUID identifier. 
 
@@ -31,8 +28,7 @@ To access a single checkout, use the `CheckoutServiceInterface::getCheckout` met
 ## Get single checkout for specific cart
 
 To fetch checkout for a cart that already exists, use the `CheckoutServiceInterface::getCheckoutForCart` method. 
-It can be useful when you want to initiate the checkout process right after 
-products are successfully added to a cart.
+You can use it when you want to initiate the checkout process right after products are successfully added to a cart.
 
 ``` php
 [[= include_file('code_samples/api/commerce/src/Controller/CustomCheckoutController.php', 26, 30) =]]
@@ -40,8 +36,7 @@ products are successfully added to a cart.
 
 ## Create checkout
 
-To create a checkout, use the `CheckoutServiceInterface::createCheckout` method and 
-provide it with a `CheckoutCreateStruct` struct that contains a `CartInterface` object.
+To create a checkout, use the `CheckoutServiceInterface::createCheckout` method and provide it with a `CheckoutCreateStruct` struct that contains a `CartInterface` object.
 
 ``` php
 [[= include_file('code_samples/api/commerce/src/Controller/CustomCheckoutController.php', 35, 41) =]]
@@ -50,8 +45,8 @@ provide it with a `CheckoutCreateStruct` struct that contains a `CartInterface`
 ## Update checkout
 
 You can update the collected data after the checkout is created.
-The data is stored within the `CheckoutInterface::context` object. 
-The last update time and status are also stored. 
+The data is stored within the `CheckoutInterface::context` object.
+The last update time and status are also stored.
 
 To update the checkout, use the `CheckoutServiceInterface::updateCheckout` method and provide it with the `CheckoutUpdateStruct` struct that contains data collected at each step of the workflow, and a transition name to identify what step follows.
 
diff --git a/docs/commerce/checkout/configure_checkout.md b/docs/commerce/checkout/configure_checkout.md
index 0fb6dff33c..fb60c3c309 100644
--- a/docs/commerce/checkout/configure_checkout.md
+++ b/docs/commerce/checkout/configure_checkout.md
@@ -5,8 +5,7 @@ edition: commerce
 
 # Configure checkout
 
-When you work with your Commerce implementation, you can review and modify 
-the checkout configuration.
+When you work with your Commerce implementation, you can review and modify the checkout configuration.
 
 !!! note "Permissions" 
 
@@ -17,8 +16,7 @@ the checkout configuration.
 Checkout workflow relies on [Symfony Workflow]([[= symfony_doc =]]/components/workflow.html).
 Each transition represents a separate checkout step. 
 
-By default, the checkout process is configured to render each step based on a separate 
-set of libraries and templates.
+By default, the checkout process is configured to render each step based on a separate set of libraries and templates.
 Each checkout step is handled by a controller that you configure in workflow metadata.
 
 Custom workflow implementations are defined under the `framework.workflows` key, 
@@ -35,8 +33,10 @@ The system can then identify which of your configured workflows handles the chec
 
 Each step configuration includes the following settings:
 
-- `controller` - A mandatory setting pointing to a library that governs the behavior of the process. The controller contains all the required business logic and submits the whole step, so that a transition can happen.
-- `next_step` - An optional name of the next workflow transition. If not provided, the next workflow-enabled transition is processed.
+- `controller` - A mandatory setting pointing to a library that governs the behavior of the process.
+The controller contains all the required business logic and submits the whole step, so that a transition can happen.
+- `next_step` - An optional name of the next workflow transition.
+If not provided, the next workflow-enabled transition is processed.
 - `label` - An optional name of the step that can be displayed in the Twig helper.
 - `translation_domain` - A optional setting that defines the domain for a site with translated content. By default it's set to `checkout`.
 
@@ -51,14 +51,12 @@ For more information, see [Work with shipping methods]([[= user_doc =]]/commerce
 
 ## Configure shipping and billing address field format
 
-In your implementation, you may need to create custom format configurations 
-for the shipping or billing address fields, for example, to use different address 
-formats based on the buyer's geographical location.
+In your implementation, you may need to create custom format configurations for the shipping or billing address fields, for example, to use different address formats based on the buyer's geographical location.
 
 Field formats for the billing and shipping addresses comply with the [FieldType Address](addressfield.md#formats) specification and can be controlled with the `billing_address_format` and `shipping_address_format` flags, respectively.
 They fall back to `billing` and `shipping` predefined formats by default:
 
-- `billing` is part of the `ibexa/corporate-accounts` repository 
-- `shipping` is part of the `ibexa/checkout` bundle's default configuration 
+- `billing` is part of the `ibexa/corporate-accounts` repository
+- `shipping` is part of the `ibexa/checkout` bundle's default configuration
 
 To modify address formats you create custom ones.
\ No newline at end of file
diff --git a/docs/commerce/checkout/customize_checkout.md b/docs/commerce/checkout/customize_checkout.md
index 7768363048..bab5967f5d 100644
--- a/docs/commerce/checkout/customize_checkout.md
+++ b/docs/commerce/checkout/customize_checkout.md
@@ -5,8 +5,7 @@ edition: commerce
 
 # Customize checkout
 
-When you work with your Commerce implementation, you can review and modify 
-the checkout configuration.
+When you work with your Commerce implementation, you can review and modify the checkout configuration.
 
 Checkout is an essential component of the Commerce offering.
 It collects data that is necessary to create an order, including:
@@ -17,11 +16,9 @@ It collects data that is necessary to create an order, including:
 
 It could also collect any other information that you find necessary.
 
-Depending on your needs, the checkout process can be either complicated or very simple. 
-For example, if the website is selling airline tickets, you may need several [additional steps](#add-checkout-step) 
-with passengers defining their special needs.
-On the other side of the spectrum would be a store that sells books with personal pickup, 
-where [one page checkout](#create-a-one-page-checkout) would be enough.
+Depending on your needs, the checkout process can be either complicated or simple. 
+For example, if the website is selling airline tickets, you may need several [additional steps](#add-checkout-step) with passengers defining their special needs.
+On the other side of the spectrum would be a store that sells books with personal pickup, where [one page checkout](#create-a-one-page-checkout) would be enough.
 
 There are several factors that make checkout particularly flexible and customizable:
 
@@ -30,8 +27,7 @@ There are several factors that make checkout particularly flexible and customiza
 - it exposes Twig functions that help you render the steps
 
 The most important contract exposed by the package is the `CheckoutServiceInterface` interface. 
-It exposes a number of methods that you can call, for example, to load checkouts based 
-on checkout identifier or for a specific cart. 
+It exposes a number of methods that you can call, for example, to load checkouts based on checkout identifier or for a specific cart. 
 Other methods help you create, update, or delete checkouts. 
 
 For more information, see [Checkout API](checkout_api.md).
@@ -39,8 +35,7 @@ For more information, see [Checkout API](checkout_api.md).
 ## Add checkout step
 
 By default, [[= product_name =]] comes with a multi-step checkout process, which you can expand by adding steps.
-For example, if you were creating a project for selling theater tickets, you could add a step 
-that allows users to select their seats.
+For example, if you were creating a project for selling theater tickets, you could add a step that allows users to select their seats.
 
 ### Define workflow
 
@@ -69,8 +64,7 @@ In this case, you want users to select seats in the audience.
 In the `src/Controller/Checkout/Step` folder, create a file that resembles the following example.
 
 The controller contains a Symfony form that collects user selections. 
-It can reuse fields and functions that come from the checkout component, for example, 
-after you check whether the form is valid, use the `AbstractStepController::advance` method to go to the next step of the process.
+It can reuse fields and functions that come from the checkout component, for example, after you check whether the form is valid, use the `AbstractStepController::advance` method to go to the next step of the process.
 
 ``` php hl_lines="23 24"
 [[= include_file('code_samples/front/shop/checkout/src/Controller/Checkout/Step/SelectSeatStepController.php') =]]
@@ -283,14 +277,14 @@ To create custom Address field type formats to be used in checkout, make the fol
 
 First, define custom format configuration keys for `billing_address_format` and `shipping_address_format`:
 
-``` yaml 
+``` yaml
 ibexa:
     repositories:
         <repository_name>:
             checkout:
                 #"billing" by default
                 billing_address_format: <custom_billing_fieldtype_address_format> 
-                #"shipping" by default 
+                #"shipping" by default
                 shipping_address_format: <custom_shipping_fieldtype_address_format> 
                 #used in registration, uses given shipping/billing addresses to pre-populate address forms in select_address checkout step, "customer" by default
                 customer_content_type: <your_ct_identifier_for_customer> 
@@ -298,7 +292,7 @@ ibexa:
 
 Then, define custom address formats, which, for example, do not include the `locality` field:
 
-``` yaml 
+``` yaml
 ibexa_field_type_address:
     formats:
         <custom_shipping_fieldtype_address_format>:
@@ -309,7 +303,7 @@ ibexa_field_type_address:
                     - postal_code
                     - email
                     - phone_number
-                    
+
         <custom_billing_fieldtype_address_format>:
             country:
                 default:
diff --git a/docs/commerce/checkout/reorder.md b/docs/commerce/checkout/reorder.md
index 8a557fce59..9a03ec3d6a 100644
--- a/docs/commerce/checkout/reorder.md
+++ b/docs/commerce/checkout/reorder.md
@@ -73,7 +73,7 @@ Reorder comes with the dedicated `Ibexa\Contracts\Checkout\Reorder\ReorderServic
 It contains helper methods and facades added over existing API to ease the order manipulation process.
 The following methods can be used to modify the reorder flow to fit your business needs:
 
-#### `ReorderService:addToCartFromOrder` 
+#### `ReorderService:addToCartFromOrder`
 
 Allows you to add items from a previous order to a cart.
 It uses historical data from previously ordered items even if they're no longer available.
@@ -96,7 +96,7 @@ The method uses the following parameters:
 - `$sourceOrder` (OrderInterface) - the source order from which context is copied
 - `$targetCheckout` (CheckoutInterface) - the target checkout to which context is copied
 
-#### `ReorderService:createReorderCart` 
+#### `ReorderService:createReorderCart`
 
 Creates a new shopping cart for reordering items from a past order in the same currency.
 The method uses the following parameters:
diff --git a/docs/commerce/order_management/configure_order_management.md b/docs/commerce/order_management/configure_order_management.md
index 5ea1d87c64..1909d304f0 100644
--- a/docs/commerce/order_management/configure_order_management.md
+++ b/docs/commerce/order_management/configure_order_management.md
@@ -7,18 +7,18 @@ edition: commerce
 
 When you work with your Commerce implementation, you can modify and customize the order processing configuration.
 
-!!! note "Permissions" 
+!!! note "Permissions"
 
     When you modify the workflow configuration, make sure you properly set user [permissions](permission_use_cases.md#commerce) for the Order management component.
 
 ## Configure order processing workflow
 
 Order processing workflow relies on a [Symfony Workflow]([[= symfony_doc =]]/components/workflow.html).
-Each transition represents a separate order processing step. 
+Each transition represents a separate order processing step.
 
 ### Default order processing configuration
 
-The default order processing workflow is called `ibexa_order`. 
+The default order processing workflow is called `ibexa_order`.
 To see the default workflow configuration, in your project directory, go to: `vendor/Ibexa/order-management/src/bundle/Resources/config/prepend.yaml`.
 
 The default workflow uses keys defined in `src/lib/Value/Status.php` file as place and transition names, for example, `PENDING_PLACE` translates into `pending`.
@@ -27,8 +27,8 @@ You can replace the default workflow configuration with a custom one if needed.
 
 ### Custom order processing workflows
 
-You define custom workflow implementations under the `framework.workflows` key. 
-If your installation supports multiple languages, for each place in the workflow, you can define a label that is pulled from a XLIFF file based on the [translation domain setting](back_office_translations.md). 
+You define custom workflow implementations under the `framework.workflows` key.
+If your installation supports multiple languages, for each place in the workflow, you can define a label that is pulled from a XLIFF file based on the [translation domain setting](back_office_translations.md).
 You can also define colors that are used for status labels.
 
 To customize your configuration, place it under the `framework.workflows.<your_workflow_name>` [configuration key](configuration.md#configuration-files):
@@ -45,8 +45,7 @@ Then reference it with `ibexa.repositories.<your_repository>.order_management.wo
 
 ### Define cancel order
 
-You can define a status and transition in which the order can be canceled 
-by modifying workflow under the `framework.workflows` [configuration key](configuration.md#configuration-files).
+You can define a status and transition in which the order can be canceled by modifying workflow under the `framework.workflows` [configuration key](configuration.md#configuration-files).
 
 ```yaml
 framework:
@@ -61,5 +60,5 @@ framework:
 
 By default, the component integration mechanism reduces product stock values when an order is made (in status "pending") and reverts it to the original value when an order is cancelled.
 In your implementation, you may want the reduction/restoration of stock to happen at other stages of the order fulfillment process.
-For this to happen, place the `reduce_stock: true` and/or `restore_stock: true` keys in other places of the workflow. 
+For this to happen, place the `reduce_stock: true` and/or `restore_stock: true` keys in other places of the workflow.
 Make sure that either of these keys is used only once.
diff --git a/docs/commerce/order_management/order_management_api.md b/docs/commerce/order_management/order_management_api.md
index 1323faf780..b8adf95bbd 100644
--- a/docs/commerce/order_management/order_management_api.md
+++ b/docs/commerce/order_management/order_management_api.md
@@ -11,7 +11,7 @@ edition: commerce
 
 To get orders and manage them, use the `Ibexa\Contracts\OrderManagement\OrderServiceInterface` interface.
 
-## Get single order 
+## Get single order
 
 ### Get single order by identifier
 
@@ -31,7 +31,7 @@ To access a single order by using its numerical ID, use the `OrderService::getOr
 
 ## Get multiple orders
 
-To fetch multiple orders, use the `OrderService::findOrders` method. 
+To fetch multiple orders, use the `OrderService::findOrders` method.
 It follows the same search query pattern as other APIs:
 
 ``` php
@@ -51,8 +51,8 @@ To create an order, use the `OrderService::createOrder` method and provide it wi
 
 ## Update order
 
-You can update the order after it's created. 
-You could do it to support a scenario when, for example, the order is processed manually and its status has to be changed in the system. 
+You can update the order after it's created.
+You could do it to support a scenario when, for example, the order is processed manually and its status has to be changed in the system.
 To update order information, use the `OrderService::updateOrder` method:
 
 ``` php
diff --git a/docs/content_management/content_api/browsing_content.md b/docs/content_management/content_api/browsing_content.md
index 8cdcadcf01..a02f1d52ff 100644
--- a/docs/content_management/content_api/browsing_content.md
+++ b/docs/content_management/content_api/browsing_content.md
@@ -143,7 +143,7 @@ of the ContentInfo object:
 
 !!! note
 
-    Note that requesting Section data may be impossible for an anonymous user.
+    Requesting Section data may be impossible for an anonymous user.
     Make sure to [authenticate](php_api.md#setting-the-repository-user) as a user with sufficient permissions.
 
 ### Object states
diff --git a/docs/content_management/content_management_api/section_api.md b/docs/content_management/content_management_api/section_api.md
index cf1baca9e2..853b8115cc 100644
--- a/docs/content_management/content_management_api/section_api.md
+++ b/docs/content_management/content_management_api/section_api.md
@@ -50,4 +50,4 @@ and the [`Section`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-
 [[= include_file('code_samples/api/public_php_api/src/Command/SectionCommand.php', 64, 67) =]]
 ```
 
-Note that assigning a Section to content does not automatically assign it to the content item's children.
+Assigning a Section to content does not automatically assign it to the content item's children.
diff --git a/docs/content_management/content_management_guide.md b/docs/content_management/content_management_guide.md
index 81944eb58f..454db47c16 100644
--- a/docs/content_management/content_management_guide.md
+++ b/docs/content_management/content_management_guide.md
@@ -8,9 +8,8 @@ description: Read the content management product guide and learn how to create,
 
 The term “content management” covers all the tasks that you need to perform to create, edit and present content to its intended audience.
 
-The content management model applied in [[= product_name =]] lies at the foundation of the entire system. 
-A system that relies on roles and permissions controls access to content items and is granular and powerful enough to be used in managing user accounts, 
-corporate accounts, products, or process definitions.
+The content management model applied in [[= product_name =]] lies at the foundation of the entire system.
+A system that relies on roles and permissions controls access to content items and is granular and powerful enough to be used in managing user accounts, corporate accounts, products, or process definitions.
 
 ## Availability
 
@@ -29,39 +28,36 @@ Content management capabilities are available in all [[= product_name =]] editio
 - media (images, videos, etc.)
 - user accounts
 
-You can set up content structure, define the templates to be filled with content, and assign different areas of the structure to your editors. 
+You can set up content structure, define the templates to be filled with content, and assign different areas of the structure to your editors.
 Next steps would be to create the actual content, and then classify content items, and organize them as necessary.
 
 You can then publish the content directly, by building a website or a web store, or by using external systems together with a [headless CMS](https://developers.ibexa.co/headless-cms) that relies on the [[= product_name =]] technology.
 
 ## Content structure
 
-All content in [[= product_name =]] is organized hierarchically, into what is called a [**content tree**](content_tree.md). 
+All content in [[= product_name =]] is organized hierarchically, into what is called a [**content tree**](content_tree.md).
 This tree-like structure repeats throughout the system, and applies to content, taxonomies, categories, and the like.
 
-Traditional as the structure may look, with relations and multiple location support, 
-a single content item can be referenced by another content item and accessed from different places of the tree, 
-which allows you to build complex architectures with multiple locales and output channels.
+Traditional as the structure may look, with relations and multiple location support, a single content item can be referenced by another content item and accessed from different places of the tree, which allows you to build complex architectures with multiple locales and output channels.
 
 ![Content structure in a Content Browser](img/content_tree.png)
 
 ## Content model
 
-A structure of elements that *store* content information is referred to as the **content model**. 
+A structure of elements that *store* content information is referred to as the **content model**.
 [[= product_name =]] comes with a predefined content model that includes a broad set of various field types and several content types.
 
-You can customize and adapt the content model to your organization's needs and the type of output channel that you use. 
-If need be, development teams can [create new field types](creating_a_point2d_field_type.md), to enhance editor and visitor experiences. 
-Content managers or even editors can then apply such field types when they modify existing or create new content types. 
+You can customize and adapt the content model to your organization's needs and the type of output channel that you use.
+If need be, development teams can [create new field types](creating_a_point2d_field_type.md), to enhance editor and visitor experiences.
+Content managers or even editors can then apply such field types when they modify existing or create new content types.
 The editing interface lets all users, including those with no coding experience, create or modify certain areas of the content model.
 
 For technical details, see [a Content model](content_model.md#content-model).
 
 ### Field types
 
-[Field types](field_types.md) are the smallest elements of the content model’s structure. 
-[[= product_name =]] comes with many built-in field types that cover most common needs, 
-for example, Text line, RichText, Integer, Measurement, Map location, etc.
+[Field types](field_types.md) are the smallest elements of the content model’s structure.
+[[= product_name =]] comes with many built-in field types that cover most common needs, for example, Text line, RichText, Integer, Measurement, Map location, etc.
 
 Their role is to:
 
@@ -78,39 +74,37 @@ For a complete list of available field types, see [field type reference](field_t
 
 Once you use a field type to design and build a content type definition, and define its settings, it becomes a Field.
 
-Fields can be as simple as Name, based on a Text line field type, or as complex as Page, 
-based on a landing page field type, with multiple options to set and choose from:
+Fields can be as simple as Name, based on a Text line field type, or as complex as Page, based on a landing page field type, with multiple options to set and choose from:
 
 ![Landing page field settings](img/fields.png)
 
 ### Content types
 
-Life gets easier when you have templates to fill in with content. Content types are such templates, which editors use to create content items. 
+Life gets easier when you have templates to fill in with content. Content types are such templates, which editors use to create content items.
 Content types define what Fields are available in the content item.
 
-[[= product_name =]] comes with several basic content types, and creating new ones, editing, 
-and deleting them is done by using a visual interface, with no coding skills needed.
+[[= product_name =]] comes with several basic content types, and creating new ones, editing, and deleting them is done by using a visual interface, with no coding skills needed.
 
 ![Content types vs. content items](img/content_types.png)
 
 ### Content items
 
-Content items are pieces of content, such as, for example, products, articles, blog posts, or media. 
+Content items are pieces of content, such as, for example, products, articles, blog posts, or media.
 In [[= product_name =]], everything is a content item — not just pages, articles or products, but also all media (images, videos, etc.) or even user accounts.
 
-Each content item, apart from its name and identifier, contains a composition of Fields, which differs depending on the type of content. 
+Each content item, apart from its name and identifier, contains a composition of Fields, which differs depending on the type of content.
 For example, articles might have a title, an author, a body, and an image, while products may have a name, category, price, size, color, etc.
 
 ### Forms
 
-Forms could be seen as a special kind of content items, because their role is to gather information from website users and not present it. 
-You create them from basic form fields available in [[= product_name =]]. 
+Forms could be seen as a special kind of content items, because their role is to gather information from website users and not present it.
+You create them from basic form fields available in [[= product_name =]].
 By adding forms to the website, you can increase the website’s functionality and improve user experience.
 Certain editions of [[= product_name =]] come with a visual [Form Builder]([[= user_doc =]]/content_management/work_with_forms/).
 
 ## Content management capabilities
 
-Each content item has at least one location within the content tree, and can have several versions and multiple translations. 
+Each content item has at least one location within the content tree, and can have several versions and multiple translations.
 It can also have related assets, such as images or other media, and assigned keywords, or tags.
 
 You can use these characteristics in combination with system features to create the most comprehensive and functional digital presence for your organization.
@@ -119,20 +113,20 @@ You can use these characteristics in combination with system features to create
 
 #### Locations
 
-When a content item is created and published, it's assigned a place in the content tree, designated by a Location ID. 
-A single content item can have more than one Location ID, which means that the same content can be found on different branches of the tree. 
+When a content item is created and published, it's assigned a place in the content tree, designated by a Location ID.
+A single content item can have more than one Location ID, which means that the same content can be found on different branches of the tree.
 However, a single location can have only one content item assigned to it.
 
 ![Locations](img/locations.png)
 
 Locations can be used to control the availability of content items to end users:
-you can [hide specific locations]([[= user_doc =]]/content_management/content_organization/manage_locations_urls/#hide-locations) of a content item, while others remain available. 
+you can [hide specific locations]([[= user_doc =]]/content_management/content_organization/manage_locations_urls/#hide-locations) of a content item, while others remain available.
 By [swapping locations]([[= user_doc =]]/content_management/content_organization/manage_locations_urls/#swap-locations), you can immediately replace an obsolete version of a content item with an updated one.
 
 #### Versions
 
-Content items can have several [versions]([[= user_doc =]]/content_management/content_versions/). 
-By default, there are three version statuses available: draft, published, and archived. 
+Content items can have several [versions]([[= user_doc =]]/content_management/content_versions/).
+By default, there are three version statuses available: draft, published, and archived.
 Before they're published, drafts can be routed between different user roles for review and approval.
 
 ![Versions](img/versions.png)
@@ -141,7 +135,7 @@ Editors can [compare different content item versions]([[= user_doc =]]/content_m
 
 #### Translations
 
-Content items can have more than one [translation]([[= user_doc =]]/content_management/translate_content/). 
+Content items can have more than one [translation]([[= user_doc =]]/content_management/translate_content/).
 If a website has different fronts, for different locales, and different language versions of content exist, [[= product_name =]] serves the one that matches the locale.
 
 ![Translations](img/translations.png)
@@ -175,17 +169,17 @@ There are multiple tools within [[= product_name =]] that help content managers
 
 ### Taxonomy
 
-With taxonomy you can create tags or keywords within a tree structure and assign them to content items. 
+With taxonomy you can create tags or keywords within a tree structure and assign them to content items.
 This way you can classify content and make it easier for end users to find the content they need, or browse and view content from a category that suits them best.
 
 ![Taxonomy principles](img/taxonomy.png)
 
 ### Access control
 
-When your [[= product_name =]] instance has multiple contributors and visitors, administrators can give them access to different areas of the website and different capabilities. 
+When your [[= product_name =]] instance has multiple contributors and visitors, administrators can give them access to different areas of the website and different capabilities.
 It's done by creating roles, with each role having a different set of [permissions](permission_overview.md), the most fitting example being the `content/edit` permission limited to an `Articles/BookReviews/Historical` subtree of the content tree.
 
-In the next steps, after you create user groups, you’d assign roles to these groups, and add individual users to each of such groups. 
+In the next steps, after you create user groups, you’d assign roles to these groups, and add individual users to each of such groups.
 For more technical information about permissions and limitations, see [Permission use cases](permission_use_cases.md).
 
 There are, however, mechanisms to control access to content with even more convenience.
@@ -193,26 +187,25 @@ There are, however, mechanisms to control access to content with even more conve
 ### Sections
 
 You can divide your content tree into nominal parts to better organize it.
-Once you have defined sections, for example, Media or Forms, and assigned them to content items, 
-you can decide which roles have access to which Section of the tree.
+Once you have defined sections, for example, Media or Forms, and assigned them to content items, you can decide which roles have access to which Section of the tree.
 
-The setting is inherited, which means that a child content item inherits a value of this setting from its parent. 
+The setting is inherited, which means that a child content item inherits a value of this setting from its parent.
 Changing a Section setting does not result in moving a content item to a different location within a content tree.
 
 ![Members of the Media Section](img/sections.png)
 
 ### Object states
 
-While reviewing the details of each individual content item in your content tree, you can assign a state to it, for example, “Locked” or “Not locked”. 
-Then you can set a permission that allows or denies users access to content items in a specific state. 
+While reviewing the details of each individual content item in your content tree, you can assign a state to it, for example, “Locked” or “Not locked”.
+Then you can set a permission that allows or denies users access to content items in a specific state.
 This setting isn't inherited.
 
 ![Object states in content item’s Details](img/object_states.png)
 
 ### User segments
 
-Although segments aren't meant to classify content, they could fall into this category, because their role is about targeting users, and not controlling their access to content. 
-With segments, you can reach specific groups, or categories, of visitors with specific information about content or products that could be of their interest. 
+Although segments aren't meant to classify content, they could fall into this category, because their role is about targeting users, and not controlling their access to content.
+With segments, you can reach specific groups, or categories, of visitors with specific information about content or products that could be of their interest.
 For example, you can build Pages that contain different recommendations, depending on who is visiting them.
 
 ![A Segment Group with two user segments](img/user_segments.png)
@@ -225,19 +218,18 @@ Since content management is an ongoing process, and, in your implementation, you
 
 **1\. Create a content model**
 
-Any content that you might want to deliver to a viewer can be structured and split into smaller elements. 
+Any content that you might want to deliver to a viewer can be structured and split into smaller elements.
 Reverse-engineer the intended concepts into individual fields, which can be categorized, and then picked from categories and combined into content items.
 
 Reuse existing Fields Types or [customize them to fit your needs](create_custom_generic_field_type.md), then [create content types]([[= user_doc =]]/content_management/create_edit_content_items/).
 
 **2\. Define permissions**
 
-Although this step isn't directly related to content management, 
-it's a good time to [set up user roles and permissions]([[= user_doc =]]/permission_management/work_with_permissions/), which users would need to work with content.
+Although this step isn't directly related to content management, it's a good time to [set up user roles and permissions]([[= user_doc =]]/permission_management/work_with_permissions/), which users would need to work with content.
 
 **3\. Author content**
 
-[Create various content items]([[= user_doc =]]/content_management/create_edit_content_items/), such as pages, articles, forms, or media. While you fill Fields with content, several actions are there to help you with your task. 
+[Create various content items]([[= user_doc =]]/content_management/create_edit_content_items/), such as pages, articles, forms, or media. While you fill Fields with content, several actions are there to help you with your task.
 You can pause and resume the work, preview the results, or send content for review.
 
 ![Send to review](img/send_to_review.png)
@@ -248,7 +240,7 @@ Again, this isn't part of content management, but at this point you can [publish
 
 **5\. Organize content**
 
-Organize the content of your website by copying or moving content items, [controlling Locations and URL addresses]([[= user_doc =]]/content_management/content_organization/manage_locations_urls/). 
+Organize the content of your website by copying or moving content items, [controlling Locations and URL addresses]([[= user_doc =]]/content_management/content_organization/manage_locations_urls/).
 Then work with Tags, Sections and Object States to [classify]([[= user_doc =]]/content_management/content_organization/classify_content/#sections) it.
 
 ## Benefits
@@ -267,21 +259,15 @@ The most important benefits of using Content management capabilities of [[= prod
 
 ### Corporate website
 
-The most common use case for a comprehensive content management system like [[= product_name =]] would be creating and maintaining a multinational company’s digital presence, 
-with both public and intranet channels, multiple websites with overlapping content structures, 
-and business partners and end-customers alike wanting to connect through different channels to access public and classified content.
+The most common use case for a comprehensive content management system like [[= product_name =]] would be creating and maintaining a multinational company’s digital presence, with both public and intranet channels, multiple websites with overlapping content structures, and business partners and end-customers alike wanting to connect through different channels to access public and classified content.
 
 ### B2C web store
 
 Content management could lie at a foundation of a successful global web store, where customers connect through localized websites and branded mobile apps:
-individual products can have multiple variants with differing related assets,
-product descriptions must be available in multiple language versions, 
-and access to certain areas of the store depends on both a country and a segment that the customer comes from.
+individual products can have multiple variants with differing related assets, product descriptions must be available in multiple language versions, and access to certain areas of the store depends on both a country and a segment that the customer comes from.
 
 ### B2B store
 
-Extensive content management capabilities would prove themselves in a setting, 
-where multiple buyers from different partner companies connect to an industry leader’s trading website, 
-and they expect to find well organized SKU catalogs that contain basic product information. 
-From there they would like to access detailed specifications, white papers and application notes. 
+Extensive content management capabilities would prove themselves in a setting, where multiple buyers from different partner companies connect to an industry leader’s trading website, and they expect to find well organized SKU catalogs that contain basic product information.
+From there they would like to access detailed specifications, white papers and application notes.
 The same products could come with different brands and at different price points, depending on the customer segment or origin.
diff --git a/docs/content_management/field_types/field_type_reference/binaryfilefield.md b/docs/content_management/field_types/field_type_reference/binaryfilefield.md
index c19d0cc9d6..f5cf63ee51 100644
--- a/docs/content_management/field_types/field_type_reference/binaryfilefield.md
+++ b/docs/content_management/field_types/field_type_reference/binaryfilefield.md
@@ -14,14 +14,14 @@ It's capable of handling virtually any file type and is typically used for stori
 
 #### Properties
 
-Note that both `BinaryFile` and `Media` Value and Type inherit from the `BinaryBase` abstract field type, and share common properties.
+Both `BinaryFile` and `Media` Value and Type inherit from the `BinaryBase` abstract field type, and share common properties.
 
 `Ibexa\Core\FieldType\BinaryFile\Value` offers the following properties:
 
 |Attribute|Type|Description|Example|
 |------|------|------|------|
 |`id`|string|Binary file identifier. This ID depends on the [IO Handler](clustering.md#dfs-io-handler) that is being used. With the native, default handlers (FileSystem and Legacy), the ID is the file path, relative to the binary file storage root dir (`var/<vardir>/storage/original` by default).|application/63cd472dd7.pdf|
-|`fileName`|string|The human-readable file name, as exposed to the outside. Used when sending the file for download in order to name the file.|20130116_whitepaper.pdf|
+|`fileName`|string|The human-readable file name, as exposed to the outside. Used when sending the file for download to name the file.|20130116_whitepaper.pdf|
 |`fileSize`|int|File size, in bytes.|1077923|
 |`mimeType`|string|The file's MIME type.|application/pdf|
 |`uri`|string|The binary file's `content/download` URI. If the URI doesn't include a host or protocol, it applies to the request domain.|/content/download/210/2707|
diff --git a/docs/content_management/field_types/field_type_reference/imagefield.md b/docs/content_management/field_types/field_type_reference/imagefield.md
index 6b2b20a569..f3b39bb947 100644
--- a/docs/content_management/field_types/field_type_reference/imagefield.md
+++ b/docs/content_management/field_types/field_type_reference/imagefield.md
@@ -181,7 +181,7 @@ $createStruct = $contentService->newContentCreateStruct(
 $createStruct->setField( 'image', '/tmp/image.png' );
 ```
 
-In order to customize the Image's alternative texts, you must first get an `Image\Value` object, and set this property. For that, you can use the `Image\Value::fromString()` method that accepts the path to a local file:
+To customize the Image's alternative texts, you must first get an `Image\Value` object, and set this property. For that, you can use the `Image\Value::fromString()` method that accepts the path to a local file:
 
 ``` php
 $createStruct = $contentService->newContentCreateStruct(
diff --git a/docs/content_management/field_types/field_type_reference/mediafield.md b/docs/content_management/field_types/field_type_reference/mediafield.md
index a37d738a1e..0fc60a416a 100644
--- a/docs/content_management/field_types/field_type_reference/mediafield.md
+++ b/docs/content_management/field_types/field_type_reference/mediafield.md
@@ -31,7 +31,7 @@ It's capable of handling the following types of files:
 
 `Ibexa\Core\FieldType\Media\Value` offers the following properties.
 
-Note that both `Media` and `BinaryFile` Value and Type inherit from the `BinaryBase` abstract field type and share common properties.
+Both `Media` and `BinaryFile` Value and Type inherit from the `BinaryBase` abstract field type and share common properties.
 
 |Property|Type|Description|Example|
 |------|------|------|------|
diff --git a/docs/content_management/field_types/field_type_reference/pagefield.md b/docs/content_management/field_types/field_type_reference/pagefield.md
index c771074bdb..31e0874a07 100644
--- a/docs/content_management/field_types/field_type_reference/pagefield.md
+++ b/docs/content_management/field_types/field_type_reference/pagefield.md
@@ -22,7 +22,7 @@ Page field type is only used in the Page content type that is included in [[= pr
 
 Layout defines how a Page is divided into zones.
 
-The placement of zones is defined in a template which is a part of the layout configuration. You can modify the template in order to define your own zone layout.
+The placement of zones is defined in a template which is a part of the layout configuration. You can modify the template to define your own zone layout.
 
 For information on how to create and configure new blocks for the Page, see [Page layouts](render_page.md#render-a-layout).
 
diff --git a/docs/content_management/field_types/field_type_reference/richtextfield.md b/docs/content_management/field_types/field_type_reference/richtextfield.md
index 9f1bb9d763..7ea222dd52 100644
--- a/docs/content_management/field_types/field_type_reference/richtextfield.md
+++ b/docs/content_management/field_types/field_type_reference/richtextfield.md
@@ -8,7 +8,7 @@ This field type validates and stores structured rich text, and exposes it in sev
 |------|------|------|
 |`RichText`|`ezrichtext`|mixed|
 
-## PHP API field type 
+## PHP API field type
 
 ### Value object
 
diff --git a/docs/content_management/field_types/field_type_search.md b/docs/content_management/field_types/field_type_search.md
index 6090ed9ab8..6dc4f804b1 100644
--- a/docs/content_management/field_types/field_type_search.md
+++ b/docs/content_management/field_types/field_type_search.md
@@ -47,7 +47,7 @@ Ibexa\Core\FieldType\Keyword\SearchField:
         - {name: ibexa.field_type.indexable, alias: ezkeyword}
 ```
 
-Note that `alias` should be the same as field type ID.
+`alias` should be the same as field type ID.
 
 ## Search Field values
 
diff --git a/docs/content_management/field_types/field_type_storage.md b/docs/content_management/field_types/field_type_storage.md
index 0e2a65e390..507352bfe4 100644
--- a/docs/content_management/field_types/field_type_storage.md
+++ b/docs/content_management/field_types/field_type_storage.md
@@ -91,7 +91,7 @@ A field type may store arbitrary data in external data sources.
 External storage can be e.g. a web service, a file in the file system, another database
 or even the [[= product_name =]] database itself (in form of a non-standard table).
 
-In order to store data in external storage, the field type interacts with the Persistence SPI
+To store data in external storage, the field type interacts with the Persistence SPI
 through the `Ibexa\Contracts\Core\FieldType\FieldStorage` interface.
 
 Accessing the internal storage of a content item that includes a Field of the field type
@@ -101,7 +101,7 @@ calls one of the following methods to also access the external data:
 |------|-----------|
 |`hasFieldData()`|Returns whether the field type stores external data at all.|
 |`storeFieldData()`|Called right before a Field of the field type is stored. The method stores `$externalData`. It returns `true` if the call manipulated internal data of the given Field, so that it's updated in the internal database.|
-|`getFieldData()`|Called after a Field has been restored from the database in order to restore `$externalData`.|
+|`getFieldData()`|Called after a Field has been restored from the database to restore `$externalData`.|
 |`deleteFieldData()`|Must delete external data for the given Field, if exists.|
 |`getIndexData()`|Returns the actual index data for the provided `Ibexa\Contracts\Core\Persistence\Content\Field`. For more information, see [search service](field_type_search.md#search-field-values).|
 
@@ -110,19 +110,19 @@ To retrieve and store data in the [[= product_name =]] data storage,
 but outside of the normal structures (e.g. a custom table in an SQL database),
 use [Gateway-based storage](#gateway-based-storage) with properly injected Doctrine Connection.
 
-Note that the field type must take care on its own for being compliant with different data sources and that third parties can extend the data source support easily.
+The field type must take care on its own for being compliant with different data sources and that third parties can extend the data source support easily.
 
 ### Gateway-based storage
 
-In order to allow the usage of a field type that uses external data with different data storages, it's recommended to implement a gateway infrastructure and a registry for the gateways. To make this easier, the Core implementation of field types provides corresponding interfaces and base classes. They can also be used for custom field types.
+To allow the usage of a field type that uses external data with different data storages, it's recommended to implement a gateway infrastructure and a registry for the gateways. To make this easier, the Core implementation of field types provides corresponding interfaces and base classes. They can also be used for custom field types.
 
-The interface `Ibexa\Contracts\Core\FieldType\StorageGateway` is implemented by gateways, in order to be handled correctly by the registry. It has one method:
+The interface `Ibexa\Contracts\Core\FieldType\StorageGateway` is implemented by gateways, to be handled correctly by the registry. It has one method:
 
 |Method|Description|
 |------|-----------|
 |`setConnection()`|The registry mechanism uses this method to set the SPI storage connection (e.g. the database connection to the Legacy Storage database) into the gateway, which might be used to store external data. The connection is retrieved from the `$context` array automatically by the registry.|
 
-Note that the Gateway implementation itself must take care of validating that it received a usable connection. If it does not, it should throw a `RuntimeException`.
+The Gateway implementation itself must take care of validating that it received a usable connection. If it does not, it should throw a `RuntimeException`.
 
 The registry mechanism is realized as a base class for `FieldStorage` implementations: `Ibexa\Core\FieldType\GatewayBasedStorage`. For managing `StorageGateway`s, the following methods are already implemented in the base class:
 
@@ -170,10 +170,10 @@ services:
     App\FieldType\MyField\Storage\Gateway\DoctrineStorage: ~
 ```
 
-Note that `ibexa.api.storage_engine.legacy.connection` is of type `Doctrine\DBAL\Connection`. If your gateway still uses an implementation of `eZ\Publish\Core\Persistence\Database\DatabaseHandler` (`eZ\Publish\Core\Persistence\Doctrine\ConnectionHandler`), instead of the `ibexa.api.storage_engine.legacy.connection`, you can pass the `ibexa.api.storage_engine.legacy.dbhandler` service.
+`ibexa.api.storage_engine.legacy.connection` is of type `Doctrine\DBAL\Connection`. If your gateway still uses an implementation of `eZ\Publish\Core\Persistence\Database\DatabaseHandler` (`eZ\Publish\Core\Persistence\Doctrine\ConnectionHandler`), instead of the `ibexa.api.storage_engine.legacy.connection`, you can pass the `ibexa.api.storage_engine.legacy.dbhandler` service.
 
 
-Also note that there can be several gateways per field type (one per storage engine). In this case it's recommended to either create base implementation which each gateway can inherit or create interface which each gateway must implement and reference it instead of specific implementation when type-hinting method arguments.
+Also there can be several gateways per field type (one per storage engine). In this case it's recommended to either create base implementation which each gateway can inherit or create interface which each gateway must implement and reference it instead of specific implementation when type-hinting method arguments.
 
 !!! tip
 
diff --git a/docs/content_management/field_types/field_types.md b/docs/content_management/field_types/field_types.md
index 412b1979a1..e8bd92c6cf 100644
--- a/docs/content_management/field_types/field_types.md
+++ b/docs/content_management/field_types/field_types.md
@@ -27,7 +27,7 @@ available in the [`Ibexa\Core\FieldType`](https://github.com/ibexa/core/tree/mai
     Remember that all your custom field types must be registered in `config/services.yml`.
     For more information see [Registration](type_and_value.md#registration).
 
-In order to provide custom functionality for a field type, the SPI interacts with multiple layers of the [[= product_name =]] architecture:
+To provide custom functionality for a field type, the SPI interacts with multiple layers of the [[= product_name =]] architecture:
 
 ![Field type Overview](field_type_overview.png)
 
@@ -41,10 +41,8 @@ Below that, the field type must support the **public PHP API** implementation re
 - Value creation and validation
 - Communication with the Persistence SPI
 
-On the bottom level, a field type can additionally hook into the **Persistence SPI**
-in order to store data from a `FieldValue` in an external service.
-Note that all non-standard [[= product_name =]] database tables (e.g. `ezurl`)
-are treated as [external storage](field_type_storage.md#storing-data-externally).
+On the bottom level, a field type can additionally hook into the **Persistence SPI** to store data from a `FieldValue` in an external service.
+All non-standard [[= product_name =]] database tables (e.g. `ezurl`) are treated as [external storage](field_type_storage.md#storing-data-externally).
 
 The following sequence diagrams visualize the process of creating and publishing new content across all layers, especially focused on the interaction with a field type.
 
diff --git a/docs/content_management/pages/page_block_attributes.md b/docs/content_management/pages/page_block_attributes.md
index d2a3e9dac0..426ae901ca 100644
--- a/docs/content_management/pages/page_block_attributes.md
+++ b/docs/content_management/pages/page_block_attributes.md
@@ -73,7 +73,7 @@ To define the type, create a `src/Block/Attribute/MyStringAttributeType.php` fil
 [[= include_file('code_samples/page/custom_attribute/src/Block/Attribute/MyStringAttributeType.php') =]]
 ```
 
-Note that the attribute uses `AbstractType` (line 5) and `TextType` (line 6).
+The attribute uses `AbstractType` (line 5) and `TextType` (line 6).
 Adding `getBlockPrefix` (line 15) returns a unique prefix key for a custom template of the attribute.
 
 ### Mapper
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
index e1b32f1328..b94931dabb 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
@@ -432,7 +432,7 @@ As explained in [User Context Hash caching](context_aware_cache.md#user-context-
 user-context-hash. Users with the same user-context-hash here the same cache (as long as [[= product_name =]]
 responds with `Vary: X-Context-User-Hash`).
 
-In order to simulate the requests the HTTP cache sends to [[= product_name =]], you need this user-context-hash.
+To simulate the requests the HTTP cache sends to [[= product_name =]], you need this user-context-hash.
 To obtain it, use `curl`.
 
 ```bash
@@ -450,7 +450,7 @@ Some notes about each of these parameters:
 - `--header "Surrogate-Capability: abc=ESI/1.0"`, strictly speaking not needed when fetching the user-context-hash, but this tells [[= product_name =]] that client understands ESI tags.
   It's good practice to always include this header when imitating the HTTP Cache.
 - `--header "accept: application/vnd.fos.user-context-hash"` tells [[= product_name =]] that the client wants to receive the user-context-hash
-- `--header "x-fos-original-url: /"` is required by the fos-http-cache bundle in order to deliver the user-context-hash
+- `--header "x-fos-original-url: /"` is required by the fos-http-cache bundle to deliver the user-context-hash
 - `https://www.staging.foobar.com.us-2.platformsh.site/_fos_user_context_hash` : here we use the hostname we earlier told
   curl how to resolve using `---resolve`. `/_fos_user_context_hash` is the route to the controller that are able to
   deliver the user-context-hash.
@@ -510,7 +510,7 @@ So back to the original problem here. This resource is for some reason not cache
 `x-cache: MISS` we started with). But origin says this page can be cached for 1 day. How can that be?
 The likely reason is that this page also contains some ESI fragments and that one or more of these aren't cachable.
 
-So, first let's see if there are any ESIs here. We remove the `-IXGET` options (in order to see content of the response,
+So, first let's see if there are any ESIs here. We remove the `-IXGET` options (to see content of the response,
 not only headers) to curl and search for esi:
 
 ```bash
@@ -535,7 +535,7 @@ shell.
     $ curl -IXGET --resolve www.staging.foobar.com.us-2.platformsh.site:443:1.2.3.4 --header "Surrogate-Capability: abc=ESI/1.0" --header "x-user-context-hash: daea248406c0043e62997b37292bf93a8c91434e8661484983408897acd93814" 'https://www.staging.foobar.com.us-2.platformsh.site/_fragment?_hash=B%2BLUWB2kxTCc6nc5aEEn0eEqBSFar%2Br6jNm8fvSKdWU%3D&_path=locationId%3D2%26contentId%3D52%26blockId%3D11%26versionNo%3D3%26languageCode%3Deng-GB%26serialized_siteaccess%3D%257B%2522name%2522%253A%2522site%2522%252C%2522matchingType%2522%253A%2522default%2522%252C%2522matcher%2522%253Anull%252C%2522provider%2522%253Anull%257D%26serialized_siteaccess_matcher%3Dnull%26_format%3Dhtml%26_locale%3Den_GB%26_controller%3DEzSystems%255CEzPlatformPageFieldTypeBundle%255CController%255CBlockController%253A%253ArenderAction'
 ```
 
-You can also note that this ESI is handled by a controller in the `FieldTypePage` bundle provided by [[= product_name =]].
+This ESI is handled by a controller in the `FieldTypePage` bundle provided by [[= product_name =]].
 
 The output is:
 
@@ -592,14 +592,14 @@ The `Set-Cookie` here may cause the problem. A ESI fragment should never set a c
 - Clients only receive the headers set in the "mother" document (the headers in the "/" response in this case).
 
 - Only the content of ESIs responses is returned to the client. **No headers set in the ESI response will ever reach the client**. ESI headers are only seen by the HTTP cache.
-  
+
 - Symfony reverse proxy doesn't support ESIs at all, and any ESI calls (`render_esi()`) are implicitly replaced by
   sub-requests (`render()`). So any `Set-Cookie` **is** sent to the client when using Symfony reverse proxy.
-  
+
 - Fastly flags it resource as "not cachable" because it set a cookie at least once. Even though that endpoint.
   stops setting cookies, Fastly still doesn't cache that fragment. Any document referring to that ESI is a `MISS`.
-  Fastly cache needs to be purged (`Purge-all` request) in order to remove this flag.
-  
+  Fastly cache needs to be purged (`Purge-all` request) to remove this flag.
+
 - It means that it's not recommended to always initiate a session when loading the front page.
 
 You must ensure that you do not unintendedly start a session in a controller used by ESIs, for example, when trying to access as session variable before a session has been initiated yet.
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
index c6bb35cd1c..431d754369 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
@@ -43,7 +43,7 @@ Vary: Cookie, Authorization
 ```
 
 In the example above the response is set to be cached for 10 minutes.
-It varies on the `Cookie` header in order to be able to cache it for the given user.
+It varies on the `Cookie` header to be able to cache it for the given user.
 To optimize it, the default VCL strips any cookie other than session cookies to make this work.
 
 It also varies on `Authorization` to cover any possible basic authorization headers in case that is used over sessions for some requests.
@@ -132,7 +132,7 @@ This solution requires more effort (controller, VCL logic and adapting your own
 
 For information on how user context hashes are generated, see [FOSHttpCacheBundle documentation](https://foshttpcachebundle.readthedocs.io/en/latest/features/user-context.html#generating-hashes).
 
-[[= product_name =]] implements a custom context provider in order to make user context hash reflect the current User's roles and Limitations.
+[[= product_name =]] implements a custom context provider to make user context hash reflect the current user's roles and limitations.
 This is needed given [[= product_name =]]'s more complex permission model compared to Symfony's.
 
 You can technically extend the user context hash by [implementing your own custom context provider(s)](https://foshttpcachebundle.readthedocs.io/en/latest/reference/configuration/user-context.html#custom-context-providers).
diff --git a/docs/infrastructure_and_maintenance/cache/persistence_cache.md b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
index 56f36288b4..894651849e 100644
--- a/docs/infrastructure_and_maintenance/cache/persistence_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
@@ -192,13 +192,13 @@ Persistence cache depends on all involved web servers, each of them seeing the s
 With that in mind, the following configurations of Redis are possible:
 
 - [Redis Cluster](https://redis.io/docs/management/scaling/)
-    - Shards cache across several instances in order to be able to cache more than memory of one server allows
+    - Shards cache across several instances to be able to cache more than memory of one server allows
     - Shard slaves can improve availability, however [they use asynchronous replication](https://redis.io/docs/management/scaling/#redis-cluster-consistency-guarantees) so they can't be used for reads
     - Unsupported Redis features that can affect performance: [pipelining](https://github.com/phpredis/phpredis/blob/develop/cluster.md#pipelining) and [most multiple key commands](https://github.com/phpredis/phpredis/blob/develop/cluster.md#multiple-key-commands)
 - [Redis Sentinel](https://redis.io/docs/management/sentinel/)
     - Provides high availability by providing one or several slaves (ideally 2 slaves or more, e.g. minimum 3 servers), and handle failover
     - [Slaves are asynchronously replicated](https://redis.io/docs/management/sentinel/#fundamental-things-to-know-about-sentinel-before-deploying), so they can't be used for reads
-    - Typically used with a load balancer (e.g. HAproxy with occasional calls to Redis Sentinel API) in the front in order to only speak to elected master
+    - Typically used with a load balancer (e.g. HAproxy with occasional calls to Redis Sentinel API) in the front to only speak to elected master
     - As of v3 you can also configure this [directly on the connection string]([[= symfony_doc =]]/components/cache/adapters/redis_adapter.html#configure-the-connection), **if** you use `Predis` instead of `php-redis` 
 
 Several cloud providers have managed services that are easier to set up, handle replication and scalability for you, and might perform better. Notable services include:
diff --git a/docs/infrastructure_and_maintenance/security/development_security.md b/docs/infrastructure_and_maintenance/security/development_security.md
index 4a9d0fdb5e..1a85936b4f 100644
--- a/docs/infrastructure_and_maintenance/security/development_security.md
+++ b/docs/infrastructure_and_maintenance/security/development_security.md
@@ -80,7 +80,7 @@ By default, Symfony redirects to the [URI configured in `security.yaml` as `defa
 It's possible to use the "Remember me" functionality.
 Refer to the [Symfony cookbook on this topic]([[= symfony_doc =]]/security/remember_me.html).
 
-If you want to use this feature, you must at least extend the login template in order to add the required checkbox:
+If you want to use this feature, you must at least extend the login template to add the required checkbox:
 
 ``` html+twig
 {% extends "@IbexaCore/Security/login.html.twig" %}
diff --git a/docs/infrastructure_and_maintenance/security/security_checklist.md b/docs/infrastructure_and_maintenance/security/security_checklist.md
index 731fd9f22e..e94e68b620 100644
--- a/docs/infrastructure_and_maintenance/security/security_checklist.md
+++ b/docs/infrastructure_and_maintenance/security/security_checklist.md
@@ -139,7 +139,8 @@ It prevents uploading files that might be executed on the server, a Remote Code
 Attempting to upload files from the list results in an error message.
 There are also other safety measures in place, like using the web server configuration to block execution of uploaded scripts, see the next point.
 
-You should adapt this list to your needs. Note that `svg` images are blocked because they may contain JavaScript code.
+You should adapt this list to your needs.
+`svg` images are blocked because they may contain JavaScript code.
 If you opt to allow them, make sure you take steps to mitigate the risk.
 
 The default list of blocked file types contains: `hta htm html jar js jse pgif phar php php3 php4 php5 phps phpt pht phtml svg swf xhtm xhtml`.
diff --git a/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md b/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md
index b5ca18fd9e..687e929b05 100644
--- a/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md
+++ b/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md
@@ -32,7 +32,7 @@ The most important clues around increasing overall performance of your [[= produ
 #### How can I translate my back office?
 
 The language of the back office is based on the browser language.
-In order to change it you should install the proper package for your language (see [language packages list](https://github.com/ezplatform-i18n)).
+To change it you should install the proper package for your language (see [language packages list](https://github.com/ezplatform-i18n)).
 Once you have language packages installed, you can switch the language of the back office in the User Settings menu.
 
 If you do not have a language defined in the browser, it's selected based on the `parameters.locale_fallback` parameter located in `config/packages/ibexa.yaml`.
@@ -98,8 +98,7 @@ rm -rf var/cache/*
 
 #### Where should I place my configuration files?
 
-In order to avoid merge conflicts on important configuration settings during upgrades,
-moving as much as possible of your configuration to your own files can be a good idea.
+To avoid merge conflicts on important configuration settings during upgrades, moving as much as possible of your configuration to your own files can be a good idea.
 
 All project-specific parameters should be kept in separate files.
 For example, configuration for Page Blocks could be placed in `config/packages/landing_page_blocks.yaml`.
diff --git a/docs/multisite/languages/languages.md b/docs/multisite/languages/languages.md
index be3f55d785..e24aa5cbd6 100644
--- a/docs/multisite/languages/languages.md
+++ b/docs/multisite/languages/languages.md
@@ -180,4 +180,4 @@ When setting up SiteAccesses with different language versions, you can specify a
 
 You can also assign a Default content availability flag to content types (available in the Admin Panel). When this flag is assigned, content items of this type are available even when they do not have a language version in any of the languages configured for the current SiteAccess.
 
-Note that if a language isn't provided in the list of prioritized languages and it's not the content item's first language, the URL alias for this content in this language isn't generated.
+If a language isn't provided in the list of prioritized languages and it's not the content item's first language, the URL alias for this content in this language isn't generated.
diff --git a/docs/release_notes/ez_platform_v1.11.0.md b/docs/release_notes/ez_platform_v1.11.0.md
index e617cfcca2..b20bdef658 100644
--- a/docs/release_notes/ez_platform_v1.11.0.md
+++ b/docs/release_notes/ez_platform_v1.11.0.md
@@ -14,7 +14,7 @@ If you're looking for the Long Term Support (LTS) release, see [https://ezplatfo
 
 [EZP-26885](https://issues.ibexa.co/browse/EZP-26885): you now have access to the Doctrine connection instead of
 the Zeta Components Database connection-like object which has been exposed to field types until now.
-Note that the former way will be removed in a future major version.
+The former way will be removed in a future major version.
 
 #### Content type limitation for Relation (single) field
 
diff --git a/docs/release_notes/ez_platform_v2.0.0.md b/docs/release_notes/ez_platform_v2.0.0.md
index f19dc859aa..68777b0234 100644
--- a/docs/release_notes/ez_platform_v2.0.0.md
+++ b/docs/release_notes/ez_platform_v2.0.0.md
@@ -23,7 +23,7 @@ eZ Platform has become a pure Symfony application, based on Symfony 3, which bri
 
 !!! note
 
-    Note that the move to [Symfony 3](https://symfony.com/roadmap?version=3.4) causes some changes, for example to the project's directory structure.
+    The move to [Symfony 3](https://symfony.com/roadmap?version=3.4) causes some changes, for example to the project's directory structure.
 
     Among others, the `var` directory now contains cache and logs.
     The `bin` directory is now used to call the `console` command, so use `bin/console` instead of `app/console`.
diff --git a/docs/release_notes/ez_platform_v2.2.0.md b/docs/release_notes/ez_platform_v2.2.0.md
index 133c5cddaa..b37e23459a 100644
--- a/docs/release_notes/ez_platform_v2.2.0.md
+++ b/docs/release_notes/ez_platform_v2.2.0.md
@@ -77,7 +77,7 @@ You can also [select which content types are treated the same way as user of use
 
 ### Change from UTF8 to UTF8MB4
 
-Database charset is changed from UTF8 to UTF8MB4, in order to support 4-byte characters.
+Database charset is changed from UTF8 to UTF8MB4, to support 4-byte characters.
 
 !!! caution
 
diff --git a/docs/release_notes/ez_platform_v2.4.md b/docs/release_notes/ez_platform_v2.4.md
index f2864d1993..3145d45ee4 100644
--- a/docs/release_notes/ez_platform_v2.4.md
+++ b/docs/release_notes/ez_platform_v2.4.md
@@ -148,11 +148,11 @@ This release introduces a few simplifications to API use for content types:
 
 - Exposes `content->getContentType()` for easier use, including from Twig as `content.contentType`. When iterating over the result set of content/Locations these are effectively loaded all at once.
 - Adds possibility to load several content types in bulk using `ContentTypeService->loadContentTypeList()`.
-- `UserService` now exposes `isUser()` and `isUserGroup()`. They do not need to do a lookup to the database in order to tell if a content item is of type user or user group.
+- `UserService` now exposes `isUser()` and `isUserGroup()`. They do not need to do a lookup to the database to tell if a content item is of type user or user group.
 
 #### Load multiple Locations
 
-you're now able to load multiple Locations at once, using `LocationService->loadLocationList()`. The biggest benefit of this feature is saving load time on complex landing pages when HTTP cache is cold or disabled, including when in development mode.  
+you're now able to load multiple Locations at once, using `LocationService->loadLocationList()`. The biggest benefit of this feature is saving load time on complex landing pages when HTTP cache is cold or disabled, including when in development mode.
 
 ### BC breaks and important behavior changes
 
diff --git a/docs/release_notes/ez_platform_v2.5.md b/docs/release_notes/ez_platform_v2.5.md
index 0f427fea50..315e705119 100644
--- a/docs/release_notes/ez_platform_v2.5.md
+++ b/docs/release_notes/ez_platform_v2.5.md
@@ -235,8 +235,7 @@ even if they would not have access to the trashed content.
 
 ### Docker environment
 
-BCMath PHP extension has been added to the Docker environments
-in order to enable the Allure reporting tool.
+BCMath PHP extension has been added to the Docker environments to enable the Allure reporting tool.
 
 ### Deprecated features
 
diff --git a/docs/search/search_engines/elastic_search/configure_elastic_search.md b/docs/search/search_engines/elastic_search/configure_elastic_search.md
index 2553deffe5..cb594c7079 100644
--- a/docs/search/search_engines/elastic_search/configure_elastic_search.md
+++ b/docs/search/search_engines/elastic_search/configure_elastic_search.md
@@ -6,7 +6,7 @@ description: Configure Elasticsearch to use it with Ibexa DXP.
 
 ## Configure connections
 
-To configure Elasticsearch, first, you need to configure the connections. 
+To configure Elasticsearch, first, you need to configure the connections.
 
 There are two possibilities of connection:
 
diff --git a/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md b/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md
index db0eb5afe6..01edb6985c 100644
--- a/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md
+++ b/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md
@@ -173,7 +173,7 @@ To add a template like this to your site, create a `main_layout.html.twig` file
 </html>
 ```
 
-Note that in the highlighted lines (12 and 89) the template takes advantage of [Symfony Webpack Encore]([[= symfony_doc =]]/frontend.html#webpack-encore).
+In the highlighted lines (12 and 89) the template takes advantage of [Symfony Webpack Encore]([[= symfony_doc =]]/frontend.html#webpack-encore).
 This tutorial leads you through configuring Webpack, but first you need assets.
 
 ### Adding assets
@@ -213,7 +213,7 @@ Encore
     ]);
 ```
 
-Note that `.addStyleEntry('tutorial', [])` and `.addEntry('tutorial-js', [])` refer respectively to
+`.addStyleEntry('tutorial', [])` and `.addEntry('tutorial-js', [])` refer respectively to
 `{{  encore_entry_link_tags('tutorial') }}` and `{{ encore_entry_script_tags('tutorial-js') }}` from `main_layout.html.twig`.
 This configuration creates a bundle consisting of files to be added to a template.
 
diff --git a/docs/tutorials/beginner_tutorial/7_embed_content.md b/docs/tutorials/beginner_tutorial/7_embed_content.md
index a3c3edfab1..04b1184692 100644
--- a/docs/tutorials/beginner_tutorial/7_embed_content.md
+++ b/docs/tutorials/beginner_tutorial/7_embed_content.md
@@ -32,11 +32,11 @@ Then add all Fields with the following information: 
 Confirm the creation of the content type by selecting **Create**.
 
 Create a *Landmarks* Folder and add some Landmarks to it.
-Note that you need pictures (for the Photo Field) to represent them.
+You need pictures (for the Photo Field) to represent them.
 
 ## Add Landmarks to Ride content type definition
 
-Now edit the Ride content type in order to add a Multiple Content Relation between the two content types.
+Now edit the Ride content type to add a Multiple Content Relation between the two content types.
 Create a new **Content relations (multiple)** Field called "Landmarks" with identifier `landmarks` and allow content type "Landmark" to be added to it:
 
 ![Adding Landmarks to the Ride content type](bike_ride_adding_landmarks_to_the_ride_content_type.png "Adding a relation between the Ride and the Landmark using Content Relations (multiple)")
diff --git a/docs/tutorials/generic_field_type/4_introduce_a_template.md b/docs/tutorials/generic_field_type/4_introduce_a_template.md
index a8164fc77e..d149fe7b06 100644
--- a/docs/tutorials/generic_field_type/4_introduce_a_template.md
+++ b/docs/tutorials/generic_field_type/4_introduce_a_template.md
@@ -6,12 +6,12 @@ description: Learn how to add a template for rendering the custom Field on the s
 
 ## Point 2D template
 
-In order to display data from the field type, you need to create and register a template for it.
+To display data from the field type, you need to create and register a template for it.
 Each field type template receives a set of variables that can be used to achieve the desired goal.
 In this case the most important variable is the `field`, an instance of `Ibexa\Contracts\Core\Repository\Values\Content\Field`.
 In addition to its own metadata (`id`, `fieldDefIdentifier`, etc.), it exposes the Field Value through the `value` property.
 
-Remember that field type templates can be overridden in order to tweak what is displayed and how.
+Remember that field type templates can be overridden to tweak what is displayed and how.
 For more information, see the documentation about [field type templates](form_and_template.md#content-view-templates).
 
 First, create a `point2d_field.html.twig` template in the `templates` directory.
diff --git a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
index ee8bfe3b73..0f73ab798a 100644
--- a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
+++ b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
@@ -679,7 +679,7 @@ You can find it in https://github.com/ezsystems/ezplatform-ee-installer/blob/2.3
 
 !!! caution "Form (ezform) field type"
 
-    After the update, in order to create forms, you have to add a new content type (for example, named "Form") that contains `Form` field (this content type can contain other fields
+    After the update, to create forms, you have to add a new content type (for example, named "Form") that contains `Form` field (this content type can contain other fields
     as well). After that you can use forms inside landing pages via Embed block.
 
 ### C. Update to v2.4
@@ -832,7 +832,7 @@ CREATE INDEX ezpage_pages_content_id_version_no ON ezpage_pages(content_id, vers
 
 ##### Powered-By header
 
-In order to promote use of eZ Platform, `ezsystems/ez-support-tools` v1.0.10, as of eZ Platform v2.5.16, sets the Powered-By header.
+To promote use of eZ Platform, `ezsystems/ez-support-tools` v1.0.10, as of eZ Platform v2.5.16, sets the Powered-By header.
 It's enabled by default and generates a header like `Powered-By: eZ Platform Enterprise v2`.
 
 To omit the version number, use the following configuration:
diff --git a/docs/update_and_migration/from_2.5/adapt_code_to_v3.md b/docs/update_and_migration/from_2.5/adapt_code_to_v3.md
index c41b2a5b6f..09ef65e4b6 100644
--- a/docs/update_and_migration/from_2.5/adapt_code_to_v3.md
+++ b/docs/update_and_migration/from_2.5/adapt_code_to_v3.md
@@ -29,21 +29,21 @@ This folder also contains `config/packages/ezplatform.yaml`, which contains all
 #### PHP code and bundle organization
 
 Since Symfony 4 `src/` code is no longer organized in bundles, `AppBundle` has been removed from the default eZ Platform install.
-In order to adapt, you'll need to move all your PHP code, such as controllers or event listeners, to the `src` folder and use the `App` namespace for your custom code instead.
+To adapt, you'll need to move all your PHP code, such as controllers or event listeners, to the `src` folder and use the `App` namespace for your custom code instead.
 
 !!! tip "How to make AppBundle continue to work, for now"
 
     Refactoring bundles for `src/` folder can involve extensive changes, if you want to make your `src/AppBundle` continue to work, follow [an Autoloading src/AppBundle guide on Symfony Casts](https://symfonycasts.com/screencast/symfony4-upgrade/flex-composer.json#autoloading-src-amp-src-appbundle).
-    
+
     You can also follow [Using a "path" Repository guide](https://symfonycasts.com/screencast/symfony-bundle/extracting-bundle#using-a-path-repository), to create a [composer path repository](https://getcomposer.org/doc/05-repositories.md#path).
     If you have several bundles you can move them into a `packages/` directory and load them all with:
-    
+
     ```
     "repositories": [
         { "type": "path", "url": "packages/*" },
     ],
     ```
-    
+
     Once you're ready to refactor the code to `App` namespace, follow [Bye Bye AppBundle](https://symfonycasts.com/screencast/symfony4-upgrade/bye-appbundle) article.
 
 #### View templates
diff --git a/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md b/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md
index 02a6e296df..eb3aaa9d96 100644
--- a/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md
+++ b/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md
@@ -6,7 +6,7 @@ description: Update procedure to v4.4 for people who use deprecated Commerce pac
 
 This update procedure applies if you have a v4.3 installation, you use Commerce packages and would like to continue to use them.
 
-Note that all commerce packages as of v4.4 are deprecated and will be removed in v5.
+All commerce packages as of v4.4 are deprecated and will be removed in v5.
 Until that time, they will be maintained by Ibexa with fixes, including security fixes, but they won't be further developed.
 Old packages are replaced by [the all-new Ibexa Commerce packages](ibexa_dxp_v4.4.md#all-new-ibexa-commerce-packages).
 
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
index 10c0cb932e..ff57a316bf 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
@@ -283,7 +283,7 @@ The script also has an `--image-content-types` option which you should use if yo
 
 `php bin/console ezxmltext:convert-to-richtext --image-content-types=image,custom_image -v`
 
-The script needs to know these identifiers in order to convert `<ezembed>` tags correctly. Failing to do so prevents the editor from showing image thumbnails of embedded image objects. You may find the image content types in your installation by looking for these settings in `content.ini(.append.php)`:
+The script needs to know these identifiers to convert `<ezembed>` tags correctly. Failing to do so prevents the editor from showing image thumbnails of embedded image objects. You may find the image content types in your installation by looking for these settings in `content.ini(.append.php)`:
 
 ```
 [RelationGroupSettings]
@@ -358,7 +358,7 @@ The first log message is a notice about the `ez-temporary=1` attribute which the
 The second log message is an error, but the cause described may be confusing. During the conversion, the `<table>` element is converted to an `<informaltable>` tag, which is problematic.
 The exact problem in this case is the value of the second align attribute: `<td align="middle"....>`. An align attribute may only have the following values: `left`, `right`, `center`, `justify`.
 
-In order to fix the problem, open the .xml file in a text editor and correct the errors:
+To fix the problem, open the .xml file in a text editor and correct the errors:
 
 ```xml
 <?xml version="1.0" encoding="utf-8"?>
@@ -388,7 +388,7 @@ Now, you may test if the modified `ezxmltext` may be converted using the `--dry-
 
 `php -d memory_limit=1536M bin/console ezxmltext:import-xml --dry-run  --export-dir=ezxmltext-export --content-object=56554 -v`
 
-If the tool reports no errors, then the `ezxmltext` is fixed. You may rerun the command without the `--dry-run` option in order to actually update the database with the correct XmlText.
+If the tool reports no errors, then the `ezxmltext` is fixed. You may rerun the command without the `--dry-run` option to actually update the database with the correct XmlText.
 
 Once you have fixed all the dump files in `ezxmltext-export/`, you may skip the `--content-object` option and the script imports all the dump files located in the `export-dir`:
 
@@ -438,7 +438,7 @@ eZ Platform now supports custom tags, including inline custom tags, and limited
 After migrating to RichText, you need to adapt your custom tag config for eZ Platform and rewrite the custom tags in Twig.
 See [Custom tag documentation](https://doc.ibexa.co/en/2.5/guide/extending/extending_online_editor/#custom-tags) for more info.
 
-If you configured custom attributes in legacy in OE using [ezoe_attributes.ini](https://github.com/ezsystems/ezpublish-legacy/blob/master/extension/ezoe/settings/ezoe_attributes.ini#L33-L48), note that not all types are supported.
+If you configured custom attributes in legacy in OE using [ezoe_attributes.ini](https://github.com/ezsystems/ezpublish-legacy/blob/master/extension/ezoe/settings/ezoe_attributes.ini#L33-L48), not all types are supported.
 
 Below is a table of the tags that are currently supported, and their corresponding names in eZ Platform.
 
diff --git a/docs/users/customer_groups.md b/docs/users/customer_groups.md
index c5ece13415..105e0f65f1 100644
--- a/docs/users/customer_groups.md
+++ b/docs/users/customer_groups.md
@@ -11,13 +11,13 @@ For example, you can offer a 10% discount for all products in the catalog to use
 
 !!! tip
 
-    Note that customer groups aren't the same as [user groups](user_registration.md#user-groups).
+    Customer groups aren't the same as [user groups](user_registration.md#user-groups).
     User groups concern all users in the system and can be used, for example, to handle permissions.
     Customer groups refer specifically to the commerce functionalities and enable handling prices.
 
 ## Enabling customer groups
 
 To enable using customer groups, you need to modify the User content type's definition
-by adding a [Customer Group Field](customergroupfield.md).
+by adding a [customer group field](customergroupfield.md).
 
 With this field you can add a user to any of the predefined customer groups.

From fa50644a349b5aad99fc43db2e4d3e4eca7c0d73 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Mon, 14 Oct 2024 15:07:16 +0200
Subject: [PATCH 12/77] Fixes

---
 .../admin_panel/segments_admin_panel.md       | 10 +--
 .../rest_api/rest_api_usage/rest_requests.md  |  4 +-
 docs/commerce/checkout/checkout.md            |  8 +-
 docs/commerce/checkout/checkout_api.md        | 12 +--
 docs/commerce/checkout/configure_checkout.md  | 13 ++-
 docs/commerce/checkout/customize_checkout.md  | 47 +++++-----
 docs/commerce/commerce.md                     |  2 +-
 .../order_management/order_management.md      |  7 +-
 docs/commerce/payment/configure_payment.md    | 14 +--
 docs/commerce/payment/extend_payment.md       |  9 +-
 docs/commerce/payment/payment_api.md          | 14 +--
 docs/commerce/payment/payment_method_api.md   | 22 +++--
 .../payment/payment_method_filtering.md       |  4 +-
 docs/commerce/payment/payum_integration.md    |  2 +
 .../shipping_management/configure_shipment.md | 11 ++-
 .../shipping_management/extend_shipping.md    | 19 +++--
 .../shipping_management/shipment_api.md       | 11 ++-
 .../shipping_method_api.md                    |  4 +-
 .../storefront/configure_storefront.md        |  7 +-
 docs/commerce/storefront/extend_storefront.md | 10 +--
 docs/commerce/storefront/storefront.md        |  7 +-
 .../extend_transactional_emails.md            |  8 +-
 .../content_api/browsing_content.md           | 85 +++++++------------
 .../content_api/creating_content.md           | 10 +--
 .../content_api/managing_content.md           |  8 +-
 docs/content_management/content_management.md |  2 +-
 .../content_management_api/bookmark_api.md    |  6 +-
 .../object_state_api.md                       | 17 ++--
 .../content_management_api/section_api.md     |  9 +-
 .../content_management_guide.md               | 16 ++--
 docs/content_management/content_relations.md  | 18 ++--
 .../create_custom_field_type_comparison.md    |  8 +-
 .../create_custom_generic_field_type.md       |  2 +-
 .../customize_field_type_metadata.md          | 16 ++--
 .../field_type_reference/addressfield.md      |  6 +-
 .../field_type_reference/binaryfilefield.md   |  4 +-
 .../field_type_reference/contentqueryfield.md |  2 +-
 .../field_type_reference/countryfield.md      |  8 +-
 .../customergroupfield.md                     |  2 +-
 .../field_type_reference/dateandtimefield.md  |  8 +-
 .../field_type_reference/datefield.md         |  8 +-
 .../field_type_reference.md                   |  7 +-
 .../field_type_reference/imagefield.md        | 30 +++----
 .../field_type_reference/isbnfield.md         |  2 +-
 .../field_type_reference/maplocationfield.md  |  2 +-
 .../field_type_reference/matrixfield.md       | 26 +++---
 .../field_type_reference/relationfield.md     |  2 +-
 .../field_type_reference/relationlistfield.md |  6 +-
 .../field_type_reference/selectionfield.md    |  4 +-
 .../field_type_reference/sesexternaldata.md   |  2 +-
 .../field_type_reference/sesprofiledata.md    |  2 +-
 .../field_type_reference/sesselection.md      |  2 +-
 .../specificationstype.md                     |  2 +-
 .../taxonomyentryassignmentfield.md           | 10 +--
 .../taxonomyentryfield.md                     |  4 +-
 .../field_type_reference/timefield.md         |  4 +-
 .../field_types/field_type_search.md          | 22 ++---
 .../field_types/field_type_storage.md         | 28 +++---
 .../field_types/field_type_validation.md      |  2 +-
 .../field_types/field_types.md                |  6 +-
 .../field_types/form_and_template.md          | 18 ++--
 .../field_types/type_and_value.md             |  2 +-
 .../forms/create_form_attribute.md            |  6 +-
 docs/content_management/forms/form_api.md     |  2 +-
 .../forms/form_builder_guide.md               |  2 +-
 .../images/add_image_asset_from_dam.md        |  2 +-
 .../images/configure_image_editor.md          |  2 +-
 .../pages/page_builder_guide.md               | 12 +--
 .../rich_text/extend_online_editor.md         |  2 +-
 .../rich_text/online_editor_guide.md          | 14 +--
 .../url_management/url_api.md                 |  4 +-
 docs/permissions/limitation_reference.md      |  8 +-
 docs/permissions/policies.md                  | 18 ++--
 .../authorterm_aggregation.md                 |  2 +-
 .../checkboxterm_aggregation.md               |  2 +-
 .../countryterm_aggregation.md                |  2 +-
 .../daterange_aggregation.md                  |  2 +-
 .../datetimerange_aggregation.md              |  2 +-
 .../floatrange_aggregation.md                 |  2 +-
 .../floatstats_aggregation.md                 |  2 +-
 .../integerrange_aggregation.md               |  2 +-
 .../integerstats_aggregation.md               |  2 +-
 .../keywordterm_aggregation.md                |  2 +-
 .../selectionterm_aggregation.md              |  2 +-
 .../timerange_aggregation.md                  |  2 +-
 .../criteria_reference/field_criterion.md     |  6 +-
 .../criteria_reference/fulltext_criterion.md  |  2 +-
 .../criteria_reference/image_criterion.md     |  2 +-
 .../imagedimensions_criterion.md              |  2 +-
 .../imagefilesize_criterion.md                |  2 +-
 .../imageheight_criterion.md                  |  2 +-
 .../imagemimetype_criterion.md                |  2 +-
 .../imageorientation_criterion.md             |  2 +-
 .../imagewidth_criterion.md                   |  2 +-
 .../isfieldempty_criterion.md                 |  4 +-
 .../maplocationdistance_criterion.md          |  6 +-
 .../search_criteria_reference.md              | 10 +--
 .../create_custom_aggregation.md              |  4 +-
 docs/search/search_api.md                     |  8 +-
 .../search_criteria_and_sort_clauses.md       |  2 +-
 docs/search/search_engines/search_engines.md  |  2 +-
 .../solr_search_engine/configure_solr.md      |  2 +-
 .../field_sort_clause.md                      |  8 +-
 .../maplocationdistance_sort_clause.md        |  6 +-
 .../sort_clause_reference.md                  |  4 +-
 .../2_create_the_content_model.md             |  4 +-
 .../5_display_a_list_of_content_items.md      |  2 +-
 .../beginner_tutorial/7_embed_content.md      |  6 +-
 .../1_implement_the_point2d_value_class.md    |  4 +-
 .../2_define_point2d_field_type.md            |  2 +-
 .../3_create_form_for_point2d.md              |  8 +-
 .../4_introduce_a_template.md                 |  4 +-
 .../generic_field_type/5_add_a_field.md       |  6 +-
 .../generic_field_type/7_add_a_validation.md  |  2 +-
 .../generic_field_type/8_data_migration.md    |  2 +-
 .../1_get_a_starter_website.md                |  4 +-
 .../2_prepare_the_landing_page.md             |  2 +-
 .../5_create_newsletter_form.md               |  2 +-
 docs/users/customer_groups.md                 |  2 +-
 docs/users/invitations.md                     | 18 ++--
 docs/users/login_methods.md                   | 32 +++----
 docs/users/oauth_client.md                    | 32 +++----
 docs/users/oauth_server.md                    |  2 +-
 docs/users/passwords.md                       | 14 ++-
 docs/users/segment_api.md                     | 37 ++++----
 125 files changed, 486 insertions(+), 536 deletions(-)

diff --git a/docs/administration/admin_panel/segments_admin_panel.md b/docs/administration/admin_panel/segments_admin_panel.md
index a0f7db0b3f..0abc63e172 100644
--- a/docs/administration/admin_panel/segments_admin_panel.md
+++ b/docs/administration/admin_panel/segments_admin_panel.md
@@ -1,19 +1,19 @@
 ---
-description: You can use Segments to display specific content to specific users.
+description: You can use segments to display specific content to specific users.
 edition: experience
 ---
 
 # Segments
 
-You can use Segments to display specific content to specific [ussers](users.md).
+You can use segments to display specific content to specific [ussers](users.md).
 they're used out of the box in the Targeting and Dynamic targeting blocks in the page.
 
-Segments are collected in Segment Groups:
+Segments are collected in segment groups:
 
 ![Segment Groups](admin_panel_segment_groups.png)
 
-Each Segment Group can contain Segments that you can target content for.
+Each segment group can contain segments that you can target content for.
 
 ![Segment](admin_panel_segment.png)
 
-You can assign users to Segments [through the API](segment_api.md#assigning-users).
\ No newline at end of file
+You can assign users to segments [through the API](segment_api.md#assigning-users).
\ No newline at end of file
diff --git a/docs/api/rest_api/rest_api_usage/rest_requests.md b/docs/api/rest_api/rest_api_usage/rest_requests.md
index cf59e50988..975668d4c2 100644
--- a/docs/api/rest_api/rest_api_usage/rest_requests.md
+++ b/docs/api/rest_api/rest_api_usage/rest_requests.md
@@ -114,7 +114,7 @@ On top of methods, HTTP request headers allow you to personalize the request's b
 On every resource, you can use the `Accept` header to indicate which format you want to communicate in, JSON or XML.
 This header is also used to specify the response type you want the server to send when multiple types are available.
 
-- `Accept: application/vnd.ibexa.api.Content+xml` to get `Content` (full data, Fields included) as **[XML](https://www.w3.org/XML/)**
+- `Accept: application/vnd.ibexa.api.Content+xml` to get `Content` (full data, fields included) as **[XML](https://www.w3.org/XML/)**
 - `Accept: application/vnd.ibexa.api.ContentInfo+json` to get `ContentInfo` (metadata only) as **[JSON](https://www.json.org/)**
 
 Media types are also used with the [`Content-Type` header](rest_responses.md#content-type-header) to characterize a [request body](#request-body) or a [response body](rest_responses.md#response-body).
@@ -151,7 +151,7 @@ In the [REST API reference](../rest_api_reference/rest_api_reference.html), requ
 
 One example is the [creation of an authentication session](rest_api_authentication.md#establishing-session).
 
-When creating a content item, a special payload is needed if the content type has some [Image](imagefield.md) or [BinaryFile](binaryfilefield.md) Fields as files need to be attached. See the example of a [script uploading images](#creating-content-with-binary-attachments) below.
+When creating a content item, a special payload is needed if the content type has some [Image](imagefield.md) or [BinaryFile](binaryfilefield.md) fields as files need to be attached. See the example of a [script uploading images](#creating-content-with-binary-attachments) below.
 
 When searching for content items (or Locations), the query grammar is also particular. See the [Search section](#search-views) below.
 
diff --git a/docs/commerce/checkout/checkout.md b/docs/commerce/checkout/checkout.md
index 9b51c09105..802925107a 100644
--- a/docs/commerce/checkout/checkout.md
+++ b/docs/commerce/checkout/checkout.md
@@ -6,21 +6,21 @@ edition: commerce
 # Checkout
 
 Checkout is a crucial component of the Commerce offering delivered as part of [[= product_name_com =]].
-In a course of a multi-step process, it collects necessary transaction data, such as billing and shipping addresses, and payment and shipping information.
+In a course of a multi-step process, it collects necessary transaction data, such as billing and shipping addresses, payment and shipping information.
 
 From the front-end perspective, it's a reusable component that provides access to the workflow and allows buyers to place an order for cart items.
 
 ![Address selection stage](checkout.png "Checkout stages")
 
-Depending on the model of shopping process that you need to use, the checkout process can range between a straightforward and extremely complicated one. 
+Depending on the model of shopping process that you need to use, the checkout process can range between a straightforward and extremely complicated one.
 To allow for this variation, the component is highly configurable and extensible:
 
-- Like the editorial workflow, it relies on [Symfony Workflow]([[= symfony_doc =]]/components/workflow.html) 
+- Like the editorial workflow, it relies on [Symfony Workflow]([[= symfony_doc =]]/components/workflow.html)
 - It exposes [PHP API](checkout_api.md) that allows for workflow manipulation
 - It exposes Twig functions used for checkout rendering
 
 In a default implementation, users go through a series of steps.
-They first select a billing and shipping address, then select shipping and payment methods, later they review summary and confirm their choices, to finally receive a simulated order confirmation.
+They first select a billing and shipping address, then select shipping and payment methods, later they review summary, and confirm their choices, to finally receive a simulated order confirmation.
 
 Until the checkout process is complete, at any point of the process, users can go back to the cart and modify cart information, for example, cart item quantities.
 They can also navigate back and forth between checkout steps, with an exception of the "Checkout complete" step, which always ends the process.
diff --git a/docs/commerce/checkout/checkout_api.md b/docs/commerce/checkout/checkout_api.md
index 3393fd2c82..2a66e649f2 100644
--- a/docs/commerce/checkout/checkout_api.md
+++ b/docs/commerce/checkout/checkout_api.md
@@ -7,15 +7,15 @@ edition: commerce
 
 To get checkouts and manage them, use the `Ibexa\Contracts\Checkout\CheckoutServiceInterface` interface.
 
-With `CheckoutServiceInterface`, you manipulate checkouts that are stored in sessions. 
-Checkouts are containers for the `Ibexa\Contracts\Cart\Value\CartInterface` object and all the data provided at each step of the [configurable checkout process](configure_checkout.md). 
+With `CheckoutServiceInterface`, you manipulate checkouts that are stored in sessions.
+Checkouts are containers for the `Ibexa\Contracts\Cart\Value\CartInterface` object and all the data provided at each step of the [configurable checkout process](configure_checkout.md).
 
-The checkout process relies on Symfony Workflow, and you can customize each of its steps. 
+The checkout process relies on Symfony Workflow, and you can customize each of its steps.
 Each checkout step has its own controller that allows adding forms and external API calls that process data and pass them to `CheckoutService`. 
-Completing a step results in submitting a form and updating the current checkout object. 
+Completing a step results in submitting a form and updating the current checkout object.
 At this point Symfony Workflow advances, the next controller takes over, and the whole process continues.
 
-From the developer's perspective, checkouts are referenced with an UUID identifier. 
+From the developer's perspective, checkouts are referenced with an UUID identifier.
 
 ## Get single checkout by identifier
 
@@ -27,7 +27,7 @@ To access a single checkout, use the `CheckoutServiceInterface::getCheckout` met
 
 ## Get single checkout for specific cart
 
-To fetch checkout for a cart that already exists, use the `CheckoutServiceInterface::getCheckoutForCart` method. 
+To fetch checkout for a cart that already exists, use the `CheckoutServiceInterface::getCheckoutForCart` method.
 You can use it when you want to initiate the checkout process right after products are successfully added to a cart.
 
 ``` php
diff --git a/docs/commerce/checkout/configure_checkout.md b/docs/commerce/checkout/configure_checkout.md
index fb60c3c309..4079c6da97 100644
--- a/docs/commerce/checkout/configure_checkout.md
+++ b/docs/commerce/checkout/configure_checkout.md
@@ -7,27 +7,26 @@ edition: commerce
 
 When you work with your Commerce implementation, you can review and modify the checkout configuration.
 
-!!! note "Permissions" 
+!!! note "Permissions"
 
     When you modify the workflow configuration, make sure you properly set user [permissions](permission_use_cases.md#commerce) to the checkout component.
 
 ## Configure checkout workflow
 
 Checkout workflow relies on [Symfony Workflow]([[= symfony_doc =]]/components/workflow.html).
-Each transition represents a separate checkout step. 
+Each transition represents a separate checkout step.
 
 By default, the checkout process is configured to render each step based on a separate set of libraries and templates.
 Each checkout step is handled by a controller that you configure in workflow metadata.
 
-Custom workflow implementations are defined under the `framework.workflows` key, 
-and they must support the `Ibexa\Contracts\Checkout\Value\CheckoutInterface`. 
+Custom workflow implementations are defined under the `framework.workflows` key, and they must support the `Ibexa\Contracts\Checkout\Value\CheckoutInterface`.
 The default fallback workflow is `ibexa_checkout`, which is prepended at bundle level.
 The `checkout.workflow` parameter is repository-aware.
 
-To customize your configuration, place it in a YAML file, under the `framework.workflows.<your_workflow_name>` key, and reference it with `ibexa.repositories.<your_repository>.checkout.workflow: your_workflow_name`. 
+To customize your configuration, place it in a YAML file, under the `framework.workflows.<your_workflow_name>` key, and reference it with `ibexa.repositories.<your_repository>.checkout.workflow: your_workflow_name`.
 The system can then identify which of your configured workflows handles the checkout process.
 
-!!! note 
+!!! note
 
     When you modify or create a controller, to ensure that no user data is lost, extend the `Ibexa\Bundle\Checkout\Controller\AbstractStep` controller and call the `advance()` method.
 
@@ -53,7 +52,7 @@ For more information, see [Work with shipping methods]([[= user_doc =]]/commerce
 
 In your implementation, you may need to create custom format configurations for the shipping or billing address fields, for example, to use different address formats based on the buyer's geographical location.
 
-Field formats for the billing and shipping addresses comply with the [FieldType Address](addressfield.md#formats) specification and can be controlled with the `billing_address_format` and `shipping_address_format` flags, respectively.
+Field formats for the billing and shipping addresses comply with the [FieldType Address](addressfield.md#formats) specification and can be controlled with the `billing_address_format` and `shipping_address_format` flags.
 They fall back to `billing` and `shipping` predefined formats by default:
 
 - `billing` is part of the `ibexa/corporate-accounts` repository
diff --git a/docs/commerce/checkout/customize_checkout.md b/docs/commerce/checkout/customize_checkout.md
index bab5967f5d..6ca8db41fc 100644
--- a/docs/commerce/checkout/customize_checkout.md
+++ b/docs/commerce/checkout/customize_checkout.md
@@ -16,19 +16,19 @@ It collects data that is necessary to create an order, including:
 
 It could also collect any other information that you find necessary.
 
-Depending on your needs, the checkout process can be either complicated or simple. 
+Depending on your needs, the checkout process can be either complex or straightforward.
 For example, if the website is selling airline tickets, you may need several [additional steps](#add-checkout-step) with passengers defining their special needs.
 On the other side of the spectrum would be a store that sells books with personal pickup, where [one page checkout](#create-a-one-page-checkout) would be enough.
 
-There are several factors that make checkout particularly flexible and customizable:
+Several factors can make checkout particularly flexible and customizable:
 
 - it's based on Symfony workflow
 - it exposes a variety of APIs
 - it exposes Twig functions that help you render the steps
 
-The most important contract exposed by the package is the `CheckoutServiceInterface` interface. 
-It exposes a number of methods that you can call, for example, to load checkouts based on checkout identifier or for a specific cart. 
-Other methods help you create, update, or delete checkouts. 
+The most important contract exposed by the package is the `CheckoutServiceInterface` interface.
+It exposes a number of methods that you can call, for example, to load checkouts based on checkout identifier or for a specific cart.
+Other methods help you create, update, or delete checkouts.
 
 For more information, see [Checkout API](checkout_api.md).
 
@@ -39,11 +39,10 @@ For example, if you were creating a project for selling theater tickets, you cou
 
 ### Define workflow
 
-You can create workflow definitions under the `framework.workflows` [configuration key](configuration.md#configuration-files). 
-Each workflow definition consists of a series of steps and a series of transitions between the steps. 
+You can create workflow definitions under the `framework.workflows` [configuration key](configuration.md#configuration-files).
+Each workflow definition consists of a series of steps and a series of transitions between the steps.
 
-To create a new workflow, for example, `seat_selection_checkout`, use the default workflow that comes with the storefront module as a basis,
-and add a `seat_selected` step.
+To create a new workflow, for example, `seat_selection_checkout`, use the default workflow that comes with the storefront module as a basis, and add a `seat_selected` step.
 
 ``` yaml hl_lines="3 15"
 [[= include_file('code_samples/front/shop/checkout/config/packages/checkout.yaml', 17, 19) =]] [[= include_file('code_samples/front/shop/checkout/config/packages/checkout.yaml', 38, 54) =]]
@@ -63,7 +62,7 @@ In this case, you want users to select seats in the audience.
 
 In the `src/Controller/Checkout/Step` folder, create a file that resembles the following example.
 
-The controller contains a Symfony form that collects user selections. 
+The controller contains a Symfony form that collects user selections.
 It can reuse fields and functions that come from the checkout component, for example, after you check whether the form is valid, use the `AbstractStepController::advance` method to go to the next step of the process.
 
 ``` php hl_lines="23 24"
@@ -97,7 +96,7 @@ In `assets/styles/checkout.css`, add styles required to properly display your te
 
     Remember to [add the new asset file to your Webpack configuration](assets.md#configure-assets).
 
-### Select supported workflow 
+### Select supported workflow
 
 Next, you must inform the application that the configured workflow is used in your repository.
 
@@ -106,7 +105,7 @@ You do it in repository configuration, under the `ibexa.repositories.<repository
 ``` yaml
 ibexa:
     repositories:
-        default: 
+        default:
             checkout:
                 workflow: seat_selection_checkout
 ```
@@ -124,7 +123,7 @@ You should be able to see a different checkout applied after you have added prod
 By default, [[= product_name =]] comes with a multi-step checkout process, which you can scale down by hiding steps.
 To do it, modify workflow under the `framework.workflows` [configuration key](configuration.md#configuration-files).
 
-This example shows how to hide a 'Billing & shipping address' step. 
+This example shows how to hide a 'Billing & shipping address' step.
 It can be used for logged-in users with billing data stored in their accounts.
 
 ```yaml hl_lines="14"
@@ -167,8 +166,7 @@ In the `src/Controller/Checkout` folder, create a file that resembles the follow
 [[= include_file('code_samples/front/shop/checkout/src/Controller/Checkout/OnePageCheckout.php') =]]
 ```
 
-The controller can reuse fields and functions that come from the checkout component, for example, 
-after you check whether the form is valid, use the `AbstractStepController::advance` method to go to the next step of the process.
+The controller can reuse fields and functions that come from the checkout component, for example, after you check whether the form is valid, use the `AbstractStepController::advance` method to go to the next step of the process.
 
 #### Create a form
 
@@ -193,10 +191,9 @@ In `assets/styles/checkout.css`, add styles required to properly display your te
 
     Remember to [add the new asset file to your Webpack configuration](assets.md#configure-assets).
 
-### Select supported workflow 
+### Select supported workflow
 
-Then you have to map the single-step workflow to the repository, 
-by replacing the default `ibexa_checkout` reference with one of `one_page_checkout`:
+Then you have to map the single-step workflow to the repository, by replacing the default `ibexa_checkout` reference with one of `one_page_checkout`:
 
 ``` yaml
 [[= include_file('code_samples/front/shop/checkout/config/packages/checkout.yaml', 0, 5) =]]
@@ -212,7 +209,7 @@ You should be able to see a one page checkout applied after you add products to
 ## Create custom strategy
 
 Create a PHP definition of the new strategy that allows for workflow manipulation.
-In this example, custom checkout workflow applies when specific currency code ('EUR') is used in the cart. 
+In this example, custom checkout workflow applies when specific currency code ('EUR') is used in the cart.
 
 ``` php
 [[= include_file('code_samples/workflow/strategy/NewWorkflow.php', 0, 25) =]]
@@ -220,7 +217,7 @@ In this example, custom checkout workflow applies when specific currency code ('
 
 ### Add conditional step
 
-Defining strategy allows to add conditional step for workflow if needed. 
+Defining strategy allows to add conditional step for workflow if needed.
 If you add conditional step, the checkout process uses provided workflow and goes to defined step if the condition described in the strategy is met.
 By default conditional step is set as null.
 
@@ -238,7 +235,7 @@ Now, register the strategy as a service:
 [[= include_file('code_samples/workflow/services/workflow.yaml', 0, 5) =]]
 ```
 
-### Override default workflow 
+### Override default workflow
 
 Next, you must inform the application that the configured workflow is used in your repository.
 
@@ -251,7 +248,7 @@ You do it in repository configuration, under the `ibexa.repositories.<repository
 ``` yaml
 ibexa:
     repositories:
-        <repository_name>: 
+        <repository_name>:
             checkout:
                 workflow: new_workflow
 ```
@@ -268,12 +265,12 @@ When you have multiple checkout workflows, you can specify which one to use by p
 
 ```
 
-With this setup, you can specify which workflow to use by clicking the button or link that starts the checkout. 
+With this setup, you can specify which workflow to use by clicking the button or link that starts the checkout.
 The argument passed determines which workflow is used, providing flexibility in workflow selection.
 
-## Define custom Address field type formats 
+## Define custom Address field type formats
 
-To create custom Address field type formats to be used in checkout, make the following changes in the project configuration files. 
+To create custom Address field type formats to be used in checkout, make the following changes in the project configuration files.
 
 First, define custom format configuration keys for `billing_address_format` and `shipping_address_format`:
 
diff --git a/docs/commerce/commerce.md b/docs/commerce/commerce.md
index abd000ed13..1a15fc642a 100644
--- a/docs/commerce/commerce.md
+++ b/docs/commerce/commerce.md
@@ -6,7 +6,7 @@ page_type: landing_page
 
 # Commerce
 
-The commerce component of [[= product_name =]] covers various areas of managing an e-commerce presence: from configuring payment and shipping methods, through processing a transaction (listing available products, adding products to a cart, processing checkout and sending confirmation), all the way to order management.
+The commerce component of [[= product_name =]] covers various areas of managing an e-commerce presence: from configuring payment and shipping methods, through processing a transaction (listing available products, adding products to a cart, processing checkout, and sending confirmation), all the way to order management.
 
 [[= cards([
 "commerce/cart/cart",
diff --git a/docs/commerce/order_management/order_management.md b/docs/commerce/order_management/order_management.md
index b49dc30fbd..b43dc13654 100644
--- a/docs/commerce/order_management/order_management.md
+++ b/docs/commerce/order_management/order_management.md
@@ -5,7 +5,7 @@ edition: commerce
 
 # Order management
 
-The order management component enables users to search for orders and filter search results. 
+The order management component enables users to search for orders and filter search results.
 Depending on their role, users can also track the status of their orders, review order details, and cancel orders.
 
 From the development perspective, the component enables customization of the order management workflow and integration with external systems to exchange order information.
@@ -15,7 +15,6 @@ The component exposes the following:
 - [PHP API](order_management_api.md) that allows for managing orders
 - [REST API](../../api/rest_api/rest_api_reference/rest_api_reference.html#orders) that helps get order information over HTTP
 
-### Order management service 
+### Order management service
 
-The Order Management package provides the `Ibexa\Contracts\OrderManagement\OrderServiceInterface` service, 
-which is the entrypoint for calling the [backend API](order_management_api.md).
+The Order Management package provides the `Ibexa\Contracts\OrderManagement\OrderServiceInterface` service, which is the entrypoint for calling the [backend API](order_management_api.md).
diff --git a/docs/commerce/payment/configure_payment.md b/docs/commerce/payment/configure_payment.md
index df0b3b6f61..8cdca2e74f 100644
--- a/docs/commerce/payment/configure_payment.md
+++ b/docs/commerce/payment/configure_payment.md
@@ -7,14 +7,14 @@ edition: commerce
 
 When you work with your Commerce implementation, you can review and modify the payment configuration.
 
-!!! note "Permissions" 
+!!! note "Permissions"
 
     When you modify the workflow configuration, make sure you properly set user [permissions](permission_use_cases.md#commerce) for the Payment component.
 
 ## Configure payment workflow
 
 Payment workflow relies on a [Symfony Workflow]([[= symfony_doc =]]/components/workflow.html).
-Each transition represents a separate payment step. 
+Each transition represents a separate payment step.
 
 ### Default payment workflow configuration
 
@@ -25,16 +25,16 @@ You can replace the default workflow configuration with a custom one if needed.
 
 ### Custom payment workflows
 
-You define custom workflow implementations under the `framework.workflows` key. 
+You define custom workflow implementations under the `framework.workflows` key.
 They must support the `Ibexa\Contracts\Checkout\Value\CheckoutInterface`.
 
-If your installation supports multiple languages, for each place in the workflow, you can define a label that is pulled from an XLIFF file based on the translation domain setting. 
+If your installation supports multiple languages, for each place in the workflow, you can define a label that is pulled from an XLIFF file based on the translation domain setting.
 You can also define colors that are used for status labels.
 The `primary_color` key defines a color of the font used for the label, while the `secondary_color` key defines a color of its background.
 
-Additionally, you can decide whether users can manually transition between places. 
-You do this by setting a value for the `exposed` key. 
-If you set it to `true`, a button is displayed in the UI that triggers the transition. 
+Additionally, you can decide whether users can manually transition between places.
+You do this by setting a value for the `exposed` key.
+If you set it to `true`, a button is displayed in the UI that triggers the transition.
 Otherwise, the transition can only be triggered by means of the API.
 
 ``` yaml
diff --git a/docs/commerce/payment/extend_payment.md b/docs/commerce/payment/extend_payment.md
index d50210bb5d..7c5a69c3af 100644
--- a/docs/commerce/payment/extend_payment.md
+++ b/docs/commerce/payment/extend_payment.md
@@ -5,9 +5,10 @@ edition: commerce
 
 # Extend Payment
 
-There are different ways you can extend your Payment module implementation. 
-One of them is to create a custom payment method type. 
-The other is attaching custom data to a payment.
+You can extend your Payment module implementation:
+
+- by creating a custom payment method type
+- by attaching custom data to a payment
 
 You can also [customize the payment processing workflow](configure_payment.md#custom-payment-workflows).
 
@@ -66,7 +67,7 @@ Then, register `OptionsFormMapper` a service:
 
 ### Create options validator
 
-You might want to make sure that data provided by the user is validated. 
+You might want to make sure that data provided by the user is validated.
 To do that, create an options validator that checks user input against the constraints and dispatches an error when needed.
 
 ``` php
diff --git a/docs/commerce/payment/payment_api.md b/docs/commerce/payment/payment_api.md
index 0909cf85c1..4c5c90c414 100644
--- a/docs/commerce/payment/payment_api.md
+++ b/docs/commerce/payment/payment_api.md
@@ -7,10 +7,10 @@ edition: commerce
 
 To get payments and manage them, use the `Ibexa\Contracts\Payment\PaymentServiceInterface` interface.
 
-By default, UUID is used to generate payment identifiers. 
+By default, UUID is used to generate payment identifiers.
 You can change that by providing a custom payment identifier in `Ibexa\Contracts\Payment\Payment\PaymentCreateStruct` or `Ibexa\Contracts\Payment\Payment\PaymentUpdateStruct`.
 
-## Get single payment 
+## Get single payment
 
 ### Get single payment by ID
 
@@ -30,7 +30,7 @@ To access a single payment by using its string identifier, use the `PaymentServi
 
 ## Get multiple payments
 
-To fetch multiple payments, use the `PaymentServiceInterface::findPayments` method. 
+To fetch multiple payments, use the `PaymentServiceInterface::findPayments` method.
 It follows the same search query pattern as other APIs:
 
 ``` php
@@ -39,8 +39,7 @@ It follows the same search query pattern as other APIs:
 
 ## Create payment
 
-To create a payment, use the `PaymentServiceInterface::createPayment` method and provide it with 
-the `Ibexa\Contracts\Payment\Payment\PaymentCreateStruct` object that takes the following arguments: `method`, `order` and `amount`.
+To create a payment, use the `PaymentServiceInterface::createPayment` method and provide it with the `Ibexa\Contracts\Payment\Payment\PaymentCreateStruct` object that takes the following arguments: `method`, `order` and `amount`.
 
 ``` php
 [[= include_file('code_samples/api/commerce/src/Command/PaymentCommand.php', 94, 94) =]]
@@ -49,8 +48,8 @@ the `Ibexa\Contracts\Payment\Payment\PaymentCreateStruct` object that takes the
 
 ## Update payment
 
-You can update payment information after the payment is created. 
-You could do it to support a scenario when, for example, an online payment failed, has been processed by using other means, and its status has to be updated in the system. 
+You can update payment information after the payment is created.
+You could do it to support a scenario when, for example, an online payment failed, has been processed by using other means, and its status has to be updated in the system.
 The `Ibexa\Contracts\Payment\Payment\PaymentUpdateStruct` object takes the following arguments: `transition`, `identifier`, and `context`.
 To update payment information, use the `PaymentServiceInterface::updatePayment` method:
 
@@ -61,6 +60,7 @@ To update payment information, use the `PaymentServiceInterface::updatePayment`
 ## Delete payment
 
 To delete a payment from the system, use the `PaymentServiceInterface::deletePayment` method:
+
 ``` php
 [[= include_file('code_samples/api/commerce/src/Command/PaymentCommand.php', 114, 115) =]]
 ```
diff --git a/docs/commerce/payment/payment_method_api.md b/docs/commerce/payment/payment_method_api.md
index c3e515a774..1edd74c98e 100644
--- a/docs/commerce/payment/payment_method_api.md
+++ b/docs/commerce/payment/payment_method_api.md
@@ -8,10 +8,10 @@ edition: commerce
 !!! tip "Order management REST API"
 
     To learn how to manage payment methods with the REST API, see the [REST API reference](../../api/rest_api/rest_api_reference/rest_api_reference.html#payment-methods).
-    
+
 To get payment methods and manage them, use the `Ibexa\Contracts\Payment\PaymentMethodServiceInterface` interface.
 
-From the developer's perspective, payment methods are referenced with identifiers defined manually at method creation stage in user interface. 
+From the developer's perspective, payment methods are referenced with identifiers defined manually at method creation stage in user interface.
 
 !!! note "Support for multilingual applications"
 
@@ -39,7 +39,8 @@ To access a single payment method by using its numerical ID, use the `PaymentMet
 
 ## Get multiple payment methods
 
-To fetch multiple payment methods, use the `PaymentMethodService::findPaymentMethods` method. 
+To fetch multiple payment methods, use the `PaymentMethodService::findPaymentMethods` method.
+
 It follows the same search query pattern as other APIs:
 
 ``` php
@@ -48,9 +49,14 @@ It follows the same search query pattern as other APIs:
 
 ## Create payment method
 
-To create a payment method, use the `PaymentMethodService::createPaymentMethod` method and provide it with 
-an `Ibexa\Contracts\Payment\PaymentMethod\PaymentMethodCreateStruct` object that takes the following parameters: 
-`identifier` string, `type` TypeInterface object, `names` array of string values, `descriptions` array of string values, `enabled` boolean value, and an `options` object.
+To create a payment method, use the `PaymentMethodService::createPaymentMethod` method and provide it with an `Ibexa\Contracts\Payment\PaymentMethod\PaymentMethodCreateStruct` object that takes the following parameters:
+
+- `identifier` string
+- `type` TypeInterface object
+- `names` array of string values
+- `descriptions` array of string values
+- `enabled` boolean value
+- `options` object.
 
 ``` php
 [[= include_file('code_samples/api/commerce/src/Command/PaymentMethodCommand.php', 58, 59) =]][[= include_file('code_samples/api/commerce/src/Command/PaymentMethodCommand.php', 77, 87) =]]
@@ -58,8 +64,9 @@ an `Ibexa\Contracts\Payment\PaymentMethod\PaymentMethodCreateStruct` object that
 
 ## Update payment method
 
-You can update the payment method after it's created. 
+You can update the payment method after it's created.
 An `Ibexa\Contracts\Payment\PaymentMethod\PaymentMethodUpdateStruct` object can take the following arguments: `identifier` string, `names` array of string values, `descriptions` array of string values, `enabled` boolean value, and an `options` object.
+
 To update payment method information, use the `PaymentMethodServiceInterface::updatePaymentMethod` method:
 
 ``` php
@@ -76,6 +83,7 @@ To delete a payment method from the system, use the `PaymentMethodService::delet
 ## Check whether payment method is used
 
 To check whether a payment method is used, for example, before you delete it, use the `PaymentMethodService::isPaymentMethodUsed` method:
+
 ``` php
 [[= include_file('code_samples/api/commerce/src/Command/PaymentMethodCommand.php', 109, 122) =]]
 ```
\ No newline at end of file
diff --git a/docs/commerce/payment/payment_method_filtering.md b/docs/commerce/payment/payment_method_filtering.md
index 0458e6b9ac..b26cf1903e 100644
--- a/docs/commerce/payment/payment_method_filtering.md
+++ b/docs/commerce/payment/payment_method_filtering.md
@@ -10,8 +10,8 @@ To allow this filtering, you need to create a custom payment method type and reg
 
 ## Create custom payment method type
 
-There are different ways you can extend your Payment module implementation. 
-One of them is to [create a custom payment method type](extend_payment.md). 
+You can extend your Payment module implementation in different ways.
+One of them is to [create a custom payment method type](extend_payment.md).
 
 The following example shows, how to create `New Payment Method Type`.
 
diff --git a/docs/commerce/payment/payum_integration.md b/docs/commerce/payment/payum_integration.md
index c6fd3fa5e3..8442337dba 100644
--- a/docs/commerce/payment/payum_integration.md
+++ b/docs/commerce/payment/payum_integration.md
@@ -27,7 +27,9 @@ payum:
 ## Workflow mapping
 
 In [[= product_name =]], the default payment workflow has certain places, such as `pending`, `failed`, `paid`, or `cancelled`, and their corresponding transitions.
+
 However, for your application to use other transitions and places, for example, `authorized`, `notified`, `refunded` etc., and to present them in the user interface, you need to:
+
 - override the default payment workflow
 - create a custom workflow and enable it by using semantic configuration
 
diff --git a/docs/commerce/shipping_management/configure_shipment.md b/docs/commerce/shipping_management/configure_shipment.md
index f6e13aa85f..14b9f71dd6 100644
--- a/docs/commerce/shipping_management/configure_shipment.md
+++ b/docs/commerce/shipping_management/configure_shipment.md
@@ -5,17 +5,16 @@ edition: commerce
 
 # Configure shipping
 
-When you work with your Commerce implementation, you can review and modify 
-the shipping configuration.
+When you work with your Commerce implementation, you can review and modify the shipping configuration.
 
-!!! note "Permissions" 
+!!! note "Permissions"
 
     When you modify the workflow configuration, make sure you properly set user [permissions](permission_use_cases.md#commerce) for the shipping component.
 
 ## Configure shipment workflow
 
 Shipment workflow relies on a [Symfony Workflow]([[= symfony_doc =]]/components/workflow.html).
-Each transition represents a separate shipment step. 
+Each transition represents a separate shipment step.
 
 The default fallback workflow is `ibexa_shipment`, which is prepended at bundle level.
 
@@ -23,11 +22,11 @@ The default fallback workflow is `ibexa_shipment`, which is prepended at bundle
 
 The default payment workflow configuration is called `ibexa_shipment`, you can replace it with your custom workflow identifier if needed.
 
-o see the default workflow, in your project directory, navigate to the following file: `vendor/Ibexa/shipping/src/bundle/Resources/config/workflow.yaml`.
+To see the default workflow, in your project directory, navigate to the following file: `vendor/Ibexa/shipping/src/bundle/Resources/config/workflow.yaml`.
 
 ### Custom shipment workflows
 
-You define custom workflow implementations under the `framework.workflows` [configuration key](configuration.md#configuration-files). 
+You define custom workflow implementations under the `framework.workflows` [configuration key](configuration.md#configuration-files).
 The `shipping.shipment_workflow` parameter is repository-aware.
 
 To customize your configuration, place it under the `framework.workflows.<your_workflow_name>` [configuration key](configuration.md#configuration-files):
diff --git a/docs/commerce/shipping_management/extend_shipping.md b/docs/commerce/shipping_management/extend_shipping.md
index aa690df237..d33574333f 100644
--- a/docs/commerce/shipping_management/extend_shipping.md
+++ b/docs/commerce/shipping_management/extend_shipping.md
@@ -5,7 +5,8 @@ edition: commerce
 
 # Extend shipping
 
-There are different ways in which you can extend or customize your Shipping module implementation. 
+You can extend or customize your Shipping module implementation in different ways.
+
 Here, you can learn about the following ideas to make your Commerce solution more powerful:
 
 - create a custom shipping method type
@@ -16,12 +17,12 @@ You can also [customize the shipment processing workflow](configure_shipment.md#
 
 ## Create custom shipping method type
 
-If your application needs shipping methods of other type than the default ones, you can create custom shipping method types. 
+If your application needs shipping methods of other type than the default ones, you can create custom shipping method types.
 See the code samples below to learn how to do it.
- 
+
 ### Define custom shipping method type class
 
-Create a definition of the shipping method type. 
+Create a definition of the shipping method type.
 Use a built-in type factory to define the class in `config/services.yaml`:
 
 ``` yaml
@@ -34,7 +35,7 @@ At this point a custom shipping method type should be visible on the **Create sh
 
 ### Create options form
 
-To let users create shipping methods of a custom type within the user interface, you need a Symfony form type. 
+To let users create shipping methods of a custom type within the user interface, you need a Symfony form type.
 Create a `src/ShippingMethodType/Form/Type/CustomShippingMethodOptionsType.php` file with a form type.
 
 Next, define a name of the custom shipping method type in the file, by using the `getTranslationMessages` method.
@@ -65,7 +66,7 @@ At this point you should be able to create a shipping method based on a custom s
 
 ### Create options validator
 
-You might want to validate the data provided by the user against certain constraints. 
+You might want to validate the data provided by the user against certain constraints.
 Here, you create an options validator class that checks whether the user provided the `customer_identifier` value and dispatches an error when needed.
 
 Use the type factory to define a compound validator class in `config/services.yaml`:
@@ -107,7 +108,7 @@ Then, register the storage converter as a service:
 [[= include_file('code_samples/front/shop/shipping/config/services.yaml', 0, 1) =]][[= include_file('code_samples/front/shop/shipping/config/services.yaml', 25, 28) =]]
 ```
 
-#### Storage definition 
+#### Storage definition
 
 Now, create a storage definition class and a corresponding schema.
 The table stores information specific for the custom shipping method type.
@@ -118,7 +119,7 @@ The table stores information specific for the custom shipping method type.
 
     `CREATE TABLE ibexa_shipping_method_region_custom(id int auto_increment primary key, customer_id text, shipping_method_region_id int);`
 
-Create a `src/ShippingMethodType/Storage/StorageDefinition.php` file with a storage definition: 
+Create a `src/ShippingMethodType/Storage/StorageDefinition.php` file with a storage definition:
 
 ``` php
 [[= include_file('code_samples/front/shop/shipping/src/ShippingMethodType/Storage/StorageDefinition.php') =]]
@@ -152,7 +153,7 @@ Register the voter as a service:
 [[= include_file('code_samples/front/shop/shipping/config/services.yaml', 0, 1) =]][[= include_file('code_samples/front/shop/shipping/config/services.yaml', 31, 34) =]]
 ```
 
-## Display shipping method parameters in details view 
+## Display shipping method parameters in details view
 
 You can extend the default shipping method details view by making shipping method visible on the **Cost** tab.
 To do this, create a `src/ShippingMethodType/Cost/CustomCostFormatter.php` file with a formatter class:
diff --git a/docs/commerce/shipping_management/shipment_api.md b/docs/commerce/shipping_management/shipment_api.md
index 51a99dfa5b..961826a2d8 100644
--- a/docs/commerce/shipping_management/shipment_api.md
+++ b/docs/commerce/shipping_management/shipment_api.md
@@ -9,7 +9,7 @@ To get shipments and manage them, use the `Ibexa\Contracts\Shipping\ShipmentServ
 
 From the developer's perspective, shipments are referenced with a UUID identifier.
 
-## Get single shipment 
+## Get single shipment
 
 ### Get single shipment by identifier
 
@@ -29,7 +29,7 @@ To access a single shipment by using its numerical id, use the `ShipmentService:
 
 ## Get multiple shipments
 
-To fetch multiple shipments, use the `ShipmentService::findShipments` method. 
+To fetch multiple shipments, use the `ShipmentService::findShipments` method.
 It follows the same search query pattern as other APIs:
 
 ``` php
@@ -38,8 +38,7 @@ It follows the same search query pattern as other APIs:
 
 ## Create shipment
 
-To create a shipment, use the `ShipmentService::createShipment` method and provide it with 
-an `Ibexa\Contracts\Shipping\Value\ShipmentCreateStruct` object that takes two parameters, a `shippingMethod` string and a `Money` object.
+To create a shipment, use the `ShipmentService::createShipment` method and provide it with an `Ibexa\Contracts\Shipping\Value\ShipmentCreateStruct` object that takes two parameters, a `shippingMethod` string and a `Money` object.
 
 ``` php
 [[= include_file('code_samples/api/commerce/src/Command/ShipmentCommand.php', 101, 115) =]]
@@ -47,8 +46,8 @@ an `Ibexa\Contracts\Shipping\Value\ShipmentCreateStruct` object that takes two p
 
 ## Update shipment
 
-You can update the shipment after it's created. 
-You could do it to support a scenario when, for example, the shipment is processed offline and its status has to be updated in the system. 
+You can update the shipment after it's created.
+You could do it to support a scenario when, for example, the shipment is processed offline and its status has to be updated in the system.
 To update shipment information, use the `ShipmentService::updateShipment` method:
 
 ``` php
diff --git a/docs/commerce/shipping_management/shipping_method_api.md b/docs/commerce/shipping_management/shipping_method_api.md
index ed387a19a3..b276ddcf84 100644
--- a/docs/commerce/shipping_management/shipping_method_api.md
+++ b/docs/commerce/shipping_management/shipping_method_api.md
@@ -7,7 +7,7 @@ edition: commerce
 
 To get shipping methods and manage them, use the `Ibexa\Contracts\Shipping\ShippingMethodServiceInterface` interface.
 
-Shipping methods are referenced with identifiers defined manually at method creation stage in user interface. 
+Shipping methods are referenced with identifiers defined manually at method creation stage in user interface.
 
 ## Get shipping method
 
@@ -31,7 +31,7 @@ The method takes a string as `$id` parameter and uses a prioritized language fro
 
 ## Get multiple shipping methods
 
-To fetch multiple shipping methods, use the `ShippingMethodServiceInterface::getShippingMethod` method. 
+To fetch multiple shipping methods, use the `ShippingMethodServiceInterface::getShippingMethod` method.
 It follows the same search query pattern as other APIs:
 
 ``` php
diff --git a/docs/commerce/storefront/configure_storefront.md b/docs/commerce/storefront/configure_storefront.md
index 0c9e58f4be..e291ad6ea8 100644
--- a/docs/commerce/storefront/configure_storefront.md
+++ b/docs/commerce/storefront/configure_storefront.md
@@ -8,9 +8,9 @@ The Storefront is accessible under the `<yourdomain>/product-catalog`.
 
 ## Catalog configuration
 
-With the `ibexa/storefront` package, you can configure the product catalog and make it available to your shop users. 
+With the `ibexa/storefront` package, you can configure the product catalog and make it available to your shop users.
 
-Before you start configuring the Storefront, make sure you have created, configured and published [catalogs](https://doc.ibexa.co/projects/userguide/en/latest/pim/work_with_catalogs/#create-catalogs) in the back office.
+Before you start configuring the Storefront, make sure you have created, configured, and published [catalogs](https://doc.ibexa.co/projects/userguide/en/latest/pim/work_with_catalogs/#create-catalogs) in the back office.
 
 The configuration is available under the `ibexa.system.<scope>.storefront.catalog` [configuration key](configuration.md#configuration-files).
 It accepts the following values:
@@ -96,7 +96,7 @@ ibexa:
         site_group:
             user_settings_groups:
                 - location
-                - custom_group       
+                - custom_group
 ```
 
 By default, only the `location` user settings is provided:
@@ -106,4 +106,3 @@ By default, only the `location` user settings is provided:
 - Short date and time format
 - Long date and time format
 - Language
-
diff --git a/docs/commerce/storefront/extend_storefront.md b/docs/commerce/storefront/extend_storefront.md
index ddd6b29b3f..d82b43a8fd 100644
--- a/docs/commerce/storefront/extend_storefront.md
+++ b/docs/commerce/storefront/extend_storefront.md
@@ -11,9 +11,9 @@ With the `ibexa\storefront` package come the following built-in menus:
 
 | Item   | Value     | Description |
 |------------|----------|---------|
-| [Breadcrumbs](#breadcrumbs-menu)| - | Renders breadcrumbs for content tree Root, Taxonomy Entry, Product, User settings and User settings group | 
-| [Taxonomy](#taxonomy-menu)| - | It can render a menu for product categories or tags |               
-| Currency| `currency_menu` | Renders a menu to change the active currency |               
+| [Breadcrumbs](#breadcrumbs-menu)| - | Renders breadcrumbs for content tree Root, Taxonomy Entry, product, user settings, and user settings group |
+| [Taxonomy](#taxonomy-menu)| - | It can render a menu for product categories or tags |
+| Currency| `currency_menu` | Renders a menu to change the active currency |
 | Language| `language_menu` | Renders a menu to change the active language |
 | Region  | `region_menu`  | Renders a menu to change the active region |
 
@@ -56,8 +56,8 @@ See the usage example:
 
 ```html+twig
 {% set categories_menu = knp_menu_get(
-    'ibexa_storefront.menu.taxonomy', 
-    [], 
+    'ibexa_storefront.menu.taxonomy',
+    [],
     {
         parent: category,
         depth: 3
diff --git a/docs/commerce/storefront/storefront.md b/docs/commerce/storefront/storefront.md
index bd2e3e5c22..5eac432f3e 100644
--- a/docs/commerce/storefront/storefront.md
+++ b/docs/commerce/storefront/storefront.md
@@ -6,8 +6,7 @@ edition: commerce
 # Storefront
 
 The Storefront package provides a starting kit for the developers.
-It's a set of components that serves as a basis, which developers can 
-customize and extend to create their own implementation of a web store.
+It's a set of components that serves as a basis, which developers can customize and extend to create their own implementation of a web store.
 
 ## Default UI components
 
@@ -26,9 +25,9 @@ You can modify them when you build your own web store.
 | Mini cart widget | Consists of a counter that displays a total number of items added to a cart. |
 |Orders list|Displays a list of orders with such information as status, date, value, order ID. |
 | Product category page | Displays products that belong to a specific category. |
-| Product filters component | Allows for narrowing the list of products displayed in the listing by using different filters, such as product type, availability and price. |
+| Product filters component | Allows for narrowing the list of products displayed in the listing by using different filters, such as product type, availability, and price. |
 | Product listing page | Allows for browsing through products, displays product name, code, price, and image. |
-| Region menu | Enables selecting between regions, to dynamically change the contents of the product listing page. | 
+| Region menu | Enables selecting between regions, to dynamically change the contents of the product listing page. |
 | Reorder |Allows logged-in users to repurchase previously bought items. |
 |Searching and filtering of orders| Allows logged-in users to search and filter their past orders on the orders page.|
 | Search for specific product component | Allows for searching for products, for example on the product listing page. |
diff --git a/docs/commerce/transactional_emails/extend_transactional_emails.md b/docs/commerce/transactional_emails/extend_transactional_emails.md
index 39f1c56e2b..665ed1cb9a 100644
--- a/docs/commerce/transactional_emails/extend_transactional_emails.md
+++ b/docs/commerce/transactional_emails/extend_transactional_emails.md
@@ -34,7 +34,7 @@ If this list isn't sufficient, you can use Events to include additional variable
 <?php
 
 namespace App\EventSubscriber;
-  
+
 use Ibexa\Contracts\ConnectorActito\Client\TransactionalMail\SimpleParameter;
 use Ibexa\Contracts\ConnectorActito\Event\TransactionalMailRequest\ParametersFactoryEvent;
 use Ibexa\Contracts\OrderManagement\Notification\OrderAwareNotificationInterface;
@@ -72,7 +72,7 @@ final class TransactionalMailFactoryEventSubscriber implements EventSubscriberIn
 
 ## Customize Actito end-user profile
 
-The Actito platform offers many features for customer data collection, including segmentation, subscriptions and interaction tracking.
+The Actito platform offers many features for customer data collection, including segmentation, subscriptions, and interaction tracking.
 This information can be later user for generating statistics, establishing trends, or used to calculate Personalization recommendations.
 To use these features you need to provide profile data to API requests yourself.
 You do it by means of events that are triggered during profile building.
@@ -81,14 +81,14 @@ For example, the `Ibexa\Contracts\ConnectorActito\Event\TransactionalMailRequest
 
 ```php
 <?php
-  
+
 namespace App\EventSubscriber;
 
 use Ibexa\Contracts\ConnectorActito\Client\TransactionalMail\Attribute;
 use Ibexa\Contracts\ConnectorActito\Client\TransactionalMail\Segmentation;
 use Ibexa\Contracts\ConnectorActito\Event\TransactionalMailRequest\ProfileFactoryEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-  
+
 final class TransactionalMailFactoryEventSubscriber implements EventSubscriberInterface
 {
     public static function getSubscribedEvents(): array
diff --git a/docs/content_management/content_api/browsing_content.md b/docs/content_management/content_api/browsing_content.md
index a02f1d52ff..504847d9cb 100644
--- a/docs/content_management/content_api/browsing_content.md
+++ b/docs/content_management/content_api/browsing_content.md
@@ -1,5 +1,5 @@
 ---
-description: Use PHP API to get content items and their information, content Fields, Location, and others.
+description: Use PHP API to get content items and their information, content fields, location, and others.
 ---
 
 # Browsing and viewing content
@@ -39,30 +39,25 @@ It provides you with basic content metadata such as modification and publication
 
 !!! note "Retrieving content information in a controller"
 
-    To retrieve content information in a controller, you also make use of the `ContentService`,
-    but rendering specific elements (e.g. content information or Field values)
-    is relegated to [templates](templates.md).
+    To retrieve content information in a controller, you also make use of the `ContentService`, but rendering specific elements (e.g. content information or field values) is relegated to [templates](templates.md).
 
 ### Locations
 
-To get the Locations of a content item you need to make use of the [`LocationService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-LocationService.html):
+To get the locations of a content item you need to make use of the [`LocationService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-LocationService.html):
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/ViewContentMetaDataCommand.php', 68, 72) =]]
 ```
 
-[`LocationService::loadLocations`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-LocationService.html#method_loadLocations)
-uses `ContentInfo` to get all the Locations of a content item.
+[`LocationService::loadLocations`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-LocationService.html#method_loadLocations) uses `ContentInfo` to get all the locations of a content item.
 This method returns an array of [`Location`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Persistence-Content-Location.html) value objects.
-For each Location, the code above prints out its `pathString` (the internal representation of the path).
+For each location, the code above prints out its `pathString` (the internal representation of the path).
 
 #### URL Aliases
 
-The [`URLAliasService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-URLAliasService.html)
-additionally enables you to retrieve the human-readable [URL alias](url_management.md#url-aliases) of each Location.
+The [`URLAliasService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-URLAliasService.html) additionally enables you to retrieve the human-readable [URL alias](url_management.md#url-aliases) of each location.
 
-[`URLAliasService::reverseLookup`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-URLAliasService.html#method_reverseLookup)
-gets the Location's main [URL alias](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-URLAlias.html):
+[`URLAliasService::reverseLookup`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-URLAliasService.html#method_reverseLookup) gets the location's main [URL alias](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-URLAlias.html):
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/ViewContentMetaDataCommand.php', 68, 71) =]][[= include_file('code_samples/api/public_php_api/src/Command/ViewContentMetaDataCommand.php', 72, 75) =]]
@@ -70,8 +65,7 @@ gets the Location's main [URL alias](../../api/php_api/php_api_reference/classes
 
 ### Content type
 
-You can retrieve the content type of a content item
-through the [`getContentType`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-ContentInfo.html#method_getContentType) method of the ContentInfo object:
+You can retrieve the content type of a content item through the [`getContentType`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-ContentInfo.html#method_getContentType) method of the ContentInfo object:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/ViewContentMetaDataCommand.php', 77, 79) =]]
@@ -79,15 +73,13 @@ through the [`getContentType`](../../api/php_api/php_api_reference/classes/Ibexa
 
 ### Versions
 
-To iterate over the versions of a content item,
-use the [`ContentService::loadVersions`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ContentService.html#method_loadVersions) method, which returns an array of `VersionInfo` value objects.
+To iterate over the versions of a content item, use the [`ContentService::loadVersions`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ContentService.html#method_loadVersions) method, which returns an array of `VersionInfo` value objects.
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/ViewContentMetaDataCommand.php', 81, 87) =]]
 ```
 
-You can additionally provide the `loadVersions` method with the version status
-to get only versions of a specific status, e.g.:
+You can additionally provide the `loadVersions` method with the version status to get only versions of a specific status, for example:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/ViewContentMetaDataCommand.php', 88, 89) =]]
@@ -101,8 +93,7 @@ to get only versions of a specific status, e.g.:
 ### Relations
 
 Content Relations are versioned.
-To list Relations to and from your content,
-you need to pass a `VersionInfo` object to the [`ContentService::loadRelations`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ContentService.html#method_loadRelations) method.
+To list Relations to and from your content, you need to pass a `VersionInfo` object to the [`ContentService::loadRelations`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ContentService.html#method_loadRelations) method.
 You can get the current version's `VersionInfo` using [`ContentService::loadVersionInfo`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ContentService.html#method_loadVersionInfo).
 
 ``` php
@@ -117,8 +108,7 @@ $versionInfo = $this->contentService->loadVersionInfo($contentInfo, 2);
 
 `loadRelations` provides an array of [`Relation`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Relation.html) objects.
 `Relation` has two main properties: `destinationContentInfo`, and `sourceContentInfo`.
-It also holds the [relation type](content_relations.md),
-and the optional Field this relation is made with.
+It also holds the [relation type](content_relations.md), and the optional field this relation is made with.
 
 ### Owning user
 
@@ -128,14 +118,11 @@ You can use the `getOwner` method of the `ContentInfo` object to load the conten
 [[= include_file('code_samples/api/public_php_api/src/Command/ViewContentMetaDataCommand.php', 108, 109) =]]
 ```
 
-To get the creator of the current version and not the content item's owner,
-you need to use the `creatorId` property from the current version's `VersionInfo` object.
+To get the creator of the current version and not the content item's owner, you need to use the `creatorId` property from the current version's `VersionInfo` object.
 
 ### Section
 
-You can find the Section to which a content item belongs through
-the [`getSection`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-ContentInfo.html#method_getSection) method
-of the ContentInfo object:
+You can find the Section to which a content item belongs through the [`getSection`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-ContentInfo.html#method_getSection) method of the ContentInfo object:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/ViewContentMetaDataCommand.php', 111, 112) =]]
@@ -148,8 +135,7 @@ of the ContentInfo object:
 
 ### Object states
 
-You can retrieve [Object states](object_states.md) of a content item
-using [`ObjectStateService::getContentState`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html#method_getContentState).
+You can retrieve [Object states](object_states.md) of a content item using [`ObjectStateService::getContentState`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html#method_getContentState).
 You need to provide it with the Object state group.
 All Object state groups can be retrieved through [`loadObjectStateGroups`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html#method_loadObjectStateGroups).
 
@@ -157,9 +143,9 @@ All Object state groups can be retrieved through [`loadObjectStateGroups`](../..
 [[= include_file('code_samples/api/public_php_api/src/Command/ViewContentMetaDataCommand.php', 114, 119) =]]
 ```
 
-## Viewing content with Fields
+## Viewing content with fields
 
-To retrieve the Fields of the selected content item, you can use the following command:
+To retrieve the fields of the selected content item, you can use the following command:
 
 ```php hl_lines="13-14 16-22"
 [[= include_file('code_samples/api/public_php_api/src/Command/ViewContentCommand.php', 4, 7) =]]    // ...
@@ -170,12 +156,12 @@ To retrieve the Fields of the selected content item, you can use the following c
 Line 9 shows how [`ContentService::loadContent`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ContentService.html#method_loadContent) loads the content item provided to the command.
 Line 14 makes use of the [`ContentTypeService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ContentTypeService.html) to retrieve the content type of the requested item.
 
-Lines 12-19 iterate over Fields defined by the content type.
-For each Field they print out its identifier, and then using [`FieldTypeService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-FieldTypeService.html) retrieve the Field's value and print it out to the console.
+Lines 12-19 iterate over fields defined by the content type.
+For each field they print out its identifier, and then using [`FieldTypeService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-FieldTypeService.html) retrieve the field's value and print it out to the console.
 
 ## Viewing content in different languages
 
-The Repository is SiteAccess-aware, so languages defined by the SiteAccess are automatically taken into account when loading content.
+The repository is SiteAccess-aware, so languages defined by the SiteAccess are automatically taken into account when loading content.
 
 To load a specific language, provide its language code when loading the content item:
 
@@ -191,8 +177,7 @@ $contentService->loadContent($content->id, Language::ALL);
 
 ## Getting all content in a subtree
 
-To go through all the content items contained in a subtree,
-you need to use the [`LocationService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-LocationService.html).
+To go through all the content items contained in a subtree, you need to use the [`LocationService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-LocationService.html).
 
 ``` php hl_lines="5 15"
 [[= include_file('code_samples/api/public_php_api/src/Command/BrowseLocationsCommand.php', 30, 49) =]]
@@ -200,41 +185,38 @@ you need to use the [`LocationService`](../../api/php_api/php_api_reference/clas
 
 `loadLocation` (line 15) returns a value object, here a `Location`.
 
-[`LocationService::loadLocationChildren`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-LocationService.html#method_loadLocationChildren) (line 5)
-returns a [`LocationList`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-LocationList.html) value object that you can iterate over.
+[`LocationService::loadLocationChildren`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-LocationService.html#method_loadLocationChildren) (line 5) returns a [`LocationList`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-LocationList.html) value object that you can iterate over.
 
 !!! note
 
     Refer to [Searching](search_api.md) for information on more complex search queries.
 
-## Getting parent Location
+## Getting parent location
 
-To get the parent Location of content, you first need to determine which Location is the main one,
-in case the content item has multiple Locations.
+To get the parent location of content, you first need to determine which location is the main one, in case the content item has multiple locations.
 You can do it through the `getMainLocation` method of the ContentInfo object.
 
-Next, use the `getParentLocation` method of the Location object to access the parent Location:
+Next, use the `getParentLocation` method of the location object to access the parent location:
 
 ``` php
 $mainLocation = $contentInfo->getMainLocation();
 $output->writeln("Parent Location: " . $mainLocation->getParentLocation()->pathString);
 ```
 
-## Getting content from a Location
+## Getting content from a location
 
-When dealing with Location objects (and Trash objects), you can get access to content item directly using `$location->getContent`.
+When dealing with location objects (and Trash objects), you can get access to content item directly using `$location->getContent`.
 In Twig this can also be accessed by `location.content`.
-
-This is a lazy property. It triggers loading of content when first used.
-In case of bulk of Locations coming from Search or Location Service,
-the content is also loaded in bulk for the whole Location result set.
+It triggers loading of content when first used.
+In case of bulk of locations coming from Search or Location Service,
+the content is also loaded in bulk for the whole location result set.
 
 ## Comparing content versions
 
 You can compare two versions of a content item using the `VersionComparisonService`.
 The versions must have the same language.
 
-For example, to get the comparison between the `name` Field of two versions:
+For example, to get the comparison between the `name` field of two versions:
 
 ```php
 $versionFrom = $this->contentService->loadVersionInfo($contentInfo, $versionFromId);
@@ -244,7 +226,6 @@ $nameComparison = $this->comparisonService->compare($versionFrom, $versionTo)->g
 ```
 
 `getComparisonResult` returns a `ComparisonResult` object, which depends on the field type being compared.
-In the example of a Text Line (ezstring) Field, it's an array of `StringDiff` objects.
+In the example of a Text Line (ezstring) field, it's an array of `StringDiff` objects.
 
-Each diff contains a section of the Field to compare (e.g. a part of a text line)
-and its status, which can be "unchanged", "added" or "removed".
+Each diff contains a section of the field to compare (e.g. a part of a text line) and its status, which can be "unchanged", "added" or "removed".
diff --git a/docs/content_management/content_api/creating_content.md b/docs/content_management/content_api/creating_content.md
index c8c381a5ad..ce3f920b6c 100644
--- a/docs/content_management/content_api/creating_content.md
+++ b/docs/content_management/content_api/creating_content.md
@@ -25,14 +25,14 @@ returns a new [`ContentCreateStruct`](../../api/php_api/php_api_reference/classe
 ```
 
 This command creates a draft using [`ContentService::createContent`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ContentService.html#method_createContent) (line 7).
-This method must receive a `ContentCreateStruct` and an array of Location structs.
+This method must receive a `ContentCreateStruct` and an array of location structs.
 
 `ContentCreateStruct` (which extends `ContentStruct`) is created through [`ContentService::newContentCreateStruct`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ContentService.html#method_newContentCreateStruct) (line 2),
 which receives the content type and the primary language for the content item.
 For information about translating a content item into other languages, see [Translating content](#translating-content).
 
-[`ContentStruct::setField`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-ContentStruct.html#method_setField) (line 3) enables you to define the Field values.
-When the Field accepts a simple value, you can provide it directly, as in the example above.
+[`ContentStruct::setField`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-ContentStruct.html#method_setField) (line 3) enables you to define the field values.
+When the field accepts a simple value, you can provide it directly, as in the example above.
 For some field types, for example [images](#creating-an-image), you need to provide an instance of a Value type.
 
 ### Creating an image
@@ -49,8 +49,8 @@ Value of the Image field type contains the path to the image file and other basi
 
 ### Creating content with RichText
 
-The RichText Field accepts values in a custom flavor of [Docbook](https://github.com/docbook/wiki/wiki) format.
-For example, to add a simple RichText paragraph, provide the following as input:
+The RichText field accepts values in a custom flavor of [Docbook](https://github.com/docbook/wiki/wiki) format.
+For example, to add a RichText paragraph, provide the following as input:
 
 ``` xml
 <section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ezxhtml="http://ibexa.co/xmlns/dxp/docbook/xhtml" xmlns:ezcustom="http://ibexa.co/xmlns/dxp/docbook/custom" version="5.0-variant ezpublish-1.0"><para>Description of your content item.</para></section>
diff --git a/docs/content_management/content_api/managing_content.md b/docs/content_management/content_api/managing_content.md
index 4bb52490ba..65e5c16ffa 100644
--- a/docs/content_management/content_api/managing_content.md
+++ b/docs/content_management/content_api/managing_content.md
@@ -134,7 +134,7 @@ $newParent = $this->locationService->loadLocation($location);
 $this->trashService->recover($trashItem, $newParent);
 ```
 
-You can also search through Trash items and sort the results using several public PHP API search criteria and sort clauses that have been exposed for `TrashService` queries.
+You can also search through Trash items and sort the results using several public PHP API Search Criteria and Sort Clauses that have been exposed for `TrashService` queries.
 For more information, see [Searching in trash](search_api.md#searching-in-trash).
 
 ## Content types
@@ -150,13 +150,13 @@ To operate on content types, you need to make use of [`ContentTypeService`](../.
 Adding a new content type, like creating content, must happen with the use of a struct, because a content type value object is read-only.
 In this case you use [`ContentTypeCreateStruct`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-ContentType-ContentTypeCreateStruct.html).
 
-A content type must have at least one name, in the main language, and at least one Field definition.
+A content type must have at least one name, in the main language, and at least one field definition.
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/CreateContentTypeCommand.php', 59, 69) =]][[= include_file('code_samples/api/public_php_api/src/Command/CreateContentTypeCommand.php', 76, 85) =]]
 ```
 
-You can specify more details of the Field definition in the create struct, for example:
+You can specify more details of the field definition in the create struct, for example:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/CreateContentTypeCommand.php', 67, 77) =]]
@@ -196,7 +196,7 @@ You need to provide the method with an EventQuery, which takes a date range and
 [[= include_file('code_samples/api/public_php_api/src/Command/CalendarCommand.php', 39, 50) =]]
 ```
 
-You can also get the first and last event in the list by using the `first()` and `last()` methods of an `EventCollection` (`Ibexa\Contracts\Calendar\EventCollection`) respectively:
+You can also get the first and last event in the list by using the `first()` and `last()` methods of an `EventCollection` (`Ibexa\Contracts\Calendar\EventCollection`):
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/CalendarCommand.php', 51, 53) =]]
diff --git a/docs/content_management/content_management.md b/docs/content_management/content_management.md
index 86909c5451..70ed241b9e 100644
--- a/docs/content_management/content_management.md
+++ b/docs/content_management/content_management.md
@@ -14,5 +14,5 @@ page_type: landing_page
     "content_management/forms/forms",
     "content_management/taxonomy/taxonomy",
     "content_management/workflow/workflow",
-    "content_management/data_migration/data_migration",
+    "content_management/data_migration/data_migration"
 ], columns=4) =]]
diff --git a/docs/content_management/content_management_api/bookmark_api.md b/docs/content_management/content_management_api/bookmark_api.md
index f85d0e0cb2..8f177a8db0 100644
--- a/docs/content_management/content_management_api/bookmark_api.md
+++ b/docs/content_management/content_management_api/bookmark_api.md
@@ -4,8 +4,7 @@ description: You can use the PHP API to view the bookmark list, and add or remov
 
 # Bookmark API
 
-[`BookmarkService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-BookmarkService.html)
-enables you to read, add and remove bookmarks from content.
+[`BookmarkService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-BookmarkService.html) enables you to read, add and remove bookmarks from content.
 
 !!! tip "Bookmark REST API"
 
@@ -17,8 +16,7 @@ To view a list of all bookmarks, use [`BookmarkService::loadBookmarks`](../../ap
 [[= include_file('code_samples/api/public_php_api/src/Command/BookmarkCommand.php', 43, 50) =]]
 ```
 
-You can add a bookmark to a content item by providing its Location object
-to the [`BookmarkService::createBookmark`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-BookmarkService.html#method_createBookmark) method:
+You can add a bookmark to a content item by providing its Location object to the [`BookmarkService::createBookmark`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-BookmarkService.html#method_createBookmark) method:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/BookmarkCommand.php', 37, 40) =]]
diff --git a/docs/content_management/content_management_api/object_state_api.md b/docs/content_management/content_management_api/object_state_api.md
index 28d0a73b0a..c89b79ead7 100644
--- a/docs/content_management/content_management_api/object_state_api.md
+++ b/docs/content_management/content_management_api/object_state_api.md
@@ -15,8 +15,7 @@ You can manage Object states by using the PHP API by using `ObjectStateService`.
 
 ## Getting Object state information
 
-You can use the [`ObjectStateService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html)
-to get information about Object state groups or Object states.
+You can use the [`ObjectStateService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html) to get information about Object state groups or Object states.
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/ObjectStateCommand.php', 48, 53) =]]
@@ -24,20 +23,15 @@ to get information about Object state groups or Object states.
 
 ## Creating Object states
 
-To create an Object state group and add Object states to it,
-you need to make use of the [`ObjectStateService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html):
+To create an Object state group and add Object states to it, you need to make use of the [`ObjectStateService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html):
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/ObjectStateCommand.php', 57, 61) =]]
 ```
 
-[`ObjectStateService::createObjectStateGroup`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html#method_createObjectStateGroup)
-takes as argument an [`ObjectStateGroupCreateStruct`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-ObjectState-ObjectStateGroupCreateStruct.html),
-in which you need to specify the identifier, default language and at least one name for the group.
+[`ObjectStateService::createObjectStateGroup`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html#method_createObjectStateGroup) takes as argument an [`ObjectStateGroupCreateStruct`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-ObjectState-ObjectStateGroupCreateStruct.html), in which you need to specify the identifier, default language and at least one name for the group.
 
-To create an Object state inside a group,
-use [`ObjectStateService::newObjectStateCreateStruct`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html#method_newObjectStateCreateStruct)
-and provide it with an `ObjectStateCreateStruct`:
+To create an Object state inside a group, use [`ObjectStateService::newObjectStateCreateStruct`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html#method_newObjectStateCreateStruct) and provide it with an `ObjectStateCreateStruct`:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/ObjectStateCommand.php', 63, 67) =]]
@@ -45,8 +39,7 @@ and provide it with an `ObjectStateCreateStruct`:
 
 ## Assigning Object state
 
-To assign an Object state to a content item,
-use [`ObjectStateService::setContentState`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html#method_setContentState).
+To assign an Object state to a content item, use [`ObjectStateService::setContentState`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html#method_setContentState).
 Provide it with a `ContentInfo` object of the content item, the Object state group and the Object state:
 
 ``` php
diff --git a/docs/content_management/content_management_api/section_api.md b/docs/content_management/content_management_api/section_api.md
index 853b8115cc..3abb9cde5d 100644
--- a/docs/content_management/content_management_api/section_api.md
+++ b/docs/content_management/content_management_api/section_api.md
@@ -40,14 +40,13 @@ You can also use the query to get the total number of assigned content items:
 [[= include_file('code_samples/api/public_php_api/src/Command/SectionCommand.php', 69, 75) =]][[= include_file('code_samples/api/public_php_api/src/Command/SectionCommand.php', 82, 86) =]]
 ```
 
-## Assigning Section to content
+## Assigning section to content
 
-To assign content to a Section, use the [`SectionService::assignSection`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-SectionService.html#method_assignSection) method.
-You need to provide it with the `ContentInfo` object of the content item,
-and the [`Section`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Section.html) object:
+To assign content to a section, use the [`SectionService::assignSection`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-SectionService.html#method_assignSection) method.
+You need to provide it with the `ContentInfo` object of the content item, and the [`Section`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Section.html) object:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/SectionCommand.php', 64, 67) =]]
 ```
 
-Assigning a Section to content does not automatically assign it to the content item's children.
+Assigning a section to content does not automatically assign it to the content item's children.
diff --git a/docs/content_management/content_management_guide.md b/docs/content_management/content_management_guide.md
index 454db47c16..4f79454b8d 100644
--- a/docs/content_management/content_management_guide.md
+++ b/docs/content_management/content_management_guide.md
@@ -64,7 +64,7 @@ Their role is to:
 - store data
 - validate input data
 - make the data searchable
-- display Fields of a given field type
+- display fields of a given field type
 
 For a complete list of available field types, see [field type reference](field_type_reference.md).
 
@@ -72,7 +72,7 @@ For a complete list of available field types, see [field type reference](field_t
 
 ### Fields
 
-Once you use a field type to design and build a content type definition, and define its settings, it becomes a Field.
+Once you use a field type to design and build a content type definition, and define its settings, it becomes a field.
 
 Fields can be as simple as Name, based on a Text line field type, or as complex as Page, based on a landing page field type, with multiple options to set and choose from:
 
@@ -81,7 +81,7 @@ Fields can be as simple as Name, based on a Text line field type, or as complex
 ### Content types
 
 Life gets easier when you have templates to fill in with content. Content types are such templates, which editors use to create content items.
-Content types define what Fields are available in the content item.
+Content types define what fields are available in the content item.
 
 [[= product_name =]] comes with several basic content types, and creating new ones, editing, and deleting them is done by using a visual interface, with no coding skills needed.
 
@@ -90,9 +90,9 @@ Content types define what Fields are available in the content item.
 ### Content items
 
 Content items are pieces of content, such as, for example, products, articles, blog posts, or media.
-In [[= product_name =]], everything is a content item — not just pages, articles or products, but also all media (images, videos, etc.) or even user accounts.
+In [[= product_name =]], everything is a content item — not only pages, articles or products, but also all media (images, videos, etc.) or even user accounts.
 
-Each content item, apart from its name and identifier, contains a composition of Fields, which differs depending on the type of content.
+Each content item, apart from its name and identifier, contains a composition of fields, which differs depending on the type of content.
 For example, articles might have a title, an author, a body, and an image, while products may have a name, category, price, size, color, etc.
 
 ### Forms
@@ -208,7 +208,7 @@ Although segments aren't meant to classify content, they could fall into this ca
 With segments, you can reach specific groups, or categories, of visitors with specific information about content or products that could be of their interest.
 For example, you can build Pages that contain different recommendations, depending on who is visiting them.
 
-![A Segment Group with two user segments](img/user_segments.png)
+![A segment group with two user segments](img/user_segments.png)
 
 ## How to get started
 
@@ -221,7 +221,7 @@ Since content management is an ongoing process, and, in your implementation, you
 Any content that you might want to deliver to a viewer can be structured and split into smaller elements.
 Reverse-engineer the intended concepts into individual fields, which can be categorized, and then picked from categories and combined into content items.
 
-Reuse existing Fields Types or [customize them to fit your needs](create_custom_generic_field_type.md), then [create content types]([[= user_doc =]]/content_management/create_edit_content_items/).
+Reuse existing fields types or [customize them to fit your needs](create_custom_generic_field_type.md), then [create content types]([[= user_doc =]]/content_management/create_edit_content_items/).
 
 **2\. Define permissions**
 
@@ -229,7 +229,7 @@ Although this step isn't directly related to content management, it's a good tim
 
 **3\. Author content**
 
-[Create various content items]([[= user_doc =]]/content_management/create_edit_content_items/), such as pages, articles, forms, or media. While you fill Fields with content, several actions are there to help you with your task.
+[Create various content items]([[= user_doc =]]/content_management/create_edit_content_items/), such as pages, articles, forms, or media. While you fill fields with content, several actions are there to help you with your task.
 You can pause and resume the work, preview the results, or send content for review.
 
 ![Send to review](img/send_to_review.png)
diff --git a/docs/content_management/content_relations.md b/docs/content_management/content_relations.md
index 19de54b0d2..29ec913759 100644
--- a/docs/content_management/content_relations.md
+++ b/docs/content_management/content_relations.md
@@ -1,5 +1,5 @@
 ---
-description: Content Relations control links between different content items, either created explicitly or by linking inside RichText Fields.
+description: Content Relations control links between different content items, either created explicitly or by linking inside RichText fields.
 ---
 
 # Content Relations
@@ -13,20 +13,20 @@ A **Relation** can exist between any two content items in the repository.
 For example, images are linked to news articles they're used in.
 Instead of using a fixed set of image attributes, the images are stored as separate content items outside the article.
 
-There are different types of Relations available in the system.
-Content can have Relations on item or on Field level.
+In the system you can find different types of Relations.
+Content can have Relations on item or on field level.
 
 *Relations at Field level* are created using one of two special field types: Content relation (single) and Content relations (multiple).
-These Fields allow you to select one or more other content items in the Field value, which are linked to these Fields.
+These fields allow you to select one or more other content items in the field value, which are linked to these fields.
 
 *Relations at content item level* can be of three different types:
 
 - *Common Relations* are created between two content items using the public PHP API.
-- *RichText linked Relations* are created using a Field of the RichText type.
-When an internal link (a link to another Location or content item) is placed in a RichText Field,
+- *RichText linked Relations* are created using a field of the RichText type.
+When an internal link (a link to another Location or content item) is placed in a RichText field,
 the system automatically creates a Relation.
 The Relation is automatically removed from the system when the link is removed from the content item.
-- *RichText embedded Relations* also use a RichText Field.
-When an Embed element is placed in a RichText Field, the system automatically creates a Relation
-between the embedded content item and the one with the RichText Field.
+- *RichText embedded Relations* also use a RichText field.
+When an Embed element is placed in a RichText field, the system automatically creates a Relation
+between the embedded content item and the one with the RichText field.
 The Relation is automatically removed from the system when the link is removed from the content item.
diff --git a/docs/content_management/field_types/create_custom_field_type_comparison.md b/docs/content_management/field_types/create_custom_field_type_comparison.md
index 30585b91c0..7a3a036a9f 100644
--- a/docs/content_management/field_types/create_custom_field_type_comparison.md
+++ b/docs/content_management/field_types/create_custom_field_type_comparison.md
@@ -1,11 +1,11 @@
 ---
-description: Enable comparison of content Fields based on a custom field type.
+description: Enable comparison of content fields based on a custom field type.
 ---
 
 # Create custom field type comparison
 
-In the back office, you can compare the contents of Fields.
-Comparing is possible only between two versions of the same Field that are in the same language.
+In the back office, you can compare the contents of fields.
+Comparing is possible only between two versions of the same field that are in the same language.
 
 You can add the possibility to compare custom and other unsupported field types.
 
@@ -42,7 +42,7 @@ Next, create a `src/FieldType/HelloWorld/Comparison/Value.php` file that holds t
 
 ## Create comparison engine
 
-The comparison engine handles the operations required for comparing the contents of Fields.
+The comparison engine handles the operations required for comparing the contents of fields.
 Each field type requires a separate comparison engine, which implements the `Ibexa\Contracts\VersionComparison\Engine\FieldTypeComparisonEngine` interface.
 
 For the "Hello World" field type, create the following comparison engine based on the engine for the TextLine field type.
diff --git a/docs/content_management/field_types/create_custom_generic_field_type.md b/docs/content_management/field_types/create_custom_generic_field_type.md
index 54a507bd1f..835085a9f2 100644
--- a/docs/content_management/field_types/create_custom_generic_field_type.md
+++ b/docs/content_management/field_types/create_custom_generic_field_type.md
@@ -58,7 +58,7 @@ It enables you to edit the new field type.
 [[= include_file('code_samples/field_types/generic_ft/src/Form/Type/HelloWorldType.php') =]]
 ```
 
-Now you can map Field definitions into Symfony forms with FormMapper.
+Now you can map field definitions into Symfony forms with FormMapper.
 Add the `mapFieldValueForm()` method required by `FieldValueFormMapperInterface`
 and the required `use` statements to `src/FieldType/HelloWorld/Type.php`:
 
diff --git a/docs/content_management/field_types/customize_field_type_metadata.md b/docs/content_management/field_types/customize_field_type_metadata.md
index d237f54cd0..9a8fdf2fde 100644
--- a/docs/content_management/field_types/customize_field_type_metadata.md
+++ b/docs/content_management/field_types/customize_field_type_metadata.md
@@ -4,13 +4,13 @@ description: You can customize which field type metadata should be disabled in t
 
 # Customize field type metadata
 
-When creating a content type definition, you add Fields and configure their metadata,
+When creating a content type definition, you add fields and configure their metadata,
 such as whether they're required, translatable, and so on.
 
 If needed, you can customize that some of those options are disabled in the back office for specific field types.
-To do this, add custom service definition for `ModifyFieldDefinitionsCollectionTypeExtension` 
+To do this, add custom service definition for `ModifyFieldDefinitionsCollectionTypeExtension`.
 
-For example, this configuration means that no Image Field can be set as required in the definition of a content type:
+For example, this configuration means that no Image field can be set as required in the definition of a content type:
 
 ``` yaml
 services:
@@ -28,9 +28,9 @@ services:
 
 `modifiedOptions` lists the changes you want to make. The following options are available:
 
-- `disable_identifier_field` - disables changing the Field identifier
-- `disable_required_field` - disables setting the Field as required
-- `disable_translatable_field` - disables setting the Field as translatable
-- `disable_remove` - disables removing the Field from content type definition (after it has been saved)
+- `disable_identifier_field` - disables changing the field identifier
+- `disable_required_field` - disables setting the field as required
+- `disable_translatable_field` - disables setting the field as translatable
+- `disable_remove` - disables removing the field from content type definition (after it has been saved)
 
-![Image Field with disabled required option](disable-required-field.png)
+![Image field with disabled required option](disable-required-field.png)
diff --git a/docs/content_management/field_types/field_type_reference/addressfield.md b/docs/content_management/field_types/field_type_reference/addressfield.md
index 604cb4c6c6..a9d82c4622 100644
--- a/docs/content_management/field_types/field_type_reference/addressfield.md
+++ b/docs/content_management/field_types/field_type_reference/addressfield.md
@@ -1,7 +1,7 @@
 # Address field type
 
-This Field represents and handles address fields.
-It allows you to customize address Fields per country.
+This field represents and handles address fields.
+It allows you to customize address fields per country.
 
 | Name      | Internal name   | Expected input              |
 |-----------|-----------------|-----------------------------|
@@ -67,7 +67,7 @@ formats:
                 - postal_code
 ```
 
-#### Modifying Field configuration
+#### Modifying field configuration
 
 ```yaml
 formats:
diff --git a/docs/content_management/field_types/field_type_reference/binaryfilefield.md b/docs/content_management/field_types/field_type_reference/binaryfilefield.md
index f5cf63ee51..54a912a262 100644
--- a/docs/content_management/field_types/field_type_reference/binaryfilefield.md
+++ b/docs/content_management/field_types/field_type_reference/binaryfilefield.md
@@ -59,11 +59,11 @@ To use a remote file, you have to download it locally first, then remove it afte
 
 ## REST API specifics
 
-Used in the REST API, a BinaryFile Field mostly serializes the hash described above. However there are a couple specifics worth mentioning.
+Used in the REST API, a BinaryFile field mostly serializes the hash described above. However there are a couple specifics worth mentioning.
 
 ### Reading content: `url` property
 
-When reading the contents of a Field of this type, an extra key is added: `url`. This key gives you the absolute file URL, protocol and host included.
+When reading the contents of a field of this type, an extra key is added: `url`. This key gives you the absolute file URL, protocol and host included.
 
 Example: `http://example.com/var/ezdemo_site/storage/original/application/63cd472dd7819da7b75e8e2fee507c68.pdf`
 
diff --git a/docs/content_management/field_types/field_type_reference/contentqueryfield.md b/docs/content_management/field_types/field_type_reference/contentqueryfield.md
index fc752e2419..b7ef3d27d2 100644
--- a/docs/content_management/field_types/field_type_reference/contentqueryfield.md
+++ b/docs/content_management/field_types/field_type_reference/contentqueryfield.md
@@ -1,6 +1,6 @@
 # Content query field type
 
-This field type maps an executable repository query to a Field.
+This field type maps an executable repository query to a field.
 
 | Name      | Internal name | Expected input |
 |-----------|---------------|----------------|
diff --git a/docs/content_management/field_types/field_type_reference/countryfield.md b/docs/content_management/field_types/field_type_reference/countryfield.md
index 099b42ecdb..d44bbf1247 100644
--- a/docs/content_management/field_types/field_type_reference/countryfield.md
+++ b/docs/content_management/field_types/field_type_reference/countryfield.md
@@ -23,15 +23,15 @@ Example array:
 ];
 ```
 
-When you set an array directly on a Content Field you don't need to provide all this information, the field type assumes it's a hash and in this case accepts a simplified structure described below under [Hash format](#hash-format).
+When you set an array directly on a content field you don't need to provide all this information, the field type assumes it's a hash and in this case accepts a simplified structure described below under [Hash format](#hash-format).
 
 ### Validation
 
-This field type validates whether multiple countries are allowed by the Field definition, and whether the [Alpha2](https://www.iso.org/iso-3166-country-codes.html) is valid according to the countries configured in [[= product_name =]].
+This field type validates whether multiple countries are allowed by the field definition, and whether the [Alpha2](https://www.iso.org/iso-3166-country-codes.html) is valid according to the countries configured in [[= product_name =]].
 
 ### Settings
 
-The Field definition of this field type can be configured with one option:
+The field definition of this field type can be configured with one option:
 
 | Name         | Type      | Default value | Description|
 |--------------|-----------|---------------|------------|
@@ -46,7 +46,7 @@ $settings = [
 
 ### Hash format
 
-The format used for serialization is simpler than the full format. It's also available when setting value on the content Field, by setting the value to an array instead of the Value object. Example of that shown below:
+The format used for serialization is simpler than the full format. It's also available when setting value on the content field, by setting the value to an array instead of the Value object. Example of that shown below:
 
 ``` php
 // Value object content example
diff --git a/docs/content_management/field_types/field_type_reference/customergroupfield.md b/docs/content_management/field_types/field_type_reference/customergroupfield.md
index ba6e694690..6cd3d118dd 100644
--- a/docs/content_management/field_types/field_type_reference/customergroupfield.md
+++ b/docs/content_management/field_types/field_type_reference/customergroupfield.md
@@ -1,4 +1,4 @@
-# Customer group Field
+# Customer group field
 
 This field type represents a customer group that a user belongs to.
 
diff --git a/docs/content_management/field_types/field_type_reference/dateandtimefield.md b/docs/content_management/field_types/field_type_reference/dateandtimefield.md
index 4535563975..f8a7c7108b 100644
--- a/docs/content_management/field_types/field_type_reference/dateandtimefield.md
+++ b/docs/content_management/field_types/field_type_reference/dateandtimefield.md
@@ -72,12 +72,12 @@ This field type does not perform any special validation of the input value.
 
 ### Settings
 
-The Field definition of this field type can be configured with several options:
+The field definition of this field type can be configured with several options:
 
 |Name|Type|Default value|Description|
 |------|------|------|------|
 |`useSeconds`|`boolean`|`false`|Used to control displaying of seconds in the output.|
-|`defaultType`|`mixed`|`Type::DEFAULT_EMPTY`|One of the `DEFAULT_*` constants, used by the administration interface for setting the default Field value. See below for more details.|
+|`defaultType`|`mixed`|`Type::DEFAULT_EMPTY`|One of the `DEFAULT_*` constants, used by the administration interface for setting the default field value. See below for more details.|
 |`dateInterval`|`null|\DateInterval`|`null`|This setting complements `defaultType` setting and can be used only when the latter is set to `Type::DEFAULT_CURRENT_DATE_ADJUSTED`. In that case the default input value when using administration interface is adjusted by the given `\DateInterval`.|
 
 Following `defaultType` default value options are available as constants in the `Ibexa\Core\FieldType\DateAndTime\Type` class:
@@ -102,11 +102,11 @@ $settings = [
 
 ## Template rendering
 
-The template called by the [`ibexa_render_field()` Twig function](field_twig_functions.md#ibexa_render_field) while rendering a Date Field has access to the following parameters:
+The template called by the [`ibexa_render_field()` Twig function](field_twig_functions.md#ibexa_render_field) while rendering a Date field has access to the following parameters:
 
 | Parameter | Type     | Default | Description|
 |-----------|----------|---------|------------|
-| `locale`  | `string` |   n/a   | Internal parameter set by the system based on current request locale or if not set calculated based on the language of the Field. |
+| `locale`  | `string` |   n/a   | Internal parameter set by the system based on current request locale or if not set calculated based on the language of the field. |
 
 Example:
 
diff --git a/docs/content_management/field_types/field_type_reference/datefield.md b/docs/content_management/field_types/field_type_reference/datefield.md
index 8d25bd3e7f..982b29d40e 100644
--- a/docs/content_management/field_types/field_type_reference/datefield.md
+++ b/docs/content_management/field_types/field_type_reference/datefield.md
@@ -74,11 +74,11 @@ This field type does not perform any special validation of the input value.
 
 ### Settings
 
-The Field definition of this field type can be configured with a single option:
+The field definition of this field type can be configured with a single option:
 
 |Name|Type|Default value|Description|
 |------|------|------|------|
-|`defaultType`|`mixed`|`Type::DEFAULT_EMPTY`|One of the `DEFAULT_*` constants, used by the administration interface for setting the default Field value. See below for more details.|
+|`defaultType`|`mixed`|`Type::DEFAULT_EMPTY`|One of the `DEFAULT_*` constants, used by the administration interface for setting the default field value. See below for more details.|
 
 Following `defaultType` default value options are available as constants in the `Ibexa\Core\FieldType\Date\Type` class:
 
@@ -99,11 +99,11 @@ $settings = [
 
 ## Template rendering
 
-The template called by [the `ibexa_render_field()` Twig function](field_twig_functions.md#ibexa_render_field) while rendering a Date Field has access to the following parameters:
+The template called by [the `ibexa_render_field()` Twig function](field_twig_functions.md#ibexa_render_field) while rendering a Date field has access to the following parameters:
 
 | Parameter | Type     |Description|
 |-----------|----------|------------|
-| `locale`  | `string` |Internal parameter set by the system based on current request locale or if not set, calculated based on the language of the Field. |
+| `locale`  | `string` |Internal parameter set by the system based on current request locale or if not set, calculated based on the language of the field. |
 
 Example:
 
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
index 0b0bcda2a6..9c222a5e1a 100644
--- 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
@@ -5,7 +5,10 @@ page_type: reference
 
 # Field type reference
 
-A field type is the underlying building block of the content model. It consists of two entities: Field value and Field definition. Field value is determined by values entered into the Content Field. Field definition is provided by the content type, and holds any user defined rules used by field type to determine how a Field Value is validated, stored, retrieved, formatted and so on.
+A field type is the underlying building block of the content model.
+It consists of two entities: field value and field definition.
+Field value is determined by values entered into the content field.
+Field definition is provided by the content type, and holds any user defined rules used by field type to determine how a field Value is validated, stored, retrieved, formatted and so on.
 
 [[= product_name =]] comes with a collection of field types that can be used to build powerful and complex content structures. In addition, it's possible to extend the system by creating custom types for special needs.
 
@@ -23,7 +26,7 @@ Custom field types have to be programmed in PHP. However, the built-in field ty
 | [Author](authorfield.md) | Stores a list of authors, each consisting of author name and author email. | No | Yes |
 | [BinaryFile](binaryfilefield.md) | Stores a file.| Yes | Yes |
 | [Checkbox](checkboxfield.md) | Stores a boolean value. | Yes | Yes |
-| [Content query](contentqueryfield.md) | Maps an executable repository query to a Field. | No | No |
+| [Content query](contentqueryfield.md) | Maps an executable repository query to a field. | No | No |
 | [Country](countryfield.md) | Stores country names as a string. | Yes[^1^](#1-note-on-legacy-search-engine) | Yes |
 | [Customer group](customergroupfield.md) | Stores customer group to which a user belongs.
 | [DateAndTime](dateandtimefield.md) | Stores a full date including time information. | Yes | Yes |
diff --git a/docs/content_management/field_types/field_type_reference/imagefield.md b/docs/content_management/field_types/field_type_reference/imagefield.md
index f3b39bb947..a8f9ef003c 100644
--- a/docs/content_management/field_types/field_type_reference/imagefield.md
+++ b/docs/content_management/field_types/field_type_reference/imagefield.md
@@ -12,14 +12,14 @@ A **variation service** handles the conversion of the original image into diffe
 
 ### Value object
 
-The `value` property of an Image Field returns an `Ibexa\Core\FieldType\Image\Value` object with the following properties:
+The `value` property of an Image field returns an `Ibexa\Core\FieldType\Image\Value` object with the following properties:
 
 ##### Properties
 
 |Property|Type|Example|Description|
 |------|------|------|------|
 |`id`|string|`0/8/4/1/1480-1-eng-GB/image.png`|The image's unique identifier. Usually the path, or a part of the path. To get the full path, use the `uri` property.|
-|`alternativeText`|string|`Picture of an apple.`|The alternative text, as entered in the Field's properties. This property is optional. It's recommended that you require the alternative text for an image when you add the Image Field to a content type, by selecting the "Alternative text is required" checkbox.|
+|`alternativeText`|string|`Picture of an apple.`|The alternative text, as entered in the field's properties. This property is optional. It's recommended that you require the alternative text for an image when you add the Image field to a content type, by selecting the "Alternative text is required" checkbox.|
 |`fileName`|string|`image.png`|The original image's filename, without the path.|
 |`fileSize`|int|`37931`|The original image's size, in bytes.|
 |`uri`|string|`var/ezdemo_site/storage/images/0/8/4/1/1480-1-eng-GB/image.png`|The original image's URI.|
@@ -73,19 +73,19 @@ The Image field type supports one `FieldDefinition` option: the maximum size for
 
     As the default value for maximum size is set to 10MB, we recommend setting the `upload_max_filesize` key in the `php.ini` configuration file to a value equal to or higher than that. It prevents validation errors while editing content types.
 
-## Using an Image Field
+## Using an Image field
 
 To read more about handling images and image variations, see the [Images documentation](images.md).
 
 ### Template Rendering
 
-When displayed using `ibexa_render_field`, an Image Field outputs this type of HTML:
+When displayed using `ibexa_render_field`, an Image field outputs this type of HTML:
 
 ``` html+twig
 <img src="var/ezdemo_site/storage/images/0/8/4/1/1480-1-eng-GB/image_medium.png" width="844" height="430" alt="Alternative text" />
 ```
 
-The template called by the [`ibexa_render_field()` Twig function](field_twig_functions.md#ibexa_render_field) while rendering a Image Field accepts the following parameters:
+The template called by the [`ibexa_render_field()` Twig function](field_twig_functions.md#ibexa_render_field) while rendering a Image field accepts the following parameters:
 
 | Parameter | Type     | Default        | Description |
 |-----------|----------|----------------|-------------|
@@ -100,7 +100,7 @@ Example: 
 {{ ibexa_render_field( content, 'image', { 'parameters':{ 'alias': 'imagelarge', 'width': 400, 'height': 400 } } ) }}
 ```
 
-The raw Field can also be used if needed. Image variations for the Field's content can be obtained using the `ibexa_image_alias` Twig helper:
+The raw field can also be used if needed. Image variations for the field's content can be obtained using the `ibexa_image_alias` Twig helper:
 
 ``` html+twig
 {% set imageAlias = ibexa_image_alias( field, versionInfo, 'medium' ) %}
@@ -114,7 +114,7 @@ The variation's properties can be used to generate the required output:
 
 ### With the REST API
 
-Image Fields within REST are exposed by the `application/vnd.ibexa.api.Content` media-type. An Image Field looks like this:
+Image Fields within REST are exposed by the `application/vnd.ibexa.api.Content` media-type. An Image field looks like this:
 
 ``` xml
 <field>
@@ -140,7 +140,7 @@ Image Fields within REST are exposed by the `application/vnd.ibexa.api.Content`
 </field>
 ```
 
-Children of the `fieldValue` node list the general properties of the Field's original image (`fileSize`, `fileName`, `inputUri`, etc.), and its variations. For each variation, a URI is provided. Requested through REST, this resource generates the variation if it doesn't exist yet, and list the variation details:
+Children of the `fieldValue` node list the general properties of the field's original image (`fileSize`, `fileName`, `inputUri`, etc.), and its variations. For each variation, a URI is provided. Requested through REST, this resource generates the variation if it doesn't exist yet, and list the variation details:
 
 ``` xml
 <ContentImageVariation media-type="application/vnd.ibexa.api.ContentImageVariation+xml" href="/api/ibexa/v2/content/binary/images/240-1480/variations/tiny">
@@ -156,7 +156,7 @@ Children of the `fieldValue` node list the general properties of the Field's ori
 
 #### Getting an image variation
 
-The variation service, `ibexa.field_type.ezimage.variation_service`, can be used to generate/get variations for a Field. It expects a VersionInfo, the Image Field, and the variation name as a string (`large`, `medium`, etc.):
+The variation service, `ibexa.field_type.ezimage.variation_service`, can be used to generate/get variations for a field. It expects a VersionInfo, the Image field, and the variation name as a string (`large`, `medium`, etc.):
 
 ``` php
 $variation = $imageVariationHandler->getVariation(
@@ -170,7 +170,7 @@ echo $variation->uri;
 
 ### From PHP
 
-As for any field type, there are several ways to input content to a Field. For an Image, the quickest is to call `setField()` on the ContentStruct:
+As for any field type, there are several ways to input content to a field. For an Image, the quickest is to call `setField()` on the ContentStruct:
 
 ``` php
 $createStruct = $contentService->newContentCreateStruct(
@@ -211,9 +211,9 @@ $createStruct->setField( 'image', $imageValue );
 
 ### From REST
 
-The REST API expects Field values to be provided in a hash-like structure. Those keys are identical to those expected by the `Image\Value` constructor: `fileName`, `alternativeText`. In addition, image data can be provided using the `data` property, with the image's content encoded as base64.
+The REST API expects field values to be provided in a hash-like structure. Those keys are identical to those expected by the `Image\Value` constructor: `fileName`, `alternativeText`. In addition, image data can be provided using the `data` property, with the image's content encoded as base64.
 
-#### Creating an Image Field
+#### Creating an Image field
 
 ```
 <?xml version="1.0" encoding="UTF-8"?>
@@ -236,9 +236,9 @@ The REST API expects Field values to be provided in a hash-like structure. Those
 </ContentCreate>
 ```
 
-### Updating an Image Field
+### Updating an Image field
 
-Updating an Image Field requires that you re-send existing data. This can be done by re-using the Field obtained via REST, **removing the variations key**, and updating `alternativeText`, `fileName` or `data`. If you do not want to change the image itself, do not provide the `data` key.
+Updating an Image field requires that you re-send existing data. This can be done by re-using the field obtained via REST, **removing the variations key**, and updating `alternativeText`, `fileName` or `data`. If you do not want to change the image itself, do not provide the `data` key.
 
 ``` xml
 <?xml version="1.0" encoding="UTF-8"?>
@@ -279,7 +279,7 @@ With the following values:
 
 Images are stored in `web/var/ezdemo_site/storage/images/0/8/4/1/1480-1-eng-GB`.
 
-Using the Field ID digits in reverse order as the folder structure maximizes sharding of files through multiple folders on the filesystem.
+Using the field ID digits in reverse order as the folder structure maximizes sharding of files through multiple folders on the filesystem.
 
 Within this folder, images are named like the uploaded file, suffixed with an underscore and the variation name:
 
diff --git a/docs/content_management/field_types/field_type_reference/isbnfield.md b/docs/content_management/field_types/field_type_reference/isbnfield.md
index 6a8673d9fc..85f3f32998 100644
--- a/docs/content_management/field_types/field_type_reference/isbnfield.md
+++ b/docs/content_management/field_types/field_type_reference/isbnfield.md
@@ -28,7 +28,7 @@ The constructor for this value object initializes a new Value object with the va
 
 ### Validation
 
-The input passed into this field type is subject of ISBN validation depending on the Field settings in its FieldDefinition stored in the content type. An example of this Field setting is shown below and controls if input is validated as ISBN-13 or ISBN-10:
+The input passed into this field type is subject of ISBN validation depending on the field settings in its FieldDefinition stored in the content type. An example of this field setting is shown below and controls if input is validated as ISBN-13 or ISBN-10:
 
 ``` php
 Array
diff --git a/docs/content_management/field_types/field_type_reference/maplocationfield.md b/docs/content_management/field_types/field_type_reference/maplocationfield.md
index fda73e5a7a..72345b9f4c 100644
--- a/docs/content_management/field_types/field_type_reference/maplocationfield.md
+++ b/docs/content_management/field_types/field_type_reference/maplocationfield.md
@@ -50,7 +50,7 @@ $MapLocationValue = new MapLocation\Value(
 
 ## Template rendering
 
-The template called by [the `ibexa_render_field()` Twig function](field_twig_functions.md#ibexa_render_field) while rendering a Map Location Field accepts the following parameters:
+The template called by [the `ibexa_render_field()` Twig function](field_twig_functions.md#ibexa_render_field) while rendering a Map Location field accepts the following parameters:
 
 |Parameter|Type|Default|Description|
 |------|------|------|------|
diff --git a/docs/content_management/field_types/field_type_reference/matrixfield.md b/docs/content_management/field_types/field_type_reference/matrixfield.md
index 6cb775b5a8..4f57166d65 100644
--- a/docs/content_management/field_types/field_type_reference/matrixfield.md
+++ b/docs/content_management/field_types/field_type_reference/matrixfield.md
@@ -1,6 +1,6 @@
 # Matrix field type
 
-This Field represents and handles a table of rows and columns of data.
+This field represents and handles a table of rows and columns of data.
 
 | Name     | Internal name | Expected input |
 |----------|---------------|----------------|
@@ -37,11 +37,11 @@ new FieldType\Value([
 
 ### Validation
 
-The minimum number of rows is set on content type level for each Field.
+The minimum number of rows is set on content type level for each field.
 
 Validation checks for empty rows. A row is considered empty if it contains only empty cells (or cells containing only spaces). Empty rows are removed.
 
-If, after removing empty rows, the number of rows does not fulfill the configured `Minimum number of rows`, the Field doesn't validate.
+If, after removing empty rows, the number of rows does not fulfill the configured `Minimum number of rows`, the field doesn't validate.
 
 For example, the following input doesn't validate if `Minimum number of rows` is set to 3, because the second row is empty:
 
@@ -55,13 +55,13 @@ new FieldType\Value([
 
 ## GraphQL field type operations
 
-To get a Field of the Matrix field type with GraphQL, you need to specify a Content ID, a content type, and a field type.
+To get a field of the Matrix field type with GraphQL, you need to specify a Content ID, a content type, and a field type.
 
-The types that are returned are named after the Type and the Field:
+The types that are returned are named after the Type and the field:
 
 - `{TypeIdentifier}{FieldIdentifier}Row`
 
-The example below shows a GraphQL query for a Recipe content item (belonging to a content type with a Matrix Field added), that has two Fields:
+The example below shows a GraphQL query for a Recipe content item (belonging to a content type with a Matrix field added), that has two fields:
 
 - `name`: `ezstring`
 - `ingredients`: `ezmatrix` with two columns: `ingredient` and `quantity`
@@ -80,7 +80,7 @@ The example below shows a GraphQL query for a Recipe content item (belonging to
 }
 ```
 
-The Type returned for the Matrix Field exposes columns defined in the Field definition:
+The Type returned for the Matrix field exposes columns defined in the field definition:
 
 ```
 {
@@ -104,9 +104,9 @@ The Type returned for the Matrix Field exposes columns defined in the Field defi
 }
 ```
 
-### Query for the field type and Field definition's details
+### Query for the field type and field definition's details
 
-With this query you can inspect details of specific content type. In case of a Matrix Field, you can ask for the list of columns, their names and identifiers.
+With this query you can inspect details of specific content type. In case of a Matrix field, you can ask for the list of columns, their names and identifiers.
 
 ```
 {
@@ -167,12 +167,12 @@ Example response:
 
 ### Mutation
 
-To create a Matrix field type you need to define field type and Field definition identifiers.
-The types that are used for input are named after the Type and the Field:
+To create a Matrix field type you need to define field type and field definition identifiers.
+The types that are used for input are named after the Type and the field:
 
 - `{TypeIdentifier}{FieldIdentifier}RowInput` e.g. `dish.nutritionFacts`, `event.agenda`: `DishNutritionFactsRowInput`, `EventAgendaRowInput`
 
-The example below shows how to create a Recipe content item (belonging to a content type with a Matrix field type added) that has two Fields:
+The example below shows how to create a Recipe content item (belonging to a content type with a Matrix field type added) that has two fields:
 
 - `name`: `"Cake Ingredient List"`
 - `ingredients`: `ezmatrix` with two columns: `ingredient` and `quantity`
@@ -195,7 +195,7 @@ The example below shows how to create a Recipe content item (belonging to a cont
 }
 ```
 
-The response confirms creation of the new Recipe Field:
+The response confirms creation of the new Recipe field:
 
 ```
 {
diff --git a/docs/content_management/field_types/field_type_reference/relationfield.md b/docs/content_management/field_types/field_type_reference/relationfield.md
index 3eecb4a313..41bdcab5a9 100644
--- a/docs/content_management/field_types/field_type_reference/relationfield.md
+++ b/docs/content_management/field_types/field_type_reference/relationfield.md
@@ -48,7 +48,7 @@ This field type validates whether the provided relation exists, but before that
 
 ### Settings
 
-The Field definition of this field type can be configured with three options:
+The field definition of this field type can be configured with three options:
 
 |Name|Type|Default value|Description|
 |------|------|------|------|
diff --git a/docs/content_management/field_types/field_type_reference/relationlistfield.md b/docs/content_management/field_types/field_type_reference/relationlistfield.md
index 081abdf4d8..6bf2fe0943 100644
--- a/docs/content_management/field_types/field_type_reference/relationlistfield.md
+++ b/docs/content_management/field_types/field_type_reference/relationlistfield.md
@@ -60,7 +60,7 @@ This field type validates if:
 - the `selectionMethod` specified is `\Ibexa\Core\FieldType\RelationList\Type::SELECTION_BROWSE` or `\Ibexa\Core\FieldType\RelationList\Type::SELECTION_DROPDOWN`. A validation error is thrown if the value does not match.
 - the `selectionDefaultLocation` specified is `null`, `string` or `integer`. If the type validation fails a validation error is thrown.
 - the value specified in `selectionContentTypes` is an `array`. If not, a validation error in given.
-- the number of content items selected in the Field isn't greater than the `selectionLimit`.
+- the number of content items selected in the field isn't greater than the `selectionLimit`.
 
 !!! note
 
@@ -68,7 +68,7 @@ This field type validates if:
 
 ### Settings
 
-The Field definition of this field type can be configured with the following options:
+The field definition of this field type can be configured with the following options:
 
 |Name|Type|Default value|Description|
 |------|------|------|------|
@@ -87,7 +87,7 @@ Following selection methods are available:
 
 |Name|Type|Default value|Description|
 |------|------|------|------|
-|`RelationListValueValidator[selectionLimit]`|`integer`|`0`|The number of content items that can be selected in the Field. When set to 0, any number can be selected.|
+|`RelationListValueValidator[selectionLimit]`|`integer`|`0`|The number of content items that can be selected in the field. When set to 0, any number can be selected.|
 
 ``` php
 // Example of using settings and validators configuration in PHP
diff --git a/docs/content_management/field_types/field_type_reference/selectionfield.md b/docs/content_management/field_types/field_type_reference/selectionfield.md
index 88852b4749..be0133db59 100644
--- a/docs/content_management/field_types/field_type_reference/selectionfield.md
+++ b/docs/content_management/field_types/field_type_reference/selectionfield.md
@@ -63,7 +63,7 @@ $hash = [ 1, 2 ];
 
 ### Validation
 
-This field type validates the input, verifying if all selected options exist in the Field definition and checks if multiple selections are allowed in the Field definition.
+This field type validates the input, verifying if all selected options exist in the field definition and checks if multiple selections are allowed in the field definition.
 If any of these validations fail, a `ValidationError` is thrown, specifying the error message. When option validation fails, a list with the invalid options is also presented.
 
 ### Settings
@@ -71,7 +71,7 @@ If any of these validations fail, a `ValidationError` is thrown, specifying the
 | Name         | Type      | Default value | Description|
 |--------------|-----------|---------------|------------|
 | `isMultiple` | `boolean` | `false`       | Used to allow or prohibit multiple selection from the option list. |
-| `options`    | `hash`    | `[]`     | Stores the list of options defined in the Field definition.    |
+| `options`    | `hash`    | `[]`     | Stores the list of options defined in the field definition.    |
 
 ``` php
 // Selection field type example settings
diff --git a/docs/content_management/field_types/field_type_reference/sesexternaldata.md b/docs/content_management/field_types/field_type_reference/sesexternaldata.md
index 78af38f8f9..c8d2f9c22d 100644
--- a/docs/content_management/field_types/field_type_reference/sesexternaldata.md
+++ b/docs/content_management/field_types/field_type_reference/sesexternaldata.md
@@ -6,7 +6,7 @@ The data is stored in the `ses_externaldata` table with the following structure:
 |Field|Type|Description|
 |--- |--- |--- |
 |`sku`|char(40)|Unique ID of the Product category (CatalogElement).|
-|`identifier`|char(40)|ID of the Field.|
+|`identifier`|char(40)|ID of the field.|
 |`language_code`|char(8)|Language code, for example, `ger-DE`.|
 |`ses_field_type`|char(20)|The data type used for this data.|
 |`content`|longtext|Serialized data in string format.|
diff --git a/docs/content_management/field_types/field_type_reference/sesprofiledata.md b/docs/content_management/field_types/field_type_reference/sesprofiledata.md
index fd6fe85102..c836bbd15b 100644
--- a/docs/content_management/field_types/field_type_reference/sesprofiledata.md
+++ b/docs/content_management/field_types/field_type_reference/sesprofiledata.md
@@ -8,4 +8,4 @@ because it's impossible to store special HTML characters (`<`,`>`, `""`,`''`, `&
 The name of the customer (taken from the contact section) can be used for lists.
 To do it, use the name pattern in the content type definition of the User content type.
 
-`customer_profile_data` is the identifier of the Field where the profile data is stored.
+`customer_profile_data` is the identifier of the field where the profile data is stored.
diff --git a/docs/content_management/field_types/field_type_reference/sesselection.md b/docs/content_management/field_types/field_type_reference/sesselection.md
index 857c262f56..56a21e8fd5 100644
--- a/docs/content_management/field_types/field_type_reference/sesselection.md
+++ b/docs/content_management/field_types/field_type_reference/sesselection.md
@@ -20,4 +20,4 @@ ibexa.commerce.site_access.config.core.default.sesselection.news_type:
 
 The `translation_context` key, which identifies the context used for translating the labels, is optional. 
 
-To add a SesSelection Field to a content type, make sure the Field's identifier is the same as the configuration key (in the example above, `news_type`).
+To add a SesSelection field to a content type, make sure the field's identifier is the same as the configuration key (in the example above, `news_type`).
diff --git a/docs/content_management/field_types/field_type_reference/specificationstype.md b/docs/content_management/field_types/field_type_reference/specificationstype.md
index 27358f9436..205526c3b6 100644
--- a/docs/content_management/field_types/field_type_reference/specificationstype.md
+++ b/docs/content_management/field_types/field_type_reference/specificationstype.md
@@ -4,7 +4,7 @@ This field type stores a structured list of attributes for products.
 
 !!! caution "Field naming"
 
-    A Field of the SpecificationsType must have `ses_specifications` as its Field identifier.
+    A field of the SpecificationsType must have `ses_specifications` as its field identifier.
 
 The data is stored in JSON format.
 
diff --git a/docs/content_management/field_types/field_type_reference/taxonomyentryassignmentfield.md b/docs/content_management/field_types/field_type_reference/taxonomyentryassignmentfield.md
index 900e915f72..4e2234d08f 100644
--- a/docs/content_management/field_types/field_type_reference/taxonomyentryassignmentfield.md
+++ b/docs/content_management/field_types/field_type_reference/taxonomyentryassignmentfield.md
@@ -1,15 +1,15 @@
 # TaxonomyEntryAssignment field type
 
-`TaxonomyEntryAssignment` Field is used to integrate content with the Taxonomy module. 
+`TaxonomyEntryAssignment` field is used to integrate content with the Taxonomy module. 
 It allows you to select tags or categories and assign them to content. 
 This field type assigns tags to the content in the data action, so then you can use `TaxonomyService` on this content item. 
 
 !!! caution "Duplicate taxonomy fields"
 
-    Because tags are assigned per content item, not per Field, you cannot use two **Taxonomy Entry Assignment** Fields with the same taxonomy type in one content type.
+    Because tags are assigned per content item, not per field, you cannot use two **Taxonomy Entry Assignment** fields with the same taxonomy type in one content type.
 
 
-To be able to assign tags to the content, first, you need to add a `TaxonomyEntryAssignment` Field to the content type definition.
+To be able to assign tags to the content, first, you need to add a `TaxonomyEntryAssignment` field to the content type definition.
 
 | Name                     | Internal name                    | Expected input |
 |--------------------------|----------------------------------|----------------|
@@ -60,8 +60,8 @@ The constructor accepts `taxonomyEntries` and `taxonomy` as described above.
 
 #### String representation
 
-If the Field has no entries - empty string.
-If the Field has entries (for example: "Cars and 5 more") - a string displaying the first taxonomy entry and the number of rest of the entries.
+If the field has no entries - empty string.
+If the field has entries (for example: "Cars and 5 more") - a string displaying the first taxonomy entry and the number of rest of the entries.
 
 #### Hash format
 
diff --git a/docs/content_management/field_types/field_type_reference/taxonomyentryfield.md b/docs/content_management/field_types/field_type_reference/taxonomyentryfield.md
index 28937db563..f28def6546 100644
--- a/docs/content_management/field_types/field_type_reference/taxonomyentryfield.md
+++ b/docs/content_management/field_types/field_type_reference/taxonomyentryfield.md
@@ -11,7 +11,7 @@ It's used as a parent for a tag or category.
 
 ### Input expectations
 
-A `TaxonomyEntry` Field accepts an array with an `Ibexa\Contracts\Taxonomy\Value\TaxonomyEntry` object.
+A `TaxonomyEntry` field accepts an array with an `Ibexa\Contracts\Taxonomy\Value\TaxonomyEntry` object.
 
 | Type     | Description | Example         |
 |--------|-----------------|-----------------|
@@ -69,7 +69,7 @@ No validation.
 
 #### Settings
 
-The Field definition of this field type can be configured with the following options:
+The field definition of this field type can be configured with the following options:
 
 |Name|Type|Default value|Description|
 |------|------|------|------|
diff --git a/docs/content_management/field_types/field_type_reference/timefield.md b/docs/content_management/field_types/field_type_reference/timefield.md
index 4cf65dbde3..3ee3a86c38 100644
--- a/docs/content_management/field_types/field_type_reference/timefield.md
+++ b/docs/content_management/field_types/field_type_reference/timefield.md
@@ -80,11 +80,11 @@ $settings = [
 
 ## Template rendering
 
-The template called by [the `ibexa_render_field()` Twig function](field_twig_functions.md#ibexa_render_field) while rendering a Date Field has access to the following parameters:
+The template called by [the `ibexa_render_field()` Twig function](field_twig_functions.md#ibexa_render_field) while rendering a Date field has access to the following parameters:
 
 | Parameter | Type     | Default | Description|
 |-----------|----------|---------|------------|
-| `locale`  | `string` |   n/a   | Internal parameter set by the system based on current request locale or, if not set, calculated based on the language of the Field. |
+| `locale`  | `string` |   n/a   | Internal parameter set by the system based on current request locale or, if not set, calculated based on the language of the field. |
 
 Example:
 
diff --git a/docs/content_management/field_types/field_type_search.md b/docs/content_management/field_types/field_type_search.md
index 6dc4f804b1..ac6ba501e3 100644
--- a/docs/content_management/field_types/field_type_search.md
+++ b/docs/content_management/field_types/field_type_search.md
@@ -30,11 +30,11 @@ This example from the `Url` field type shows that the field type always returns
 
 ### `getDefaultMatchField()`
 
-This method retrieves the name of the default Field to be used for matching. As field types can index multiple Fields (see [MapLocation](maplocationfield.md) field type's implementation of this interface), this method is used to define the default field for matching. The default Field is typically used by the [`Field` Search Criterion](field_criterion.md).
+This method retrieves the name of the default field to be used for matching. As field types can index multiple fields (see [MapLocation](maplocationfield.md) field type's implementation of this interface), this method is used to define the default field for matching. The default field is typically used by the [`Field` Search Criterion](field_criterion.md).
 
 ### `getDefaultSortField()`
 
-This method gets name of the default Field to be used for sorting. As field types can index multiple Fields (see [MapLocation](maplocationfield.md) field type's implementation of this interface), this method is used to define default field for sorting. Default Field is typically used by the [`Field` Sort Clause](field_sort_clause.md).
+This method gets name of the default field to be used for sorting. As field types can index multiple fields (see [MapLocation](maplocationfield.md) field type's implementation of this interface), this method is used to define default field for sorting. Default field is typically used by the [`Field` Sort Clause](field_sort_clause.md).
 
 ## Register `Indexable` implementations
 
@@ -49,15 +49,15 @@ Ibexa\Core\FieldType\Keyword\SearchField:
 
 `alias` should be the same as field type ID.
 
-## Search Field values
+## Search field values
 
-The search Field values returned by the `getIndexData` method are simple value objects consisting of the following properties:
+The search field values returned by the `getIndexData` method are simple value objects consisting of the following properties:
 
 |Property|Description|
 |--------|-----------|
 |`$name`|The name of the field|
 |`$value`|The value of the field|
-|`$type`|An `Ibexa\Contracts\Core\Search\FieldType` instance, describing the type information of the Field.|
+|`$type`|An `Ibexa\Contracts\Core\Search\FieldType` instance, describing the type information of the field.|
 
 ## Search field types
 
@@ -68,13 +68,13 @@ The default available search field types that can be found in the `Ibexa\Contrac
 |Field type|Description|
 |--------|-----------|
 |`BooleanField`|Boolean values.|
-|`CustomField`|Custom Field, for custom search data types. Probably requires additional configuration in the search backend.|
+|`CustomField`|Custom field, for custom search data types. Probably requires additional configuration in the search backend.|
 |`DateField`|Date field. Can be used for date range queries.|
 |`DocumentField`|Document field|
 |`FloatField`|Field for floating point numbers.|
-|`FullTextField`|Represents full text searchable value of the Field which can be indexed by the legacy search engine. Some full text Fields are stored as an array of strings.|
+|`FullTextField`|Represents full text searchable value of the field which can be indexed by the legacy search engine. Some full text fields are stored as an array of strings.|
 |`GeoLocationField`|Field used for Geo Location.|
-|`IdentifierField`|Field used for IDs. Basically acts like the string Field, but it's not queried by fulltext searches|
+|`IdentifierField`|Field used for IDs. Basically acts like the string field, but it's not queried by fulltext searches|
 |`IntegerField`|Field for integer numbers.|
 |`MultipleBooleanField`|Multiple boolean values.|
 |`MultipleIdentifierField`|Multiple IDs values.|
@@ -87,12 +87,12 @@ The default available search field types that can be found in the `Ibexa\Contrac
 ## Configuring Solr
 
 As mentioned before, if you use the standard type definitions, there is no need to configure the search backend in any way.
-The Field definitions are handled using `dynamicField` definitions in Solr, for example.
+The field definitions are handled using `dynamicField` definitions in Solr, for example.
 
-If you want to configure the handling of your Field, you can always add a special Field definition to the Solr `schema.xml`. For Fields, the field type names used by the Solr search backend look like this: `<content_type_identifier>/<field_identifier>/<search_field_name>_<type>`.
+If you want to configure the handling of your field, you can always add a special field definition to the Solr `schema.xml`. For fields, the field type names used by the Solr search backend look like this: `<content_type_identifier>/<field_identifier>/<search_field_name>_<type>`.
 You can define custom `dynamicField` definitions to match, for example, on your custom `_<type>` definition.
 
-You could also define a custom Field definition for certain Fields, like for the name Field in an article:
+You could also define a custom field definition for certain fields, like for the name field in an article:
 
 ```
 <field name="article/name/value_s" type="string" indexed="true" stored="true" required="false"/>
diff --git a/docs/content_management/field_types/field_type_storage.md b/docs/content_management/field_types/field_type_storage.md
index 507352bfe4..73da67dac2 100644
--- a/docs/content_management/field_types/field_type_storage.md
+++ b/docs/content_management/field_types/field_type_storage.md
@@ -6,17 +6,17 @@ description: To be able to store the data saved to a Field, you must configure s
 
 ## Storage conversion
 
-If you want to store Field values in regular [[= product_name =]] database tables,
+If you want to store field values in regular [[= product_name =]] database tables,
 the `FieldValue` must be converted to the storage-specific format used by the Persistence SPI:
 `Ibexa\Contracts\Core\Persistence\Content\FieldValue`.
-After restoring a Field of the field type, you must reverse the conversion.
+After restoring a field of the field type, you must reverse the conversion.
 
 The following methods of the field type are responsible for that:
 
 |Method|Description|
 |------|-----------|
-|`toPersistenceValue()`|This method receives the value of a Field of the field type and returns an SPI `FieldValue`, which can be stored.|
-|`fromPersistenceValue()`|This method receives an SPI `FieldValue` and reconstructs the original value of the Field from it.|
+|`toPersistenceValue()`|This method receives the value of a field of the field type and returns an SPI `FieldValue`, which can be stored.|
+|`fromPersistenceValue()`|This method receives an SPI `FieldValue` and reconstructs the original value of the field from it.|
 
 The SPI `FieldValue` struct has properties which the field type can use:
 
@@ -24,15 +24,15 @@ The SPI `FieldValue` struct has properties which the field type can use:
 |--------|-----------|
 |`$data`|The data to be stored in the database. This may be a scalar value, an associative array or a simple, serializable object.|
 |`$externalData`|The arbitrary data stored in this field isn't touched by any of the [[= product_name =]] components directly, but is available for [Storing data externally](#storing-data-externally).|
-|`$sortKey`|A value which can be used to sort content by this Field.|
+|`$sortKey`|A value which can be used to sort content by this field.|
 
 ### Legacy storage engine
 
-The Legacy storage engine uses the `ezcontentobject_attribute` table to store Field values,
-and `ezcontentclass_attribute` to store Field definition values.
+The Legacy storage engine uses the `ezcontentobject_attribute` table to store field values,
+and `ezcontentclass_attribute` to store field definition values.
 they're both based on the same principle.
 
-Each row represents a Field or a Field definition, and offers several free fields of different types, where the type can store its data e.g.
+Each row represents a field or a field definition, and offers several free fields of different types, where the type can store its data e.g.
 
 - `ezcontentobject_attribute` offers:
     - `data_int`
@@ -47,7 +47,7 @@ Each type is free to use those fields in any way it requires.
 
 The default Legacy storage engine cannot store arbitrary value information as provided by a field type.
 This means that using this storage engine requires a conversion.
-Converters map a Field's semantic values to the fields described above, for both settings (validation and configuration) and value.
+Converters map a field's semantic values to the fields described above, for both settings (validation and configuration) and value.
 
 The conversion takes place through the `Ibexa\Core\Persistence\Legacy\Content\FieldValue\Converter` interface,
 which you must implement in your field type. The interface contains the following methods:
@@ -79,7 +79,7 @@ The tag has the following attribute:
 
 | Attribute name | Usage |
 |----------------|-------|
-| `alias` | Represents the `fieldTypeIdentifier` (just like for the [field type service](type_and_value.md#registration)). |
+| `alias` | Represents the `fieldTypeIdentifier` (like for the [field type service](type_and_value.md#registration)). |
 
 !!! tip
 
@@ -94,15 +94,15 @@ or even the [[= product_name =]] database itself (in form of a non-standard tabl
 To store data in external storage, the field type interacts with the Persistence SPI
 through the `Ibexa\Contracts\Core\FieldType\FieldStorage` interface.
 
-Accessing the internal storage of a content item that includes a Field of the field type
+Accessing the internal storage of a content item that includes a field of the field type
 calls one of the following methods to also access the external data:
 
 |Method|Description|
 |------|-----------|
 |`hasFieldData()`|Returns whether the field type stores external data at all.|
-|`storeFieldData()`|Called right before a Field of the field type is stored. The method stores `$externalData`. It returns `true` if the call manipulated internal data of the given Field, so that it's updated in the internal database.|
-|`getFieldData()`|Called after a Field has been restored from the database to restore `$externalData`.|
-|`deleteFieldData()`|Must delete external data for the given Field, if exists.|
+|`storeFieldData()`|Called right before a Field of the field type is stored. The method stores `$externalData`. It returns `true` if the call manipulated internal data of the given field, so that it's updated in the internal database.|
+|`getFieldData()`|Called after a field has been restored from the database to restore `$externalData`.|
+|`deleteFieldData()`|Must delete external data for the given field, if exists.|
 |`getIndexData()`|Returns the actual index data for the provided `Ibexa\Contracts\Core\Persistence\Content\Field`. For more information, see [search service](field_type_search.md#search-field-values).|
 
 Each of the above methods (except `hasFieldData`) receives a `$context` array with information on the underlying storage and the environment.
diff --git a/docs/content_management/field_types/field_type_validation.md b/docs/content_management/field_types/field_type_validation.md
index 9496254370..8faab59a9c 100644
--- a/docs/content_management/field_types/field_type_validation.md
+++ b/docs/content_management/field_types/field_type_validation.md
@@ -1,5 +1,5 @@
 ---
-description: Field type validation allows you to validate if data entered stored in the Field conforms to the schema.
+description: Field type validation allows you to validate if data entered stored in the field conforms to the schema.
 ---
 
 # Field type validation
diff --git a/docs/content_management/field_types/field_types.md b/docs/content_management/field_types/field_types.md
index e8bd92c6cf..9979d30106 100644
--- a/docs/content_management/field_types/field_types.md
+++ b/docs/content_management/field_types/field_types.md
@@ -1,5 +1,5 @@
 ---
-description: Field types define the Fields that a content item is built of.
+description: Field types define the fields that a content item is built of.
 ---
 
 # Field types
@@ -12,11 +12,11 @@ Field types are responsible for:
 - Storing data, either using the native storage engine mechanisms or specific means
 - Validating input data
 - Making the data searchable (if applicable)
-- Displaying Fields of this type
+- Displaying fields of this type
 
 ## Custom data
 
-[[= product_name =]] can support custom data to be stored in the Fields of a content item.
+[[= product_name =]] can support custom data to be stored in the fields of a content item.
 To do so, you need to create a custom field type.
 
 A custom field type must implement the **FieldType Service Provider Interfaces**
diff --git a/docs/content_management/field_types/form_and_template.md b/docs/content_management/field_types/form_and_template.md
index b064f1eb94..9ce61fc79b 100644
--- a/docs/content_management/field_types/form_and_template.md
+++ b/docs/content_management/field_types/form_and_template.md
@@ -1,12 +1,12 @@
 ---
-description: field type FormMappers allow Field editing, while custom templates ensure the Field can be rendered both in the back office and on site front.
+description: Field type FormMappers allow field editing, while custom templates ensure the field can be rendered both in the back office and on site front.
 ---
 
 # Form and template
 
 ## FormMapper
 
-The FormMapper maps Field definitions into Symfony forms, allowing Field editing.
+The FormMapper maps field definitions into Symfony forms, allowing field editing.
 
 It can implement two interfaces:
 
@@ -18,7 +18,7 @@ when you require non-standard settings
 
 The `FieldValueFormMapperInterface::mapFieldValueForm` method accepts two arguments:
 
-- `FormInterface` — form for the current Field
+- `FormInterface` — form for the current field
 - `FieldData` — underlying data for current field form
 
 You have to add your form type to the content editing form. The example shows how `ezboolean` injects the form:
@@ -55,9 +55,9 @@ public function mapFieldValueForm(FormInterface $fieldForm, FieldData $data)
 Your type has to be called `value`.
 In the example above, `CheckboxFieldType::class` is used, but you can use standard Symfony form type instead.
 
-It's good practice to encapsulate Fields with custom types as it allows easier templating.
+It's good practice to encapsulate fields with custom types as it allows easier templating.
 Type has to be compatible with your field type's `Ibexa\Core\FieldType` implementation.
-You can use a [`DataTransformer`]([[= symfony_doc =]]/form/data_transformers.html) to achieve that or just assure correct property and form field names.
+You can use a [`DataTransformer`]([[= symfony_doc =]]/form/data_transformers.html) to achieve that or assure correct property and form field names.
 
 ### FieldDefinitionFormMapperInterface
 
@@ -120,8 +120,8 @@ The `fieldType` key has to correspond to the name of your field type.
 
 ## Content view templates
 
-To render the Field in content view by using the [`ibexa_render_field()` Twig helper](field_twig_functions.md#ibexa_render_field),
-you need to define a template containing a block for the Field.
+To render the field in content view by using the [`ibexa_render_field()` Twig helper](field_twig_functions.md#ibexa_render_field),
+you need to define a template containing a block for the field.
 
 ``` html+twig
 {% block customfieldtype_field %}
@@ -184,7 +184,7 @@ ibexa:
 
 ### Back office view template
 
-For templates for previewing the Field in the back office,
+For templates for previewing the field in the back office,
 using the design engine is recommended with `ibexa_standard_design.override_kernel_templates` set to `true`.
 With the design engine you can apply a template (e.g. `Resources/views/themes/admin/content_fields.html.twig`) without any extra configuration.
 
@@ -200,7 +200,7 @@ ibexa:
 
 ### Field edit template
 
-To use a template for the Field edit form in the back office, you need to specify it in configuration
+To use a template for the field edit form in the back office, you need to specify it in configuration
 under the `twig.form_themes` [configuration key](configuration.md#configuration-files):
 
 ``` yaml
diff --git a/docs/content_management/field_types/type_and_value.md b/docs/content_management/field_types/type_and_value.md
index cd2f40ee22..cd00b660e4 100644
--- a/docs/content_management/field_types/type_and_value.md
+++ b/docs/content_management/field_types/type_and_value.md
@@ -66,7 +66,7 @@ A field type needs to deal with the custom value format provided by it. In order
 
 #### `acceptValue()`
 
-This method is responsible for accepting and converting user input for the Field. It checks the input structure by accepting, building, and returning a different structure holding the data.
+This method is responsible for accepting and converting user input for the field. It checks the input structure by accepting, building, and returning a different structure holding the data.
 
 For example: a user provides an HTTP link as a string, `acceptValue()` converts the link to a URL field type value object. Unlike the `FieldType\Value` constructor, it's possible to make this method aware of multiple input types (object or primitive).
 
diff --git a/docs/content_management/forms/create_form_attribute.md b/docs/content_management/forms/create_form_attribute.md
index 4cb7ccbdca..eecc92d055 100644
--- a/docs/content_management/forms/create_form_attribute.md
+++ b/docs/content_management/forms/create_form_attribute.md
@@ -83,9 +83,9 @@ php bin/console assets:install
 yarn encore dev
 ```
 
-## Implement Field
+## Implement field
 
-Now you have to implement the Field, and make sure the value from the Rich Text attribute is passed on to the field form.
+Now you have to implement the field, and make sure the value from the Rich Text attribute is passed on to the field form.
 
 Create a `src/FormBuilder/Form/Type/CheckboxWithRichtextDescriptionType.php` file.
 
@@ -105,7 +105,7 @@ Now, the attribute value can be stored in the new Form.
 
 ## Create submission converter
 
-The new Field is based on a checkbox, so to display the submissions of this field, you can use the `BooleanFieldSubmissionConverter`. 
+The new field is based on a checkbox, so to display the submissions of this field, you can use the `BooleanFieldSubmissionConverter`. 
 
 Create a `src/FormBuilder/FormSubmission/Converter/RichtextDescriptionFieldSubmissionConverter.php` file.
 
diff --git a/docs/content_management/forms/form_api.md b/docs/content_management/forms/form_api.md
index c5c0c5e3c7..3c2f2428e8 100644
--- a/docs/content_management/forms/form_api.md
+++ b/docs/content_management/forms/form_api.md
@@ -33,7 +33,7 @@ This method takes:
 
 - the `ContentInfo` object of the content item containing the form
 - the language code
-- the value of the Field containing the form
+- the value of the field containing the form
 - the array of form field values
 
 ``` php
diff --git a/docs/content_management/forms/form_builder_guide.md b/docs/content_management/forms/form_builder_guide.md
index 411e4b5b15..aad4fe1e29 100644
--- a/docs/content_management/forms/form_builder_guide.md
+++ b/docs/content_management/forms/form_builder_guide.md
@@ -102,7 +102,7 @@ To do it, you have to:
 1. add Symfony form type,
 1. customize Form templates,
 1. add scripts,
-1. implement Field,
+1. implement field,
 1. implement field mapper,
 1. create submission converter.
 
diff --git a/docs/content_management/images/add_image_asset_from_dam.md b/docs/content_management/images/add_image_asset_from_dam.md
index 0026685098..11b6b748e5 100644
--- a/docs/content_management/images/add_image_asset_from_dam.md
+++ b/docs/content_management/images/add_image_asset_from_dam.md
@@ -76,7 +76,7 @@ You can customize the parameters according to your needs.
 For more information about supported parameters, see the [Unsplash documentation](https://unsplash.com/documentation#dynamically-resizable-images).
 
 In the back office, go to **Admin** > **Content types**.
-In the **Content** group, create a content type for DAM images, which includes the ImageAsset Field. 
+In the **Content** group, create a content type for DAM images, which includes the ImageAsset field.
 
 Now, when you use the Embed block in the Page Builder, you should see a DAM Image.
 
diff --git a/docs/content_management/images/configure_image_editor.md b/docs/content_management/images/configure_image_editor.md
index 10d904e115..3e6688f525 100644
--- a/docs/content_management/images/configure_image_editor.md
+++ b/docs/content_management/images/configure_image_editor.md
@@ -4,7 +4,7 @@ description: Configure image editor to crop, flip, and modify images.
 
 # Configure Image Editor
 
-When a content item contains Fields of the [ezimage](imageassetfield.md) type, users can perform basic image editing functions with the Image Editor.
+When a content item contains fields of the [ezimage](imageassetfield.md) type, users can perform basic image editing functions with the Image Editor.
 For more information, see the [user documentation]([[= user_doc =]]/editing_images/).
 
 !!! note
diff --git a/docs/content_management/pages/page_builder_guide.md b/docs/content_management/pages/page_builder_guide.md
index 8f561289fd..55de800b46 100644
--- a/docs/content_management/pages/page_builder_guide.md
+++ b/docs/content_management/pages/page_builder_guide.md
@@ -67,10 +67,10 @@ E. Buttons:
 
 |Button|Description|
 |------|-----------|
-|![Edit and preview switch](page_builder_toolbar_editpreview.png)|Access main properties of the Page, like title and description.|
-|![Preview segments](page_builder_toolbar_preview_segment.png)|Access preview of the Page for a given Segment.|
-|![Timeline button](page_builder_toolbartimelinetoggler.png)|Access the timeline to preview how the Page changes with time. You can also view the list of all upcoming scheduled events.|
-|![View toggler](page_builder_toolbar_devicestoggler.png)|Toggle through to see how the Page is rendered on different devices.|
+|![Edit and preview switch](page_builder_toolbar_editpreview.png)|Access main properties of the page, like title and description.|
+|![Preview segments](page_builder_toolbar_preview_segment.png)|Access preview of the page for a given segment.|
+|![Timeline button](page_builder_toolbartimelinetoggler.png)|Access the timeline to preview how the page changes with time. You can also view the list of all upcoming scheduled events.|
+|![View toggler](page_builder_toolbar_devicestoggler.png)|Toggle through to see how the page is rendered on different devices.|
 |![Elements menu](page_builder_toolbarelements.png)|Move Page blocks / Structure view to the other side of the screen.|
 |![Undo](page_builder_undo.png)|Undo latest change.|
 |![Redo](page_builder_redo.png)|Redo latest change.|
@@ -201,9 +201,9 @@ Additionaly, Page Builder offers you a selection of ready-to-use page blocks tha
 
 A. **Default** blocks:
 
-- Dynamic targeting - embeds recommended items based on the Segment the user belongs to.
+- Dynamic targeting - embeds recommended items based on the segment the user belongs to.
 - Personalized - displays a list of content items/products that are recommended to end users when specific scenarios are triggered.
-- Targeting - embeds a content item based on the Segment the user belongs to.
+- Targeting - embeds a content item based on the segment the user belongs to.
 
 B. **PIM** blocks:
 
diff --git a/docs/content_management/rich_text/extend_online_editor.md b/docs/content_management/rich_text/extend_online_editor.md
index f6b346e3d6..8b285ef127 100644
--- a/docs/content_management/rich_text/extend_online_editor.md
+++ b/docs/content_management/rich_text/extend_online_editor.md
@@ -4,7 +4,7 @@ description: Add custom tags, styles and data attributes to enrich the functiona
 
 # Extend Online Editor
 
-[[= product_name =]] users edit the contents of RichText Fields, for example, 
+[[= product_name =]] users edit the contents of RichText fields, for example, 
 in the Content box of a Page, by using the Online Editor.
 
 You can extend the Online Editor by adding custom tags and styles, defining custom 
diff --git a/docs/content_management/rich_text/online_editor_guide.md b/docs/content_management/rich_text/online_editor_guide.md
index b4f4d76f4e..6687e9e979 100644
--- a/docs/content_management/rich_text/online_editor_guide.md
+++ b/docs/content_management/rich_text/online_editor_guide.md
@@ -6,7 +6,7 @@ description: Learn how to use the Online Editor, a tool that allows you to edit
 
 ## What is Online Editor
 
-Online Editor is the interface for editing RichText Fields in any content item in [[= product_name =]].
+Online Editor is the interface for editing RichText fields in any content item in [[= product_name =]].
 It offers standard editing capabilities and extensibility points to customize the editing experience and the available elements.
 
 Online Editor is based on [CKEditor 5](https://ckeditor.com/ckeditor-5/).
@@ -17,9 +17,9 @@ Online Editor is available in all supported [[= product_name =]] versions and ed
 
 ## How to get started
 
-Online Editor is the default editing interface for all RichText Fields. 
-To start using it, create any content item with a RichText Field 
-(for example, using the built-in Article content type) and edit this Field.
+Online Editor is the default editing interface for all RichText fields. 
+To start using it, create any content item with a RichText field 
+(for example, using the built-in Article content type) and edit this field.
 
 ## Capabilities
 
@@ -30,12 +30,12 @@ It also allows embedding other content from the repository, but also from Facebo
 
 #### Links
 
-All links added to a RichText Field by using the link element are listed
+All links added to a RichText field by using the link element are listed
 and can be managed in the [Link manager](url_management.md).
 
 #### Distraction free mode
 
-While editing Rich Text Fields, you can switch to distraction free mode that expands the workspace to full screen.
+While editing Rich Text fields, you can switch to distraction free mode that expands the workspace to full screen.
 
 ![Distraction free mode](distraction_free_mode.png)
 
@@ -116,6 +116,6 @@ Refer to [Extend Online Editor](extend_online_editor.md#link-tag) for a similar
 
 ### Embed external resources
 
-Custom tags allow embedding content from external resources inside RichText Fields. 
+Custom tags allow embedding content from external resources inside RichText fields. 
 The built-in elements offer embedding of Twitter or Facebook posts, but you can extend the capability by embedding other resources. 
 These can be, for example, 3D product or real estate viewers.
\ No newline at end of file
diff --git a/docs/content_management/url_management/url_api.md b/docs/content_management/url_management/url_api.md
index cd85a1b6e3..e12facc24c 100644
--- a/docs/content_management/url_management/url_api.md
+++ b/docs/content_management/url_management/url_api.md
@@ -1,11 +1,11 @@
 ---
-description: The PHP API URLService enables searching for external URLs used in tech text and URL Fields.
+description: The PHP API URLService enables searching for external URLs used in tech text and URL fields.
 ---
 
 # URL API
 
 [`URLService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-URLService.html)
-enables you to find, load and update external URLs used in RichText and URL Fields.
+enables you to find, load and update external URLs used in RichText and URL fields.
 
 To view a list of all URLs, use [`URLService::findUrls`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-URLService.html#method_findUrls)
 
diff --git a/docs/permissions/limitation_reference.md b/docs/permissions/limitation_reference.md
index bb5d987c13..3e690e3521 100644
--- a/docs/permissions/limitation_reference.md
+++ b/docs/permissions/limitation_reference.md
@@ -279,10 +279,10 @@ This limitation can be used as a role limitation.
 |------|------|------|
 |`<Session_id>`|`<Session_name>`|All valid session IDs can be set as value(s)|
 
-## Segment Group limitation [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
+## Segment group limitation [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
-The Segment Group (`SegmentGroup`) limitation specifies whether the User has access Segments within a specific 
-Segment Group.
+The segment group (`SegmentGroup`) limitation specifies whether the user has access segments within a specific 
+segment group.
 
 This limitation can be used as a role limitation.
 
@@ -290,7 +290,7 @@ This limitation can be used as a role limitation.
 
 |Value|UI value|Description|
 |------|------|------|
-|`<Segment_group_id>`|`<Segment_group_name>`|All valid Segment Group IDs can be set as value(s).|
+|`<Segment_group_id>`|`<Segment_group_name>`|All valid segment group IDs can be set as value(s).|
 
 ## SiteAccess limitation
 
diff --git a/docs/permissions/policies.md b/docs/permissions/policies.md
index 64e6f25e54..40602e556b 100644
--- a/docs/permissions/policies.md
+++ b/docs/permissions/policies.md
@@ -146,20 +146,20 @@ which define, which parts of the application or website the user has access to.
 
 | Module                 | Function                      | Effect                   | Possible limitations                                              |
 |------------------------|-------------------------------|--------------------------|-------------------------------------------------------------------|
-| <nobr>`segment`</nobr> | <nobr>`assign_to_user`</nobr> | assign Segments to Users | [Segment Group](limitation_reference.md#segment-group-limitation) |
-|                        | <nobr>`create`</nobr>         | create Segments          | [Segment Group](limitation_reference.md#segment-group-limitation) |
-|                        | <nobr>`read`</nobr>           | load Segment information | [Segment Group](limitation_reference.md#segment-group-limitation) |
-|                        | <nobr>`remove`</nobr>         | remove Segments          | [Segment Group](limitation_reference.md#segment-group-limitation) |
-|                        | <nobr>`update`</nobr>         | update Segments          | [Segment Group](limitation_reference.md#segment-group-limitation) |
+| <nobr>`segment`</nobr> | <nobr>`assign_to_user`</nobr> | assign segments to users | [Segment Group](limitation_reference.md#segment-group-limitation) |
+|                        | <nobr>`create`</nobr>         | create segments          | [Segment Group](limitation_reference.md#segment-group-limitation) |
+|                        | <nobr>`read`</nobr>           | load segment information | [Segment Group](limitation_reference.md#segment-group-limitation) |
+|                        | <nobr>`remove`</nobr>         | remove segments          | [Segment Group](limitation_reference.md#segment-group-limitation) |
+|                        | <nobr>`update`</nobr>         | update segments          | [Segment Group](limitation_reference.md#segment-group-limitation) |
 
 #### Segment groups [[% include 'snippets/commerce_badge.md' %]]
 
 | Module                       | Function              | Effect                         | Possible limitations |
 |------------------------------|-----------------------|--------------------------------|----------------------|
-| <nobr>`segment_group`</nobr> | <nobr>`create`</nobr> | create Segment Groups          |
-|                              | <nobr>`read`</nobr>   | load Segment Group information |
-|                              | <nobr>`remove`</nobr> | remove Segment Groups          |
-|                              | <nobr>`update`</nobr> | update Segment Groups          |
+| <nobr>`segment_group`</nobr> | <nobr>`create`</nobr> | create segment groups          |
+|                              | <nobr>`read`</nobr>   | load segment group information |
+|                              | <nobr>`remove`</nobr> | remove segment groups          |
+|                              | <nobr>`update`</nobr> | update segment groups          |
 
 #### Shipments [[% include 'snippets/commerce_badge.md' %]]
 
diff --git a/docs/search/aggregation_reference/authorterm_aggregation.md b/docs/search/aggregation_reference/authorterm_aggregation.md
index 906eabfbdf..e4a3ce48bb 100644
--- a/docs/search/aggregation_reference/authorterm_aggregation.md
+++ b/docs/search/aggregation_reference/authorterm_aggregation.md
@@ -1,6 +1,6 @@
 # AuthorTermAggregation
 
-The Field-based [AuthorTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-AuthorTermAggregation.html) aggregates search results by the value of the Author Field.
+The field-based [AuthorTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-AuthorTermAggregation.html) aggregates search results by the value of the Author field.
 
 ## Arguments
 
diff --git a/docs/search/aggregation_reference/checkboxterm_aggregation.md b/docs/search/aggregation_reference/checkboxterm_aggregation.md
index fe3f642d23..3a409402b1 100644
--- a/docs/search/aggregation_reference/checkboxterm_aggregation.md
+++ b/docs/search/aggregation_reference/checkboxterm_aggregation.md
@@ -1,6 +1,6 @@
 # CheckboxTermAggregation
 
-The Field-based [CheckboxTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-CheckboxTermAggregation.html) aggregates search results by the value of the Checkbox Field.
+The field-based [CheckboxTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-CheckboxTermAggregation.html) aggregates search results by the value of the Checkbox field.
 
 ## Arguments
 
diff --git a/docs/search/aggregation_reference/countryterm_aggregation.md b/docs/search/aggregation_reference/countryterm_aggregation.md
index c376ebf8ae..f05f7fb4da 100644
--- a/docs/search/aggregation_reference/countryterm_aggregation.md
+++ b/docs/search/aggregation_reference/countryterm_aggregation.md
@@ -1,6 +1,6 @@
 # CountryTermAggregation
 
-The Field-based [CountryTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-CountryTermAggregation.html) aggregates search results by the value of the Country Field.
+The field-based [CountryTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-CountryTermAggregation.html) aggregates search results by the value of the Country field.
 
 ## Arguments
 
diff --git a/docs/search/aggregation_reference/daterange_aggregation.md b/docs/search/aggregation_reference/daterange_aggregation.md
index 864d45bb1b..8610db02ce 100644
--- a/docs/search/aggregation_reference/daterange_aggregation.md
+++ b/docs/search/aggregation_reference/daterange_aggregation.md
@@ -1,6 +1,6 @@
 # DateRangeAggregation
 
-The Field-based [DateRangeAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-DateRangeAggregation.html) aggregates search results by the value of the Date, DateTime or Time Field.
+The field-based [DateRangeAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-DateRangeAggregation.html) aggregates search results by the value of the Date, DateTime or Time field.
 
 ## Arguments
 
diff --git a/docs/search/aggregation_reference/datetimerange_aggregation.md b/docs/search/aggregation_reference/datetimerange_aggregation.md
index 26fcb233fd..8a70814a5f 100644
--- a/docs/search/aggregation_reference/datetimerange_aggregation.md
+++ b/docs/search/aggregation_reference/datetimerange_aggregation.md
@@ -1,6 +1,6 @@
 # DateTimeRangeAggregation
 
-The Field-based [DateTimeRangeAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-DateTimeRangeAggregation.html) aggregates search results by the value of the Date, DateTime or Time Field.
+The field-based [DateTimeRangeAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-DateTimeRangeAggregation.html) aggregates search results by the value of the Date, DateTime or Time field.
 
 ## Arguments
 
diff --git a/docs/search/aggregation_reference/floatrange_aggregation.md b/docs/search/aggregation_reference/floatrange_aggregation.md
index 262c023877..6086012648 100644
--- a/docs/search/aggregation_reference/floatrange_aggregation.md
+++ b/docs/search/aggregation_reference/floatrange_aggregation.md
@@ -1,6 +1,6 @@
 # FloatRangeAggregation
 
-The Field-based [FloatRangeAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-FloatRangeAggregation.html) aggregates search results by the value of the Float Field.
+The field-based [FloatRangeAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-FloatRangeAggregation.html) aggregates search results by the value of the Float field.
 
 ## Arguments
 
diff --git a/docs/search/aggregation_reference/floatstats_aggregation.md b/docs/search/aggregation_reference/floatstats_aggregation.md
index c2ccfdac77..710fb5f870 100644
--- a/docs/search/aggregation_reference/floatstats_aggregation.md
+++ b/docs/search/aggregation_reference/floatstats_aggregation.md
@@ -1,6 +1,6 @@
 # FloatStatsAggregation
 
-The Field-based [FloatStatsAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-FloatStatsAggregation.html) aggregates search results by the value of the Float Field
+The field-based [FloatStatsAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-FloatStatsAggregation.html) aggregates search results by the value of the Float field
 and provides statistical information for the values. You can use the provided getters to access the values:
 
 - sum (`getSum()`)
diff --git a/docs/search/aggregation_reference/integerrange_aggregation.md b/docs/search/aggregation_reference/integerrange_aggregation.md
index 53d32118a3..c16e7e8eaf 100644
--- a/docs/search/aggregation_reference/integerrange_aggregation.md
+++ b/docs/search/aggregation_reference/integerrange_aggregation.md
@@ -1,6 +1,6 @@
 # IntegerRangeAggregation
 
-The Field-based [IntegerRangeAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-IntegerRangeAggregation.html) aggregates search results by the value of the Integer Field.
+The field-based [IntegerRangeAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-IntegerRangeAggregation.html) aggregates search results by the value of the Integer field.
 
 ## Arguments
 
diff --git a/docs/search/aggregation_reference/integerstats_aggregation.md b/docs/search/aggregation_reference/integerstats_aggregation.md
index 707a2c8645..f32dac1bce 100644
--- a/docs/search/aggregation_reference/integerstats_aggregation.md
+++ b/docs/search/aggregation_reference/integerstats_aggregation.md
@@ -1,6 +1,6 @@
 # IntegerStatsAggregation
 
-The Field-based [IntegerStatsAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-IntegerStatsAggregation.html) aggregates search results by the value of the Integer Field
+The field-based [IntegerStatsAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-IntegerStatsAggregation.html) aggregates search results by the value of the Integer field
 and provides statistical information for the values. You can use the provided getters to access the values:
 
 - sum (`getSum()`)
diff --git a/docs/search/aggregation_reference/keywordterm_aggregation.md b/docs/search/aggregation_reference/keywordterm_aggregation.md
index 227a685a48..11543be631 100644
--- a/docs/search/aggregation_reference/keywordterm_aggregation.md
+++ b/docs/search/aggregation_reference/keywordterm_aggregation.md
@@ -1,6 +1,6 @@
 # KeywordTermAggregation
 
-The Field-based [KeywordTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-KeywordTermAggregation.html) aggregates search results by the value of the Keyword Field.
+The field-based [KeywordTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-KeywordTermAggregation.html) aggregates search results by the value of the Keyword field.
 
 ## Arguments
 
diff --git a/docs/search/aggregation_reference/selectionterm_aggregation.md b/docs/search/aggregation_reference/selectionterm_aggregation.md
index 989b5527ee..2951cca5bc 100644
--- a/docs/search/aggregation_reference/selectionterm_aggregation.md
+++ b/docs/search/aggregation_reference/selectionterm_aggregation.md
@@ -1,6 +1,6 @@
 # SelectionTermAggregation
 
-The Field-based [SelectionTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-SelectionTermAggregation.html) aggregates search results by the value of the Selection Field.
+The field-based [SelectionTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-SelectionTermAggregation.html) aggregates search results by the value of the Selection field.
 
 ## Arguments
 
diff --git a/docs/search/aggregation_reference/timerange_aggregation.md b/docs/search/aggregation_reference/timerange_aggregation.md
index ae7601bb1f..2ef07cc216 100644
--- a/docs/search/aggregation_reference/timerange_aggregation.md
+++ b/docs/search/aggregation_reference/timerange_aggregation.md
@@ -1,6 +1,6 @@
 # TimeRangeAggregation
 
-The Field-based [TimeRangeAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-TimeRangeAggregation.html) aggregates search results by the value of the Date, DateTime or Time Field.
+The field-based [TimeRangeAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-TimeRangeAggregation.html) aggregates search results by the value of the Date, DateTime or Time field.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/field_criterion.md b/docs/search/criteria_reference/field_criterion.md
index bf4e91a61b..7df0882309 100644
--- a/docs/search/criteria_reference/field_criterion.md
+++ b/docs/search/criteria_reference/field_criterion.md
@@ -1,17 +1,17 @@
 # Field Criterion
 
 The [`Field` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-Field.html)
-searches for content based on the content of one of its Fields.
+searches for content based on the content of one of its fields.
 
 ## Arguments
 
-- `target` - string representing the identifier of the Field to query
+- `target` - string representing the identifier of the field to query
 - `operator` - operator constant (IN, EQ, GT, GTE, LT, LTE, LIKE, BETWEEN, CONTAINS)
 - `value` - the value to query for
 
 The `LIKE` operator works together with wildcards (`*`). Without a wildcards its results are the same as for the `EQ` operator.
 
-The `CONTAINS` operator works with collection Fields like the Country field type,
+The `CONTAINS` operator works with collection fields like the Country field type,
 enabling you to retrieve results when the query value is one of the values of the collection.
 Querying for a collection with the `EQ` operator returns result only when the whole collection equals the query values.
 
diff --git a/docs/search/criteria_reference/fulltext_criterion.md b/docs/search/criteria_reference/fulltext_criterion.md
index fe2aa9da84..80da04a403 100644
--- a/docs/search/criteria_reference/fulltext_criterion.md
+++ b/docs/search/criteria_reference/fulltext_criterion.md
@@ -1,7 +1,7 @@
 # FullText Criterion
 
 The [`FullText` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-FullText.html)
-searches for content based on the full text content of its Fields.
+searches for content based on the full text content of its fields.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/image_criterion.md b/docs/search/criteria_reference/image_criterion.md
index a72d0e080a..6250dae93e 100644
--- a/docs/search/criteria_reference/image_criterion.md
+++ b/docs/search/criteria_reference/image_criterion.md
@@ -8,7 +8,7 @@ The `Image` Search Criterion searches for image by specified image attributes.
 
 ## Arguments
 
-- `fieldDefIdentifier` - string representing the identifier of the Field
+- `fieldDefIdentifier` - string representing the identifier of the field
 - `imageCriteriaData` - array representing image attributes. All attributes are optional.
 
 ## Example
diff --git a/docs/search/criteria_reference/imagedimensions_criterion.md b/docs/search/criteria_reference/imagedimensions_criterion.md
index 8c4ce70289..f16a6eb803 100644
--- a/docs/search/criteria_reference/imagedimensions_criterion.md
+++ b/docs/search/criteria_reference/imagedimensions_criterion.md
@@ -8,7 +8,7 @@ The `Dimensions` Search Criterion searches for image with specified dimensions.
 
 ## Arguments
 
-- `fieldDefIdentifier` - string representing the identifier of the Field
+- `fieldDefIdentifier` - string representing the identifier of the field
 - `imageCriteriaData` - an array representing minimum and maximum values for width and height, expressed in pixels
 
 ## Example
diff --git a/docs/search/criteria_reference/imagefilesize_criterion.md b/docs/search/criteria_reference/imagefilesize_criterion.md
index 741abf1b77..25ef00afba 100644
--- a/docs/search/criteria_reference/imagefilesize_criterion.md
+++ b/docs/search/criteria_reference/imagefilesize_criterion.md
@@ -8,7 +8,7 @@ The `FileSize` Search Criterion searches for image with specified size.
 
 ## Arguments
 
-- `fieldDefIdentifier` - string representing the identifier of the Field
+- `fieldDefIdentifier` - string representing the identifier of the field
 - (optional) `minValue` - numeric representing minimum file size expressed in MB, default: 0
 - (optional) `maxValue` - numeric representing maximum file size expressed in MB, default: `null`
 
diff --git a/docs/search/criteria_reference/imageheight_criterion.md b/docs/search/criteria_reference/imageheight_criterion.md
index 8df32dc0a2..bdd00bba32 100644
--- a/docs/search/criteria_reference/imageheight_criterion.md
+++ b/docs/search/criteria_reference/imageheight_criterion.md
@@ -8,7 +8,7 @@ The `Height` Search Criterion searches for image with specified height.
 
 ## Arguments
 
-- `fieldDefIdentifier` - string representing the identifier of the Field
+- `fieldDefIdentifier` - string representing the identifier of the field
 - (optional) `minValue` - int representing minimum file height expressed in pixels, default: 0
 - (optional) `maxValue` - int representing maximum file height expressed in pixels, default: `null`
 
diff --git a/docs/search/criteria_reference/imagemimetype_criterion.md b/docs/search/criteria_reference/imagemimetype_criterion.md
index 543e36f61c..ee011079c3 100644
--- a/docs/search/criteria_reference/imagemimetype_criterion.md
+++ b/docs/search/criteria_reference/imagemimetype_criterion.md
@@ -8,7 +8,7 @@ The `MimeType` Search Criterion searches for image with specified mime type(s).
 
 ## Arguments
 
-- `fielDefIdentifier` - string representing the identifier of the Field
+- `fielDefIdentifier` - string representing the identifier of the field
 - `type` - string(s) representing mime type(s)
 
 ## Example
diff --git a/docs/search/criteria_reference/imageorientation_criterion.md b/docs/search/criteria_reference/imageorientation_criterion.md
index 6a6fa047c9..71838053d9 100644
--- a/docs/search/criteria_reference/imageorientation_criterion.md
+++ b/docs/search/criteria_reference/imageorientation_criterion.md
@@ -9,7 +9,7 @@ Supported orientation values: landscape, portrait and square.
 
 ## Arguments
 
-- `fielDefIdentifier` - string representing the identifier of the Field
+- `fielDefIdentifier` - string representing the identifier of the field
 - `orientation` - strings representing orientations
 
 ## Example
diff --git a/docs/search/criteria_reference/imagewidth_criterion.md b/docs/search/criteria_reference/imagewidth_criterion.md
index bf9f479070..2a3986f225 100644
--- a/docs/search/criteria_reference/imagewidth_criterion.md
+++ b/docs/search/criteria_reference/imagewidth_criterion.md
@@ -8,7 +8,7 @@ The `Width` Search Criterion searches for image with specified width.
 
 ## Arguments
 
-- `fieldDefIdentifier` - string representing the identifier of the Field
+- `fieldDefIdentifier` - string representing the identifier of the field
 - (optional) `minValue` - int representing minimum file width expressed in pixels, default: 0
 - (optional) `maxValue` - int representing maximum file width expressed in pixels, default: `null`
 
diff --git a/docs/search/criteria_reference/isfieldempty_criterion.md b/docs/search/criteria_reference/isfieldempty_criterion.md
index 8eea7bde20..0151abf906 100644
--- a/docs/search/criteria_reference/isfieldempty_criterion.md
+++ b/docs/search/criteria_reference/isfieldempty_criterion.md
@@ -5,9 +5,9 @@ searches for content based on whether a specified Field is empty or not.
 
 ## Arguments
 
-- `fieldDefinitionIdentifier` - string representing the identifier of the Field
+- `fieldDefinitionIdentifier` - string representing the identifier of the field
 - (optional) `value` - bool representing whether to search for empty (default `true`),
-or non-empty Fields (`false`)
+or non-empty fields (`false`)
 
 ## Limitations
 
diff --git a/docs/search/criteria_reference/maplocationdistance_criterion.md b/docs/search/criteria_reference/maplocationdistance_criterion.md
index d4b30223bf..7d93ce0583 100644
--- a/docs/search/criteria_reference/maplocationdistance_criterion.md
+++ b/docs/search/criteria_reference/maplocationdistance_criterion.md
@@ -1,13 +1,13 @@
 # MapLocationDistance Criterion
 
 The [`MapLocationDistance` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-MapLocationDistance.html)
-searches content based on the distance between the location contained in a MapLocation Field and the provided coordinates.
+searches content based on the distance between the location contained in a MapLocation field and the provided coordinates.
 
 ## Arguments
 
-- `target` - string representing the Field definition identifier
+- `target` - string representing the field definition identifier
 - `operator` - Operator constant (IN, EQ, GT, GTE, LT, LTE, BETWEEN)
-- `distance` - float(s) representing the distances between the map location in the Field and the location provided in `latitude` and `longitude` arguments
+- `distance` - float(s) representing the distances between the map location in the field and the location provided in `latitude` and `longitude` arguments
 - `latitude` - float representing the latitude of the location to calculate distance to
 - `longitude` - float representing the longitude of the location to calculate distance to
 
diff --git a/docs/search/criteria_reference/search_criteria_reference.md b/docs/search/criteria_reference/search_criteria_reference.md
index be07642c2b..83d3ce4df1 100644
--- a/docs/search/criteria_reference/search_criteria_reference.md
+++ b/docs/search/criteria_reference/search_criteria_reference.md
@@ -9,7 +9,7 @@ Search Criteria are filters for Content and Location Search and
 
 Criteria can take some of the following arguments:
 
-- `target` - when the Criterion supports targeting a specific Field, example: `FieldDefinition` or Metadata identifier
+- `target` - when the Criterion supports targeting a specific field, example: `FieldDefinition` or Metadata identifier
 - `value` - the value(s) to filter on, typically a scalar or array of scalars
 - `operator` - constants on `Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator`: `IN`, `EQ`, `GT`, `GTE`, `LT`, `LTE`, `LIKE`, `BETWEEN`, `CONTAINS`. Most Criteria do not expose this and select `EQ` or `IN` depending on whether the value is scalar or an array. `IN` and `BETWEEN` always act on an array of values, while the other operators act on single scalar value
 - `valueData` - additional value data, required by some Criteria, for instance `MapLocationDistance`
@@ -32,9 +32,9 @@ Due to this storage limitation, searching content using the Country field type o
 |[CurrencyCodeCriterion](currencycode_criterion.md)|Currency code|&#10004; |&#10004; |&#10004; |
 |[DateMetadata](datemetadata_criterion.md)|The date when content was created or last modified|&#10004; |&#10004; |&#10004; |
 |[Depth](depth_criterion.md)|Location depth in the content tree| |&#10004; |&#10004; |
-|[Field](field_criterion.md)|Content of one of content item's Fields|&#10004; |&#10004; | |
+|[Field](field_criterion.md)|Content of one of content item's fields|&#10004; |&#10004; | |
 |[FieldRelation](fieldrelation_criterion.md)|Content items the content in question has Relations to|&#10004; |&#10004; | |
-|[FullText](fulltext_criterion.md)|Full text content of a content item's Fields|&#10004; |&#10004; | |
+|[FullText](fulltext_criterion.md)|Full text content of a content item's fields|&#10004; |&#10004; | |
 |[Image](image_criterion.md)|Image by specified image attributes|&#10004;|&#10004;||
 |[ImageDimensions](imagedimensions_criterion.md)|Image dimensions: height and width|&#10004;|&#10004;||
 |[ImageFileSize](imagefilesize_criterion.md)|Image size in MB|&#10004;|&#10004;||
@@ -43,7 +43,7 @@ Due to this storage limitation, searching content using the Country field type o
 |[ImageOrientation](imageorientation_criterion.md)|Image orientation|&#10004;|&#10004;||
 |[ImageWidth](imagewidth_criterion.md)|Image width in pixels|&#10004;|&#10004;||
 |[IsCurrencyEnabledCriterion](iscurrencyenabled_criterion.md)|Whether a specified currency is enabled in the system| | | |
-|[IsFieldEmpty](isfieldempty_criterion.md)|Whether a specified Field of a content item is empty or not|&#10004; |&#10004; | |
+|[IsFieldEmpty](isfieldempty_criterion.md)|Whether a specified field of a content item is empty or not|&#10004; |&#10004; | |
 |[IsMainLocation](ismainlocation_criterion.md)|Whether a Location is the main Location of a content item| |&#10004; |&#10004; |
 |[IsProductBased](isproductbased_criterion.md)|Whether content represents a product|&#10004; |&#10004; |&#10004; |
 |[IsUserBased](isuserbased_criterion.md)|Whether content represents a User account|&#10004; |&#10004; |&#10004; |
@@ -51,7 +51,7 @@ Due to this storage limitation, searching content using the Country field type o
 |[LanguageCode](languagecode_criterion.md)|Whether a content item is translated into the selected language|&#10004; |&#10004; |&#10004; |
 |[LocationId](locationid_criterion.md)|Location ID|&#10004; |&#10004; |&#10004; |
 |[LocationRemoteId](locationremoteid_criterion.md)|Location remote ID|&#10004; |&#10004; |&#10004; |
-|[MapLocationDistance](maplocationdistance_criterion.md)|Distance between the location contained in a MapLocation Field and the provided coordinates|&#10004; |&#10004; | |
+|[MapLocationDistance](maplocationdistance_criterion.md)|Distance between the location contained in a MapLocation field and the provided coordinates|&#10004; |&#10004; | |
 |[MatchAll](matchall_criterion.md)|Returns all search results|&#10004; |&#10004; |&#10004; |
 |[MatchNone](matchnone_criterion.md)|Returns no search results|&#10004; |&#10004; |&#10004; |
 |[ObjectStateId](objectstateid_criterion.md)|Object State ID|&#10004; |&#10004; |&#10004; |
diff --git a/docs/search/extensibility/create_custom_aggregation.md b/docs/search/extensibility/create_custom_aggregation.md
index 158ab68f94..3555cc4ed8 100644
--- a/docs/search/extensibility/create_custom_aggregation.md
+++ b/docs/search/extensibility/create_custom_aggregation.md
@@ -35,7 +35,7 @@ interface or inherit one of following abstract classes:
 
 An aggregation can also implement one of the following interfaces:
 
-- `Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\FieldAggregation`, based on content Field
+- `Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\FieldAggregation`, based on content field
 - `Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\LocationAggregation`, based on content Location
 - `Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\RawAggregation`, based on details of the index structure
 
@@ -44,7 +44,7 @@ An aggregation can also implement one of the following interfaces:
     An aggregation definition must contain at least the name of an aggregation 
     and optional aggregation parameters, such as, for example, the path (string) 
     that is used to limit aggregation results to a specific subtree, Content 
-    Type identifier, or Field definition identifier, which is mapped 
+    Type identifier, or field definition identifier, which is mapped 
     to the search index field name.
     
     Aggregation definition must be independent of the search engine used.
diff --git a/docs/search/search_api.md b/docs/search/search_api.md
index 6fcfd29472..13f2f1fdd1 100644
--- a/docs/search/search_api.md
+++ b/docs/search/search_api.md
@@ -39,7 +39,7 @@ The following command takes the content type identifier as an argument and lists
 
 [`SearchService::findContentInfo`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-SearchService.html#method_findContentInfo) (line 16)
 retrieves [`ContentInfo`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Persistence-Content-ContentInfo.html) objects of the found content items.
-You can also use [`SearchService::findContent`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-SearchService.html#method_findContent) to get full Content objects, together with their Field information.
+You can also use [`SearchService::findContent`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-SearchService.html#method_findContent) to get full Content objects, together with their field information.
 
 To query for a single result, for example by providing a Content ID,
 use the [`SearchService::findSingle`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-SearchService.html#method_findSingle) method:
@@ -354,11 +354,11 @@ Aggregation results contain the name of the result and the count of found items:
 [[= include_file('code_samples/api/public_php_api/src/Command/FindWithAggregationCommand.php', 46, 49) =]]
 ```
 
-With field aggregations you can group search results according to the value of a specific Field.
-In this case the aggregation takes the content type identifier and the Field identifier as parameters.
+With field aggregations you can group search results according to the value of a specific field.
+In this case the aggregation takes the content type identifier and the field identifier as parameters.
 
 The following example creates an aggregation named `selection` that groups results
-according to the value of the `topic` Field in the `article` content type:
+according to the value of the `topic` field in the `article` content type:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/FindWithAggregationCommand.php', 39, 40) =]]
diff --git a/docs/search/search_criteria_and_sort_clauses.md b/docs/search/search_criteria_and_sort_clauses.md
index 165ef184e8..7a92203ad4 100644
--- a/docs/search/search_criteria_and_sort_clauses.md
+++ b/docs/search/search_criteria_and_sort_clauses.md
@@ -20,7 +20,7 @@ or [`ContentId` Criterion handler](https://github.com/ibexa/solr/blob/main/src/l
 
 ## Custom Criteria and Sort Clauses
 
-Sometimes you can find that standard Search Criteria and Sort Clauses provided with [[= product_name =]] aren't sufficient for your needs. Most often this is the case if you have a custom field type using external storage which cannot be searched using the standard Field Criterion.
+Sometimes you can find that standard Search Criteria and Sort Clauses provided with [[= product_name =]] aren't sufficient for your needs. Most often this is the case if you have a custom field type using external storage which cannot be searched using the standard field Criterion.
 
 !!!note
 
diff --git a/docs/search/search_engines/search_engines.md b/docs/search/search_engines/search_engines.md
index a710ddf405..7b4556a7a3 100644
--- a/docs/search/search_engines/search_engines.md
+++ b/docs/search/search_engines/search_engines.md
@@ -21,7 +21,7 @@ Currently, they exist in their own [[= product_name =]] Bundles:
 | Index-time boosting | No | No | Query-time boosting\*\*\* |
 | Aggregations | No | Yes | Yes |
 
-\* Usage of Criteria and Sort Clauses for Fields does not perform well on medium to larger 
+\* Usage of Criteria and Sort Clauses for fields does not perform well on medium to larger 
 amount of data with Legacy Search Engine (SQL).
 
 \*\* For more information about fulltext search syntax support, see [Fulltext Criterion](fulltext_criterion.md).
diff --git a/docs/search/search_engines/solr_search_engine/configure_solr.md b/docs/search/search_engines/solr_search_engine/configure_solr.md
index 668fb6a88e..e3a00e663a 100644
--- a/docs/search/search_engines/solr_search_engine/configure_solr.md
+++ b/docs/search/search_engines/solr_search_engine/configure_solr.md
@@ -118,7 +118,7 @@ The configuration above results in the following boosting (content type / Field)
 
     Remember to clear the cache and perform search engine reindex afterwords.
 
-    The above configuration results in the following boosting (content type / Field):
+    The above configuration results in the following boosting (content type / field):
     
     - `folder/name: 20.0`
     - `folder/description: 10.0`
diff --git a/docs/search/sort_clause_reference/field_sort_clause.md b/docs/search/sort_clause_reference/field_sort_clause.md
index c4b1758ff6..ef63a746ce 100644
--- a/docs/search/sort_clause_reference/field_sort_clause.md
+++ b/docs/search/sort_clause_reference/field_sort_clause.md
@@ -1,15 +1,15 @@
 # Field Sort Clause
 
 The [`Field` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Field.html)
-sorts search results by the value of one of the content items' Fields.
+sorts search results by the value of one of the content items' fields.
 
-Search results of the provided content type are sorted in Field value order.
+Search results of the provided content type are sorted in field value order.
 Results of the query that do not belong to the content type are ranked lower.
 
 ## Arguments
 
-- `typeIdentifier` - string representing the identifier of the content type to which the Field belongs
-- `fieldIdentifier` - string representing the identifier of the Field to sort by
+- `typeIdentifier` - string representing the identifier of the content type to which the field belongs
+- `fieldIdentifier` - string representing the identifier of the field to sort by
 [[= include_file('docs/snippets/sort_direction.md') =]]
 
 ## Limitations
diff --git a/docs/search/sort_clause_reference/maplocationdistance_sort_clause.md b/docs/search/sort_clause_reference/maplocationdistance_sort_clause.md
index 2ea5d75833..19a9058640 100644
--- a/docs/search/sort_clause_reference/maplocationdistance_sort_clause.md
+++ b/docs/search/sort_clause_reference/maplocationdistance_sort_clause.md
@@ -1,12 +1,12 @@
 # MapLocationDistance Sort Clause
 
 The [`MapLocationDistance` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-MapLocationDistance.html)
-sorts search results by the distance of the indicated MapLocation Field to the provided location.
+sorts search results by the distance of the indicated MapLocation field to the provided location.
 
 ## Arguments
 
-- `typeIdentifier` - string representing the identifier of the content type to which the MapLocation Field belongs
-- `fieldIdentifier` - string representing the identifier of the MapLocation Field to sort by
+- `typeIdentifier` - string representing the identifier of the content type to which the MapLocation field belongs
+- `fieldIdentifier` - string representing the identifier of the MapLocation field to sort by
 - `latitude` - float representing the latitude of the location to calculate distance to
 - `longitude`- float representing the longitude of the location to calculate distance to
 [[= include_file('docs/snippets/sort_direction.md') =]]
diff --git a/docs/search/sort_clause_reference/sort_clause_reference.md b/docs/search/sort_clause_reference/sort_clause_reference.md
index f9e9290e58..3b17725741 100644
--- a/docs/search/sort_clause_reference/sort_clause_reference.md
+++ b/docs/search/sort_clause_reference/sort_clause_reference.md
@@ -25,10 +25,10 @@ All Sort Clauses can take the following optional argument:
 | [DateModified](datemodified_sort_clause.md)                   | The date when content was last modified                                                     | &#10004;       | &#10004;        | &#10004;  |
 | [DatePublished](datepublished_sort_clause.md)                 | The date when content was created                                                           | &#10004;       | &#10004;        | &#10004;  |
 | [Depth](depth_sort_clause.md)                                 | Location depth in the content tree                                                          |                | &#10004;        | &#10004;  |
-| [Field](field_sort_clause.md)                                 | Content of one of content item's Fields                                                     | &#10004;       | &#10004;        |           |
+| [Field](field_sort_clause.md)                                 | Content of one of content item's fields                                                     | &#10004;       | &#10004;        |           |
 | [Id](id_sort_clause.md)                                       | Location ID                                                                                 |                | &#10004;        | &#10004;  |
 | [IsMainLocation](ismainlocation_sort_clause.md)               | Whether a Location is the main Location of a content item                                   |                | &#10004;        |           |
-| [MapLocationDistance](maplocationdistance_sort_clause.md)     | Distance between the location contained in a MapLocation Field and the provided coordinates | &#10004;       | &#10004;        |           |
+| [MapLocationDistance](maplocationdistance_sort_clause.md)     | Distance between the location contained in a MapLocation field and the provided coordinates | &#10004;       | &#10004;        |           |
 | [Path](path_sort_clause.md)                                   | PathString of the Location                                                                  |                | &#10004;        | &#10004;  |
 | [Priority](priority_sort_clause.md)                           | Location priority                                                                           |                | &#10004;        | &#10004;  |
 | [Random](random_sort_clause.md)                               | Random seed                                                                                 | &#10004;       | &#10004;        |           |
diff --git a/docs/tutorials/beginner_tutorial/2_create_the_content_model.md b/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
index 02b0453b04..a515ce1ee3 100644
--- a/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
+++ b/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
@@ -14,7 +14,7 @@ Below is a short introduction that only covers points needed for this tutorial.
 The [[= product_name =]] content repository is centered around **content items**. A content item is a single piece of content, for example an article, a product review, a place, etc.
 
 Every content item is an instance of a content type. Content types define what **Fields** are included in each content item.
-For example, an article could include Fields such as *title*, *image*, *abstract*, *article's body*, *publication date* and *list of authors*.
+For example, an article could include fields such as *title*, *image*, *abstract*, *article's body*, *publication date* and *list of authors*.
 
 Fields can belong to one of the installed **field types**, about 30 in the default distribution.
 Each field type is built to represent a specific type of data: a text line, a block of rich text, an image, a collection of relations to content items, etc.
@@ -46,7 +46,7 @@ Fill the form with this basic info: 
 - **Name**: Ride
 - **Identifier**: `ride`
 
-Then create all Fields with the following information: 
+Then create all fields with the following information: 
 
 | Field type   | Name             | Identifier       |  Required | Searchable | Translatable |
 | ------------ | ---------------- | ---------------- | --------- | ---------- | ------------ |
diff --git a/docs/tutorials/beginner_tutorial/5_display_a_list_of_content_items.md b/docs/tutorials/beginner_tutorial/5_display_a_list_of_content_items.md
index 15deaca6ca..1bb83b4f18 100644
--- a/docs/tutorials/beginner_tutorial/5_display_a_list_of_content_items.md
+++ b/docs/tutorials/beginner_tutorial/5_display_a_list_of_content_items.md
@@ -175,7 +175,7 @@ Because this template is rendered inside a table, it starts with a `<tr>` tag.
 ```
 ### Add Media permission
 
-To be able to view the `photo` Field you have to add a `read` permission to `Media` section.
+To be able to view the `photo` field you have to add a `read` permission to `Media` section.
 
 In the main menu, go to **Admin** (gear icon) -> **Roles**, and click the **Anonymous** role.
 
diff --git a/docs/tutorials/beginner_tutorial/7_embed_content.md b/docs/tutorials/beginner_tutorial/7_embed_content.md
index 04b1184692..6666dbbb87 100644
--- a/docs/tutorials/beginner_tutorial/7_embed_content.md
+++ b/docs/tutorials/beginner_tutorial/7_embed_content.md
@@ -20,7 +20,7 @@ A Landmark is an interesting place that Rides go through. Each Ride may be relat
 - **Name**: Landmark
 - **Identifier**: landmark
 
-Then add all Fields with the following information: 
+Then add all fields with the following information: 
 
 | Field type   | Name             | Identifier       |  Required | Searchable | Translatable |
 | ------------ | ---------------- | ---------------- | --------- | ---------- | ------------ |
@@ -32,12 +32,12 @@ Then add all Fields with the following information: 
 Confirm the creation of the content type by selecting **Create**.
 
 Create a *Landmarks* Folder and add some Landmarks to it.
-You need pictures (for the Photo Field) to represent them.
+You need pictures (for the Photo field) to represent them.
 
 ## Add Landmarks to Ride content type definition
 
 Now edit the Ride content type to add a Multiple Content Relation between the two content types.
-Create a new **Content relations (multiple)** Field called "Landmarks" with identifier `landmarks` and allow content type "Landmark" to be added to it:
+Create a new **Content relations (multiple)** field called "Landmarks" with identifier `landmarks` and allow content type "Landmark" to be added to it:
 
 ![Adding Landmarks to the Ride content type](bike_ride_adding_landmarks_to_the_ride_content_type.png "Adding a relation between the Ride and the Landmark using Content Relations (multiple)")
 
diff --git a/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md b/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md
index 99dd03a5c9..8e87d2cd07 100644
--- a/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md
+++ b/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md
@@ -1,5 +1,5 @@
 ---
-description: Learn how to create a Value class that stores the value of the Field.
+description: Learn how to create a Value class that stores the value of the field.
 ---
 
 # Step 1 - Implement the Point 2D Value class
@@ -18,7 +18,7 @@ Open your project with a clean installation and create the base directory for a
 
 The Value class of a field type is by design very simple.
 It's used to represent an instance of the field type within a content item.
-Each Field presents its data using an instance of the Type's Value class.
+Each field presents its data using an instance of the Type's Value class.
 For more information about field type Value, see [Value handling](type_and_value.md#value-handling).
 
 !!! tip
diff --git a/docs/tutorials/generic_field_type/2_define_point2d_field_type.md b/docs/tutorials/generic_field_type/2_define_point2d_field_type.md
index 3c58e7b09e..aa6e1b68fc 100644
--- a/docs/tutorials/generic_field_type/2_define_point2d_field_type.md
+++ b/docs/tutorials/generic_field_type/2_define_point2d_field_type.md
@@ -1,5 +1,5 @@
 ---
-description: Learn how to create the Type class which contains the logic for the Field.
+description: Learn how to create the Type class which contains the logic for the field.
 ---
 
 # Step 2 - Define the Point 2D field type
diff --git a/docs/tutorials/generic_field_type/3_create_form_for_point2d.md b/docs/tutorials/generic_field_type/3_create_form_for_point2d.md
index a794996c79..ad6ab18cfb 100644
--- a/docs/tutorials/generic_field_type/3_create_form_for_point2d.md
+++ b/docs/tutorials/generic_field_type/3_create_form_for_point2d.md
@@ -1,5 +1,5 @@
 ---
-description: Learn how to create a form used for editing a custom Field definition.
+description: Learn how to create a form used for editing a custom field definition.
 ---
 
 # Step 3 - Create a form for editing field type
@@ -17,7 +17,7 @@ This method adds fields for `x` and `y` coordinates.
 
 ## Add a Form Mapper Interface
 
-The FormMapper adds the Field definitions into Symfony forms using the `add()` method. 
+The FormMapper adds the field definitions into Symfony forms using the `add()` method. 
 The `FieldValueFormMapperInterface` provides an edit form for your field type in the administration interface.
 For more information about the FormMappers, see [field type form and template](form_and_template.md).
 
@@ -25,8 +25,8 @@ First, implement a `FieldValueFormMapperInterface` interface (`Ibexa\Contracts\C
 
 Next, implement a `mapFieldValueForm()` method and invoke `FormInterface::add` method with the following arguments (highlighted lines):
 
-- Name of the property the Field value maps to: `value`
-- Type of the Field: `Point2DType::class`
+- Name of the property the field value maps to: `value`
+- Type of the field: `Point2DType::class`
 - Custom options: `required` and `label`
 
 Final version of the Type class should have the following statements and functions:
diff --git a/docs/tutorials/generic_field_type/4_introduce_a_template.md b/docs/tutorials/generic_field_type/4_introduce_a_template.md
index d149fe7b06..353b390785 100644
--- a/docs/tutorials/generic_field_type/4_introduce_a_template.md
+++ b/docs/tutorials/generic_field_type/4_introduce_a_template.md
@@ -1,5 +1,5 @@
 ---
-description: Learn how to add a template for rendering the custom Field on the site front.
+description: Learn how to add a template for rendering the custom field on the site front.
 ---
 
 # Step 4 - Introduce a template
@@ -9,7 +9,7 @@ description: Learn how to add a template for rendering the custom Field on the s
 To display data from the field type, you need to create and register a template for it.
 Each field type template receives a set of variables that can be used to achieve the desired goal.
 In this case the most important variable is the `field`, an instance of `Ibexa\Contracts\Core\Repository\Values\Content\Field`.
-In addition to its own metadata (`id`, `fieldDefIdentifier`, etc.), it exposes the Field Value through the `value` property.
+In addition to its own metadata (`id`, `fieldDefIdentifier`, etc.), it exposes the field Value through the `value` property.
 
 Remember that field type templates can be overridden to tweak what is displayed and how.
 For more information, see the documentation about [field type templates](form_and_template.md#content-view-templates).
diff --git a/docs/tutorials/generic_field_type/5_add_a_field.md b/docs/tutorials/generic_field_type/5_add_a_field.md
index 539028721d..c76df827e0 100644
--- a/docs/tutorials/generic_field_type/5_add_a_field.md
+++ b/docs/tutorials/generic_field_type/5_add_a_field.md
@@ -1,8 +1,8 @@
 ---
-description: Learn how to use your custom field type by adding a Field to a content type and creating an instance.
+description: Learn how to use your custom field type by adding a field to a content type and creating an instance.
 ---
 
-# Step 5 - Add a new Point 2D Field
+# Step 5 - Add a new Point 2D field
 
 All actions in this step are done in the admin interface also called the back office.
 Go to the admin interface (`<yourdomain>/admin`) and log in with the default username: `admin` and the default password: `publish`. 
@@ -22,7 +22,7 @@ New content type should have the following settings:
 
 ![Adding new field](point2d_field_definition.png)
 
-Next, define **point2d** with the following Fields:
+Next, define **point2d** with the following fields:
 
 |Field type|Name|Identifier|Required|Translatable|
 |----------|----|----------|--------|------------|
diff --git a/docs/tutorials/generic_field_type/7_add_a_validation.md b/docs/tutorials/generic_field_type/7_add_a_validation.md
index f28b66bce9..9dcb644b72 100644
--- a/docs/tutorials/generic_field_type/7_add_a_validation.md
+++ b/docs/tutorials/generic_field_type/7_add_a_validation.md
@@ -1,5 +1,5 @@
 ---
-description: Learn how to validate custom Field data.
+description: Learn how to validate custom field data.
 ---
 
 # Step 7 - Add basic validation
diff --git a/docs/tutorials/generic_field_type/8_data_migration.md b/docs/tutorials/generic_field_type/8_data_migration.md
index f05138a1e0..01ff0a951f 100644
--- a/docs/tutorials/generic_field_type/8_data_migration.md
+++ b/docs/tutorials/generic_field_type/8_data_migration.md
@@ -1,5 +1,5 @@
 ---
-description: Learn how to serialize and deserialize Field data to enable sorting or search.
+description: Learn how to serialize and deserialize field data to enable sorting or search.
 ---
 
 # Step 8 -  Data migration between field type versions
diff --git a/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md b/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md
index 453abbaea2..85dd6bd28b 100644
--- a/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md
+++ b/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md
@@ -44,13 +44,13 @@ Log in to the back office – add `/admin` to your installation's address (`<y
 ### Modify existing Article content type
 
 You also need to modify the built-in Article content type. It makes inserting photos into articles easier.
-Edit it to remove the Image Field that has a Content Relation (ezobjectrelation) type, and create a new Field in its place:
+Edit it to remove the Image field that has a Content Relation (ezobjectrelation) type, and create a new field in its place:
 
 | Field type | Name  | Identifier | Required | Searchable | Translatable |
 |------------|-------|------------|----------|------------|--------------|
 | Image Asset | Image | `image`    |yes       |no          | no           |
 
-![New image Field in the Article content type](enterprise_tut_image_in_article_ct.png)
+![New image field in the Article content type](enterprise_tut_image_in_article_ct.png)
 
 ## Add template, configuration and style files
 
diff --git a/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md b/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
index fd183c140f..8fd898a0c2 100644
--- a/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
+++ b/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
@@ -34,7 +34,7 @@ You can see that the home Page has only one zone with the block.
 ![Empty Page with default layout](enterprise_tut_empty_single_block.png)
 
 Remove the Tag block. Hover over it and select the trash icon from the menu.
-Click the **Field** button on the left of the top bar to switch to editing Page Fields.
+Click the **Field** button on the left of the top bar to switch to editing page fields.
 Change the Title of the page to "Home". Then, publish the Page to update its name.
 
 The design for the website you're making needs a layout with two zones: a main column and a narrower sidebar.
diff --git a/docs/tutorials/page_and_form_tutorial/5_create_newsletter_form.md b/docs/tutorials/page_and_form_tutorial/5_create_newsletter_form.md
index e7750efb07..5f656f4f60 100644
--- a/docs/tutorials/page_and_form_tutorial/5_create_newsletter_form.md
+++ b/docs/tutorials/page_and_form_tutorial/5_create_newsletter_form.md
@@ -28,7 +28,7 @@ In the Form Builder, add and configure (using the **Basic** and **Validation** t
 
 The configuration should look like this:
 
-![Adding Fields to Newsletter Form](enterprise_tut_form_creation.png "Adding Fields to Newsletter Form")
+![Adding fields to Newsletter Form](enterprise_tut_form_creation.png "Adding fields to Newsletter Form")
 
 When you add all the fields, save the form and click **Publish**.
 Now you can edit the Front Page and add a Form block below the Random block.
diff --git a/docs/users/customer_groups.md b/docs/users/customer_groups.md
index 105e0f65f1..4fd317c72e 100644
--- a/docs/users/customer_groups.md
+++ b/docs/users/customer_groups.md
@@ -17,7 +17,7 @@ For example, you can offer a 10% discount for all products in the catalog to use
 
 ## Enabling customer groups
 
-To enable using customer groups, you need to modify the User content type's definition
+To enable using customer groups, you need to modify the user content type's definition
 by adding a [customer group field](customergroupfield.md).
 
 With this field you can add a user to any of the predefined customer groups.
diff --git a/docs/users/invitations.md b/docs/users/invitations.md
index 9b133c43f4..5af3d6b00d 100644
--- a/docs/users/invitations.md
+++ b/docs/users/invitations.md
@@ -4,30 +4,25 @@ description: Manage user invitations to create an account in the frontend or the
 
 # Inviting users
 
-[[= product_name =]] allows you to create and send invitations to create an account in
-the frontend as a customer, the back office as an employee, or the Corporate Portal as an organisation member.
+[[= product_name =]] allows you to create and send invitations to create an account in the frontend as a customer, the back office as an employee, or the Corporate Portal as an organisation member.
 You can send invitations to individual users or in bulk.
 
 ## Roles and policies
 
 To invite other members to the site or the back office, a user needs to have the `User:Invite` permission added to their role.
-You can limit the ability to invite other members to specific user groups, 
-such as Editors, or to the specific roles within the group, for example: Admin, Buyer.
+You can limit the ability to invite other members to specific user groups, such as Editors, or to the specific roles within the group, for example: Admin, Buyer.
 
 ## Creating and sending invitations
 
-Invitations are created with [InvitationService](../api/php_api/php_api_reference/classes/Ibexa-Contracts-User-Invitation-InvitationService.html),
-but sending them requires additional setup.
-[[= product_name =]] provides you with `Ibexa\User\Invitation\MailSender` implementation of
-`InvitationSender` interface for sending invitations via email.
+Invitations are created with [InvitationService](../api/php_api/php_api_reference/classes/Ibexa-Contracts-User-Invitation-InvitationService.html), but sending them requires additional setup.
+[[= product_name =]] provides you with `Ibexa\User\Invitation\MailSender` implementation of `InvitationSender` interface for sending invitations via email.
 If you want to send invitations through different channels, you need to create a custom setup.
 
 ## Invitation and registration form templates
 
 ### Semantic configuration
 
-To set up custom templates for invitation or registration forms,
-create a template file and inform the system, through configuration, when to use this template.
+To set up custom templates for invitation or registration forms, create a template file and inform the system, through configuration, when to use this template.
 
 You might also set a SiteAccess under `scope`, to which the new user is invited.
 If the SiteAccess isn't set, it falls back to the default `site` value.
@@ -44,8 +39,7 @@ For example, use the following [configuration](configuration.md#configuration-fi
                      mail: "@@App/invitation/mail.html.twig"
 ```
 
-Here, you can specify which template should be used for the invitation mail,
-and what should be the expiration time for the invitation link included in that mail.
+Here, you can specify which template should be used for the invitation mail, and what should be the expiration time for the invitation link included in that mail.
 If a user does not click the invitation link sent to them in time, you can refresh the invitation.
 Refresh resets the time limit and changes the hash in the invitation link.
 
diff --git a/docs/users/login_methods.md b/docs/users/login_methods.md
index 9e001b4a93..405763221a 100644
--- a/docs/users/login_methods.md
+++ b/docs/users/login_methods.md
@@ -4,10 +4,9 @@ description: Set up user login methods.
 
 # Login methods
 
-Two login methods are available: with User name or with email.
+Two login methods are available: with user name or with email.
 
-Providers for these two methods are `ibexa.security.user_provider.username`
-and `ibexa.security.user_provider.email`.
+Providers for these two methods are `ibexa.security.user_provider.username` and `ibexa.security.user_provider.email`.
 
 You can configure which method is allowed under the `security` [configuration key](configuration.md#configuration-files):
 
@@ -31,33 +30,28 @@ security:
             provider: ibexa
 ```
 
-You can customize per User Field whether the email address used as a login method must be unique or not.
+You can customize per user field whether the email address used as a login method must be unique or not.
 
-To check that all existing User accounts have unique emails,
-run the `ibexa:user:audit-database` command.
-It lists all User accounts with duplicate emails.
+To check that all existing user accounts have unique emails, run the `ibexa:user:audit-database` command.
+It lists all user accounts with duplicate emails.
 
 !!! caution
 
-    Because logging in with email was not available until version v3.0,
-    you can come across issues if you use the option on an existing database.
+    Because logging in with email was not available until version v3.0, you can come across issues if you use the option on an existing database.
 
     This may happen if more than one account uses the same email address.
-    Login through the User name is still available.
+    Login through the user name is still available.
 
-    To resolve the issues, run `ibexa:user:audit-database`
-    and manually modify accounts that have duplicate emails.
+    To resolve the issues, run `ibexa:user:audit-database` and manually modify accounts that have duplicate emails.
 
 ## Login rules
 
-You can set the rules for allowed User names in the back office per User Field.
+You can set the rules for allowed user names in the back office per user field.
 The rules are set using regular expressions.
 
-For example, to ensure that User names can only contain lowercase letters,
-set `[a-z]+$` as **Username pattern**:
+For example, to ensure that user names can only contain lowercase letters, set `[a-z]+$` as **Username pattern**:
 
-![Setting a User name pattern](username_pattern.png)
+![Setting a user name pattern](username_pattern.png)
 
-To check that all existing User accounts have names that fit the current pattern,
-run the `ibexa:user:audit-database` command.
-It checks all User accounts in the database and lists those that do not fit the pattern.
\ No newline at end of file
+To check that all existing user accounts have names that fit the current pattern, run the `ibexa:user:audit-database` command.
+It checks all user accounts in the database and lists those that do not fit the pattern.
\ No newline at end of file
diff --git a/docs/users/oauth_client.md b/docs/users/oauth_client.md
index c9ff278be0..4f9f8f64ff 100644
--- a/docs/users/oauth_client.md
+++ b/docs/users/oauth_client.md
@@ -16,14 +16,12 @@ to provide OAuth2 authentication.
 ### Configure connection to Authorization Server
 
 Details of the configuration depend on the OAuth2 Authorization Server that you want to use.
-For sample configurations for different providers,
-see [`knpuniversity/oauth2-client-bundle` configuration](https://github.com/knpuniversity/oauth2-client-bundle#configuration).
+For sample configurations for different providers, see [`knpuniversity/oauth2-client-bundle` configuration](https://github.com/knpuniversity/oauth2-client-bundle#configuration).
 Some client types require additional packages.
 Missing package is indicated in an error message.
 
 For example, the following configuration creates a `google` client for Google OAuth2 Authorization Server to log users in.
-Two environment variables, `OAUTH_GOOGLE_CLIENT_ID` and `OAUTH_GOOGLE_CLIENT_SECRET`,
-correspond to [the set-up on Google side](https://support.google.com/cloud/answer/6158849).
+Two environment variables, `OAUTH_GOOGLE_CLIENT_ID` and `OAUTH_GOOGLE_CLIENT_SECRET`, correspond to [the set-up on Google side](https://support.google.com/cloud/answer/6158849).
 
 ``` yaml
 [[= include_file('code_samples/user_management/oauth_google/config/packages/knpu_oauth2_client.yaml') =]]
@@ -62,35 +60,32 @@ By adding the `Ibexa\Bundle\OAuth2Client\Security\Authenticator\OAuth2Authentica
 Resource owner mappers map the data received from the OAuth2 authorization server to user information in the repository.
 
 Resource owner mappers must implement the [`Ibexa\Contracts\OAuth2Client\ResourceOwner\ResourceOwnerMapper`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-OAuth2Client-ResourceOwner-ResourceOwnerMapper.html) interface.
+
 Four implementations of `ResourceOwnerMapper` are proposed by default:
 
 - `ResourceOwnerToExistingUserMapper` is the base class extended by the following mappers:
     - `ResourceOwnerIdToUserMapper` - loads a user (resource owner) based on the identifier, but doesn't create a new user.
     - `ResourceOwnerEmailToUserMapper` - loads a user (resource owner) based on the email, but doesn't create a new user.
-- `ResourceOwnerToExistingOrNewUserMapper` - checks whether the user exists and loads the data if it does.  If not, creates a new user in the repository.
+- `ResourceOwnerToExistingOrNewUserMapper` - checks whether the user exists and loads the data if it does. If not, creates a new user in the repository.
 
 To use `ResourceOwnerToExistingOrNewUserMapper`, you need to extend it in your custom mapper.
 
-!!! tip "OAuth User content type"
+!!! tip "OAuth user content type"
 
-    When you implement your own mapper for external login,
-    It's good practice to create a special User content type for users registered in this way.
+    When you implement your own mapper for external login, it's good practice to create a special user content type for users registered in this way.
     The users who register through an external service do not have a separate password in the system.
     Instead, they log in by their external service's password.
 
-    To avoid issues with password restrictions in the built-in User content type,
-    create a special content type (for example, "OAuth User"), without restrictions on the password.
+    To avoid issues with password restrictions in the built-in user content type, create a special content type (for example, "OAuth user"), without restrictions on the password.
 
-    This new content type must also contain the User (`ezuser`) Field.
+    This new content type must also contain the user (`ezuser`) field.
 
 The following example shows how to create a Resource Owner mapper for the `google` client from previous examples.
 
 Create a resource owner mapper for Google login in `src/OAuth/GoogleResourceOwnerMapper.php`.
-The mapper extends `ResourceOwnerToExistingOrNewUserMapper`,
-which enables it to create a new user in the repository if the user doesn't exist yet.
+The mapper extends `ResourceOwnerToExistingOrNewUserMapper`, which enables it to create a new user in the repository if the user doesn't exist yet.
 
-The mapper loads a user (line 51) or creates a new one (line 61),
-based on the information from `resourceOwner`, that's the OAuth2 authorization server.
+The mapper loads a user (line 51) or creates a new one (line 61), based on the information from `resourceOwner`, that's the OAuth2 authorization server.
 
 The new username is set with a `google:` prefix (lines 19, 109), to avoid conflicts with users registered in a regular way.
 
@@ -106,8 +101,7 @@ Configure the service by using the `ibexa.oauth2_client.resource_owner_mapper` t
 
 ## Add login button
 
-After you have activated the OAuth2 client for the `admin` SiteAccess,
-you need to add a **Log in with Google** to the back office login form.
+After you have activated the OAuth2 client for the `admin` SiteAccess, you need to add a **Log in with Google** to the back office login form.
 
 Create the following template file in `templates/themes/admin/account/login/oauth2_login.html.twig`:
 
@@ -115,9 +109,7 @@ Create the following template file in `templates/themes/admin/account/login/oaut
 [[= include_file('code_samples/user_management/oauth_google/templates/themes/admin/account/login/oauth2_login.html.twig') =]]
 ```
 
-For more information about the OAuth connection URL Twig functions,
-see [`ibexa_oauth2_connect_path`](url_twig_functions.md#ibexa_oauth2_connect_path)
-and [`ibexa_oauth2_connect_url`](url_twig_functions.md#ibexa_oauth2_connect_url).
+For more information about the OAuth connection URL Twig functions, see [`ibexa_oauth2_connect_path`](url_twig_functions.md#ibexa_oauth2_connect_path) and [`ibexa_oauth2_connect_url`](url_twig_functions.md#ibexa_oauth2_connect_url).
 
 Finally, add the template to the login form by using the `login-form-after` [component](custom_components.md):
 
diff --git a/docs/users/oauth_server.md b/docs/users/oauth_server.md
index 6071f1cad2..a3ed42b91d 100644
--- a/docs/users/oauth_server.md
+++ b/docs/users/oauth_server.md
@@ -163,7 +163,7 @@ or delete a client (`league:oauth2-server:delete-client`).
 !!! note
 
     For a list of all the commands that you can use maintain your clients, in a terminal, run `bin/console list league:oauth2-server`.
-    To see usage details for each of the commands, run `bin/console help <command>` . 
+    To see usage details for each of the commands, run `bin/console help <command>` .
 
     For more information, see the package's [online documentation](https://github.com/thephpleague/oauth2-server-bundle/blob/master/docs/basic-setup.md).
 
diff --git a/docs/users/passwords.md b/docs/users/passwords.md
index 42f66eacdd..1a290245b5 100644
--- a/docs/users/passwords.md
+++ b/docs/users/passwords.md
@@ -24,8 +24,7 @@ By default, it's set to `PT1H` (one hour).
 ## Revoking passwords
 
 In case of a security situation such as a data leakage, you may need to force users to change their passwords.
-You can do it with the help of the `ibexa:user:expire-password` command,
-which revokes the passwords for specific users, user groups or users belonging to the chosen content type.
+You can do it with the help of the `ibexa:user:expire-password` command, which revokes the passwords for specific users, user groups, or users belonging to the chosen content type.
 
 To select which users to revoke passwords for, use one of the following options with the command:
 
@@ -54,7 +53,7 @@ php bin/console ibexa:user:expire-password --user-group-id=13
 ## Password rules
 
 You can customize the password policy in your project.
-Each password setting is customizable per User field type.
+Each password setting is customizable per user field type.
 You can change the [password attributes](#password-attributes) or [password expiration settings](#password-expiration), and determine the rules for [repeating passwords](#repeating-passwords).
 
 To access the password settings:
@@ -66,7 +65,7 @@ To access the password settings:
 
 !!! tip
 
-    There can be other content types that function as users, beyond the built-in User content type.
+    There can be other content types that function as users, beyond the built-in user content type.
     For details, see [User Identifiers](repository_configuration.md#user-identifiers).
 
 ## Password attributes
@@ -82,7 +81,7 @@ You can also set the minimum password length.
 
 ## Password expiration
 
-In the **User account (ezuser)** Field definition, you can set password expiration rules, which forces users to change their passwords periodically.
+In the **User account (ezuser)** field definition, you can set password expiration rules, which forces users to change their passwords periodically.
 
 ![Password expiry settings](password_expiry.png)
 
@@ -104,7 +103,7 @@ This rule is valid by default when password expiration is set.
 ## Breached passwords
 
 You can set a rule that prevents using passwords which have been exposed in a public breach.
-To do this, in the **User account (ezuser)** Field definition, select "Password must not be contained in a public breach".
+To do this, in the **User account (ezuser)** field definition, select "Password must not be contained in a public breach".
 
 ![Protection against using breached passwords](password_breached.png)
 
@@ -114,5 +113,4 @@ It does not check existing passwords, so it won't block login for anyone. It app
 !!! note
 
     The password itself isn't sent to the https://haveibeenpwned.com/ API, which makes this check secure.
-    For more information on how that is possible,
-    see [Validating Leaked Passwords with k-Anonymity](https://blog.cloudflare.com/validating-leaked-passwords-with-k-anonymity/).
+    For more information on how that is possible, see [Validating Leaked Passwords with k-Anonymity](https://blog.cloudflare.com/validating-leaked-passwords-with-k-anonymity/).
diff --git a/docs/users/segment_api.md b/docs/users/segment_api.md
index 3cacd22bc1..a025b2ebe7 100644
--- a/docs/users/segment_api.md
+++ b/docs/users/segment_api.md
@@ -1,5 +1,5 @@
 ---
-description: You can use PHP API to get Segment information, create and manage Segments, and assign users to them.
+description: You can use PHP API to get segment information, create and manage segments, and assign users to them.
 edition: experience
 ---
 
@@ -7,18 +7,18 @@ edition: experience
 
 Segments enable you to profile the content displayed to specific users.
 
-To manage Segments, use the `SegmentationService`.
+To manage segments, use the `SegmentationService`.
 
-## Getting Segment information
+## Getting segment information
 
-To load a Segment Group, use `SegmentationService::loadSegmentGroupByIdentifier()`.
-Get all Segments assigned to the group with `SegmentationService::loadSegmentsAssignedToGroup()`:
+To load a segment group, use `SegmentationService::loadSegmentGroupByIdentifier()`.
+Get all segments assigned to the group with `SegmentationService::loadSegmentsAssignedToGroup()`:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/SegmentCommand.php', 54, 62) =]]
 ```
 
-Similarly, you can load a Segment by using `SegmentationService::loadSegmentByIdentifier()`:
+Similarly, you can load a segment by using `SegmentationService::loadSegmentByIdentifier()`:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/SegmentCommand.php', 62, 63) =]]
@@ -26,7 +26,7 @@ Similarly, you can load a Segment by using `SegmentationService::loadSegmentById
 
 ## Checking assignment
 
-You can check whether a user is assigned to a Segment with `SegmentationService::isUserAssignedToSegment()`:
+You can check whether a user is assigned to a segment with `SegmentationService::isUserAssignedToSegment()`:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/SegmentCommand.php', 66, 71) =]]
@@ -34,40 +34,35 @@ You can check whether a user is assigned to a Segment with `SegmentationService:
 
 ## Assigning users
 
-To assign a user to a Segment, use `SegmentationService::assignUserToSegment()`:
+To assign a user to a segment, use `SegmentationService::assignUserToSegment()`:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/SegmentCommand.php', 64, 65) =]]
 ```
 
-## Creating Segments
+## Creating segments
 
-Each Segment must be assigned to a Segment Group.
+Each segment must be assigned to a segment group.
 
-To create a Segment Group, use `SegmentationService::createSegmentGroup()`
-and provide it with a `SegmentGroupCreateStruct`:
+To create a segment group, use `SegmentationService::createSegmentGroup()` and provide it with a `SegmentGroupCreateStruct`:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/SegmentCommand.php', 38, 45) =]]
 ```
 
-To add a Segment, use `SegmentationService::createSegment()`
-and provide it with a `SegmentCreateStruct`, which takes an existing group as one of the parameters:
+To add a segment, use `SegmentationService::createSegment()` and provide it with a `SegmentCreateStruct`, which takes an existing group as one of the parameters:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/SegmentCommand.php', 46, 53) =]]
 ```
 
-## Updating Segments
+## Updating segments
 
-To update a Segment or a Segment Group, use `SegmentationService::updateSegment()`
-or `SegmentationService::updateSegmentGroup()` and provide it with `SegmentUpdateStruct`
-or `SegmentGroupUpdateStruct`, respectively.
+To update a segment or a segment group, use `SegmentationService::updateSegment()` or `SegmentationService::updateSegmentGroup()` and provide it with `SegmentUpdateStruct` or `SegmentGroupUpdateStruct`.
 
-## Deleting Segments
+## Deleting segments
 
-To delete a Segment or a Segment Group, use `SegmentationService::removeSegment()`
-or `SegmentationService::removeSegmentGroup()`, respectively:
+To delete a segment or a segment group, use `SegmentationService::removeSegment()` or `SegmentationService::removeSegmentGroup()`:
 
 ``` php
 $this->segmentationService->removeSegmentGroup($group);

From 88aac466b9021cf252849fae1685c1d6e81f0af8 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Tue, 15 Oct 2024 11:07:51 +0200
Subject: [PATCH 13/77] Fixes

---
 docs/administration/admin_panel/admin_panel.md         |  4 ++--
 .../admin_panel/corporate_admin_panel.md               |  2 +-
 .../admin_panel/languages_admin_panel.md               |  2 +-
 docs/administration/admin_panel/roles_admin_panel.md   |  9 +++++----
 .../administration/admin_panel/segments_admin_panel.md |  4 ++--
 .../admin_panel/url_management_admin_panel.md          |  4 ++--
 docs/administration/admin_panel/users_admin_panel.md   |  4 ++--
 .../dashboard/configure_default_dashboard.md           | 10 +++++-----
 .../content_management/content_api/browsing_content.md |  1 +
 docs/content_management/locations.md                   |  4 ++--
 .../security/security_checklist.md                     |  2 +-
 docs/multisite/languages/languages.md                  |  4 ++--
 docs/permissions/permission_use_cases.md               |  2 +-
 docs/release_notes/ez_platform_v1.7.0_lts.md           |  2 +-
 docs/release_notes/ez_platform_v2.5.md                 |  2 +-
 docs/release_notes/ez_platform_v3.1.md                 |  2 +-
 docs/search/search_criteria_and_sort_clauses.md        |  2 +-
 .../migrating_from_ez_publish_platform.md              |  2 +-
 docs/users/user_management_guide.md                    |  2 +-
 19 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/docs/administration/admin_panel/admin_panel.md b/docs/administration/admin_panel/admin_panel.md
index 08cf8b9b06..ed7f692e43 100644
--- a/docs/administration/admin_panel/admin_panel.md
+++ b/docs/administration/admin_panel/admin_panel.md
@@ -6,9 +6,9 @@ page_type: landing_page
 # Admin panel
 
 Once you set up your environment you can start your work as an administrator.
-Your most functional tools can be found in **Admin Panel**.
+You can find key tools in **Admin** panel.
 
-To access Admin Panel, click the icon: ![Admin Panel Icon](admin_panel_icon.png){.inline-image}.
+To access **Admin** panel, click the icon: ![Admin panel Icon](admin_panel_icon.png){.inline-image}.
 
 [[= cards([
     "administration/admin_panel/users_admin_panel",
diff --git a/docs/administration/admin_panel/corporate_admin_panel.md b/docs/administration/admin_panel/corporate_admin_panel.md
index db7a00709c..11b4be2fac 100644
--- a/docs/administration/admin_panel/corporate_admin_panel.md
+++ b/docs/administration/admin_panel/corporate_admin_panel.md
@@ -4,7 +4,7 @@ description: You can manage companies profiles in the Admin Panel.
 
 # Corporate
 
-You can manage companies profiles in the Admin Panel.
+You can manage companies profiles in the **Admin** panel.
 
 There, in the **Corporate** section, you can find basic information about existing companies, for example, details, versions, locations, translations, a list of members, billing addresses, and technical details regarding the organization, such as visibility, IDs, or relations.
 
diff --git a/docs/administration/admin_panel/languages_admin_panel.md b/docs/administration/admin_panel/languages_admin_panel.md
index a4b97f9f47..0d2c226e72 100644
--- a/docs/administration/admin_panel/languages_admin_panel.md
+++ b/docs/administration/admin_panel/languages_admin_panel.md
@@ -6,7 +6,7 @@ description: Ibexa DXP offers the ability to create multiple translations of you
 
 [[= product_name =]] offers the ability to create multiple translations of your website.
 Which version is shown to a visitor depends on the way your installation is set up.
-A new language version for the website can be added in the [Admin Panel](admin_panel.md) in the **Languages** tab.
+You can add a new language version for the website in the [Admin Panel](admin_panel.md) in the **Languages** tab.
 
 Every new language must have a name and a language code, written in the `xxx-XX` format, for example `eng-GB` etc.
 
diff --git a/docs/administration/admin_panel/roles_admin_panel.md b/docs/administration/admin_panel/roles_admin_panel.md
index a1dd7ffd1b..6c1b5b613c 100644
--- a/docs/administration/admin_panel/roles_admin_panel.md
+++ b/docs/administration/admin_panel/roles_admin_panel.md
@@ -4,7 +4,7 @@ description: To give users an access to your website you need to assign them rol
 
 # Roles
 
-To give users an access to your website you need to assign them roles in the Admin Panel.
+To give users an access to your website you need to assign them roles in the **Admin** panel.
 
 ![Roles](admin_panel_roles.png "Roles")
 
@@ -14,7 +14,7 @@ Each role consists of:
 
 ![Policies](admin_panel_policies.png "Policies")
 
-Rules that give users access to different function in a module.
+Policies are the rules that give users access to different function in a module.
 You can restrict what user can do with limitations.
 The available limitations depend on the chosen policy.
 When policy has more than one limitation, all of them have to apply.
@@ -35,8 +35,9 @@ Every user or user group can have multiple roles.
 A user can also belong to many groups, for example, Administrators, Editors, Subscribers.
 
 Best practice is to avoid assigning roles to users directly.
-Model your content (content types, Sections, Locations etc.) in a way that can be accessed by generic roles.
+Model your content (content types, sections, locations etc.) in a way that can be accessed by generic roles.
 That way system is be more secure and easier to manage.
-This approach also improves performance. Role assignments and policies are taken into account during search/load queries.
+This approach also improves performance.
+Role assignments and policies are taken into account during search/load queries.
 
 See [Permissions overview](permissions.md) for further information and [Permission use cases](permission_use_cases.md) for details on how to customize access to different parts of the back office.
\ No newline at end of file
diff --git a/docs/administration/admin_panel/segments_admin_panel.md b/docs/administration/admin_panel/segments_admin_panel.md
index 0abc63e172..36e43aaa00 100644
--- a/docs/administration/admin_panel/segments_admin_panel.md
+++ b/docs/administration/admin_panel/segments_admin_panel.md
@@ -6,9 +6,9 @@ edition: experience
 # Segments
 
 You can use segments to display specific content to specific [ussers](users.md).
-they're used out of the box in the Targeting and Dynamic targeting blocks in the page.
+They're used out of the box in the Targeting and Dynamic targeting blocks in the page.
 
-Segments are collected in segment groups:
+You can collect segments in segment groups:
 
 ![Segment Groups](admin_panel_segment_groups.png)
 
diff --git a/docs/administration/admin_panel/url_management_admin_panel.md b/docs/administration/admin_panel/url_management_admin_panel.md
index bbe0768b4f..23bb6d5292 100644
--- a/docs/administration/admin_panel/url_management_admin_panel.md
+++ b/docs/administration/admin_panel/url_management_admin_panel.md
@@ -1,10 +1,10 @@
 ---
-description: URL Management let you manage external URL addresses and URL wildcards.
+description: URL Management lets you manage external URL addresses and URL wildcards.
 ---
 
 # URL Management
 
-You can manage external URL addresses and URL wildcards in the Admin Panel.
+You can manage external URL addresses and URL wildcards in the **Admin** panel.
 Configure URL aliases to have human-readable URL addresses throughout your system.
 
 See [URL management](url_management.md) for further information.
diff --git a/docs/administration/admin_panel/users_admin_panel.md b/docs/administration/admin_panel/users_admin_panel.md
index 6ac21cb991..3604f57a7b 100644
--- a/docs/administration/admin_panel/users_admin_panel.md
+++ b/docs/administration/admin_panel/users_admin_panel.md
@@ -1,11 +1,11 @@
 ---
-description: All user groups and users can be accessed in the users tab.
+description: You can access all users and user groups in the users tab.
 ---
 
 # Users
 
 [Users](users.md) in [[= product_name =]] are treated the same way as content items.
-they're organized in groups such as *Guests*, *Editors*, *Anonymous*, which makes it easier to manage them and their permissions.
+They're organized in groups such as *Guests*, *Editors*, *Anonymous*, which makes it easier to manage them and their permissions.
 All user groups and users can be accessed in the Admin panel by selecting **Users**.
 
 ![Users and user groups](admin_panel_users.png "Users and user groups")
diff --git a/docs/administration/dashboard/configure_default_dashboard.md b/docs/administration/dashboard/configure_default_dashboard.md
index cbfbf89153..7d8fa52315 100644
--- a/docs/administration/dashboard/configure_default_dashboard.md
+++ b/docs/administration/dashboard/configure_default_dashboard.md
@@ -32,7 +32,7 @@ All the settings in the configuration are reflected in the back office.
 ## Container remote ID
 
 Defines starting location container for all the dashboards, including customized and predifined ones.
-You can see it in the Admin panel, **Dashboards** section, **Dashboards** folder in the content tree.
+You can see it in the **Admin** panel, **Dashboards** section, **Dashboards** folder in the content tree.
 In the **Technical details** tab, it is defined as **Location remote ID**.
 
 ![Container remote ID](dashboard_container_remote_id.png)
@@ -41,19 +41,19 @@ In the **Technical details** tab, it is defined as **Location remote ID**.
 
 Specifies default predefined dashboard.
 All the users can see this dashboard as a starting dashboard in the back office.
-You can see it in the Admin panel, **Dashboards** section, **Default dashboard** folder inside of **Predefined dashboards** container in the content tree.
+You can see it in the **Admin** panel, **Dashboards** section, **Default dashboard** folder inside of **Predefined dashboards** container in the content tree.
 In the **Technical details** tab, it's defined as **Location remote ID**.
 
 ## Users container remote ID
 
 Defines a container for users folders, which contain all customized dashboards.
-You can see it in the Admin panel, **Dashboards** section, **User dashboards** folder inside of main **Dashboards** container in the content tree.
+You can see it in the **Admin** panel, **Dashboards** section, **User dashboards** folder inside of main **Dashboards** container in the content tree.
 In the **Technical details** tab, it's defined as **Location remote ID**.
 
 ## Predefined container remote ID
 
 Defines a container that contains all predefined dashboards created by Administrator.
-You can see it in the Admin panel, **Dashboards** section, **Predefined dashboards** folder inside of main **Dashboards** container in the content tree.
+You can see it in the **Admin** panel, **Dashboards** section, **Predefined dashboards** folder inside of main **Dashboards** container in the content tree.
 In the **Technical details** tab, it's defined as **Location remote ID**.
 
 ## Section identifier
@@ -63,7 +63,7 @@ Specifies the name of the [Section](sections.md).
 ## Content type identifier
 
 It is an identifier that represents dashboard content type.
-You can find it in the Admin panel, **Dashboard content Ttpe** section, **View/Global properties** tab.
+You can find it in the **Admin** panel, **Dashboard content Ttpe** section, **View/Global properties** tab.
 
 ![Content type identifier](dashboard_content_type_identifier.png)
 
diff --git a/docs/content_management/content_api/browsing_content.md b/docs/content_management/content_api/browsing_content.md
index 504847d9cb..cc15a0428e 100644
--- a/docs/content_management/content_api/browsing_content.md
+++ b/docs/content_management/content_api/browsing_content.md
@@ -207,6 +207,7 @@ $output->writeln("Parent Location: " . $mainLocation->getParentLocation()->pathS
 
 When dealing with location objects (and Trash objects), you can get access to content item directly using `$location->getContent`.
 In Twig this can also be accessed by `location.content`.
+This is a lazy property.
 It triggers loading of content when first used.
 In case of bulk of locations coming from Search or Location Service,
 the content is also loaded in bulk for the whole location result set.
diff --git a/docs/content_management/locations.md b/docs/content_management/locations.md
index 0d4abbe7cf..4b32cfeebf 100644
--- a/docs/content_management/locations.md
+++ b/docs/content_management/locations.md
@@ -62,13 +62,13 @@ It contains a Folder content item.
 
 **Users** is the top level Location that contains the built-in system for managing user accounts.
 
-![Users in admin panel](admin_panel_users.png "Users in admin panel")
+![Users in Admin panel](admin_panel_users.png "Users in Admin panel")
 
 A user is simply a content item of the user account content type.
 The users are organized within user group content items below this Location.
 
 In other words, the **Users** Location contains the actual users and user groups,
-which can be viewed by selecting the **Users** tab in the Admin Panel.
+which can be viewed by selecting the **Users** tab in the **Admin** Panel.
 
 The default ID number of the **Users** Location is 5.
 It contains user group content items.
diff --git a/docs/infrastructure_and_maintenance/security/security_checklist.md b/docs/infrastructure_and_maintenance/security/security_checklist.md
index e94e68b620..f081addb83 100644
--- a/docs/infrastructure_and_maintenance/security/security_checklist.md
+++ b/docs/infrastructure_and_maintenance/security/security_checklist.md
@@ -190,7 +190,7 @@ Or use other permission-based [**Limitations**](https://doc.ibexa.co/en/latest/p
 Security should be a multi-layered exercise. It's wise to minimize what features you make available to the world, even if there are no known or suspected vulnerabilities in those features, and even if your content is properly protected by roles and policies. Reduce your attack surface by exposing only what you must.
 
 - If possible, make the back office unavailable on the open internet.
-- [Symfony FOSJsRoutingBundle](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle) is required in those releases where it's included, to expose routes to JavaScript. It exposes only the required routes, nothing more. It's only required in the back office site access though, so you can consider blocking it in other site accesses. You should also go through your own custom routes, and decide for each if you need to expose them or not. See the documentation on [YAML route definitions for exposure](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle/blob/master/Resources/doc/usage.rst#generating-uris).
+- [Symfony FOSJsRoutingBundle](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle) is required in those releases where it's included, to expose routes to JavaScript. It exposes only the required routes, nothing more. It's only required in the back office SiteAccess though, so you can consider blocking it in other SiteAccesses. You should also go through your own custom routes, and decide for each if you need to expose them or not. See the documentation on [YAML route definitions for exposure](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle/blob/master/Resources/doc/usage.rst#generating-uris).
 - By default, a [Powered-By header](https://doc.ibexa.co/en/latest/update_and_migration/from_1.x_2.x/update_db_to_2.5/#powered-by-header) is set. It specifies what version of the DXP is running. For example, `x-powered-by: Ibexa Experience v4`. This doesn't expose anything that couldn't be detected through other means. But if you wish to obscure this, you can either omit the version number, or disable the header entirely.
 - Consider whether certain interfaces must be left available on the open internet. For example:
     - The `/search` and `/graphql` endpoints
diff --git a/docs/multisite/languages/languages.md b/docs/multisite/languages/languages.md
index e24aa5cbd6..8a43b2ad67 100644
--- a/docs/multisite/languages/languages.md
+++ b/docs/multisite/languages/languages.md
@@ -19,7 +19,7 @@ publishing the draft doesn't overwrite later modifications.
 
 ### Adding available languages
 
-The multilanguage system operates based on a global translation list that contains all languages available in the installation. Languages can be [added to this list from the Admin Panel](https://doc.ibexa.co/projects/userguide/en/latest/content_management/translate_content/) in the back office. After adding a language be sure to dump all assets to the file system:
+The multilanguage system operates based on a global translation list that contains all languages available in the installation. Languages can be [added to this list from the **Admin** panel](https://doc.ibexa.co/projects/userguide/en/latest/content_management/translate_content/) in the back office. After adding a language be sure to dump all assets to the file system:
 
 ```
 yarn encore <environment>
@@ -178,6 +178,6 @@ If the `translation_siteaccesses` setting isn't provided, implicit *related S
 
 When setting up SiteAccesses with different language versions, you can specify a list of preset languages for each SiteAccess. When this SiteAccess is used, the system goes through this list. If a content item is unavailable in the first (prioritized) language, it attempts to use the next language in the list, and so on. Thanks to this you can have a fallback in case of a lacking translation.
 
-You can also assign a Default content availability flag to content types (available in the Admin Panel). When this flag is assigned, content items of this type are available even when they do not have a language version in any of the languages configured for the current SiteAccess.
+You can also assign a Default content availability flag to content types (available in the **Admin** panel). When this flag is assigned, content items of this type are available even when they do not have a language version in any of the languages configured for the current SiteAccess.
 
 If a language isn't provided in the list of prioritized languages and it's not the content item's first language, the URL alias for this content in this language isn't generated.
diff --git a/docs/permissions/permission_use_cases.md b/docs/permissions/permission_use_cases.md
index 7654d8c5e9..363c92df5d 100644
--- a/docs/permissions/permission_use_cases.md
+++ b/docs/permissions/permission_use_cases.md
@@ -92,7 +92,7 @@ You do it by creating two new roles for a user group:
 Follow the example below to learn how to do that.
 
 **Cookbook**, **Dinner recipes** and **Dessert recipes** containers aren't accessible in the frontend. 
-Edit access to them in the **Admin Panel**. 
+Edit access to them in the **Admin** panel. 
 
 ![Subtree file structure](subtree_usability_notes_1.png)
 
diff --git a/docs/release_notes/ez_platform_v1.7.0_lts.md b/docs/release_notes/ez_platform_v1.7.0_lts.md
index e1fc90c844..83ee966f74 100644
--- a/docs/release_notes/ez_platform_v1.7.0_lts.md
+++ b/docs/release_notes/ez_platform_v1.7.0_lts.md
@@ -32,7 +32,7 @@ Community members are more than welcome to contribute to the translation process
 
 ![](udwre.png)
 
--   The Admin Panel now provides a way to get a clean **digest view of content types** configured in the system, with the ability to clearly get access to properties and field definitions.
+-   The **Admin** panel now provides a way to get a clean **digest view of content types** configured in the system, with the ability to clearly get access to properties and field definitions.
 
 ![](contenttypeviews.png)
 
diff --git a/docs/release_notes/ez_platform_v2.5.md b/docs/release_notes/ez_platform_v2.5.md
index 315e705119..0c5491ba01 100644
--- a/docs/release_notes/ez_platform_v2.5.md
+++ b/docs/release_notes/ez_platform_v2.5.md
@@ -70,7 +70,7 @@ all features related to user management, such as user accounts, registering, cha
 
     ### Workflow improvements
 
-    You can now preview a diagram of the configured workflows in the Admin Panel.
+    You can now preview a diagram of the configured workflows in the **Admin** panel.
 
     ![Diagram of a workflow configuration](2.5_workflow_diagram.png)
 
diff --git a/docs/release_notes/ez_platform_v3.1.md b/docs/release_notes/ez_platform_v3.1.md
index 8aa9a118c6..35cca92347 100644
--- a/docs/release_notes/ez_platform_v3.1.md
+++ b/docs/release_notes/ez_platform_v3.1.md
@@ -70,7 +70,7 @@ You can create, modify or delete URL wildcards, and decide if the user should be
 
 !!! note
 
-    As of this release, the Link manager is no longer part of the Content panel, and now it belongs to the Admin panel of the back office.
+    As of this release, the Link manager is no longer part of the Content panel, and now it belongs to the **Admin** panel of the back office.
 
 ![URL Management UI](3_1_URL_Management.png "URL Management UI")
 
diff --git a/docs/search/search_criteria_and_sort_clauses.md b/docs/search/search_criteria_and_sort_clauses.md
index 7a92203ad4..165ef184e8 100644
--- a/docs/search/search_criteria_and_sort_clauses.md
+++ b/docs/search/search_criteria_and_sort_clauses.md
@@ -20,7 +20,7 @@ or [`ContentId` Criterion handler](https://github.com/ibexa/solr/blob/main/src/l
 
 ## Custom Criteria and Sort Clauses
 
-Sometimes you can find that standard Search Criteria and Sort Clauses provided with [[= product_name =]] aren't sufficient for your needs. Most often this is the case if you have a custom field type using external storage which cannot be searched using the standard field Criterion.
+Sometimes you can find that standard Search Criteria and Sort Clauses provided with [[= product_name =]] aren't sufficient for your needs. Most often this is the case if you have a custom field type using external storage which cannot be searched using the standard Field Criterion.
 
 !!!note
 
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
index ff57a316bf..f102abe807 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
@@ -495,7 +495,7 @@ php bin/console assetic:dump --env=prod
 
 ##### Unstyled login screen after upgrade
 
-It's possible that after the upgrade your admin screen is unstyled. This may happen because the new SiteAccess isn't available in the database. You can fix it by editing the permissions for the Anonymous user. Go to **Roles** in the Admin Panel and edit the limitations of the Anonymous user's `user/login` policy. Add all SiteAccesses to the limitation, save, and clear the browser cache. The login screen should now show proper styling.
+It's possible that after the upgrade your admin screen is unstyled. This may happen because the new SiteAccess isn't available in the database. You can fix it by editing the permissions for the Anonymous user. Go to **Roles** in the **Admin** panel and edit the limitations of the Anonymous user's `user/login` policy. Add all SiteAccesses to the limitation, save, and clear the browser cache. The login screen should now show proper styling.
 
 ##### Translating URLs
 
diff --git a/docs/users/user_management_guide.md b/docs/users/user_management_guide.md
index 0512770383..03fa21ada1 100644
--- a/docs/users/user_management_guide.md
+++ b/docs/users/user_management_guide.md
@@ -19,7 +19,7 @@ User management is available in all [[= product_name =]] versions.
 ## How does user management work
 
 [[= product_name =]] simplifies user management with an intuitive and powerful system of accounts, Roles, Permissions, groups, and Segments.
-You can find all user groups and users in the **Admin Panel** by selecting **Users**.
+You can find all user groups and users in the **Admin** panel by selecting **Users**.
 Here, you can manage users, their relations, roles, and policies.
 
 ![User's section](users_section.png)

From 6c158a13b6956b0096cc1b65aca9b6df37fd4c55 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Tue, 15 Oct 2024 11:29:15 +0200
Subject: [PATCH 14/77] Fixes

---
 docs/administration/admin_panel/users_admin_panel.md      | 2 +-
 docs/content_management/pages/create_custom_page_block.md | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/administration/admin_panel/users_admin_panel.md b/docs/administration/admin_panel/users_admin_panel.md
index 3604f57a7b..60ba4141f6 100644
--- a/docs/administration/admin_panel/users_admin_panel.md
+++ b/docs/administration/admin_panel/users_admin_panel.md
@@ -6,7 +6,7 @@ description: You can access all users and user groups in the users tab.
 
 [Users](users.md) in [[= product_name =]] are treated the same way as content items.
 They're organized in groups such as *Guests*, *Editors*, *Anonymous*, which makes it easier to manage them and their permissions.
-All user groups and users can be accessed in the Admin panel by selecting **Users**.
+You can access all users and user groups in the **Admin** panel by selecting **Users**.
 
 ![Users and user groups](admin_panel_users.png "Users and user groups")
 
diff --git a/docs/content_management/pages/create_custom_page_block.md b/docs/content_management/pages/create_custom_page_block.md
index fdc0b28720..6198b6b987 100644
--- a/docs/content_management/pages/create_custom_page_block.md
+++ b/docs/content_management/pages/create_custom_page_block.md
@@ -132,5 +132,8 @@ The following UDW configuration is used so only an `event` typed content item ca
 
 For more information, see [UDW configuration](browser.md#udw-configuration).
 
-Your custom page block is now ready. 
-Before you can use it in Page Builder, you must [enable it in Page field settings]([[= user_doc =]]/content_management/configure_ct_field_settings/#block-display).
+Your custom page block is now ready.
+
+!!! caution
+
+    Before you can use it in Page Builder, you must [enable it in Page field settings]([[= user_doc =]]/content_management/configure_ct_field_settings/#block-display).

From 94f89b4e75f8ba7dcf1d4a1f828dd5e4fd5cf595 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Tue, 15 Oct 2024 12:55:05 +0200
Subject: [PATCH 15/77] Fixes

---
 docs/cdp/cdp_data_customization.md            |  2 +-
 docs/commerce/cart/cart.md                    |  2 +-
 docs/commerce/commerce.md                     | 48 +++++++++----------
 .../data_migration/data_migration.md          |  2 +-
 .../field_type_reference/imagefield.md        |  2 +-
 docs/content_management/pages/pages.md        |  2 +-
 docs/getting_started/getting_started.md       |  2 +-
 docs/ibexa_cloud/ibexa_cloud.md               |  6 +--
 docs/ibexa_engage/ibexa_engage.md             |  2 +-
 docs/ibexa_products/editions.md               |  6 +--
 .../cache/cache.md                            |  2 +-
 .../cache/persistence_cache.md                | 10 ++--
 .../infrastructure_and_maintenance.md         |  2 +-
 .../security/security_checklist.md            |  1 +
 .../sessions.md                               |  2 +-
 docs/multisite/multisite.md                   |  2 +-
 docs/multisite/siteaccess/siteaccess.md       |  2 +-
 docs/permissions/permissions.md               |  2 +-
 .../api_reference/api_reference.md            |  2 +-
 docs/personalization/personalization.md       |  2 +-
 docs/pim/pim.md                               |  2 +-
 docs/product_guides/product_guides.md         | 20 ++++----
 docs/release_notes/ez_platform_v2.3.md        | 12 ++---
 docs/release_notes/release_notes.md           |  2 +-
 docs/resources/resources.md                   |  2 +-
 ...customize_elasticsearch_index_structure.md |  4 +-
 docs/search/search.md                         |  2 +-
 .../search_criteria_and_sort_clauses.md       |  8 ++--
 docs/templating/templating.md                 |  2 +-
 .../content_twig_functions.md                 |  2 +-
 .../twig_function_reference.md                | 24 +++++-----
 docs/tutorials/tutorials.md                   |  2 +-
 .../from_4.3/update_from_4.3.md               |  6 +--
 docs/users/users.md                           | 20 ++++----
 34 files changed, 101 insertions(+), 108 deletions(-)

diff --git a/docs/cdp/cdp_data_customization.md b/docs/cdp/cdp_data_customization.md
index 25f722c89b..be0ff92c20 100644
--- a/docs/cdp/cdp_data_customization.md
+++ b/docs/cdp/cdp_data_customization.md
@@ -87,7 +87,7 @@ This Processor is a default one, as long as no other Processor with higher prior
 ​
 This Processor generates JSON data from hash representation of the field type (it uses `\Ibexa\Contracts\Core\FieldType\FieldType::toHash` method).
 
-!!! warning
+!!! caution
 
     CDP doesn't support column mapping, which allows you to match records on JSON data directly.
 
diff --git a/docs/commerce/cart/cart.md b/docs/commerce/cart/cart.md
index 6d08175bca..6fb4b1fe4e 100644
--- a/docs/commerce/cart/cart.md
+++ b/docs/commerce/cart/cart.md
@@ -30,7 +30,7 @@ Information that relates to anonymous users is stored in the PHP session, while
 
 By default, anonymous users can add items to cart, but to display the cart view, they have to log in and transition into an authenticated user.
 
-!!! note 
+!!! note
 
     For information about roles and permissions that control access to the cart, see [Permission use cases](permission_use_cases.md#commerce).
 
diff --git a/docs/commerce/commerce.md b/docs/commerce/commerce.md
index 1a15fc642a..7debfab0bf 100644
--- a/docs/commerce/commerce.md
+++ b/docs/commerce/commerce.md
@@ -9,43 +9,43 @@ page_type: landing_page
 The commerce component of [[= product_name =]] covers various areas of managing an e-commerce presence: from configuring payment and shipping methods, through processing a transaction (listing available products, adding products to a cart, processing checkout, and sending confirmation), all the way to order management.
 
 [[= cards([
-"commerce/cart/cart",
-"commerce/checkout/checkout",
-"commerce/order_management/order_management",
-"commerce/payment/payment",
-"commerce/shipping_management/shipping_management",
-"commerce/storefront/storefront",
-"commerce/transactional_emails/transactional_emails"
+    "commerce/cart/cart",
+    "commerce/checkout/checkout",
+    "commerce/order_management/order_management",
+    "commerce/payment/payment",
+    "commerce/shipping_management/shipping_management",
+    "commerce/storefront/storefront",
+    "commerce/transactional_emails/transactional_emails"
 ], columns=4) =]]
 
 ## Configure
 
 [[= cards([
-"commerce/checkout/configure_checkout",
-"commerce/order_management/configure_order_management",
-"commerce/payment/configure_payment",
-"commerce/shipping_management/configure_shipment",
-"commerce/storefront/configure_storefront"
+    "commerce/checkout/configure_checkout",
+    "commerce/order_management/configure_order_management",
+    "commerce/payment/configure_payment",
+    "commerce/shipping_management/configure_shipment",
+    "commerce/storefront/configure_storefront"
 ], columns=4) =]]
 
 ## Extend
 
 [[= cards([
-"commerce/checkout/customize_checkout",
-"commerce/payment/extend_payment",
-"commerce/shipping_management/extend_shipping",
-"commerce/storefront/extend_storefront",
-"commerce/transactional_emails/extend_transactional_emails"
+    "commerce/checkout/customize_checkout",
+    "commerce/payment/extend_payment",
+    "commerce/shipping_management/extend_shipping",
+    "commerce/storefront/extend_storefront",
+    "commerce/transactional_emails/extend_transactional_emails"
 ], columns=4) =]]
 
 ## Explore Commerce API
 
 [[= cards([
-"commerce/cart/cart_api",
-"commerce/checkout/checkout_api",
-"commerce/order_management/order_management_api",
-"commerce/payment/payment_api",
-"commerce/payment/payment_method_api",
-"commerce/shipping_management/shipping_method_api",
-"commerce/shipping_management/shipment_api"
+    "commerce/cart/cart_api",
+    "commerce/checkout/checkout_api",
+    "commerce/order_management/order_management_api",
+    "commerce/payment/payment_api",
+    "commerce/payment/payment_method_api",
+    "commerce/shipping_management/shipping_method_api",
+    "commerce/shipping_management/shipment_api"
 ], columns=4) =]]
diff --git a/docs/content_management/data_migration/data_migration.md b/docs/content_management/data_migration/data_migration.md
index 816194eede..1c41409fa4 100644
--- a/docs/content_management/data_migration/data_migration.md
+++ b/docs/content_management/data_migration/data_migration.md
@@ -22,5 +22,5 @@ You can run data migrations either with a command, or with the [PHP API](data_mi
     "content_management/data_migration/importing_data",
     "content_management/data_migration/exporting_data",
     "content_management/data_migration/data_migration_actions",
-    "content_management/data_migration/managing_migrations",
+    "content_management/data_migration/managing_migrations"
 ]) =]]
diff --git a/docs/content_management/field_types/field_type_reference/imagefield.md b/docs/content_management/field_types/field_type_reference/imagefield.md
index a8f9ef003c..7197585793 100644
--- a/docs/content_management/field_types/field_type_reference/imagefield.md
+++ b/docs/content_management/field_types/field_type_reference/imagefield.md
@@ -65,7 +65,7 @@ Using the variation Service, variations of the original image can be obtained. t
 
 The Image field type supports one `FieldDefinition` option: the maximum size for the file.
 
-!!!note
+!!! note
 
     Maximum size is rounded to 1 MB (legacy storage limitation).
 
diff --git a/docs/content_management/pages/pages.md b/docs/content_management/pages/pages.md
index e82d0052c4..d861a86c80 100644
--- a/docs/content_management/pages/pages.md
+++ b/docs/content_management/pages/pages.md
@@ -12,5 +12,5 @@ Pages are block-based special types of content that editors can create and modif
     "content_management/pages/page_blocks",
     "content_management/pages/page_block_attributes",
     "content_management/pages/page_block_validators",
-    "content_management/pages/create_custom_page_block",
+    "content_management/pages/create_custom_page_block"
 ], columns=3) =]]
diff --git a/docs/getting_started/getting_started.md b/docs/getting_started/getting_started.md
index 67e89c4cd3..b7b018fd16 100644
--- a/docs/getting_started/getting_started.md
+++ b/docs/getting_started/getting_started.md
@@ -10,5 +10,5 @@ To get started working with [[= product_name =]], see how you can get an install
 [[= cards([
     "getting_started/requirements",
     "getting_started/install_ibexa_dxp",
-    "getting_started/first_steps",
+    "getting_started/first_steps"
 ], columns=3) =]]
diff --git a/docs/ibexa_cloud/ibexa_cloud.md b/docs/ibexa_cloud/ibexa_cloud.md
index 749f96ac26..21f24843a0 100644
--- a/docs/ibexa_cloud/ibexa_cloud.md
+++ b/docs/ibexa_cloud/ibexa_cloud.md
@@ -9,7 +9,7 @@ month_change: false
 [[= product_name_cloud =]] is a cloud hosting platform that enables you to host your application in the cloud using the Platform.sh service.
 
 [[= cards([
-"ibexa_cloud/ibexa_cloud_guide",
-"ibexa_cloud/install_on_ibexa_cloud",
-"ibexa_cloud/ddev_and_ibexa_cloud",
+    "ibexa_cloud/ibexa_cloud_guide",
+    "ibexa_cloud/install_on_ibexa_cloud",
+    "ibexa_cloud/ddev_and_ibexa_cloud"
 ], columns=3) =]]
diff --git a/docs/ibexa_engage/ibexa_engage.md b/docs/ibexa_engage/ibexa_engage.md
index 7b14a7704a..a48086f36e 100644
--- a/docs/ibexa_engage/ibexa_engage.md
+++ b/docs/ibexa_engage/ibexa_engage.md
@@ -13,5 +13,5 @@ You can also integrate [[= product_name_engage =]] with [[= product_name_connect
 [[= cards([
     "ibexa_engage/install_ibexa_engage",
     "ibexa_engage/create_campaign",
-    "ibexa_engage/integrate_ibexa_connect",
+    "ibexa_engage/integrate_ibexa_connect"
 ], columns=3) =]]
diff --git a/docs/ibexa_products/editions.md b/docs/ibexa_products/editions.md
index 8fe28003a8..e610984a8e 100644
--- a/docs/ibexa_products/editions.md
+++ b/docs/ibexa_products/editions.md
@@ -8,9 +8,9 @@ page_type: landing_page
 Three [[= product_name =]] product editions are available to help you accelerate your digital transformation at the speed and cost that work best for you.
 
 [[= cards([
-"ibexa_products/ibexa_headless",
-"ibexa_products/ibexa_experience",
-"ibexa_products/ibexa_commerce"
+    "ibexa_products/ibexa_headless",
+    "ibexa_products/ibexa_experience",
+    "ibexa_products/ibexa_commerce"
 ], columns=3) =]]
 
 ## Feature comparison
diff --git a/docs/infrastructure_and_maintenance/cache/cache.md b/docs/infrastructure_and_maintenance/cache/cache.md
index 0ca8bf13cd..939ad7c745 100644
--- a/docs/infrastructure_and_maintenance/cache/cache.md
+++ b/docs/infrastructure_and_maintenance/cache/cache.md
@@ -10,5 +10,5 @@ page_type: landing_page
 [[= cards([
     "infrastructure_and_maintenance/cache/http_cache/http_cache",
     "infrastructure_and_maintenance/cache/http_cache/reverse_proxy",
-    "infrastructure_and_maintenance/cache/persistence_cache",
+    "infrastructure_and_maintenance/cache/persistence_cache"
 ], columns=3) =]]
diff --git a/docs/infrastructure_and_maintenance/cache/persistence_cache.md b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
index 894651849e..0a8b7a210d 100644
--- a/docs/infrastructure_and_maintenance/cache/persistence_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
@@ -158,7 +158,7 @@ Depending on the number of lookups and latency to cache server this might affect
 
 Out of the box in `config/packages/cache_pool/cache.redis.yaml` you'll find a default example that can be used.
 
-!!! note "Ibexa Cloud"
+!!! note "[[= product_name_cloud =]]"
 
     For Ibexa Cloud/Platform.sh: This is automatically configured in `vendor/ibexa/core/src/bundle/Core/DependencyInjection/IbexaCoreExtension.php` if you have enabled Redis as `rediscache` Platform.sh service.
 
@@ -207,9 +207,9 @@ Several cloud providers have managed services that are easier to set up, handle
 - [Azure Redis Cache](https://azure.microsoft.com/en-us/products/cache/)
 - [Google Cloud Memorystore](https://cloud.google.com/memorystore/)
 
-###### Ibexa Cloud / Platform.sh usage
+###### [[= product_name_cloud =]] / Platform.sh usage
 
-!!! note "Ibexa Cloud"
+!!! note "[[= product_name_cloud =]]"
 
     If you use Platform.sh Enterprise you can benefit from the Redis Sentinel across three nodes for great fault tolerance.
     Platform.sh Professional and lower versions offer Redis in single instance mode only.
@@ -236,9 +236,9 @@ There is one Memcached adapter available out of the box.
 
 Out of the box in `config/packages/cache_pool/cache.memcached.yaml` you'll find a default example that can be used.
 
-!!! note "Ibexa Cloud"
+!!! note "[[= product_name_cloud =]]"
 
-    For Ibexa Cloud/Platform.sh: This is automatically configured in `vendor/ibexa/core/src/bundle/Core/DependencyInjection/IbexaCoreExtension.php` if you have enabled Memcached as `cache` Platform.sh service.
+    For [[= product_name_cloud =]]/Platform.sh: This is automatically configured in `vendor/ibexa/core/src/bundle/Core/DependencyInjection/IbexaCoreExtension.php` if you have enabled Memcached as `cache` Platform.sh service.
 
 For anything else, you can enable it with environment variables detected automatically by `vendor/ibexa/core/src/bundle/Core/DependencyInjection/IbexaCoreExtension.php`.
 For instance, if you set the following environment variables `export CACHE_POOL="cache.memcached" CACHE_DSN="user:pass@localhost?weight=33"`, it results in config like this:
diff --git a/docs/infrastructure_and_maintenance/infrastructure_and_maintenance.md b/docs/infrastructure_and_maintenance/infrastructure_and_maintenance.md
index e78c231344..611be02702 100644
--- a/docs/infrastructure_and_maintenance/infrastructure_and_maintenance.md
+++ b/docs/infrastructure_and_maintenance/infrastructure_and_maintenance.md
@@ -11,5 +11,5 @@ page_type: landing_page
     "infrastructure_and_maintenance/performance",
     "infrastructure_and_maintenance/databases",
     "infrastructure_and_maintenance/environments",
-    "infrastructure_and_maintenance/support_and_maintenance_faq",
+    "infrastructure_and_maintenance/support_and_maintenance_faq"
 ], columns=3) =]]
diff --git a/docs/infrastructure_and_maintenance/security/security_checklist.md b/docs/infrastructure_and_maintenance/security/security_checklist.md
index f081addb83..443fc5a0f5 100644
--- a/docs/infrastructure_and_maintenance/security/security_checklist.md
+++ b/docs/infrastructure_and_maintenance/security/security_checklist.md
@@ -197,6 +197,7 @@ Security should be a multi-layered exercise. It's wise to minimize what features
     - The REST API endpoints
 
 !!! tip "Access control"
+
     One way to lock down an endpoint that should not be openly available is to restrict access to logged-in users, by using the [`access_control`]([[= symfony_doc =]]/security/access_control.html) feature. In your YAML configuration, under the `security` key, add an entry similar to the following one, which redirects requests to a login page:
 
     ```yaml
diff --git a/docs/infrastructure_and_maintenance/sessions.md b/docs/infrastructure_and_maintenance/sessions.md
index 234dfd0417..df25a9d677 100644
--- a/docs/infrastructure_and_maintenance/sessions.md
+++ b/docs/infrastructure_and_maintenance/sessions.md
@@ -117,7 +117,7 @@ Alternatively if you have needs to configure Redis servers dynamically:
 - Set `%ibexa.session.handler_id%` (or `SESSION_HANDLER_ID` env var) to `Ibexa\Bundle\Core\Session\Handler\NativeSessionHandler`
 - Set `%ibexa.session.save_path%` (or `SESSION_SAVE_PATH` env var) to [save_path config for Redis](https://github.com/phpredis/phpredis/#php-session-handler)
 
-!!! note "Ibexa Cloud"
+!!! note "[[= product_name_cloud =]]"
 
     For [[= product_name_cloud =]] (and Platform.sh), this is already configured in `config/env/platformsh.php` based on `.platform.yaml` config.
 
diff --git a/docs/multisite/multisite.md b/docs/multisite/multisite.md
index e9e49103fb..c39960bead 100644
--- a/docs/multisite/multisite.md
+++ b/docs/multisite/multisite.md
@@ -18,5 +18,5 @@ To quickly set up new sites with predefined site templates, use [Site Factory](s
     "multisite/set_up_translation_siteaccess",
     "multisite/multisite_configuration",
     "multisite/site_factory/site_factory",
-    "multisite/site_factory/site_factory_configuration",
+    "multisite/site_factory/site_factory_configuration"
 ], columns=3) =]]
diff --git a/docs/multisite/siteaccess/siteaccess.md b/docs/multisite/siteaccess/siteaccess.md
index a4e8d747e5..5e634770e6 100644
--- a/docs/multisite/siteaccess/siteaccess.md
+++ b/docs/multisite/siteaccess/siteaccess.md
@@ -27,5 +27,5 @@ Many other settings in the application are also configured per SiteAccess (also
 [[= cards([
     "multisite/siteaccess/siteaccess_matching",
     "multisite/siteaccess/siteaccess_aware_configuration",
-    "multisite/siteaccess/injecting_siteaccess",
+    "multisite/siteaccess/injecting_siteaccess"
 ], columns=3) =]]
diff --git a/docs/permissions/permissions.md b/docs/permissions/permissions.md
index 9adc744eac..2a9fb2ffb1 100644
--- a/docs/permissions/permissions.md
+++ b/docs/permissions/permissions.md
@@ -11,6 +11,6 @@ The permission system of [[= product_name =]] enables you to control in detail w
     "permissions/permission_overview",
     "permissions/policies",
     "permissions/permission_use_cases",
-    "permissions/limitations",
+    "permissions/limitations"
 ], columns=4) =]]
 
diff --git a/docs/personalization/api_reference/api_reference.md b/docs/personalization/api_reference/api_reference.md
index 7910d07941..26d349b7f7 100644
--- a/docs/personalization/api_reference/api_reference.md
+++ b/docs/personalization/api_reference/api_reference.md
@@ -11,5 +11,5 @@ This section provides documentation for the Personalization API operations.
     "personalization/api_reference/tracking_api",
     "personalization/api_reference/content_api",
     "personalization/api_reference/recommendation_api",
-    "personalization/api_reference/user_api",
+    "personalization/api_reference/user_api"
 ], columns=4) =]]
diff --git a/docs/personalization/personalization.md b/docs/personalization/personalization.md
index c491f121c1..f5e3be3e88 100644
--- a/docs/personalization/personalization.md
+++ b/docs/personalization/personalization.md
@@ -22,7 +22,7 @@ To provide online recommendations, the service must at least:
     "personalization/how_it_works",
     "personalization/enable_personalization",
     "personalization/integrate_recommendation_service",
-    "personalization/api_reference/api_reference",
+    "personalization/api_reference/api_reference"
 ], columns=3) =]]
 
 
diff --git a/docs/pim/pim.md b/docs/pim/pim.md
index 2fd55d49f9..348a34d22d 100644
--- a/docs/pim/pim.md
+++ b/docs/pim/pim.md
@@ -13,5 +13,5 @@ including their specifications and pricing.
     "pim/products",
     "pim/catalogs",
     "pim/pim_configuration",
-    "pim/prices",
+    "pim/prices"
 ], columns=3) =]]
diff --git a/docs/product_guides/product_guides.md b/docs/product_guides/product_guides.md
index 01cb96c4d5..0170535db7 100644
--- a/docs/product_guides/product_guides.md
+++ b/docs/product_guides/product_guides.md
@@ -10,14 +10,14 @@ month_change: true
 Discover the primary ones with the help of product guides. Condensed content allows you to quickly learn about their availability, capabilities, and benefits.
 
 [[= cards([
-"users/user_management_guide",
-"content_management/content_management_guide",
-"content_management/rich_text/online_editor_guide",
-"content_management/pages/page_builder_guide",
-"content_management/forms/form_builder_guide",
-"customer_management/customer_portal",
-"personalization/personalization_guide",
-"pim/pim_guide",
-"ibexa_cloud/ibexa_cloud_guide",
-"cdp/cdp_guide"
+    "users/user_management_guide",
+    "content_management/content_management_guide",
+    "content_management/rich_text/online_editor_guide",
+    "content_management/pages/page_builder_guide",
+    "content_management/forms/form_builder_guide",
+    "customer_management/customer_portal",
+    "personalization/personalization_guide",
+    "pim/pim_guide",
+    "ibexa_cloud/ibexa_cloud_guide",
+    "cdp/cdp_guide"
 ], columns=4) =]]
diff --git a/docs/release_notes/ez_platform_v2.3.md b/docs/release_notes/ez_platform_v2.3.md
index 40e0236e43..f5adf40815 100644
--- a/docs/release_notes/ez_platform_v2.3.md
+++ b/docs/release_notes/ez_platform_v2.3.md
@@ -12,7 +12,7 @@
 
 ### Content scheduling
 
-!!! dxp
+!!! note
 
     You can now schedule content on a Page to become visible at a specific time in the future.
 
@@ -33,13 +33,11 @@
 
     The timeline also shows other events, such a Content published using the date-based publisher.
 
-    !!! tip "User documentation"
-
-        You can also check user documentation on [advanced publishing options](https://doc.ibexa.co/projects/userguide/en/2.5/publishing/advanced_publishing_options)
+For more information, check [advanced publishing options](https://doc.ibexa.co/projects/userguide/en/2.5/publishing/advanced_publishing_options) in User Documentation.
 
 ### Form Builder
 
-!!! dxp
+!!! note
 
     The new Form Builder enables you to create Form content items with multiple form fields.
 
@@ -51,9 +49,7 @@
 
     See [Extending Form Builder](https://doc.ibexa.co/en/2.5/guide/extending/extending_form_builder) for information on how to modify and create Form fields.
 
-    !!! tip "User documentation"
-
-        You can also check user documentation on [forms](https://doc.ibexa.co/projects/userguide/en/2.5/creating_content_advanced/#forms)
+Fore more information, check [forms](https://doc.ibexa.co/projects/userguide/en/2.5/creating_content_advanced/#forms) in User Documentation.
 
 ### ImageAsset field type
 
diff --git a/docs/release_notes/release_notes.md b/docs/release_notes/release_notes.md
index 45189ce2d1..39d186da98 100644
--- a/docs/release_notes/release_notes.md
+++ b/docs/release_notes/release_notes.md
@@ -12,5 +12,5 @@ The latest stable and LTS (Long Term Support) version of [[= product_name =]] is
     "release_notes/ibexa_dxp_v4.6",
     "release_notes/ibexa_dxp_v4.5",
     "release_notes/ibexa_dxp_v3.3",
-    "release_notes/ez_platform_v2.5",
+    "release_notes/ez_platform_v2.5"
 ], columns=4) =]]
diff --git a/docs/resources/resources.md b/docs/resources/resources.md
index 18993c0d5d..e583db0813 100644
--- a/docs/resources/resources.md
+++ b/docs/resources/resources.md
@@ -11,5 +11,5 @@ helpful tools, and learn how you can contribute to the creation of the platform.
 [[= cards([
     "resources/release_process_and_roadmap",
     "resources/phpstorm_plugin",
-    "resources/contributing/report_and_follow_issues",
+    "resources/contributing/report_and_follow_issues"
 ], columns=3) =]]
diff --git a/docs/search/extensibility/customize_elasticsearch_index_structure.md b/docs/search/extensibility/customize_elasticsearch_index_structure.md
index 03d27e204d..f6a3091d31 100644
--- a/docs/search/extensibility/customize_elasticsearch_index_structure.md
+++ b/docs/search/extensibility/customize_elasticsearch_index_structure.md
@@ -11,9 +11,7 @@ This lets you control the size of [Elasticsearch shards](https://www.elastic.co/
 By customizing the structure to your needs, you can avoid "oversharding" (having too many shards),
 which negatively affects performance and can lead to instability.
 
-!!! tip "Sizing Elasticsearch shards"
-
-    See [Elasticsearch documentation](https://www.elastic.co/guide/en/elasticsearch/reference/8.4/size-your-shards.html) for more information about adapting the size of your search index shards.
+For more information about adapting the size of your search index shards, see [Elasticsearch documentation](https://www.elastic.co/guide/en/elasticsearch/reference/8.4/size-your-shards.html).
 
 ## Selecting indexing strategy
 
diff --git a/docs/search/search.md b/docs/search/search.md
index c0162d2ca2..4abcb4f656 100644
--- a/docs/search/search.md
+++ b/docs/search/search.md
@@ -15,5 +15,5 @@ page_type: landing_page
     "search/search_criteria_and_sort_clauses",
     "search/extensibility/create_custom_search_criterion",
     "search/extensibility/create_custom_sort_clause",
-    "search/extensibility/create_custom_aggregation",
+    "search/extensibility/create_custom_aggregation"
 ], columns=4) =]]
diff --git a/docs/search/search_criteria_and_sort_clauses.md b/docs/search/search_criteria_and_sort_clauses.md
index 165ef184e8..57adec1227 100644
--- a/docs/search/search_criteria_and_sort_clauses.md
+++ b/docs/search/search_criteria_and_sort_clauses.md
@@ -22,7 +22,7 @@ or [`ContentId` Criterion handler](https://github.com/ibexa/solr/blob/main/src/l
 
 Sometimes you can find that standard Search Criteria and Sort Clauses provided with [[= product_name =]] aren't sufficient for your needs. Most often this is the case if you have a custom field type using external storage which cannot be searched using the standard Field Criterion.
 
-!!!note
+!!! note
 
     Legacy (SQL-based) search can also be used in `ezkeyword` external storage.
 
@@ -104,10 +104,8 @@ Ibexa\Core\Search\Legacy\Content\Location\Gateway\SortClauseHandler\Location\Dep
     tags:
         - {name: ibexa.search.legacy.gateway.sort_clause_handler.location}
 ```
-
-!!! note "See also"
-
-    For more information about passing parameters, see [Symfony Service Container documentation]([[= symfony_doc =]]/book/service_container.html#service-parameters).
+    
+For more information about passing parameters, see [Symfony Service Container documentation]([[= symfony_doc =]]/book/service_container.html#service-parameters).
 
 ## Search using custom Field Criterion [REST]
 
diff --git a/docs/templating/templating.md b/docs/templating/templating.md
index 963f9468aa..12dab1b679 100644
--- a/docs/templating/templating.md
+++ b/docs/templating/templating.md
@@ -17,5 +17,5 @@ Content view configuration is SiteAccess-aware.
     "templating/templates/templates",
     "templating/queries_and_controllers/content_queries",
     "templating/twig_function_reference/twig_function_reference",
-    "templating/design_engine/design_engine",
+    "templating/design_engine/design_engine"
 ], columns=4) =]]
diff --git a/docs/templating/twig_function_reference/content_twig_functions.md b/docs/templating/twig_function_reference/content_twig_functions.md
index 421d83e5f7..22594451c5 100644
--- a/docs/templating/twig_function_reference/content_twig_functions.md
+++ b/docs/templating/twig_function_reference/content_twig_functions.md
@@ -97,7 +97,7 @@ data to the content item's HTML code.
 {{ ibexa_seo(content) }}
 ```
 
-!!! tip 
+!!! tip
 
     The following example uses both SEO-related functions:
 
diff --git a/docs/templating/twig_function_reference/twig_function_reference.md b/docs/templating/twig_function_reference/twig_function_reference.md
index a38b5dddd6..091a42af92 100644
--- a/docs/templating/twig_function_reference/twig_function_reference.md
+++ b/docs/templating/twig_function_reference/twig_function_reference.md
@@ -10,16 +10,16 @@ and [Twig extensions provided by Symfony]([[= symfony_doc =]]/reference/twig_ref
 [[= product_name =]] offers the following custom Twig functions and filters:
 
 [[= cards([
-  "templating/twig_function_reference/cart_twig_functions",
-  "templating/twig_function_reference/catalog_twig_functions",
-  "templating/twig_function_reference/checkout_twig_functions",
-  "templating/twig_function_reference/content_twig_functions",
-  "templating/twig_function_reference/field_twig_functions",
-  "templating/twig_function_reference/product_twig_functions",
-  "templating/twig_function_reference/site_context_twig_functions",
-  "templating/twig_function_reference/storefront_twig_functions",
-  "templating/twig_function_reference/image_twig_functions",
-  "templating/twig_function_reference/url_twig_functions",
-  "templating/twig_function_reference/date_twig_filters",
-  "templating/twig_function_reference/other_twig_filters"
+    "templating/twig_function_reference/cart_twig_functions",
+    "templating/twig_function_reference/catalog_twig_functions",
+    "templating/twig_function_reference/checkout_twig_functions",
+    "templating/twig_function_reference/content_twig_functions",
+    "templating/twig_function_reference/field_twig_functions",
+    "templating/twig_function_reference/product_twig_functions",
+    "templating/twig_function_reference/site_context_twig_functions",
+    "templating/twig_function_reference/storefront_twig_functions",
+    "templating/twig_function_reference/image_twig_functions",
+    "templating/twig_function_reference/url_twig_functions",
+    "templating/twig_function_reference/date_twig_filters",
+    "templating/twig_function_reference/other_twig_filters"
 ], columns=4) =]]
diff --git a/docs/tutorials/tutorials.md b/docs/tutorials/tutorials.md
index 3711d5cc8b..9980883911 100644
--- a/docs/tutorials/tutorials.md
+++ b/docs/tutorials/tutorials.md
@@ -10,5 +10,5 @@ Get started with tutorials to learn how to create a site with [[= product_name =
 [[= cards([
     "tutorials/beginner_tutorial/beginner_tutorial",
     "tutorials/page_and_form_tutorial/page_and_form_tutorial",
-    "tutorials/generic_field_type/creating_a_point2d_field_type",
+    "tutorials/generic_field_type/creating_a_point2d_field_type"
 ], columns=3) =]]
diff --git a/docs/update_and_migration/from_4.3/update_from_4.3.md b/docs/update_and_migration/from_4.3/update_from_4.3.md
index dbc2b03471..10ef903ab7 100644
--- a/docs/update_and_migration/from_4.3/update_from_4.3.md
+++ b/docs/update_and_migration/from_4.3/update_from_4.3.md
@@ -17,6 +17,6 @@ A. If you do not use Commerce functionalities, you can proceed with removing the
 B. If you use Commerce functionalities based on the deprecated packages, you can continue to use them for the time being.
 
 [[= cards([
-"update_and_migration/from_4.3/update_from_4.3_new_commerce",
-"update_and_migration/from_4.3/update_from_4.3_old_commerce",
-],) =]]
+    "update_and_migration/from_4.3/update_from_4.3_new_commerce",
+    "update_and_migration/from_4.3/update_from_4.3_old_commerce"
+], columns=2) =]]
diff --git a/docs/users/users.md b/docs/users/users.md
index 2e0fadcbf9..f5cf37ba11 100644
--- a/docs/users/users.md
+++ b/docs/users/users.md
@@ -12,24 +12,24 @@ All such user accounts have the same underlying mechanism and enable you to cont
 ## Invite nad manage users
 
 [[= cards([
-"users/user_management_guide",
-"users/invitations",
-"users/user_registration",
+    "users/user_management_guide",
+    "users/invitations",
+    "users/user_registration"
 ], columns=3) =]]
 
 ## Authenticate users
 
 [[= cards([
-"users/login_methods",
-"users/passwords",
-"users/user_authentication",
-"users/oauth_client",
-"users/oauth_server",
+    "users/login_methods",
+    "users/passwords",
+    "users/user_authentication",
+    "users/oauth_client",
+    "users/oauth_server"
 ], columns=5) =]]
 
 ## Group users
 
 [[= cards([
-"users/customer_groups",
-"users/segment_api",
+    "users/customer_groups",
+    "users/segment_api"
 ], columns=2) =]]

From 28c7a8f60ec0ac98131962aaa64ba4626fed34df Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Tue, 15 Oct 2024 13:10:23 +0200
Subject: [PATCH 16/77] Variables fix

---
 docs/content_management/images/fastly_io.md   |  2 +-
 .../content_management/rich_text/rich_text.md |  2 +-
 docs/getting_started/install_ibexa_dxp.md     |  2 +-
 docs/getting_started/requirements.md          | 98 +++++++++----------
 docs/ibexa_products/editions.md               |  2 +-
 docs/ibexa_products/ibexa_commerce.md         |  2 +-
 docs/ibexa_products/ibexa_experience.md       |  2 +-
 docs/ibexa_products/ibexa_headless.md         |  2 +-
 .../cache/http_cache/reverse_proxy.md         |  4 +-
 .../security/reporting_issues.md              |  2 +-
 docs/release_notes/ibexa_dxp_v3.2.md          |  2 +-
 docs/release_notes/ibexa_dxp_v3.3.md          |  2 +-
 docs/release_notes/ibexa_dxp_v4.0.md          |  2 +-
 .../ibexa_dxp_v4.0_deprecations.md            |  2 +-
 docs/release_notes/ibexa_dxp_v4.1.md          |  2 +-
 docs/release_notes/ibexa_dxp_v4.2.md          |  2 +-
 docs/release_notes/ibexa_dxp_v4.3.md          |  2 +-
 docs/release_notes/ibexa_dxp_v4.4.md          |  6 +-
 docs/release_notes/ibexa_dxp_v4.5.md          |  2 +-
 docs/release_notes/ibexa_dxp_v4.6.md          | 10 +-
 docs/release_notes/release_notes.md           |  2 +-
 docs/resources/new_in_doc.md                  |  2 +-
 docs/resources/phpstorm_plugin.md             | 20 ++--
 docs/resources/release_process_and_roadmap.md |  2 +-
 .../beginner_tutorial/1_get_ready.md          |  2 +-
 .../1_implement_the_point2d_value_class.md    |  2 +-
 .../from_3.3/update_from_3.3.md               |  2 +-
 .../from_4.3/update_from_4.3_old_commerce.md  |  2 +-
 docs/update_and_migration/update_ibexa_dxp.md |  2 +-
 29 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/docs/content_management/images/fastly_io.md b/docs/content_management/images/fastly_io.md
index 4ec1bcf606..959c4891a9 100644
--- a/docs/content_management/images/fastly_io.md
+++ b/docs/content_management/images/fastly_io.md
@@ -11,7 +11,7 @@ To be able to configure this feature, you need [Fastly IO subscription](https://
 
 ## Enable shielding
 
-To use Fastly Image Optimizer, you first need a [working setup of Ibexa DXP and Fastly](reverse_proxy.md#using-varnish-or-fastly)
+To use Fastly Image Optimizer, you first need a [working setup of [[= product_name =]] and Fastly](reverse_proxy.md#using-varnish-or-fastly)
 with shielding enabled.
 To enable shielding, follow the steps in [Fastly developer documentation](https://developer.fastly.com/learning/concepts/shielding/#enabling-and-disabling-shielding).
 Remember to choose a shield location from the **Shielding** menu, as described in [Fastly user documentation](https://docs.fastly.com/en/guides/shielding#enabling-shielding).
diff --git a/docs/content_management/rich_text/rich_text.md b/docs/content_management/rich_text/rich_text.md
index 3024c2e56d..5319ba4bed 100644
--- a/docs/content_management/rich_text/rich_text.md
+++ b/docs/content_management/rich_text/rich_text.md
@@ -5,7 +5,7 @@ page_type: landing_page
 
 # RichText
 
-RichText is a type of field that you add in any content item in Ibexa DXP and edit in Online Editor.
+RichText is a type of field that you add in any content item in [[= product_name =]] and edit in Online Editor.
 
 [[= cards([
     "content_management/rich_text/online_editor_guide",
diff --git a/docs/getting_started/install_ibexa_dxp.md b/docs/getting_started/install_ibexa_dxp.md
index e305d82e1d..90b22f389d 100644
--- a/docs/getting_started/install_ibexa_dxp.md
+++ b/docs/getting_started/install_ibexa_dxp.md
@@ -2,7 +2,7 @@
 description: Install Ibexa DXP on a Linux system and prepare your installation for production.
 ---
 
-# Install Ibexa DXP
+# Install [[= product_name =]]
 
 !!! note
 
diff --git a/docs/getting_started/requirements.md b/docs/getting_started/requirements.md
index 421767ebc6..15aa503e90 100644
--- a/docs/getting_started/requirements.md
+++ b/docs/getting_started/requirements.md
@@ -7,7 +7,7 @@ description: System, component and package requirements for running Ibexa DXP.
 # Requirements
 
 This document covers all supported versions of the product.
-To review the requirements, select the specific version of Ibexa DXP you're interested in.
+To review the requirements, select the specific version of [[= product_name =]] you're interested in.
 
 The following server requirements cover both running the software on-premise and on third-party PaaS providers.
 
@@ -26,7 +26,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
 ## Operating system
 
-=== "Ibexa DXP v4.6"
+=== "[[= product_name =]] v4.6"
 
     |Name|Version|
     |---|---|
@@ -38,7 +38,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
     If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release. For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
 
-=== "Ibexa DXP v3.3"
+=== "[[= product_name =]] v3.3"
 
     |Name|Version|
     |---|---|
@@ -62,7 +62,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
 ## Web server
 
-=== "Ibexa DXP v4.6"
+=== "[[= product_name =]] v4.6"
 
     - Nginx 1.18-1.25+
     - Apache 2.4 (with required modules `mod_rewrite`, `mod_env` and recommended: `mod_setenvif`, `mod_expires`;
@@ -70,7 +70,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
     If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release. For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
 
-=== "Ibexa DXP v3.3"
+=== "[[= product_name =]] v3.3"
 
     - Nginx 1.18
     - Apache 2.4 (with required modules `mod_rewrite`, `mod_env` and recommended: `mod_setenvif`, `mod_expires`;
@@ -84,7 +84,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
 ## DBMS
 
-=== "Ibexa DXP v4.6"
+=== "[[= product_name =]] v4.6"
 
     - MariaDB 10.3-10.11+
     - MySQL 8.0
@@ -92,7 +92,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
     If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release. For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
 
-=== "Ibexa DXP v3.3"
+=== "[[= product_name =]] v3.3"
 
     - MariaDB  10.3, 10.4 (optionally 10.2 - deprecated)
     - MySQL  8.0 (optionally 5.7 - deprecated)
@@ -110,7 +110,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
 ## PHP
 
-=== "Ibexa DXP v4.6"
+=== "[[= product_name =]] v4.6"
 
     - 8.3
     - 8.2
@@ -118,7 +118,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     - 8.0 (PHP 8.0 has reached its End of Life. Unless you have extended support from vendors like Debian or Zend, you should use PHP 8.1)
     - 7.4 (PHP 7.4 has reached its End of Life. Unless you have extended support from vendors like Debian or Zend, you should use PHP 8.1)
 
-=== "Ibexa DXP v3.3"
+=== "[[= product_name =]] v3.3"
 
     - 8.3
     - 8.2
@@ -129,14 +129,14 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
 === "eZ Platform v2.5"
 
-    - 7.1 (PHP 7.1 has reached its End of Life. Unless you have extended support from vendors like Debian or Zend, you should upgrade to Ibexa DXP v3.3 or v4.x)
-    - 7.2 (PHP 7.2 has reached its End of Life. Unless you have extended support from vendors like Debian or Zend, you should upgrade to Ibexa DXP v3.3 or v4.x)
-    - 7.3 (PHP 7.3 has reached its End of Life. Unless you have extended support from vendors like Debian or Zend, you should upgrade to Ibexa DXP v3.3 or v4.x)
-    - 7.4 (PHP 7.4 has reached its End of Life. Unless you have extended support from vendors like Debian or Zend, you should upgrade to Ibexa DXP v3.3 or v4.x)
+    - 7.1 (PHP 7.1 has reached its End of Life. Unless you have extended support from vendors like Debian or Zend, you should upgrade to [[= product_name =]] v3.3 or v4.x)
+    - 7.2 (PHP 7.2 has reached its End of Life. Unless you have extended support from vendors like Debian or Zend, you should upgrade to [[= product_name =]]P v3.3 or v4.x)
+    - 7.3 (PHP 7.3 has reached its End of Life. Unless you have extended support from vendors like Debian or Zend, you should upgrade to [[= product_name =]] v3.3 or v4.x)
+    - 7.4 (PHP 7.4 has reached its End of Life. Unless you have extended support from vendors like Debian or Zend, you should upgrade to [[= product_name =]] v3.3 or v4.x)
 
 ### PHP extensions
 
-=== "Ibexa DXP v4.6"
+=== "[[= product_name =]] v4.6"
 
     - `php-cli`
     - `php-fpm`
@@ -152,7 +152,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     - `php-sodium`
     - `php-bcmath`
 
-=== "Ibexa DXP v3.3"
+=== "[[= product_name =]] v3.3"
 
     - `php-cli`
     - `php-fpm`
@@ -183,11 +183,11 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
 ### Cluster PHP extensions
 
-=== "Ibexa DXP v4.6"
+=== "[[= product_name =]] v4.6"
 
     - `php-redis` or `php-memcached`
 
-=== "Ibexa DXP v3.3"
+=== "[[= product_name =]] v3.3"
 
     - `php-redis` or `php-memcached`
 
@@ -199,12 +199,12 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
 ## Search
 
-=== "Ibexa DXP v4.6"
+=== "[[= product_name =]] v4.6"
 
     - For content search, Solr 7.7 LTS or Solr 8, recommended 8.11.1 or higher. Alternatively, Elasticsearch 7.16.2 or higher 7.x version.
     - The above solutions require Oracle Java/Open JDK. The minimum requirement is 8 LTS, recommended 11 LTS. Newer versions aren't supported.
 
-=== "Ibexa DXP v3.3"
+=== "[[= product_name =]] v3.3"
 
     - For content search, Solr 7.7 LTS or Solr 8, recommended 8.11.1 or higher. Alternatively, Elasticsearch 7.16.2 or higher 7.x version.
     - For BinaryFile field indexing, Apache Tika 1.20 or higher 1.x version, recommended 1.28.1 or higher.
@@ -218,7 +218,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
 ## Graphic Handler
 
-=== "Ibexa DXP v4.6"
+=== "[[= product_name =]] v4.6"
 
     - GraphicsMagick
     - ImageMagick
@@ -233,7 +233,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     - Gifsicle
     - cwebp
 
-=== "Ibexa DXP v3.3"
+=== "[[= product_name =]] v3.3"
 
     - GraphicsMagick
     - ImageMagick
@@ -256,7 +256,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
 ## [Clustering](clustering.md)
 
-=== "Ibexa DXP v4.6"
+=== "[[= product_name =]] v4.6"
 
     - Linux NFS or S3/EFS (for IO, aka binary files stored in content repository, not supported with legacy)
     - Redis 4.0+, 5.0 or higher (separate instances for session and cache, both using a `volatile-*` [eviction policy](https://redis.io/docs/reference/eviction/), session instance configured for persistence) or [Memcached](https://memcached.org/) 1.5 or higher
@@ -264,7 +264,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
     If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release. For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
 
-=== "Ibexa DXP v3.3"
+=== "[[= product_name =]] v3.3"
 
     - Linux NFS or S3/EFS (for IO, aka binary files stored in content repository, not supported with legacy)
     - Redis 4.0+, 5.0 or higher (separate instances for session and cache, both using a `volatile-*` [eviction policy](https://redis.io/docs/reference/eviction/), session instance configured for persistence) or [Memcached](https://memcached.org/) 1.5 or higher
@@ -282,11 +282,11 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
 ## Filesystem
 
-=== "Ibexa DXP v4.6"
+=== "[[= product_name =]] v4.6"
 
     - Linux ext4 / XFS
 
-=== "Ibexa DXP v3.3"
+=== "[[= product_name =]] v3.3"
 
     - Linux ext4 / XFS
 
@@ -296,11 +296,11 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
 ## Package manager
 
-=== "Ibexa DXP v4.6"
+=== "[[= product_name =]] v4.6"
 
     - Composer: recent 2.7 version
 
-=== "Ibexa DXP v3.3"
+=== "[[= product_name =]] v3.3"
 
     - Composer: recent 2.1 version
 
@@ -310,14 +310,14 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
 ## Asset manager
 
-=== "Ibexa DXP v4.6"
+=== "[[= product_name =]] v4.6"
 
     - `Node.js` 18+
     - `yarn` 1.15.2+
 
     If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release. For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
 
-=== "Ibexa DXP v3.3"
+=== "[[= product_name =]] v3.3"
 
     - `Node.js` 14+, 16+, 18+ (`Node.js` 14+ has reached its End of Life. We strongly recommend using a newer version to ensure you receive security updates.)
     - `yarn` 1.15.2+
@@ -333,18 +333,18 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
 ## Browser
 
-=== "Ibexa DXP v4.6"
+=== "[[= product_name =]] v4.6"
 
-    Ibexa DXP is developed to work with *any* web browser that supports modern standards, on *any* screen resolution suitable for web, running on *any* device. However for the Editorial and Administration User Interfaces you'll need; a minimum of 1366-by-768 screen resolution, a desktop or tablet device, and a recommended/supported browser among the ones found below.
+    [[= product_name =]] is developed to work with *any* web browser that supports modern standards, on *any* screen resolution suitable for web, running on *any* device. However for the Editorial and Administration User Interfaces you'll need; a minimum of 1366-by-768 screen resolution, a desktop or tablet device, and a recommended/supported browser among the ones found below.
 
     - Mozilla® Firefox® most recent stable version (recommended)
     - Google Chrome™ most recent stable version (recommended)
     - Chromium™ based browsers such as Microsoft® Edge® and Opera®, most recent stable version, desktop *and* tablet
     - Apple® Safari® most recent stable version, desktop *and* tablet
 
-=== "Ibexa DXP v3.3"
+=== "[[= product_name =]] v3.3"
 
-    Ibexa DXP is developed to work with *any* web browser that supports modern standards, on *any* screen resolution suitable for web, running on *any* device. However for the Editorial and Administration User Interfaces you'll need; a minimum of 1366-by-768 screen resolution, a desktop or tablet device, and a recommended/supported browser among the ones found below.
+    [[= product_name =]] is developed to work with *any* web browser that supports modern standards, on *any* screen resolution suitable for web, running on *any* device. However for the Editorial and Administration User Interfaces you'll need; a minimum of 1366-by-768 screen resolution, a desktop or tablet device, and a recommended/supported browser among the ones found below.
 
     - Mozilla® Firefox® most recent stable version (recommended)
     - Google Chrome™ most recent stable version (recommended)
@@ -366,17 +366,17 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
     ### Cloud hosting with Ibexa Cloud and Platform.sh
 
-    In general, Ibexa Cloud supports all features and services of [Platform.sh](https://platform.sh/marketplace/ibexa/) that are compatible and supported by the Ibexa DXP version you use.
+    In general, Ibexa Cloud supports all features and services of [Platform.sh](https://platform.sh/marketplace/ibexa/) that are compatible and supported by the [[= product_name =]] version you use.
 
     For example:
 
-    - Platform.sh provides Redis support for versions 3.2, 4.0 and 5.0. Ibexa DXP supports Redis version 4.0 or higher, and recommends 5.0. As a result, Redis is supported on Ibexa Cloud in versions 4.0 and 5.0, but 5.0 is recommended.
+    - Platform.sh provides Redis support for versions 3.2, 4.0 and 5.0. [[= product_name =]] supports Redis version 4.0 or higher, and recommends 5.0. As a result, Redis is supported on Ibexa Cloud in versions 4.0 and 5.0, but 5.0 is recommended.
 
-    Features or services supported by Ibexa DXP but not covered by Platform.sh may be possible by means of a [custom integration](#custom-integrations).
+    Features or services supported by [[= product_name =]] but not covered by Platform.sh may be possible by means of a [custom integration](#custom-integrations).
 
     ### Ibexa Cloud Setup support matrix
 
-    All Ibexa DXP features are supported in accordance with the example above. For example: As Legacy Bridge isn't supported with v3, it's not supported on Ibexa Cloud either.
+    All [[= product_name =]] features are supported in accordance with the example above. For example: As Legacy Bridge isn't supported with v3, it's not supported on Ibexa Cloud either.
 
     !!! note
 
@@ -391,21 +391,21 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
     ### Supported Ibexa Cloud setup
 
-    Because of the large range of possible configurations of Ibexa DXP, there are many possibilities beyond what is provided in the default recommended configuration.
+    Because of the large range of possible configurations of [[= product_name =]], there are many possibilities beyond what is provided in the default recommended configuration.
 
     Make sure to set aside time and budget for:
 
     - Verifying your requirements and ensuring they're supported by Platform.sh
     - Additional time for adaptation and configuration work, and testing by your development team
-    - Additional consulting/onboarding time with Platform.sh, Ibexa technical services, and/or one of the many partners with prior experience using Platform.sh with Ibexa DXP
+    - Additional consulting/onboarding time with Platform.sh, Ibexa technical services, and/or one of the many partners with prior experience using Platform.sh with [[= product_name =]]
 
     The cost and effort of this isn't included in Ibexa Cloud subscription and is vary depending on the project.
 
     ### Custom integrations
 
-    Features supported by Ibexa DXP, but not natively by Platform.sh, can in many cases be used by means of custom integrations with external services.
+    Features supported by [[= product_name =]], but not natively by Platform.sh, can in many cases be used by means of custom integrations with external services.
 
-    For example, you can create an integration with S3 by means of setting up your own S3 bucket and configuring the relevant parts of Ibexa DXP.
+    For example, you can create an integration with S3 by means of setting up your own S3 bucket and configuring the relevant parts of [[= product_name =]].
     We recommend giving the development team working on the project access to the bucket
     to ensure work is done in a DevOps way without depending on external teams when changes are needed.
 
@@ -413,17 +413,17 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
     ### Cloud hosting with Ibexa Cloud and Platform.sh
 
-    In general, Ibexa Cloud supports all features and services of [Platform.sh](https://platform.sh/marketplace/ibexa/) that are compatible and supported by the Ibexa DXP version you use.
+    In general, Ibexa Cloud supports all features and services of [Platform.sh](https://platform.sh/marketplace/ibexa/) that are compatible and supported by the [[= product_name =]] version you use.
 
     For example:
 
-    - Platform.sh provides Redis support for versions 3.2, 4.0 and 5.0. Ibexa DXP supports Redis version 4.0 or higher, and recommends 5.0. As a result, Redis is supported on Ibexa Cloud in versions 4.0 and 5.0, but 5.0 is recommended.
+    - Platform.sh provides Redis support for versions 3.2, 4.0 and 5.0. [[= product_name =]] supports Redis version 4.0 or higher, and recommends 5.0. As a result, Redis is supported on Ibexa Cloud in versions 4.0 and 5.0, but 5.0 is recommended.
 
-    Features or services supported by Ibexa DXP but not covered by Platform.sh may be possible by means of a [custom integration](#custom-integrations).
+    Features or services supported by [[= product_name =]] but not covered by Platform.sh may be possible by means of a [custom integration](#custom-integrations).
 
     ### Ibexa Cloud Setup support matrix
 
-    All Ibexa DXP features are supported in accordance with the example above. For example: As Legacy Bridge isn't supported with v3, it's not supported on Ibexa Cloud either.
+    All [[= product_name =]] features are supported in accordance with the example above. For example: As Legacy Bridge isn't supported with v3, it's not supported on Ibexa Cloud either.
 
     !!! note
 
@@ -438,21 +438,21 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
     ### Supported Ibexa Cloud setup
 
-    Because of the large range of possible configurations of Ibexa DXP, there are many possibilities beyond what is provided in the default recommended configuration.
+    Because of the large range of possible configurations of [[= product_name =]], there are many possibilities beyond what is provided in the default recommended configuration.
 
     Make sure to set aside time and budget for:
 
     - Verifying your requirements and ensuring they're supported by Platform.sh
     - Additional time for adaptation and configuration work, and testing by your development team
-    - Additional consulting/onboarding time with Platform.sh, Ibexa technical services, and/or one of the many partners with prior experience using Platform.sh with Ibexa DXP
+    - Additional consulting/onboarding time with Platform.sh, Ibexa technical services, and/or one of the many partners with prior experience using Platform.sh with [[= product_name =]]
 
     The cost and effort of this isn't included in Ibexa Cloud subscription and is vary depending on the project.
 
     ### Custom integrations
 
-    Features supported by Ibexa DXP, but not natively by Platform.sh, can in many cases be used by means of custom integrations with external services.
+    Features supported by [[= product_name =]], but not natively by Platform.sh, can in many cases be used by means of custom integrations with external services.
 
-    For example, you can create an integration with S3 by means of setting up your own S3 bucket and configuring the relevant parts of Ibexa DXP.
+    For example, you can create an integration with S3 by means of setting up your own S3 bucket and configuring the relevant parts of [[= product_name =]].
     We recommend giving the development team working on the project access to the bucket
     to ensure work is done in a DevOps way without depending on external teams when changes are needed.
 
diff --git a/docs/ibexa_products/editions.md b/docs/ibexa_products/editions.md
index e610984a8e..f23b56d9a7 100644
--- a/docs/ibexa_products/editions.md
+++ b/docs/ibexa_products/editions.md
@@ -3,7 +3,7 @@ description: Learn more about various Ibexa DXP editions' features to help yours
 page_type: landing_page
 ---
 
-# Ibexa DXP editions
+# [[= product_name =]] editions
 
 Three [[= product_name =]] product editions are available to help you accelerate your digital transformation at the speed and cost that work best for you.
 
diff --git a/docs/ibexa_products/ibexa_commerce.md b/docs/ibexa_products/ibexa_commerce.md
index b4b35679ab..af76988d45 100644
--- a/docs/ibexa_products/ibexa_commerce.md
+++ b/docs/ibexa_products/ibexa_commerce.md
@@ -4,7 +4,7 @@ description: Explore all of the key features, functionalities, and advantages of
 month_change: true
 ---
 
-# Ibexa DXP Commerce edition product guide
+# [[= product_name_com =]] edition product guide
 
 ## What is [[= product_name_com =]]
 
diff --git a/docs/ibexa_products/ibexa_experience.md b/docs/ibexa_products/ibexa_experience.md
index 26bad17a35..321ec21b00 100644
--- a/docs/ibexa_products/ibexa_experience.md
+++ b/docs/ibexa_products/ibexa_experience.md
@@ -4,7 +4,7 @@ description: Learn about all the main attributes, features, and benefits of the
 month_change: true
 ---
 
-# Ibexa DXP Experience edition product guide
+# [[= product_name_exp =]] edition product guide
 
 ## What is [[= product_name_exp =]]
 
diff --git a/docs/ibexa_products/ibexa_headless.md b/docs/ibexa_products/ibexa_headless.md
index 89f4fbed80..18a6aaeb18 100644
--- a/docs/ibexa_products/ibexa_headless.md
+++ b/docs/ibexa_products/ibexa_headless.md
@@ -3,7 +3,7 @@ title: Ibexa Headless
 description: Get to know Ibexa Headless - an edition that focuses on content management.
 ---
 
-# Ibexa DXP Headless edition product guide
+# [[= product_name_headless =]] edition product guide
 
 ## What is [[= product_name_headless =]]
 
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md b/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
index d57ac1335c..964c68b7d6 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
@@ -58,7 +58,7 @@ If you decide to use Fastly VCL, consider using [Fastly CLI](https://developer.f
 To learn more, see [Prepare to use Fastly locally](fastly.md#prepare-for-using-fastly-locally) and [Introduction to Fastly CLI](fastly.md#quick-introduction-to-fastly-cli).
 
 !!! tip
-    Support for Fastly Shielding was added in Ibexa DXP v3.3.24 and v4.1.6
+    Support for Fastly Shielding was added in [[= product_name =]] v3.3.24 and v4.1.6
 
     When you extend [FOSHttpCacheBundle](https://foshttpcachebundle.readthedocs.io/en/latest/),
     you can also adapt your VCL further with [FOSHttpCache documentation](https://foshttpcache.readthedocs.io/en/latest/varnish-configuration.html)
@@ -107,7 +107,7 @@ When using Fastly, you need to set `trusted_proxies` according to the [IP ranges
 
     You don't have to set `trusted_proxies` when using Fastly on Platform.sh.
     The Platform.sh router automatically changes the source IP of requests coming from Fastly,
-    replacing the source IP with the actual client IP and removing any `X-FORWARD-...` header in the request before it reaches Ibexa DXP.
+    replacing the source IP with the actual client IP and removing any `X-FORWARD-...` header in the request before it reaches [[= product_name =]].
 
 For more information about setting these variables, see [Configuration examples](#configuration-examples).
 
diff --git a/docs/infrastructure_and_maintenance/security/reporting_issues.md b/docs/infrastructure_and_maintenance/security/reporting_issues.md
index e7e7decfb5..bb66751cbd 100644
--- a/docs/infrastructure_and_maintenance/security/reporting_issues.md
+++ b/docs/infrastructure_and_maintenance/security/reporting_issues.md
@@ -1,5 +1,5 @@
 ---
-description: How to report security issues in Ibexa DXP?
+description: Learn how to report security issues in Ibexa DXP.
 ---
 
 # Reporting security issues in Ibexa products
diff --git a/docs/release_notes/ibexa_dxp_v3.2.md b/docs/release_notes/ibexa_dxp_v3.2.md
index 319a06c776..d757720ba4 100644
--- a/docs/release_notes/ibexa_dxp_v3.2.md
+++ b/docs/release_notes/ibexa_dxp_v3.2.md
@@ -1,6 +1,6 @@
 <!-- vale VariablesVersion = NO -->
 
-# Ibexa DXP v3.2
+# [[= product_name =]] v3.2
 
 **Version number**: v3.2
 
diff --git a/docs/release_notes/ibexa_dxp_v3.3.md b/docs/release_notes/ibexa_dxp_v3.3.md
index 33ae9b648e..b16bb78bfc 100644
--- a/docs/release_notes/ibexa_dxp_v3.3.md
+++ b/docs/release_notes/ibexa_dxp_v3.3.md
@@ -4,7 +4,7 @@ description: Ibexa DXP v3.3 is a Long Term Support release that offers a new Per
 
 <!-- vale off -->
 
-# Ibexa DXP v3.3
+# [[= product_name =]] v3.3
 
 **Version number**: v3.3
 
diff --git a/docs/release_notes/ibexa_dxp_v4.0.md b/docs/release_notes/ibexa_dxp_v4.0.md
index 4895dc7c8b..9c7ae07b89 100644
--- a/docs/release_notes/ibexa_dxp_v4.0.md
+++ b/docs/release_notes/ibexa_dxp_v4.0.md
@@ -110,7 +110,7 @@ See [Exclusions](https://doc.ibexa.co/projects/userguide/en/latest/personalizati
 v4.0 sees significant code cleanup, including renaming of namespaces, services, REST API endpoints
 and many other internal names.
 
-Refer to [Ibexa DXP v4.0 deprecations and backwards compatibility breaks](ibexa_dxp_v4.0_deprecations.md)
+Refer to [[[= product_name =]] v4.0 deprecations and backwards compatibility breaks](ibexa_dxp_v4.0_deprecations.md)
 for full details of changes and how they influence your project.
 
 ## Full changelog
diff --git a/docs/release_notes/ibexa_dxp_v4.0_deprecations.md b/docs/release_notes/ibexa_dxp_v4.0_deprecations.md
index 7a24755958..e62abdeddc 100644
--- a/docs/release_notes/ibexa_dxp_v4.0_deprecations.md
+++ b/docs/release_notes/ibexa_dxp_v4.0_deprecations.md
@@ -1,6 +1,6 @@
 <!-- vale VariablesVersion = NO -->
 
-# Ibexa DXP v4.0 deprecations and backwards compatibility breaks
+# [[= product_name =]] v4.0 deprecations and backwards compatibility breaks
 
 [[= product_name =]] v4.0 introduces changes to significant parts of the code
 to align with the product name change from earlier eZ Platform.
diff --git a/docs/release_notes/ibexa_dxp_v4.1.md b/docs/release_notes/ibexa_dxp_v4.1.md
index bf7956c4dc..162d36c79f 100644
--- a/docs/release_notes/ibexa_dxp_v4.1.md
+++ b/docs/release_notes/ibexa_dxp_v4.1.md
@@ -3,7 +3,7 @@ description: Ibexa DXP v4.1 enhances the PIM capabilities, adds a Measurement fi
 ---
 <!-- vale VariablesVersion = NO -->
 
-# Ibexa DXP v4.1
+# [[= product_name =]] v4.1
 
 **Version number**: v4.1
 
diff --git a/docs/release_notes/ibexa_dxp_v4.2.md b/docs/release_notes/ibexa_dxp_v4.2.md
index 64e9093a95..a52431591f 100644
--- a/docs/release_notes/ibexa_dxp_v4.2.md
+++ b/docs/release_notes/ibexa_dxp_v4.2.md
@@ -4,7 +4,7 @@ description: Ibexa DXP v4.2 adds the Customer Portal and user management capabil
 
 <!-- vale VariablesVersion = NO -->
 
-# Ibexa DXP v4.2
+# [[= product_name =]] v4.2
 
 **Version number**: v4.2
 
diff --git a/docs/release_notes/ibexa_dxp_v4.3.md b/docs/release_notes/ibexa_dxp_v4.3.md
index 3f8bc46a66..b3f72f6153 100644
--- a/docs/release_notes/ibexa_dxp_v4.3.md
+++ b/docs/release_notes/ibexa_dxp_v4.3.md
@@ -3,7 +3,7 @@ description: Ibexa DXP v4.3 adds the improvements to the Customer Portal, PIM an
 ---
 <!-- vale VariablesVersion = NO -->
 
-# Ibexa DXP v4.3
+# [[= product_name =]] v4.3
 
 **Version number**: v4.3
 
diff --git a/docs/release_notes/ibexa_dxp_v4.4.md b/docs/release_notes/ibexa_dxp_v4.4.md
index 56efb3d45e..d780d5cb4a 100644
--- a/docs/release_notes/ibexa_dxp_v4.4.md
+++ b/docs/release_notes/ibexa_dxp_v4.4.md
@@ -3,7 +3,7 @@ description: Ibexa DXP v4.4 adds the improvements to the Welcome Page, All-new I
 ---
 <!-- vale VariablesVersion = NO -->
 
-# Ibexa DXP v4.4
+# [[= product_name =]] v4.4
 
 **Version number**: v4.4
 
@@ -56,7 +56,7 @@ for example, cropping, resizing and trimming before serving it to end user.
 Fastly is an external service that requires a separate subscription,
 to learn more see, [Fastly Image Optimizer website](https://docs.fastly.com/en/guides/about-fastly-image-optimizer).
 
-If you already have Fastly IO subscription, you can move to [Fastly IO configuration in Ibexa DXP](https://doc.ibexa.co/en/4.4/content_management/images/fastly_io/).
+If you already have Fastly IO subscription, you can move to [Fastly IO configuration in [[= product_name =]]](https://doc.ibexa.co/en/4.4/content_management/images/fastly_io/).
 
 #### Fastly VCL upload
 
@@ -92,7 +92,7 @@ provide the best recommendations.
 ## Ibexa Connect
 
 You can now take advantage of [Ibexa Connect](https://www.ibexa.co/products/ibexa-connect),
-an iPaaS (integration platform-as-a-service) which allows you to connect Ibexa DXP with third-party applications.
+an iPaaS (integration platform-as-a-service) which allows you to connect [[= product_name =]] with third-party applications.
 [[= product_name_connect =]] features a low-code drag-and-drop interface and hundreds of connectors to different services
 that help you automate business processes.
 
diff --git a/docs/release_notes/ibexa_dxp_v4.5.md b/docs/release_notes/ibexa_dxp_v4.5.md
index aa236f5463..6e8e6c845a 100644
--- a/docs/release_notes/ibexa_dxp_v4.5.md
+++ b/docs/release_notes/ibexa_dxp_v4.5.md
@@ -4,7 +4,7 @@ description: Ibexa DXP v4.5 adds new features to Ibexa Commerce, translation com
 
 <!-- vale off -->
 
-# Ibexa DXP v4.5
+# [[= product_name =]] v4.5
 
 **Version number**: v4.5
 
diff --git a/docs/release_notes/ibexa_dxp_v4.6.md b/docs/release_notes/ibexa_dxp_v4.6.md
index 5586d64a0a..33c21a8ba0 100644
--- a/docs/release_notes/ibexa_dxp_v4.6.md
+++ b/docs/release_notes/ibexa_dxp_v4.6.md
@@ -4,7 +4,7 @@ description: Ibexa DXP v4.6 brings improvements to Commerce, PIM and Personaliza
 
 <!-- vale VariablesVersion = NO -->
 
-# Ibexa DXP v4.6
+# [[= product_name =]] v4.6
 
 **Version number**: v4.6
 
@@ -469,7 +469,7 @@ For more information, see [Ibexa Connect scenario block](https://doc.ibexa.co/en
 
 ### DDEV
 
-[Ibexa DXP can officially be run on DDEV](https://ddev.readthedocs.io/en/latest/users/quickstart/#ibexa-dxp). For more information, see the [DDEV guide](https://doc.ibexa.co/en/master/getting_started/install_with_ddev/), which offers a step-by-step walkthrough for installing Ibexa DXP.
+[[[= product_name =]] can officially be run on DDEV](https://ddev.readthedocs.io/en/latest/users/quickstart/#ibexa-dxp). For more information, see the [DDEV guide](https://doc.ibexa.co/en/master/getting_started/install_with_ddev/), which offers a step-by-step walkthrough for installing [[= product_name =]].
 
 ### Customer Data Platform (CDP)
 
@@ -482,7 +482,7 @@ For more information, see [CDP Activation](https://doc.ibexa.co/en/master/cdp/cd
 
 ### New packages 
 
-The following packages has been introduced in Ibexa DXP v4.6.0:
+The following packages has been introduced in [[= product_name =]] v4.6.0:
 
 - [ibexa/oauth2-server](oauth_server.md) (optional)
 - ibexa/site-context
@@ -503,7 +503,7 @@ The following packages has been introduced in Ibexa DXP v4.6.0:
 
 ### REST APIs
 
-Ibexa DXP v4.6.0 adds REST API coverage for the following features:
+[[= product_name =]] v4.6.0 adds REST API coverage for the following features:
 
 - Price engine
 - Shipping
@@ -668,7 +668,7 @@ The following events have been added in the v4.6.0 release (39 events in total):
 
 ### View matchers
 
-The following view matchers have been introduced in Ibexa DXP v4.6.0:
+The following view matchers have been introduced in [[= product_name =]] v4.6.0:
 
 - `\Ibexa\Core\MVC\Symfony\Matcher\ContentBased\IsPreview`
 - `\Ibexa\Taxonomy\View\Matcher\TaxonomyEntryBased\Id`
diff --git a/docs/release_notes/release_notes.md b/docs/release_notes/release_notes.md
index 39d186da98..b056225bce 100644
--- a/docs/release_notes/release_notes.md
+++ b/docs/release_notes/release_notes.md
@@ -5,7 +5,7 @@ page_type: landing_page
 
 # Release notes
 
-The latest stable and LTS (Long Term Support) version of [[= product_name =]] is [Ibexa DXP v4.6](ibexa_dxp_v4.6.md).
+The latest stable and LTS (Long Term Support) version of [[= product_name =]] is [[[= product_name =]] v4.6](ibexa_dxp_v4.6.md).
 
 
 [[= cards([
diff --git a/docs/resources/new_in_doc.md b/docs/resources/new_in_doc.md
index abd528171f..dcbce2baaf 100644
--- a/docs/resources/new_in_doc.md
+++ b/docs/resources/new_in_doc.md
@@ -26,7 +26,7 @@ This page contains recent highlights and notable changes in [[= product_name =]]
 
 ### Getting started
 
-- Added instructions in [Install Ibexa DXP](https://doc.ibexa.co/en/master/getting_started/install_ibexa_dxp/#create-project) about using PHP 8.3 to create a project
+- Added instructions in [Install [[= product_name =]]](https://doc.ibexa.co/en/master/getting_started/install_ibexa_dxp/#create-project) about using PHP 8.3 to create a project
 - Updated the [requirements for running v3.3.x on PHP 8.3](https://doc.ibexa.co/en/master/getting_started/requirements/#php)
 
 ### Infrastructure and maintenance
diff --git a/docs/resources/phpstorm_plugin.md b/docs/resources/phpstorm_plugin.md
index 840297dc7d..7a43117a75 100644
--- a/docs/resources/phpstorm_plugin.md
+++ b/docs/resources/phpstorm_plugin.md
@@ -2,9 +2,9 @@
 description: The Ibexa DXP PHPStorm plugin helps you speed up your development by providing file templates, autocompletion, a quick installation wizard, and more.
 ---
 
-# Ibexa DXP plugin for PhpStorm
+# [[= product_name =]] plugin for PhpStorm
 
-Ibexa DXP plugin for PhpStorm helps you to work with Ibexa DXP by speeding up installation
+[[= product_name =]] plugin for PhpStorm helps you to work with [[= product_name =]] by speeding up installation
 and providing file templates, intentions, autocompletion, and other features.
 
 ## Requirements
@@ -14,14 +14,14 @@ and providing file templates, intentions, autocompletion, and other features.
 
 ## Install PhpStorm plugin
 
-You can install the Ibexa DXP plugin for PhpStorm from the JetBrains Marketplace,
+You can install the [[= product_name =]] plugin for PhpStorm from the JetBrains Marketplace,
 or manually, from a downloaded .jar file.
 
 ### Install from JetBrains Marketplace
 
 To install plugin from JetBrains marketplace:
 
-Look for "Ibexa DXP" in the plugin browser and click **Install**.
+Look for "[[= product_name =]]" in the plugin browser and click **Install**.
 
 ### Install from file
 
@@ -49,23 +49,23 @@ You can use it to:
     Some plugin features depends on the selected product edition and version. 
     For example, "deprecated namespaces usage" inspection is enabled only if the project uses v4.x.  
 
-Plugin configuration is automatically resolved when opening Ibexa DXP project for the first time.
-If detection is successful, a notification appears with an "Enable Ibexa DXP support for this project" link.
+Plugin configuration is automatically resolved when opening [[= product_name =]] project for the first time.
+If detection is successful, a notification appears with an "Enable [[= product_name =]] support for this project" link.
 
-If you created your project by using Ibexa DXP project wizard, the plugin is automatically enabled and configured based 
+If you created your project by using [[= product_name =]] project wizard, the plugin is automatically enabled and configured based 
 on wizard data.
 
 ## Features
 
 ### Project wizard
 
-The plugin enables creating a new Ibexa DXP project directly from PhpStorm.
+The plugin enables creating a new [[= product_name =]] project directly from PhpStorm.
 To do it, select **File** > **New Project...** > **Ibexa DXP**.
 
 In project settings form you can choose:
 
 - Location of the project
-- Product edition: Ibexa OSS, Ibexa Content, Ibexa Experience, Ibexa Commerce
+- Product edition: Ibexa OSS, Ibexa Content, [[= product_name_exp =]], [[= product_name_com =]]
 - Authentication token (for Content, Experience and Commerce editions)
 - Product version: Default (latest LTS version), Latest (fast track or LTS), Latest LTS and "Next 3.x" (unstable, based on the 3.x branch) and "Next 4.x" (unstable, based on the 4.x branch)
 - Generate [Ibexa Cloud configuration](install_on_ibexa_cloud.md) 
@@ -106,7 +106,7 @@ The plugin provides the following built-in file templates:
 
 The templates are available in, for example, the context menu in **Project window** > **New** > **Ibexa DXP**.
 
-The list of available file templates depends on the Ibexa DXP edition used by the project.
+The list of available file templates depends on the [[= product_name =]] edition used by the project.
 
 For all file templates you can customize:
 
diff --git a/docs/resources/release_process_and_roadmap.md b/docs/resources/release_process_and_roadmap.md
index 8934287fcb..78d2f406de 100644
--- a/docs/resources/release_process_and_roadmap.md
+++ b/docs/resources/release_process_and_roadmap.md
@@ -2,7 +2,7 @@
 description: "Ibexa DXP releases new versions periodically in different flavors: Ibexa Headless, Ibexa Experience and Ibexa Commerce, plus open-source Ibexa OSS."
 ---
 
-# Ibexa DXP release process and roadmap
+# [[= product_name =]] release process and roadmap
 
 ## Release process
 
diff --git a/docs/tutorials/beginner_tutorial/1_get_ready.md b/docs/tutorials/beginner_tutorial/1_get_ready.md
index cc906da90b..a8e18d9d7c 100644
--- a/docs/tutorials/beginner_tutorial/1_get_ready.md
+++ b/docs/tutorials/beginner_tutorial/1_get_ready.md
@@ -6,7 +6,7 @@ description: Start the tutorial by getting a clean installation of Ibexa DXP.
 
 To begin the tutorial, you need a clean installation of [[= product_name =]].
 
-Get it by following the [install Ibexa DXP](install_ibexa_dxp.md) guide.
+Get it by following the [install [[= product_name =]]](install_ibexa_dxp.md) guide.
 You need a web server, a relational database and PHP.
 
 The clean installation contains only a root content item which displays a welcome page.
diff --git a/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md b/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md
index 8e87d2cd07..3681254569 100644
--- a/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md
+++ b/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md
@@ -7,7 +7,7 @@ description: Learn how to create a Value class that stores the value of the fiel
 ## Project installation
 
 To start the tutorial, you need to make a clean [[= product_name =]] installation.
-Follow the guide for your system to [install Ibexa DXP](install_ibexa_dxp.md),
+Follow the guide for your system to [install [[= product_name =]]](install_ibexa_dxp.md),
 [configure a server](requirements.md),
 and [start the web server](install_ibexa_dxp.md#use-phps-built-in-server).
 Remember to install using the `dev` environment.
diff --git a/docs/update_and_migration/from_3.3/update_from_3.3.md b/docs/update_and_migration/from_3.3/update_from_3.3.md
index 1833eb9396..076a5bc274 100644
--- a/docs/update_and_migration/from_3.3/update_from_3.3.md
+++ b/docs/update_and_migration/from_3.3/update_from_3.3.md
@@ -368,7 +368,7 @@ See [Update Flex server](#update-flex-server).
 
 #### VCL configuration for Fastly
 
-Ibexa DXP now supports Fastly shielding. If you're using Fastly and want to use shielding, you need to update your VCL files.
+[[= product_name =]] now supports Fastly shielding. If you're using Fastly and want to use shielding, you need to update your VCL files.
 
 !!! tip
 
diff --git a/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md b/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md
index eb3aaa9d96..d1f7f335b3 100644
--- a/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md
+++ b/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md
@@ -195,7 +195,7 @@ Apply the following database update scripts:
 
 #### Ibexa Open Source
 
-If you have no access to Ibexa DXP's `ibexa/installer` package, database upgrade isn't necessary.
+If you have no access to [[= product_name =]]'s `ibexa/installer` package, database upgrade isn't necessary.
 
 ## Ensure password safety
 
diff --git a/docs/update_and_migration/update_ibexa_dxp.md b/docs/update_and_migration/update_ibexa_dxp.md
index 7175101c17..351cbd9175 100644
--- a/docs/update_and_migration/update_ibexa_dxp.md
+++ b/docs/update_and_migration/update_ibexa_dxp.md
@@ -2,7 +2,7 @@
 description: Update your installation to the latest supported version.
 ---
 
-# Updating Ibexa DXP
+# Updating [[= product_name =]]
 
 To update [[= product_name =]] to a newer version, select the version you're currently using:
 

From 99a61d910dc6e45a444f3b91d0a2f1759bd9c15e Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Tue, 15 Oct 2024 14:58:09 +0200
Subject: [PATCH 17/77] More fixes

---
 .../extending_thumbnails.md                   |  2 +-
 .../importing_assets_from_bundle.md           |  2 +-
 .../reusable_components.md                    |  6 +-
 .../back_office_menus/back_office_menus.md    |  2 +-
 .../customize_search_suggestion.md            |  2 +-
 .../back_office/multifile_upload.md           |  2 +-
 .../back_office/notifications.md              |  2 +-
 .../back_office/subitems_list.md              |  2 +-
 .../configuration/dynamic_configuration.md    |  6 +-
 .../configuration/repository_configuration.md |  6 +-
 .../content_organization/content_types.md     |  4 +-
 .../content_organization/sections.md          |  2 +-
 .../dashboard/customize_dashboard.md          |  4 +-
 .../project_organization/bundles.md           | 10 ++--
 .../project_organization.md                   |  2 +-
 .../recent_activity/recent_activity.md        |  6 +-
 docs/api/graphql/graphql.md                   |  2 +-
 docs/api/graphql/graphql_custom_ft.md         |  2 +-
 docs/api/graphql/graphql_operations.md        |  2 +-
 docs/api/graphql/graphql_queries.md           |  2 +-
 docs/api/php_api/php_api.md                   |  2 +-
 .../rest_api/rest_api_usage/rest_responses.md |  5 +-
 docs/cdp/cdp.md                               |  2 +-
 .../cdp_add_clientside_tracking.md            |  1 +
 docs/cdp/cdp_guide.md                         |  2 +-
 docs/cdp/cdp_installation.md                  |  4 +-
 docs/commerce/checkout/customize_checkout.md  |  2 +-
 docs/commerce/payment/extend_payment.md       |  2 +-
 docs/commerce/payment/payum_integration.md    |  2 +-
 .../shipping_management/extend_shipping.md    |  2 +-
 .../transactional_emails.md                   |  2 +-
 .../content_availability.md                   |  2 +-
 .../content_management_guide.md               |  2 +-
 docs/content_management/content_model.md      | 11 ++--
 .../data_migration/exporting_data.md          |  4 +-
 .../data_migration/managing_migrations.md     |  2 +-
 .../create_custom_generic_field_type.md       | 10 +---
 .../field_type_reference/formfield.md         |  2 +-
 .../field_type_reference/imagefield.md        |  2 +-
 .../field_types/field_types.md                |  2 +-
 .../field_types/form_and_template.md          |  6 +-
 .../file_management/file_url_handling.md      |  2 +-
 .../forms/work_with_forms.md                  |  3 +-
 .../images/add_image_asset_from_dam.md        |  6 +-
 .../images/configure_image_editor.md          |  3 +-
 docs/content_management/images/fastly_io.md   |  4 +-
 docs/content_management/images/images.md      |  2 +
 .../pages/ibexa_connect_scenario_block.md     |  4 +-
 .../pages/page_block_attributes.md            |  1 +
 .../pages/page_block_validators.md            |  2 +-
 .../pages/page_builder_guide.md               |  5 +-
 .../rich_text/create_custom_richtext_block.md |  3 +-
 .../rich_text/extend_online_editor.md         |  1 +
 .../rich_text/online_editor_guide.md          |  6 +-
 docs/customer_management/cp_configuration.md  |  1 +
 docs/getting_started/first_steps.md           | 26 ++-------
 docs/getting_started/install_ibexa_dxp.md     | 11 ++--
 docs/getting_started/install_with_ddev.md     |  4 +-
 docs/getting_started/requirements.md          | 46 +++++++--------
 docs/ibexa_cloud/ddev_and_ibexa_cloud.md      |  4 +-
 docs/ibexa_cloud/install_on_ibexa_cloud.md    | 14 ++---
 docs/ibexa_engage/create_campaign.md          |  2 +-
 docs/ibexa_engage/install_ibexa_engage.md     |  4 +-
 docs/ibexa_engage/integrate_ibexa_connect.md  |  6 +-
 docs/ibexa_products/editions.md               |  2 +-
 docs/ibexa_products/ibexa_commerce.md         |  3 +-
 docs/ibexa_products/ibexa_experience.md       | 11 ++--
 docs/ibexa_products/ibexa_headless.md         |  1 +
 .../cache/http_cache/content_aware_cache.md   |  6 +-
 .../cache/http_cache/fastly.md                | 16 ++---
 .../cache/http_cache/reverse_proxy.md         |  2 +-
 .../cache/persistence_cache.md                |  2 +-
 .../clustering/clustering_with_ddev.md        |  6 +-
 docs/infrastructure_and_maintenance/devops.md |  2 +-
 .../security/reporting_issues.md              |  9 +--
 .../security/security_checklist.md            | 21 +++----
 .../support_and_maintenance_faq.md            |  2 +-
 .../languages/back_office_translations.md     |  2 +-
 docs/multisite/languages/languages.md         |  6 +-
 docs/multisite/multisite_configuration.md     |  7 ++-
 docs/multisite/site_factory/site_factory.md   |  4 +-
 .../site_factory_configuration.md             |  4 +-
 .../siteaccess_aware_configuration.md         |  4 +-
 .../siteaccess/siteaccess_matching.md         |  2 +-
 docs/permissions/limitation_reference.md      |  6 +-
 docs/permissions/permission_use_cases.md      |  2 +-
 .../api_reference/content_api.md              |  2 +-
 .../api_reference/recommendation_api.md       | 12 ++--
 .../api_reference/tracking_api.md             | 14 +++--
 .../personalization/api_reference/user_api.md |  2 +-
 .../personalization/enable_personalization.md |  5 +-
 .../integrate_recommendation_service.md       |  2 +-
 .../legacy_recommendation_api.md              |  6 +-
 docs/personalization/personalization_guide.md |  2 +-
 docs/pim/pim_guide.md                         |  6 +-
 docs/release_notes/ez_platform_v1.11.0.md     |  3 +-
 docs/release_notes/ez_platform_v1.12.0.md     | 11 ++--
 docs/release_notes/ez_platform_v2.1.0.md      |  2 +-
 docs/release_notes/ez_platform_v2.2.0.md      |  4 +-
 docs/release_notes/ez_platform_v2.3.md        | 10 ++--
 docs/release_notes/ez_platform_v2.4.md        | 12 ++--
 docs/release_notes/ez_platform_v2.5.md        |  6 +-
 docs/release_notes/ez_platform_v3.0.md        |  8 +--
 .../ez_platform_v3.0_deprecations.md          |  2 +-
 docs/release_notes/ez_platform_v3.1.md        |  2 +-
 docs/release_notes/ibexa_dxp_v3.2.md          | 17 +++---
 docs/release_notes/ibexa_dxp_v3.3.md          |  6 +-
 docs/release_notes/ibexa_dxp_v4.0.md          | 16 ++---
 docs/release_notes/ibexa_dxp_v4.1.md          |  4 +-
 docs/release_notes/ibexa_dxp_v4.2.md          |  6 +-
 docs/release_notes/ibexa_dxp_v4.3.md          |  5 +-
 docs/release_notes/ibexa_dxp_v4.4.md          | 18 +++---
 docs/release_notes/ibexa_dxp_v4.5.md          | 11 ++--
 docs/release_notes/ibexa_dxp_v4.6.md          | 23 ++++----
 .../contributing/report_and_follow_issues.md  |  4 +-
 docs/resources/new_in_doc.md                  | 58 +++++++++----------
 docs/resources/phpstorm_plugin.md             | 14 ++---
 .../rawrange_aggregation.md                   |  2 +-
 .../rawstats_aggregation.md                   |  2 +-
 .../rawterm_aggregation.md                    |  2 +-
 .../customprice_criterion.md                  |  2 +-
 .../isfieldempty_criterion.md                 |  2 +-
 .../search_criteria_reference.md              |  2 +-
 .../search_criteria_and_sort_clauses.md       |  2 +-
 .../configure_elastic_search.md               |  7 ++-
 .../elastic_search/install_elastic_search.md  |  7 ++-
 .../legacy_search_overview.md                 |  1 +
 .../solr_search_engine/install_solr.md        |  7 ++-
 .../customfield_sort_clause.md                |  2 +-
 .../customprice_sort_clause.md                |  2 +-
 .../field_sort_clause.md                      |  2 +-
 docs/snippets/update/db/db_backup_warning.md  |  2 +-
 docs/snippets/update/finish_the_update.md     |  4 +-
 docs/snippets/update/merge_composer.md        |  4 +-
 .../design_engine/add_new_design.md           |  2 +-
 docs/templating/layout/add_search_form.md     |  2 +-
 .../queries_and_controllers/controllers.md    |  4 +-
 .../create_custom_query_type.md               |  4 +-
 .../cart_twig_functions.md                    |  2 +-
 .../urls_and_routes/custom_breadcrumbs.md     |  2 +-
 .../4_display_single_content_item.md          |  4 +-
 .../5_display_a_list_of_content_items.md      |  3 +-
 .../8_enable_account_registration.md          |  2 +-
 .../2_define_point2d_field_type.md            |  1 +
 .../3_create_form_for_point2d.md              |  3 +-
 .../4_introduce_a_template.md                 |  3 +-
 .../creating_a_point2d_field_type.md          |  2 +-
 .../1_get_a_starter_website.md                |  4 +-
 .../3_use_existing_blocks.md                  |  2 +-
 .../from_1.x_2.x/update_app_to_2.5.md         |  4 +-
 .../from_1.x_2.x/update_db_to_2.5.md          |  4 +-
 .../from_2.5/to_3.3.latest.md                 |  2 +-
 docs/update_and_migration/from_2.5/to_3.3.md  |  6 +-
 docs/update_and_migration/from_3.3/to_4.0.md  |  2 +-
 .../from_3.3/update_from_3.3.md               |  2 +-
 .../from_4.3/update_from_4.3.md               |  4 +-
 .../from_4.3/update_from_4.3_new_commerce.md  | 14 ++---
 .../from_4.3/update_from_4.3_old_commerce.md  |  8 +--
 .../from_4.4/update_from_4.4.md               |  5 +-
 .../from_4.5/update_from_4.5.md               |  2 +-
 .../migrate_to_ibexa_dxp/common_issues.md     |  3 +-
 .../migrating_from_ez_publish.md              |  2 +-
 .../migrating_from_ez_publish_platform.md     | 18 +++---
 docs/users/login_methods.md                   |  2 +-
 docs/users/oauth_client.md                    |  2 +-
 docs/users/oauth_server.md                    |  2 +
 docs/users/passwords.md                       |  3 +-
 docs/users/user_authentication.md             |  2 +-
 168 files changed, 456 insertions(+), 433 deletions(-)

diff --git a/docs/administration/back_office/back_office_elements/extending_thumbnails.md b/docs/administration/back_office/back_office_elements/extending_thumbnails.md
index 40ab2bd489..661086ca08 100644
--- a/docs/administration/back_office/back_office_elements/extending_thumbnails.md
+++ b/docs/administration/back_office/back_office_elements/extending_thumbnails.md
@@ -5,7 +5,7 @@ description: Customize thumbnails use for content items in the back office.
 # Extending thumbnails
 
 The thumbnails API enable you to easily choose an image for a specific content.
-If you do not want to use custom thumbnails, `ContentType` is used instead.
+If you don't want to use custom thumbnails, `ContentType` is used instead.
 
 ## Thumbnail mechanism 
 
diff --git a/docs/administration/back_office/back_office_elements/importing_assets_from_bundle.md b/docs/administration/back_office/back_office_elements/importing_assets_from_bundle.md
index 4fcca0c224..833bff03ef 100644
--- a/docs/administration/back_office/back_office_elements/importing_assets_from_bundle.md
+++ b/docs/administration/back_office/back_office_elements/importing_assets_from_bundle.md
@@ -68,7 +68,7 @@ module.exports = (ibexaConfig, ibexaConfigManager) => {
 
 !!! tip
 
-	If you do not know what `entryName` to use, you can use the browser's developer tools to check what files are loaded on the given page.
+	If you don't know what `entryName` to use, you can use the browser's developer tools to check what files are loaded on the given page.
 	Then, use the file name as `entryName`.
 
 !!! tip
diff --git a/docs/administration/back_office/back_office_elements/reusable_components.md b/docs/administration/back_office/back_office_elements/reusable_components.md
index c4f28cc621..cc912509f5 100644
--- a/docs/administration/back_office/back_office_elements/reusable_components.md
+++ b/docs/administration/back_office/back_office_elements/reusable_components.md
@@ -21,7 +21,7 @@ The alert component has the following properties:
 
 - `type` - available types of alert: error, info, success, and warning
 - `icon` - name of the icon, taken from the default icon set
-- `icon_path` - full icon path, in case you do not want to use an icon from the default icon set
+- `icon_path` - full icon path, in case you don't want to use an icon from the default icon set
 - `title` - alert title
 - `subtitle` - displays subtitle content
 - `show_subtitle_below` - default set to `false`, the subtitle is displayed next to the title
@@ -214,7 +214,7 @@ which holds the id of the button that should be enabled/disabled after a checkbo
 
 Next, pass a button under the `action` parameter to the table headline.
 
-Action buttons are rendered on the right side of the table headline (do not confuse it with the table header).
+Action buttons are rendered on the right side of the table headline (don't confuse it with the table header).
 You can also specify headline text, which is a table title displayed above, by passing it under `headline` parameter.
 
 You can generate various headline texts using the `results_headline` macro with a few parameters:
@@ -284,7 +284,7 @@ Other table component parameters include:
 - `attr` - (other HTML attributes applied on the HTML table element), for example:
     - `attr: { 'data-some-data-attribute-you-need': 'foo' }`
 - `table_body_class` and `table_body_attr` are the same as mentioned earlier, but applied on the table element
-- `show_head_cols_if_empty` - (default: `false`), by default, when `body_rows` is empty, the table component does not show the table header, but you may want to have it because for example rows are rendered dynamically with JavaScript on the browser side.
+- `show_head_cols_if_empty` - (default: `false`), by default, when `body_rows` is empty, the table component doesn't show the table header, but you may want to have it because for example rows are rendered dynamically with JavaScript on the browser side.
 
 To avoid wrapping headline inside the form, as it's done in the earlier example, you can `embed` table and override the `between_header_and_table` block:
 
diff --git a/docs/administration/back_office/back_office_menus/back_office_menus.md b/docs/administration/back_office/back_office_menus/back_office_menus.md
index 717ec37114..a3c1f4fc5d 100644
--- a/docs/administration/back_office/back_office_menus/back_office_menus.md
+++ b/docs/administration/back_office/back_office_menus/back_office_menus.md
@@ -65,7 +65,7 @@ You can listen to the following events:
 
 To add a menu item, use the `addChild()` method. Provide the method with the new menu item's identifier and, optionally, with parameters.
 
-To add an inactive menu section, do not add a route to its parameters.
+To add an inactive menu section, don't add a route to its parameters.
 
 The following method adds a new menu section under **Content**, and under it, a new item with custom attributes:
 
diff --git a/docs/administration/back_office/customize_search_suggestion.md b/docs/administration/back_office/customize_search_suggestion.md
index 7fb24af739..3c6e66f1dd 100644
--- a/docs/administration/back_office/customize_search_suggestion.md
+++ b/docs/administration/back_office/customize_search_suggestion.md
@@ -5,7 +5,7 @@ description: Customize search suggestion configuration and sources.
 # Customize search suggestion
 
 In the back office, when you start typing in the search field on the top bar, suggestions about what you could be looking for show up directly under the field.
-For more information about using this feature to search for content, see [user documentation]([[= user_doc =]]/search/search_for_content).
+For more information about using this feature to search for content, see [User Documentation]([[= user_doc =]]/search/search_for_content).
 
 ## Configuration
 
diff --git a/docs/administration/back_office/multifile_upload.md b/docs/administration/back_office/multifile_upload.md
index 08fe7c10da..9e6e4ac3ba 100644
--- a/docs/administration/back_office/multifile_upload.md
+++ b/docs/administration/back_office/multifile_upload.md
@@ -89,7 +89,7 @@ There are two types of properties: **required** and **optional**.
 
 ### Required properties
 
-All of the following properties must be used, otherwise the multi-file upload does not work.
+All of the following properties must be used, otherwise the multi-file upload doesn't work.
 
 - **onAfterUpload** _{Function}_ - a callback to be invoked immediately after a file has been uploaded
 - **adminUiConfig** _{Object}_ - UI config object. It should keep the following structure:
diff --git a/docs/administration/back_office/notifications.md b/docs/administration/back_office/notifications.md
index cb0d83597b..73e9c7fb11 100644
--- a/docs/administration/back_office/notifications.md
+++ b/docs/administration/back_office/notifications.md
@@ -103,4 +103,4 @@ ibexa:
                     timeout: 0
 ```
 
-The values shown above are the defaults. `0` means the notification does not hide automatically.
+The values shown above are the defaults. `0` means the notification doesn't hide automatically.
diff --git a/docs/administration/back_office/subitems_list.md b/docs/administration/back_office/subitems_list.md
index 9b4a2366c5..42378c734d 100644
--- a/docs/administration/back_office/subitems_list.md
+++ b/docs/administration/back_office/subitems_list.md
@@ -104,7 +104,7 @@ Optionally, Sub-items module can take a following list of props:
 
 ## Reuse Sub-items list
 
-To add a Sub-items list on a page that does not have the (right) action sidebar, you need to do one of the following things:
+To add a Sub-items list on a page that doesn't have the (right) action sidebar, you need to do one of the following things:
 
 - add a `<div>` element with the `.ibexa-extra-actions-container` selector
 - change the selector in the Sub-items settings by sending the `languageContainerSelector` prop which takes the selector for the element that renders the `languageSelector`.
diff --git a/docs/administration/configuration/dynamic_configuration.md b/docs/administration/configuration/dynamic_configuration.md
index 33e22fb6ca..574fd8ea67 100644
--- a/docs/administration/configuration/dynamic_configuration.md
+++ b/docs/administration/configuration/dynamic_configuration.md
@@ -70,13 +70,11 @@ services:
 
 You can also use the [autowire feature]([[= symfony_doc =]]/service_container/autowiring.html), by type hinting against ConfigResolverInterface.
 
-!!! tip
-
-    For more information about dependency injection, see [Service container](php_api.md#service-container).
+For more information about dependency injection, see [Service container](php_api.md#service-container).
 
 !!! note
 
-    Do not store the retrieved config value unless you know what you're doing.
+    Don't store the retrieved config value unless you know what you're doing.
     SiteAccess can change during code execution, which means you might work on the wrong value.
 
 ``` php
diff --git a/docs/administration/configuration/repository_configuration.md b/docs/administration/configuration/repository_configuration.md
index 1c68fc64bb..a25c8e6ada 100644
--- a/docs/administration/configuration/repository_configuration.md
+++ b/docs/administration/configuration/repository_configuration.md
@@ -10,7 +10,7 @@ You can define several Repositories within a single application. However, you ca
 
 ### Using default values
 
-To use the default Repository connection, you do not need to specify its details:
+To use the default Repository connection, you don't need to specify its details:
 
 ``` yaml
 ibexa:
@@ -46,7 +46,7 @@ ibexa:
 #### Multisite URI matching with multi-Repository setup
 
 You can use only one Repository (database) per domain.
-This does not prohibit using [different Repositories](persistence_cache.md#multi-repository-setup) on different subdomains.
+This doesn't prohibit using [different Repositories](persistence_cache.md#multi-repository-setup) on different subdomains.
 However, when using URI matching for multisite setup, all SiteAccesses sharing domain also need to share Repository.
 For example:
 
@@ -80,7 +80,7 @@ ibexa:
                 prefix: Ibexa\Bundle\Core\Entity
 ```
 
-Refer to [DoctrineBundle documentation](https://symfony.com/doc/3.4/reference/configuration/doctrine.html) for more information.
+For more information, see [DoctrineBundle documentation](https://symfony.com/doc/3.4/reference/configuration/doctrine.html).
 
 !!! note
 
diff --git a/docs/administration/content_organization/content_types.md b/docs/administration/content_organization/content_types.md
index f992190b15..484d99c1ed 100644
--- a/docs/administration/content_organization/content_types.md
+++ b/docs/administration/content_organization/content_types.md
@@ -17,7 +17,7 @@ Content types are organized into groups.
 
 You can add your own groups here to keep your content types in better order.
 
-For a full tutorial, see [Add a content type](first_steps.md#add-a-content-type) or follow [user documentation](https://doc.ibexa.co/projects/userguide/en/latest/content_management/create_edit_content_types/).
+For a full tutorial, see [Add a content type](first_steps.md#add-a-content-type) or follow [User Documentation](https://doc.ibexa.co/projects/userguide/en/latest/content_management/create_edit_content_types/).
 For a detailed overview of the content model, see [Content model overview](content_model.md).
 
 ## Content type metadata
@@ -29,7 +29,7 @@ It can consist of letters, digits, spaces, and special characters (it's mandator
 
 !!! note
 
-    Even if your content type defines a field intended as a name for the content item (for example, a title of an article or product name), do not confuse it with this Name, which is a piece of metadata, not a field.
+    Even if your content type defines a field intended as a name for the content item (for example, a title of an article or product name), don't confuse it with this Name, which is a piece of metadata, not a field.
 
 **Identifier** – an identifier for internal use in configuration files, templates, PHP code, etc. 
 It must be unique, can only contain lowercase letters, digits, and underscores (it's mandatory and the maximum length is 50 characters).
diff --git a/docs/administration/content_organization/sections.md b/docs/administration/content_organization/sections.md
index 7d65f7b7f0..218bd6ca78 100644
--- a/docs/administration/content_organization/sections.md
+++ b/docs/administration/content_organization/sections.md
@@ -20,7 +20,7 @@ In addition, if the main Location of a content item with multiple Location assig
 
 When content is moved to a different Location, the item itself and all of its subtree are assigned to the Section of the new Location.
 It works only for copy and move.
-Assigning a new Section to a parent content item does not affect the subtree, meaning that subtree cannot currently be updated this way.
+Assigning a new Section to a parent content item doesn't affect the subtree, meaning that subtree cannot currently be updated this way.
 
 Sections can only be removed if no content items are assigned to them.
 Even then, it should be done carefully.
diff --git a/docs/administration/dashboard/customize_dashboard.md b/docs/administration/dashboard/customize_dashboard.md
index 80d5977b3d..b8fc6ee4e2 100644
--- a/docs/administration/dashboard/customize_dashboard.md
+++ b/docs/administration/dashboard/customize_dashboard.md
@@ -10,7 +10,7 @@ Customized dashboard displays a set of widgets selected by the user.
 
 !!! tip
 
-     Detailed instruction on how to customize dashboard using Dashboard Builder is available in [[[= product_name =]] user documentation](https://doc.ibexa.co/projects/userguide/en/latest/getting_started/dashboard/work_with_dashboard/#customize-dashboard).
+     Detailed instruction on how to customize dashboard using Dashboard Builder is available in [[[= product_name =]] User Documentation](https://doc.ibexa.co/projects/userguide/en/latest/getting_started/dashboard/work_with_dashboard/#customize-dashboard).
 
 ## Manage permissions
 
@@ -32,7 +32,7 @@ For more information, see [Customize storefront layout](customize_storefront_lay
 
 Dashboard builder provides set of ready-to-use blocks, for example, Common content, Quick actions, or [[= product_name =]] News.
 
-For more information about available blocks, see [[[= product_name =]] user documentation](https://doc.ibexa.co/projects/userguide/en/latest/getting_started/dashboard/dashboard_block_reference/).
+For more information about available blocks, see [[[= product_name =]] User Documentation](https://doc.ibexa.co/projects/userguide/en/latest/getting_started/dashboard/dashboard_block_reference/).
 
 In addition to existing blocks available in Dashboard Builder, you can also create custom blocks.
 
diff --git a/docs/administration/project_organization/bundles.md b/docs/administration/project_organization/bundles.md
index 6c4ee0d029..0860c4aec6 100644
--- a/docs/administration/project_organization/bundles.md
+++ b/docs/administration/project_organization/bundles.md
@@ -33,7 +33,7 @@ When overriding files, the path inside your application has to correspond to the
 
 ### Removing bundles
 
-To remove a bundle (either one you created yourself, or an out-of-the-box one that you do not need), see the [How to Remove a Bundle]([[= symfony_doc =]]/bundles/remove.html) instruction in Symfony doc.
+To remove a bundle (either one you created yourself, or an out-of-the-box one that you don't need), see the [How to Remove a Bundle]([[= symfony_doc =]]/bundles/remove.html) instruction in Symfony doc.
 
 ## Core packages
 
@@ -65,13 +65,13 @@ To remove a bundle (either one you created yourself, or an out-of-the-box one th
 |[ibexa/system-info](https://github.com/ibexa/system-info)| Information about the system [[= product_name =]] is running on|
 |[ibexa/user](https://github.com/ibexa/user)|User management|
 
-## Ibexa Headless packages
+## [[= product_name_headless =]] packages
 
 |Bundle|Description|
 |---------|-----------|
 |ibexa/oss|Core packages|
 |ibexa/content-tree|content tree functionality|
-|ibexa/connect|[Ibexa Connect](https://doc.ibexa.co/projects/connect/en/latest/)|
+|ibexa/connect|[[[= product_name_connect =]]](https://doc.ibexa.co/projects/connect/en/latest/)|
 |ibexa/calendar|Calendar tab with a calendar widget|
 |ibexa/connector-dam|Connector for DAM (Digital Asset Management) systems|
 |ibexa/elasticsearch|Integration with Elasticsearch search engine|
@@ -99,7 +99,7 @@ To remove a bundle (either one you created yourself, or an out-of-the-box one th
 |ibexa/commerce-shop-ui|UI for the shop front page **deprecated** |
 |ibexa/commerce-shop|Main shop functionalities **deprecated** |
 
-## Ibexa Experience packages
+## [[= product_name_exp =]] packages
 
 |Bundle|Description|
 |---------|-----------|
@@ -116,7 +116,7 @@ To remove a bundle (either one you created yourself, or an out-of-the-box one th
 |ibexa/connector-qualifio|Enables integration with [Qualifio Engage platform](https://developers.qualifio.com/docs/engage/)|
 
 
-## Ibexa Commerce packages
+## [[= product_name_com =]] packages
 
 |Bundle|Description|
 |---------|-----------|
diff --git a/docs/administration/project_organization/project_organization.md b/docs/administration/project_organization/project_organization.md
index 165042989e..465f4af88f 100644
--- a/docs/administration/project_organization/project_organization.md
+++ b/docs/administration/project_organization/project_organization.md
@@ -39,7 +39,7 @@ All project assets are accessible through the `assets` path.
 ## Configuration
 
 You project's configuration is placed in the respective files in `config/packages`.
-See [Configuration](configuration.md) for more information.
+For more information, see [Configuration](configuration.md).
 
 ### Importing configuration from a bundle
 
diff --git a/docs/administration/recent_activity/recent_activity.md b/docs/administration/recent_activity/recent_activity.md
index ad7e786ee5..7d9fcbbf4f 100644
--- a/docs/administration/recent_activity/recent_activity.md
+++ b/docs/administration/recent_activity/recent_activity.md
@@ -8,7 +8,7 @@ Recent activity log displays last actions in the repository (whatever their orig
 
 ![Recent activity](admin_panel_recent_activity.png)
 
-To learn more about its back office usage and the actions logged by default, see [Recent activity in the User documentation]([[= user_doc =]]/recent_activity/recent_activity/).
+To learn more about its back office usage and the actions logged by default, see [Recent activity in User Documentation]([[= user_doc =]]/recent_activity/recent_activity/).
 
 ## Configuration and cronjob
 
@@ -51,7 +51,7 @@ This policy is required to view [activity log in user profile]([[= user_doc =]]/
 
 !!! caution
 
-    Do not assign `activity_log/read` permission to the Anonymous role, even with the owner limitation, because this role is shared among all unauthenticated users.
+    Don't assign `activity_log/read` permission to the Anonymous role, even with the owner limitation, because this role is shared among all unauthenticated users.
 
 ## User privacy
 
@@ -131,7 +131,7 @@ migration
 !!! caution
 
     Keep activity logging as light as possible.
-    Do not make database requests or heavy computation at logging time.
+    Don't make database requests or heavy computation at logging time.
     Keep them for activity log list display time.
 
 #### Create an entry
diff --git a/docs/api/graphql/graphql.md b/docs/api/graphql/graphql.md
index da5759be2c..29eb0d1842 100644
--- a/docs/api/graphql/graphql.md
+++ b/docs/api/graphql/graphql.md
@@ -24,7 +24,7 @@ They contain information about the domain objects and the fields you can [query]
 
 ### Schema generation limitations
 
-GraphQL schema cannot be generated for names that do not follow the [GraphQL specification](http://spec.graphql.org/June2018/#sec-Names), for example names that start with a digit.
+GraphQL schema cannot be generated for names that don't follow the [GraphQL specification](http://spec.graphql.org/June2018/#sec-Names), for example names that start with a digit.
 
 This concerns image variations, content types, content type groups, product types, and field definition identifiers.
 
diff --git a/docs/api/graphql/graphql_custom_ft.md b/docs/api/graphql/graphql_custom_ft.md
index c7f4b6920d..2bee87bc74 100644
--- a/docs/api/graphql/graphql_custom_ft.md
+++ b/docs/api/graphql/graphql_custom_ft.md
@@ -170,7 +170,7 @@ The following variables are available in the resolver's expression:
 
 - `field` is the current field, as an extension of the API's field object that proxies properties requests to the field Value
 - `content` is the resolved content item's `Content`
-- `location` is the content item's resolved location, for more information, see [Querying Locations](graphql_queries.md#querying-locations)
+- `location` is the content item's resolved location. For more information, see [Querying Locations](graphql_queries.md#querying-locations)
 - `item` is the content together with its location `\Ibexa\GraphQL\Value\Item`
 
 `RelationFieldValueBuilder` or `SelectionFieldValueBuilder` can be used as examples.
\ No newline at end of file
diff --git a/docs/api/graphql/graphql_operations.md b/docs/api/graphql/graphql_operations.md
index 4bac2e3dd1..96b2e54351 100644
--- a/docs/api/graphql/graphql_operations.md
+++ b/docs/api/graphql/graphql_operations.md
@@ -154,7 +154,7 @@ curl -v -X POST \
 !!! note "Authentication"
 
     The example above requires you to set your authentication cookie in the `$AUTH_COOKIE` variable.
-    See [Authentication](graphql.md#authentication) for more information.
+    For more information, see [Authentication](graphql.md#authentication).
 
 ### Uploading multiple files
 
diff --git a/docs/api/graphql/graphql_queries.md b/docs/api/graphql/graphql_queries.md
index 49106e66f6..f46e604c29 100644
--- a/docs/api/graphql/graphql_queries.md
+++ b/docs/api/graphql/graphql_queries.md
@@ -101,7 +101,7 @@ Response:
 }
 ```
 
-When you do not specify a language, the response contains the most prioritized translation.
+When you don't specify a language, the response contains the most prioritized translation.
 
 ### Get a group of content items
 
diff --git a/docs/api/php_api/php_api.md b/docs/api/php_api/php_api.md
index 7a85a1fa94..68c4927b93 100644
--- a/docs/api/php_api/php_api.md
+++ b/docs/api/php_api/php_api.md
@@ -103,7 +103,7 @@ The User may, for example, not be allowed to create content, or view a particula
 To skip permission checks, you can use the `sudo()` method.
 It allows API execution to be performed with full access, sand-boxed.
 
-You can use this method to perform an action that the current User does not have permissions for.
+You can use this method to perform an action that the current user doesn't have permissions for.
 
 For example, to [hide a Location](managing_content.md#hiding-and-revealing-locations), use:
 
diff --git a/docs/api/rest_api/rest_api_usage/rest_responses.md b/docs/api/rest_api/rest_api_usage/rest_responses.md
index 3e12e79d5f..3a9614ef66 100644
--- a/docs/api/rest_api/rest_api_usage/rest_responses.md
+++ b/docs/api/rest_api/rest_api_usage/rest_responses.md
@@ -137,10 +137,7 @@ Content-Type: application/vnd.ibexa.api.Content+json
 
 [Cross-Origin Resource Sharing (CORS)](https://en.wikipedia.org/wiki/Cross-origin_resource_sharing) can allow the REST API to be reached from a page on another domain.
 
-!!! tip "More information about CORS"
-
-    - [WHATWG's CORS Protocol specification](https://fetch.spec.whatwg.org/#cors-protocol)
-    - [Overview of CORS on developer.mozilla.org](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS)
+For more information about CORS, see [WHATWG's CORS Protocol specification](https://fetch.spec.whatwg.org/#cors-protocol) and [Overview of CORS on developer.mozilla.org](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS).
 
 CORS support is provided by the third party [nelmio/cors-bundle](https://packagist.org/packages/nelmio/cors-bundle). You can read more about it in [NelmioCorsBundle's README](https://github.com/nelmio/NelmioCorsBundle/blob/master/README.md).
 
diff --git a/docs/cdp/cdp.md b/docs/cdp/cdp.md
index 5c77b73db5..51259b70bb 100644
--- a/docs/cdp/cdp.md
+++ b/docs/cdp/cdp.md
@@ -5,7 +5,7 @@ edition: experience
 
 # Customer Data Platform (CDP)
 
-## What is Ibexa CDP
+## What is [[= product_name_cdp =]]
 
 [[= product_name_cdp =]] helps you solve one of the hardest challenges facing business world today: building unique experiences for your customers.
 With [[= product_name_cdp =]] you're able to track and aggregate data of your customers' activity on multiple channels.
diff --git a/docs/cdp/cdp_activation/cdp_add_clientside_tracking.md b/docs/cdp/cdp_activation/cdp_add_clientside_tracking.md
index ea1b6e829b..7ab8db8878 100644
--- a/docs/cdp/cdp_activation/cdp_add_clientside_tracking.md
+++ b/docs/cdp/cdp_activation/cdp_add_clientside_tracking.md
@@ -7,6 +7,7 @@ edition: experience
 
 The final step is setting up a tracking script.
 It requires a head tracking script between the `<head></head>` tags on your website, a main script after the head script, and cookie consent.
+
 For more information about setting up a tracking script, see [a tutorial in Raptor documentation](https://support.raptorsmartadvisor.com/hc/en-us/articles/9563346335004-Client-Side-Tracking).
 
 Now, you need to add a tracker to specific places in your website where you want to track users.
diff --git a/docs/cdp/cdp_guide.md b/docs/cdp/cdp_guide.md
index 71ab5229d8..61afc531f4 100644
--- a/docs/cdp/cdp_guide.md
+++ b/docs/cdp/cdp_guide.md
@@ -20,7 +20,7 @@ It includes first, second, and third-party data from multiple sources such as tr
 
 [[= product_name_cdp =]] is available in [[= product_name_exp =]] and [[= product_name_com =]] editions.
 
-## How does Ibexa CDP work
+## How does [[= product_name_cdp =]] work
 
 [[= product_name_cdp =]] unifies customer data throughout your whole organization.
 It helps you activate your users and give them real-time interaction.
diff --git a/docs/cdp/cdp_installation.md b/docs/cdp/cdp_installation.md
index 3b34652a83..e49e9b1aa2 100644
--- a/docs/cdp/cdp_installation.md
+++ b/docs/cdp/cdp_installation.md
@@ -3,12 +3,12 @@ description: Installation of standalone Ibexa CDP package.
 edition: experience
 ---
 
-# Ibexa CDP installation
+# [[= product_name_cdp =]] installation
 
 There are three steps required to install [[= product_name_cdp =]].
 First, you need to register your [[= product_name_cdp =]] account, then you can download a CDP package and update the configuration.
 
-## Register in Ibexa CDP dashboard
+## Register in [[= product_name_cdp =]] dashboard
 
 If you decide to acquire [[= product_name_cdp =]] contact your sales representative, they provide you with a registration link to [[= product_name_cdp =]].
 After registration, you get access to a separate instance where you can find data required for configuring, activating, and using this feature.
diff --git a/docs/commerce/checkout/customize_checkout.md b/docs/commerce/checkout/customize_checkout.md
index 6ca8db41fc..c6aaf415c4 100644
--- a/docs/commerce/checkout/customize_checkout.md
+++ b/docs/commerce/checkout/customize_checkout.md
@@ -287,7 +287,7 @@ ibexa:
                 customer_content_type: <your_ct_identifier_for_customer> 
 ```
 
-Then, define custom address formats, which, for example, do not include the `locality` field:
+Then, define custom address formats, which, for example, don't include the `locality` field:
 
 ``` yaml
 ibexa_field_type_address:
diff --git a/docs/commerce/payment/extend_payment.md b/docs/commerce/payment/extend_payment.md
index 7c5a69c3af..17ec29cf41 100644
--- a/docs/commerce/payment/extend_payment.md
+++ b/docs/commerce/payment/extend_payment.md
@@ -19,7 +19,7 @@ Code samples below show how this could be done if your organization wants to use
 
 !!! note "Gateway integration requirement"
 
-    [[= product_name =]] does not come with gateway redirects. Whether you're an integrator or an end customer, it's your responsibility to implement payment gateway integration.
+    [[= product_name =]] doesn't come with gateway redirects. Whether you're an integrator or an end customer, it's your responsibility to implement payment gateway integration.
 
 ### Define custom payment method type
 
diff --git a/docs/commerce/payment/payum_integration.md b/docs/commerce/payment/payum_integration.md
index 8442337dba..d3b942cd48 100644
--- a/docs/commerce/payment/payum_integration.md
+++ b/docs/commerce/payment/payum_integration.md
@@ -77,5 +77,5 @@ For a list of events, see [Event dispatcher](https://github.com/Payum/Payum/blob
 !!! caution
 
     In certain cases, depending on the payment processing service, when a customer closes the payment page in a browser and the bank has not processed the payment yet, the payment status can remain unchanged.
-    Depending on how your checkout process is configured, it may result in unwanted effects, for example, cause that the cart does not purge after the purchase.
+    Depending on how your checkout process is configured, it may result in unwanted effects, for example, cause that the cart doesn't purge after the purchase.
     Make sure that you account for this fact in your implementation.
diff --git a/docs/commerce/shipping_management/extend_shipping.md b/docs/commerce/shipping_management/extend_shipping.md
index d33574333f..f194bb1fea 100644
--- a/docs/commerce/shipping_management/extend_shipping.md
+++ b/docs/commerce/shipping_management/extend_shipping.md
@@ -174,5 +174,5 @@ You should now see the parameter, in this case it's a customer identifier, displ
 
 !!! note "Non-matching label"
 
-    This section does not discuss overriding the default form, therefore the alphanumerical customer identifier is shown under the **Cost value** label.
+    This section doesn't discuss overriding the default form, therefore the alphanumerical customer identifier is shown under the **Cost value** label.
     For more information about working with forms, see [Page and Form tutorial](../../tutorials/page_and_form_tutorial/5_create_newsletter_form.md).
diff --git a/docs/commerce/transactional_emails/transactional_emails.md b/docs/commerce/transactional_emails/transactional_emails.md
index 954d28f8a7..fc12a81e83 100644
--- a/docs/commerce/transactional_emails/transactional_emails.md
+++ b/docs/commerce/transactional_emails/transactional_emails.md
@@ -77,7 +77,7 @@ For a complete list of parameters, see [Transactional email variables reference]
 
 !!! Tip
 
-    When you invent names for your campaigns, keep them simple, and do not use special characters or spaces.
+    When you invent names for your campaigns, keep them simple, and don't use special characters or spaces.
 
 
 Campaign emails can be sent in one language only.
diff --git a/docs/content_management/content_availability.md b/docs/content_management/content_availability.md
index 650665b59d..9b3ac0ebe4 100644
--- a/docs/content_management/content_availability.md
+++ b/docs/content_management/content_availability.md
@@ -14,7 +14,7 @@ It's automatically applied to any new content item of this Type.
 A content item with this flag is available in its main language
 even if it's not translated into the language of the current SiteAccess.
 
-Without the flag, a content item isn't available at all if it does not have a language version
+Without the flag, a content item isn't available at all if it doesn't have a language version
 corresponding to the current SiteAccess.
 
 !!! note
diff --git a/docs/content_management/content_management_guide.md b/docs/content_management/content_management_guide.md
index 4f79454b8d..17957e1354 100644
--- a/docs/content_management/content_management_guide.md
+++ b/docs/content_management/content_management_guide.md
@@ -190,7 +190,7 @@ You can divide your content tree into nominal parts to better organize it.
 Once you have defined sections, for example, Media or Forms, and assigned them to content items, you can decide which roles have access to which Section of the tree.
 
 The setting is inherited, which means that a child content item inherits a value of this setting from its parent.
-Changing a Section setting does not result in moving a content item to a different location within a content tree.
+Changing a Section setting doesn't result in moving a content item to a different location within a content tree.
 
 ![Members of the Media Section](img/sections.png)
 
diff --git a/docs/content_management/content_model.md b/docs/content_management/content_model.md
index 429b5ac338..06e9bb7fce 100644
--- a/docs/content_management/content_model.md
+++ b/docs/content_management/content_model.md
@@ -12,7 +12,7 @@ Each content item is an instance of a content type.
 
 !!! tip
 
-    An introduction to the content model for non-developer users is available in [[[= product_name =]] user documentation](https://doc.ibexa.co/projects/userguide/en/latest/content_management/content_model/).
+    An introduction to the content model for non-developer users is available in [[[= product_name =]] User Documentation](https://doc.ibexa.co/projects/userguide/en/latest/content_management/content_model/).
 
 ## Content items
 
@@ -25,7 +25,7 @@ The fields can cover data ranging from single variables and text lines to media
 #### Content information
 
 General information about a content item is stored in a [`ContentInfo`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-ContentInfo.html) object.
-`ContentInfo` does not include fields. It contains following information:
+`ContentInfo` doesn't include fields. It contains following information:
 
 **`id`** - the unique ID of the Content object. These numbers aren't recycled, so if an item is deleted, its ID isn't reused when a new one is created.
 
@@ -41,7 +41,8 @@ The name is in the main language of the content item.
 **`sectionId`** - the unique number of the Section to which the content item belongs.
 New content items are placed in the Standard Section by default.
 This behavior can be changed, but content must always belong to some Section.
-See [Sections](sections.md) for more information.
+
+For more information, see [Sections](sections.md).
 
 **`currentVersionNo`** - current version number is the number of the published version or of a newly created draft (which is 1).
 
@@ -109,7 +110,7 @@ Aside from the field type, the field definition in a content type provides the f
 
 **[Searchable](search.md)** – a flag which indicates if the value of the field is indexed for searching.
 
-The Searchable flag isn't available for some fields, because some field types do not allow searching through their values.
+The Searchable flag isn't available for some fields, because some field types don't allow searching through their values.
 
 **[Translatable](languages.md)** – a flag which indicates if the value of the field can be translated. It's independent of the field type, which means that even fields such as "Float" or "Image" can be set as translatable.
 
@@ -140,4 +141,4 @@ A new version is also created when a new [language](languages.md) is added to th
 
 Products are a special type of content that holds products you can manage in the built-in PIM system.
 
-See [PIM](pim.md) for more information.
+For more information, see [PIM](pim.md).
diff --git a/docs/content_management/data_migration/exporting_data.md b/docs/content_management/data_migration/exporting_data.md
index d2969cac0e..b0169e7d13 100644
--- a/docs/content_management/data_migration/exporting_data.md
+++ b/docs/content_management/data_migration/exporting_data.md
@@ -161,7 +161,7 @@ The following types are available:
 - `segment_group`
 - `company`
 
-If you do not provide the `--type` option, the command asks you to select a type of data.
+If you don't provide the `--type` option, the command asks you to select a type of data.
 
 ## mode
 
@@ -172,7 +172,7 @@ The following modes are available:
 - `update` - updates an existing item. Only covers specified fields and properties. If the item does not exist, causes an error.
 - `delete` - deletes an existing item. If the item does not exist, causes an error.
 
-If you do not provide the `--mode` option, the command asks you to select the mode.
+If you don't provide the `--mode` option, the command asks you to select the mode.
 
 The following combinations of types are modes are available:
 
diff --git a/docs/content_management/data_migration/managing_migrations.md b/docs/content_management/data_migration/managing_migrations.md
index a1d71dae93..0a1223b905 100644
--- a/docs/content_management/data_migration/managing_migrations.md
+++ b/docs/content_management/data_migration/managing_migrations.md
@@ -24,7 +24,7 @@ You can also convert multiple files using `ibexa:migrations:kaliop:bulk-convert`
 php bin/console ibexa:migrations:kaliop:bulk-convert --recursive kaliop_files ibexa_files
 ```
 
-If you do not specify the output folder, the command overwrites the input files.
+If you don't specify the output folder, the command overwrites the input files.
 
 ## Adding migration files
 
diff --git a/docs/content_management/field_types/create_custom_generic_field_type.md b/docs/content_management/field_types/create_custom_generic_field_type.md
index 835085a9f2..e97f21329c 100644
--- a/docs/content_management/field_types/create_custom_generic_field_type.md
+++ b/docs/content_management/field_types/create_custom_generic_field_type.md
@@ -19,7 +19,7 @@ reduces the number of classes which must be created, and simplifies the tagging
 
 First, create `Value.php` in the `src/FieldType/HelloWorld` directory.
 The Value class of a field type contains only the basic logic of a field type, the rest of it's handled by the `Type` class.
-For more information about field type Value see [Value handling](type_and_value.md#value-handling).
+For more information about field type Value, see [Value handling](type_and_value.md#value-handling).
 
 The `HelloWorld` Value class should contain:
 
@@ -39,9 +39,7 @@ It provides settings for the field type and an implementation of the `Ibexa\Cont
 [[= include_file('code_samples/field_types/generic_ft/src/FieldType/HelloWorld/Type.php', 0, 6) =]][[= include_file('code_samples/field_types/generic_ft/src/FieldType/HelloWorld/Type.php', 9, 16) =]]}
 ```
 
-!!! tip
-
-    For more information about the Type class of a field type, see [Type class](type_and_value.md#type-class).
+For more information about the Type class of a field type, see [Type class](type_and_value.md#type-class).
 
 Next, register the field type as a service and tag it with `ibexa.field_type`:
 
@@ -66,9 +64,7 @@ and the required `use` statements to `src/FieldType/HelloWorld/Type.php`:
 [[= include_file('code_samples/field_types/generic_ft/src/FieldType/HelloWorld/Type.php') =]]
 ```
 
-!!! tip
-
-    For more information about the FormMappers see [field type form and template](form_and_template.md).
+For more information about the FormMappers, see [field type form and template](form_and_template.md).
 
 Next, add the `ibexa.admin_ui.field_type.form.mapper.value` tag to the service definition:
 
diff --git a/docs/content_management/field_types/field_type_reference/formfield.md b/docs/content_management/field_types/field_type_reference/formfield.md
index ab5ae4e867..00a3081439 100644
--- a/docs/content_management/field_types/field_type_reference/formfield.md
+++ b/docs/content_management/field_types/field_type_reference/formfield.md
@@ -12,4 +12,4 @@ The Form field type stores a Form consisting of one or more form fields.
 
 
 
-See [Forms](work_with_forms.md) for more information about working with Forms.
+For more information about working with Forms, see [Forms](work_with_forms.md).
diff --git a/docs/content_management/field_types/field_type_reference/imagefield.md b/docs/content_management/field_types/field_type_reference/imagefield.md
index 7197585793..f87c690ab5 100644
--- a/docs/content_management/field_types/field_type_reference/imagefield.md
+++ b/docs/content_management/field_types/field_type_reference/imagefield.md
@@ -238,7 +238,7 @@ The REST API expects field values to be provided in a hash-like structure. Those
 
 ### Updating an Image field
 
-Updating an Image field requires that you re-send existing data. This can be done by re-using the field obtained via REST, **removing the variations key**, and updating `alternativeText`, `fileName` or `data`. If you do not want to change the image itself, do not provide the `data` key.
+Updating an Image field requires that you re-send existing data. This can be done by re-using the field obtained via REST, **removing the variations key**, and updating `alternativeText`, `fileName` or `data`. If you don't want to change the image itself, don't provide the `data` key.
 
 ``` xml
 <?xml version="1.0" encoding="UTF-8"?>
diff --git a/docs/content_management/field_types/field_types.md b/docs/content_management/field_types/field_types.md
index 9979d30106..46af661cff 100644
--- a/docs/content_management/field_types/field_types.md
+++ b/docs/content_management/field_types/field_types.md
@@ -25,7 +25,7 @@ available in the [`Ibexa\Core\FieldType`](https://github.com/ibexa/core/tree/mai
 !!! note "Registration"
 
     Remember that all your custom field types must be registered in `config/services.yml`.
-    For more information see [Registration](type_and_value.md#registration).
+    For more information, see [Registration](type_and_value.md#registration).
 
 To provide custom functionality for a field type, the SPI interacts with multiple layers of the [[= product_name =]] architecture:
 
diff --git a/docs/content_management/field_types/form_and_template.md b/docs/content_management/field_types/form_and_template.md
index 9ce61fc79b..5d9546206a 100644
--- a/docs/content_management/field_types/form_and_template.md
+++ b/docs/content_management/field_types/form_and_template.md
@@ -188,7 +188,7 @@ For templates for previewing the field in the back office,
 using the design engine is recommended with `ibexa_standard_design.override_kernel_templates` set to `true`.
 With the design engine you can apply a template (e.g. `Resources/views/themes/admin/content_fields.html.twig`) without any extra configuration.
 
-If you do not use the design engine, apply the following configuration:
+If you don't use the design engine, apply the following configuration:
 
 ``` yaml
 ibexa:
@@ -219,6 +219,4 @@ All built-in field types are implemented with this approach. In that case overri
 {% endblock %}
 ```
 
-!!! tip
-
-    For more information on creating and overriding form type templates, see [Symfony documentation]([[= symfony_doc =]]/form/create_custom_field_type.html#creating-the-form-type-template).
+For more information on creating and overriding form type templates, see [Symfony documentation]([[= symfony_doc =]]/form/create_custom_field_type.html#creating-the-form-type-template).
diff --git a/docs/content_management/file_management/file_url_handling.md b/docs/content_management/file_management/file_url_handling.md
index 442fce0fdc..6f868461ca 100644
--- a/docs/content_management/file_management/file_url_handling.md
+++ b/docs/content_management/file_management/file_url_handling.md
@@ -36,7 +36,7 @@ ibexa:
 
 !!! caution
 
-    For security reasons, do not map `/path/to/ibexa/public/` as
+    For security reasons, don't map `/path/to/ibexa/public/` as
     Document Root of the static server.
     Map the `/var/` directory directly to `/path/to/ibexa/public/var` instead.
 
diff --git a/docs/content_management/forms/work_with_forms.md b/docs/content_management/forms/work_with_forms.md
index a855fc9a05..aa873ccc63 100644
--- a/docs/content_management/forms/work_with_forms.md
+++ b/docs/content_management/forms/work_with_forms.md
@@ -41,7 +41,8 @@ For information about available options, see [Gregwar/CaptchaBundle's documentat
 
 !!! note
 
-    If your installation uses Varnish to manage content cache, you must modify the configuration to avoid issues with the Captcha field. For more information, see [Ensure proper captcha behavior](reverse_proxy.md#ensure-proper-captcha-behavior).
+    If your installation uses Varnish to manage content cache, you must modify the configuration to avoid issues with the Captcha field.
+    For more information, see [Ensure proper captcha behavior](reverse_proxy.md#ensure-proper-captcha-behavior).
 
 ## Form submission purging
 
diff --git a/docs/content_management/images/add_image_asset_from_dam.md b/docs/content_management/images/add_image_asset_from_dam.md
index 11b6b748e5..87c4246d56 100644
--- a/docs/content_management/images/add_image_asset_from_dam.md
+++ b/docs/content_management/images/add_image_asset_from_dam.md
@@ -43,7 +43,8 @@ First, in `templates/themes/standard/embed/`, create a custom template `dam.html
 
 The `770px` parameter in the template above is used to render the DAM image. It's the `unsplash` specific image variation and must be defined separately.
 
-Next, in `config/packages/ibexa.yaml`, set the `dam.html.twig` template for the `embed` view type that is matched for the content type, which you created for DAM images. 
+Next, in `config/packages/ibexa.yaml`, set the `dam.html.twig` template for the `embed` view type that is matched for the content type, which you created for DAM images.
+
 For more information about displaying content, see [Content rendering](render_content.md).
 
 ``` yaml
@@ -72,7 +73,8 @@ dam_unsplash:
             fit: max
 ```
 
-You can customize the parameters according to your needs. 
+You can customize the parameters according to your needs.
+
 For more information about supported parameters, see the [Unsplash documentation](https://unsplash.com/documentation#dynamically-resizable-images).
 
 In the back office, go to **Admin** > **Content types**.
diff --git a/docs/content_management/images/configure_image_editor.md b/docs/content_management/images/configure_image_editor.md
index 3e6688f525..354a0fb771 100644
--- a/docs/content_management/images/configure_image_editor.md
+++ b/docs/content_management/images/configure_image_editor.md
@@ -5,7 +5,8 @@ description: Configure image editor to crop, flip, and modify images.
 # Configure Image Editor
 
 When a content item contains fields of the [ezimage](imageassetfield.md) type, users can perform basic image editing functions with the Image Editor.
-For more information, see the [user documentation]([[= user_doc =]]/editing_images/).
+
+For more information, see [User Documentation]([[= user_doc =]]/editing_images/).
 
 !!! note
 
diff --git a/docs/content_management/images/fastly_io.md b/docs/content_management/images/fastly_io.md
index 959c4891a9..6240abda89 100644
--- a/docs/content_management/images/fastly_io.md
+++ b/docs/content_management/images/fastly_io.md
@@ -13,8 +13,8 @@ To be able to configure this feature, you need [Fastly IO subscription](https://
 
 To use Fastly Image Optimizer, you first need a [working setup of [[= product_name =]] and Fastly](reverse_proxy.md#using-varnish-or-fastly)
 with shielding enabled.
-To enable shielding, follow the steps in [Fastly developer documentation](https://developer.fastly.com/learning/concepts/shielding/#enabling-and-disabling-shielding).
-Remember to choose a shield location from the **Shielding** menu, as described in [Fastly user documentation](https://docs.fastly.com/en/guides/shielding#enabling-shielding).
+To enable shielding, follow the steps in [Fastly Developer Documentation](https://developer.fastly.com/learning/concepts/shielding/#enabling-and-disabling-shielding).
+Remember to choose a shield location from the **Shielding** menu, as described in [Fastly User Documentation](https://docs.fastly.com/en/guides/shielding#enabling-shielding).
 
 ## VCL configuration
 
diff --git a/docs/content_management/images/images.md b/docs/content_management/images/images.md
index 4ccbc325fa..4567e63dc1 100644
--- a/docs/content_management/images/images.md
+++ b/docs/content_management/images/images.md
@@ -56,6 +56,7 @@ Image files are stored by using the `IOService,` and are completely independent
 they're generated only once and cleared on demand, for example, on content removal).
 
 LiipImagineBundle only works on image blobs, so no command line tool is needed.
+
 For more information, see the [bundle's documentation](https://symfony.com/bundles/LiipImagineBundle/current/configuration.html).
 
 !!! caution "Code injection in image EXIF"
@@ -68,6 +69,7 @@ For more information, see the [bundle's documentation](https://symfony.com/bundl
 
 You can use LiipImagine's `liip:imagine:cache:resolve` command to resolve the path to image variations that are generated from the original image, with one or more paths as arguments.
 Paths to repository images must be relative to the `var/<site>/storage/images` directory, for example: `7/4/2/0/247-1-eng-GB/test.jpg`.
+
 For more information, see [LiipImagineBundle documentation](https://symfony.com/bundles/LiipImagineBundle/current/basic-usage.html#resolve-with-the-console).
 
 ## Resizing images
diff --git a/docs/content_management/pages/ibexa_connect_scenario_block.md b/docs/content_management/pages/ibexa_connect_scenario_block.md
index 7097265c9c..872e5ad8a5 100644
--- a/docs/content_management/pages/ibexa_connect_scenario_block.md
+++ b/docs/content_management/pages/ibexa_connect_scenario_block.md
@@ -2,7 +2,7 @@
 description: Work with Ibexa Connect scenario block that retrieves and displays data from an Ibexa Connect webhook. 
 ---
 
-# Ibexa Connect scenario block
+# [[= product_name_connect =]] scenario block
 
 [[= product_name_connect =]] scenario block retrieves and displays data from an [[= product_name_connect =]] webhook. 
 Scenario block is a regular [Page block](page_blocks.md) and can be configured on field definition level as any other block.
@@ -49,7 +49,7 @@ Then, in `templates/blocks` directory under `default.html.twig`, provide your bl
 In the following example, the configuration of the block is non-complex - block is only used to display the content transferred from an [[= product_name_connect =]] webhook.
 At this point the [[= product_name_connect =]] scenario block is ready to be used in Page Builder.
 
-### Configure Ibexa Connect scenario block in Page Builder
+### Configure [[= product_name_connect =]] scenario block in Page Builder
 
 Now, you can configure [[= product_name_connect =]] scenario block in Page Builder.
 To do it, in your Page add [[= product_name_connect =]] block by dragging it from the menu to a drop zone and enter block settings. 
diff --git a/docs/content_management/pages/page_block_attributes.md b/docs/content_management/pages/page_block_attributes.md
index 426ae901ca..77f0b152c6 100644
--- a/docs/content_management/pages/page_block_attributes.md
+++ b/docs/content_management/pages/page_block_attributes.md
@@ -51,6 +51,7 @@ attributes:
 
 `embed` and `locationlist` use the Universal Discovery Widget (UDW).
 When creating a block with these two types you can configure the UDW behavior.
+
 For more information, see [Create custom page block / Add edit template](create_custom_page_block.md#add-edit-template)
 
 ## Custom attribute types
diff --git a/docs/content_management/pages/page_block_validators.md b/docs/content_management/pages/page_block_validators.md
index 1064200e00..f5f28c3eb7 100644
--- a/docs/content_management/pages/page_block_validators.md
+++ b/docs/content_management/pages/page_block_validators.md
@@ -16,7 +16,7 @@ The following block validators are available:
 
 !!! note
 
-    Do not use the `required` and `not_blank` validators for `richtext` attributes.
+    Don't use the `required` and `not_blank` validators for `richtext` attributes.
     Instead, use `not_blank_richtext`.
 
 For each validator you can provide a message that displays in the Page Builder
diff --git a/docs/content_management/pages/page_builder_guide.md b/docs/content_management/pages/page_builder_guide.md
index 55de800b46..ed97a9c6c3 100644
--- a/docs/content_management/pages/page_builder_guide.md
+++ b/docs/content_management/pages/page_builder_guide.md
@@ -85,7 +85,9 @@ F. Saving options
 |Save draft|Save the page draft*.|
 |Delete draft|Delete the page draft.|
 
-*To help you preserve your work, system saves drafts of content items automatically. For more information, see [Autosave]([[= user_doc =]]/content_management/content_versions/#autosave).
+*To help you preserve your work, system saves drafts of content items automatically.
+
+For more information, see [Autosave]([[= user_doc =]]/content_management/content_versions/#autosave).
 
 Page Builder has two main views that you can use while creating a page:
 
@@ -112,6 +114,7 @@ In the `Select layouts` section, you can select layouts that you want to be avai
 ![Switch layout](switch_layout_window.png)
 
 The default, built-in Page layout has only one zone, but developers can create other layouts in configuration.
+
 For more information, see [Configure layout](render_page.md#configure-layout).
 
 #### Add blocks
diff --git a/docs/content_management/rich_text/create_custom_richtext_block.md b/docs/content_management/rich_text/create_custom_richtext_block.md
index 672c6d4a6c..85f7c26cfe 100644
--- a/docs/content_management/rich_text/create_custom_richtext_block.md
+++ b/docs/content_management/rich_text/create_custom_richtext_block.md
@@ -75,5 +75,4 @@ You can now add your block in the Site tab.
 
 ![RichText block](extending_richtext_block.png)
 
-For more information about customizing additional options of the block or creating 
-custom blocks with other attribute types, see [Create custom Page block](create_custom_page_block.md).
+For more information about customizing additional options of the block or creating custom blocks with other attribute types, see [Create custom Page block](create_custom_page_block.md).
diff --git a/docs/content_management/rich_text/extend_online_editor.md b/docs/content_management/rich_text/extend_online_editor.md
index 8b285ef127..4ec598a2aa 100644
--- a/docs/content_management/rich_text/extend_online_editor.md
+++ b/docs/content_management/rich_text/extend_online_editor.md
@@ -14,6 +14,7 @@ and creating [custom buttons](https://ckeditor.com/docs/ckeditor4/latest/guide/w
 Online Editor is based on the CKEditor5.
 Refer to [CKEditor5 documentation](https://ckeditor.com/docs/ckeditor5/latest/index.html) to learn 
 how you can extend the Online Editor with even more elements.
+
 For more information about extending the back office, see [Extend back office](back_office.md).
 
 ## Configure custom tags
diff --git a/docs/content_management/rich_text/online_editor_guide.md b/docs/content_management/rich_text/online_editor_guide.md
index 6687e9e979..ff5ecdc735 100644
--- a/docs/content_management/rich_text/online_editor_guide.md
+++ b/docs/content_management/rich_text/online_editor_guide.md
@@ -59,7 +59,7 @@ See [Extend Online Editor](extend_online_editor.md#configure-custom-tags) for a
 
 Custom styles allow specifying custom predefined templates for specific RichText elements.
 
-Custom styles differ from custom tags in that they do not have attributes configured. A custom style requires YAML configuration that points to a template used to render an elements with this style.
+Custom styles differ from custom tags in that they don't have attributes configured. A custom style requires YAML configuration that points to a template used to render an elements with this style.
 
 See [Extend Online Editor](extend_online_editor.md#configure-custom-styles) for a full example.
 
@@ -69,11 +69,11 @@ For each RichText element type, you can configure custom data attributes or CSS
 
 Custom data attributes allow adding new attributes to existing Rich Text elements, such as headings or lists, which are added in the form of `data-ezattribute-<attribute_name>="<value>"`.
 
-See [Extend Online Editor](extend_online_editor.md#custom-data-attributes) for more information
+For more information, see [Extend Online Editor](extend_online_editor.md#custom-data-attributes).
 
 Custom CSS classes work in a similar way, giving editor a choice of classes to add to any type of element.
 
-See [Extend Online Editor](extend_online_editor.md#custom-css-classes) for more information
+For more information, see [Extend Online Editor](extend_online_editor.md#custom-css-classes).
 
 ### Plugins
 
diff --git a/docs/customer_management/cp_configuration.md b/docs/customer_management/cp_configuration.md
index f680379290..d615d19d00 100644
--- a/docs/customer_management/cp_configuration.md
+++ b/docs/customer_management/cp_configuration.md
@@ -94,4 +94,5 @@ ibexa:
 
 Reviewing pending and past orders in Customer Portal requires that you configure all currencies that any of the customers may use under the `ibexa.system.<siteaccess_name>.product_catalog.currencies` key. 
 The first currency from the list is then used for filtering the orders list and calculating the **Average order** and **Total amount** values.
+
 For more information, see [Enable purchasing products](enable_purchasing_products.md).
\ No newline at end of file
diff --git a/docs/getting_started/first_steps.md b/docs/getting_started/first_steps.md
index dfd2a8e8fa..dceb94d924 100644
--- a/docs/getting_started/first_steps.md
+++ b/docs/getting_started/first_steps.md
@@ -39,8 +39,7 @@ module.exports = [ eZConfig, ibexaConfig, ...customConfigs ];
 
 !!! caution "Password change"
 
-    Make sure that you change the default password before you switch your installation 
-    from development to production. 
+    Make sure that you change the default password before you switch your installation from development to production.
     For more information about passwords, see [Passwords](passwords.md).
     For more information about production security, see [Security checklist](security_checklist.md).
 
@@ -60,9 +59,7 @@ module.exports = [ eZConfig, ibexaConfig, ...customConfigs ];
 
 8\. Save the content type.
 
-!!! tip "More information"
-
-    - [Content model](content_model.md)
+For more information, see [Content model](content_model.md).
 
 ## Create Twig templates and match then with view config
 
@@ -92,10 +89,7 @@ Content view templates use the [Twig templating engine](https://twig.symfony.com
 <div>{{ ibexa_render_field(content, 'text') }}</div>
 ```
 
-!!! tip "More information"
-
-    - [Templates](templates.md)
-    - [Twig documentation](https://twig.symfony.com/doc/3.x/)
+For more information, see [Templates](templates.md) and [Twig documentation](https://twig.symfony.com/doc/3.x/).
 
 ## Create content and test view templates
 
@@ -139,10 +133,7 @@ The SiteAccess is automatically matched using the last part of the URI.
 
 For now the new SiteAccess does not differ from the main site.
 
-!!! tip "More information"
-
-    - [Multisite](multisite.md)
-    - [SiteAccess matchers](siteaccess_matching.md#available-siteaccess-matchers)
+For more information, see [Multisite](multisite.md) and [SiteAccess matchers](siteaccess_matching.md#available-siteaccess-matchers).
 
 ## Add a language and translate Content
 
@@ -179,10 +170,7 @@ Switch to the **Translations** tab and add a new translation.
 
 ![Previewing translated Content](first-steps-translated-content.png)
 
-!!! tip "More information"
-
-    - [Languages](languages.md)
-    - [Set up translation SiteAccess](set_up_translation_siteaccess.md)
+For more information, see [Languages](languages.md) and [Set up translation SiteAccess](set_up_translation_siteaccess.md).
 
 ## Add a design
 
@@ -256,6 +244,4 @@ Call the group "Bloggers".
 You can now log out and log in again as the new User.
 You're able to create Blog Posts only.
 
-!!! tip  "More information"
-
-    - [Permissions](permissions.md)
+For more information, see [Permissions](permissions.md).
diff --git a/docs/getting_started/install_ibexa_dxp.md b/docs/getting_started/install_ibexa_dxp.md
index 90b22f389d..507123f870 100644
--- a/docs/getting_started/install_ibexa_dxp.md
+++ b/docs/getting_started/install_ibexa_dxp.md
@@ -14,7 +14,7 @@ description: Install Ibexa DXP on a Linux system and prepare your installation f
 !!! note "Installing [[= product_name_oss =]]"
 
     This installation guide shows in details how to install [[= product_name =]] for users who have a subscription agreement with [[= product_name_base =]].
-    If you want to install [[= product_name_oss =]], you do not need authentication tokens or an account on updates.ibexa.co,
+    If you want to install [[= product_name_oss =]], you don't need authentication tokens or an account on updates.ibexa.co,
     but must adapt the steps shown here to the product edition and the `ibexa/oss-skeleton` repository.
 
 ## Prepare work environment
@@ -227,12 +227,13 @@ and for creating signed URIs when using [ESI (Edge Side Includes)]([[= symfony_d
     php -r "print bin2hex(random_bytes(32));"
     ```
 
-    Do not commit the secret to version control systems, or share it with anyone who does not strictly need it.
+    Don't commit the secret to version control systems, or share it with anyone who does not strictly need it.
     If you have any suspicion that the secret may have been exposed, replace it with a new one.
     The same goes for other secrets, like database password, Varnish invalidate token, JWT passphrase, etc.
     
     After changing the app secret, make sure that you clear the application cache and log out all the users.
-    For more information, see [Symfony documentation]([[= symfony_doc =]]/reference/configuration/framework.html#secret).   
+
+    For more information, see [Symfony documentation]([[= symfony_doc =]]/reference/configuration/framework.html#secret).
 
     It's recommended to store the database credentials in your `.env.local` file and not commit it to the Version Control System.
 
@@ -434,6 +435,6 @@ Finally, remove the temporary file:
 
 To make use of the [Link Manager](url_management.md#enabling-automatic-url-validation).
 
-## Ibexa Cloud
+## [[= product_name_cloud =]]
 
-If you want to host your application on [[= product_name_cloud =]], follow the [Install on Ibexa Cloud](install_on_ibexa_cloud.md) procedure.
+If you want to host your application on [[= product_name_cloud =]], follow the [Install on [[= product_name_cloud =]]](install_on_ibexa_cloud.md) procedure.
diff --git a/docs/getting_started/install_with_ddev.md b/docs/getting_started/install_with_ddev.md
index 4d39312782..09572891be 100644
--- a/docs/getting_started/install_with_ddev.md
+++ b/docs/getting_started/install_with_ddev.md
@@ -412,12 +412,12 @@ If the local project needs to answer to real production domains (for example, to
 
     As this feature modifies domain resolution, the real website may be unreachable until the `hosts` file is manually cleaned.
 
-### Cluster or Ibexa Cloud
+### Cluster or [[= product_name_cloud =]]
 
 DDEV can be useful to locally simulate a production cluster.
 
 - See [clustering with DDEV](clustering_with_ddev.md) to add Elasticsearch, Solr, Redis or Memcached to your DDEV installation.
-- See [DDEV and Ibexa Cloud](ddev_and_ibexa_cloud.md) to locally run an [[= product_name =]] project by using DDEV.
+- See [DDEV and [[= product_name_cloud =]]](ddev_and_ibexa_cloud.md) to locally run an [[= product_name =]] project by using DDEV.
 
 ## Stop or remove the project
 
diff --git a/docs/getting_started/requirements.md b/docs/getting_started/requirements.md
index 15aa503e90..addc377f6f 100644
--- a/docs/getting_started/requirements.md
+++ b/docs/getting_started/requirements.md
@@ -11,9 +11,9 @@ To review the requirements, select the specific version of [[= product_name =]]
 
 The following server requirements cover both running the software on-premise and on third-party PaaS providers.
 
-!!! note "Ibexa Cloud"
+!!! note "[[= product_name_cloud =]]"
 
-    For running on [Ibexa Cloud](https://www.ibexa.co/products/ibexa-cloud), where recommended configuration and support is provided out of the box, see separate [Ibexa Cloud section](#ibexa-cloud-requirements-and-setup) for further reading on its requirements.
+    For running on [[[= product_name_cloud =]]](https://www.ibexa.co/products/ibexa-cloud), where recommended configuration and support is provided out of the box, see separate [[[= product_name_cloud =]] section](#ibexa-cloud-requirements-and-setup) for further reading on its requirements.
 
 The minimal setup requires PHP, MySQL/MariaDB, Apache/Nginx, Node.js and `yarn`.
 Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached, NFS/EFS/S3 and Solr/Elasticsearch in a [clustered setup](clustering.md).
@@ -360,36 +360,36 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     - Chromium™ based browsers such as Microsoft® Edge® and Opera®, most recent stable version, desktop *and* tablet
     - Apple® Safari® most recent stable version, desktop *and* tablet
 
-## Ibexa Cloud requirements and setup
+## [[= product_name_cloud =]] requirements and setup
 
-=== "Ibexa Cloud v4.6"
+=== "[[= product_name_cloud =]] v4.6"
 
-    ### Cloud hosting with Ibexa Cloud and Platform.sh
+    ### Cloud hosting with [[= product_name_cloud =]] and Platform.sh
 
-    In general, Ibexa Cloud supports all features and services of [Platform.sh](https://platform.sh/marketplace/ibexa/) that are compatible and supported by the [[= product_name =]] version you use.
+    In general, [[= product_name_cloud =]] supports all features and services of [Platform.sh](https://platform.sh/marketplace/ibexa/) that are compatible and supported by the [[= product_name =]] version you use.
 
     For example:
 
-    - Platform.sh provides Redis support for versions 3.2, 4.0 and 5.0. [[= product_name =]] supports Redis version 4.0 or higher, and recommends 5.0. As a result, Redis is supported on Ibexa Cloud in versions 4.0 and 5.0, but 5.0 is recommended.
+    - Platform.sh provides Redis support for versions 3.2, 4.0 and 5.0. [[= product_name =]] supports Redis version 4.0 or higher, and recommends 5.0. As a result, Redis is supported on [[= product_name_cloud =]] in versions 4.0 and 5.0, but 5.0 is recommended.
 
     Features or services supported by [[= product_name =]] but not covered by Platform.sh may be possible by means of a [custom integration](#custom-integrations).
 
-    ### Ibexa Cloud Setup support matrix
+    ### [[= product_name_cloud =]] Setup support matrix
 
-    All [[= product_name =]] features are supported in accordance with the example above. For example: As Legacy Bridge isn't supported with v3, it's not supported on Ibexa Cloud either.
+    All [[= product_name =]] features are supported in accordance with the example above. For example: As Legacy Bridge isn't supported with v3, it's not supported on [[= product_name_cloud =]] either.
 
     !!! note
 
         As Platform.sh does not support a configuration with multiple PostgreSQL databases,
-        for Ibexa Cloud / Platform.sh it's impossible to have a DFS table in a separate database.
+        for [[= product_name_cloud =]] / Platform.sh it's impossible to have a DFS table in a separate database.
 
-    ### Recommended Ibexa Cloud setup
+    ### Recommended [[= product_name_cloud =]] setup
 
     For more details on recommended setup configuration see bundled `.platform.app.yaml` and `.platform/` configuration files.
 
     These files are kept up-to-date with latest recommendations and can be improved through contributions.
 
-    ### Supported Ibexa Cloud setup
+    ### Supported [[= product_name_cloud =]] setup
 
     Because of the large range of possible configurations of [[= product_name =]], there are many possibilities beyond what is provided in the default recommended configuration.
 
@@ -399,7 +399,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     - Additional time for adaptation and configuration work, and testing by your development team
     - Additional consulting/onboarding time with Platform.sh, Ibexa technical services, and/or one of the many partners with prior experience using Platform.sh with [[= product_name =]]
 
-    The cost and effort of this isn't included in Ibexa Cloud subscription and is vary depending on the project.
+    The cost and effort of this isn't included in [[= product_name_cloud =]] subscription and is vary depending on the project.
 
     ### Custom integrations
 
@@ -409,34 +409,34 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     We recommend giving the development team working on the project access to the bucket
     to ensure work is done in a DevOps way without depending on external teams when changes are needed.
 
-=== "Ibexa Cloud v3.3"
+=== "[[= product_name_cloud =]] v3.3"
 
-    ### Cloud hosting with Ibexa Cloud and Platform.sh
+    ### Cloud hosting with [[= product_name_cloud =]] and Platform.sh
 
-    In general, Ibexa Cloud supports all features and services of [Platform.sh](https://platform.sh/marketplace/ibexa/) that are compatible and supported by the [[= product_name =]] version you use.
+    In general, [[= product_name_cloud =]] supports all features and services of [Platform.sh](https://platform.sh/marketplace/ibexa/) that are compatible and supported by the [[= product_name =]] version you use.
 
     For example:
 
-    - Platform.sh provides Redis support for versions 3.2, 4.0 and 5.0. [[= product_name =]] supports Redis version 4.0 or higher, and recommends 5.0. As a result, Redis is supported on Ibexa Cloud in versions 4.0 and 5.0, but 5.0 is recommended.
+    - Platform.sh provides Redis support for versions 3.2, 4.0 and 5.0. [[= product_name =]] supports Redis version 4.0 or higher, and recommends 5.0. As a result, Redis is supported on [[= product_name_cloud =]] in versions 4.0 and 5.0, but 5.0 is recommended.
 
     Features or services supported by [[= product_name =]] but not covered by Platform.sh may be possible by means of a [custom integration](#custom-integrations).
 
-    ### Ibexa Cloud Setup support matrix
+    ### [[= product_name_cloud =]] Setup support matrix
 
-    All [[= product_name =]] features are supported in accordance with the example above. For example: As Legacy Bridge isn't supported with v3, it's not supported on Ibexa Cloud either.
+    All [[= product_name =]] features are supported in accordance with the example above. For example: As Legacy Bridge isn't supported with v3, it's not supported on [[= product_name_cloud =]] either.
 
     !!! note
 
         As Platform.sh does not support a configuration with multiple PostgreSQL databases,
-        for Ibexa Cloud / Platform.sh it's impossible to have a DFS table in a separate database.
+        for [[= product_name_cloud =]] / Platform.sh it's impossible to have a DFS table in a separate database.
 
-    ### Recommended Ibexa Cloud setup
+    ### Recommended [[= product_name_cloud =]] setup
 
     For more details on recommended setup configuration see bundled `.platform.app.yaml` and `.platform/` configuration files.
 
     These files are kept up-to-date with latest recommendations and can be improved through contributions.
 
-    ### Supported Ibexa Cloud setup
+    ### Supported [[= product_name_cloud =]] setup
 
     Because of the large range of possible configurations of [[= product_name =]], there are many possibilities beyond what is provided in the default recommended configuration.
 
@@ -446,7 +446,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     - Additional time for adaptation and configuration work, and testing by your development team
     - Additional consulting/onboarding time with Platform.sh, Ibexa technical services, and/or one of the many partners with prior experience using Platform.sh with [[= product_name =]]
 
-    The cost and effort of this isn't included in Ibexa Cloud subscription and is vary depending on the project.
+    The cost and effort of this isn't included in [[= product_name_cloud =]] subscription and is vary depending on the project.
 
     ### Custom integrations
 
diff --git a/docs/ibexa_cloud/ddev_and_ibexa_cloud.md b/docs/ibexa_cloud/ddev_and_ibexa_cloud.md
index c69a2e6d6a..03be4210d6 100644
--- a/docs/ibexa_cloud/ddev_and_ibexa_cloud.md
+++ b/docs/ibexa_cloud/ddev_and_ibexa_cloud.md
@@ -2,7 +2,7 @@
 description: Use DDEV to run an Ibexa Cloud project locally.
 ---
 
-# DDEV and Ibexa Cloud
+# DDEV and [[= product_name_cloud =]]
 
 Two ways are available to run an [[= product_name_cloud =]] project locally with DDEV:
 
@@ -11,7 +11,7 @@ Two ways are available to run an [[= product_name_cloud =]] project locally with
 
 !!! note
 
-    The following examples use [Ibexa Cloud CLI (`ibexa_cloud`)](https://cli.ibexa.co/).
+    The following examples use [[[= product_name_cloud =]] CLI (`ibexa_cloud`)](https://cli.ibexa.co/).
 
 ## With the `ddev-platformsh` add-on
 
diff --git a/docs/ibexa_cloud/install_on_ibexa_cloud.md b/docs/ibexa_cloud/install_on_ibexa_cloud.md
index 6d1d10fa88..fc842e7bbb 100644
--- a/docs/ibexa_cloud/install_on_ibexa_cloud.md
+++ b/docs/ibexa_cloud/install_on_ibexa_cloud.md
@@ -2,7 +2,7 @@
 description: Install and configure Ibexa DXP to run in cloud using Ibexa Cloud.
 ---
 
-# Install on Ibexa Cloud
+# Install on [[= product_name_cloud =]]
 
 [[= product_name_cloud =]] enables you to host your application in the cloud by using the [Platform.sh](https://platform.sh/) service.
 
@@ -85,7 +85,7 @@ When you're done with configuration, push your project to the Platform.sh remote
 git push -u <platform.sh-remote> master
 ```
 
-You can also use the [Ibexa Cloud CLI](https://cli.ibexa.cloud/) to push your code.
+You can also use the [[[= product_name_cloud =]] CLI](https://cli.ibexa.cloud/) to push your code.
 
 ``` bash
 ibexa_cloud push master
@@ -97,11 +97,11 @@ ibexa_cloud push master
 
 !!! caution
 
-    Do not use Platform.sh CLI (`platform`), instead, use the [Ibexa Cloud CLI (`ibexa_cloud`)](https://cli.ibexa.cloud/).
+    Don't use Platform.sh CLI (`platform`), instead, use the [[[= product_name_cloud =]] CLI (`ibexa_cloud`)](https://cli.ibexa.cloud/).
 
-    To install Ibexa Cloud CLI, follow https://cli.ibexa.cloud/ "Installation instructions".
+    To install [[= product_name_cloud =]] CLI, follow https://cli.ibexa.cloud/ "Installation instructions".
 
-    Ibexa Cloud CLI and Platform.sh CLI share the same commands and the [same documentation](https://docs.platform.sh/administration/cli.html#3-use), but you have to replace `platform` with `ibexa_cloud`.
+    [[= product_name_cloud =]] CLI and Platform.sh CLI share the same commands and the [same documentation](https://docs.platform.sh/administration/cli.html#3-use), but you have to replace `platform` with `ibexa_cloud`.
 
-    If you have previously set up an alias to use Platform.sh CLI with Ibexa Cloud, it's outdated.
-    Remove the alias and install Ibexa Cloud CLI instead.
+    If you have previously set up an alias to use Platform.sh CLI with [[= product_name_cloud =]], it's outdated.
+    Remove the alias and install [[= product_name_cloud =]] CLI instead.
diff --git a/docs/ibexa_engage/create_campaign.md b/docs/ibexa_engage/create_campaign.md
index e76f92e8db..afff227235 100644
--- a/docs/ibexa_engage/create_campaign.md
+++ b/docs/ibexa_engage/create_campaign.md
@@ -18,7 +18,7 @@ For more information about creating and managing campaigns, see [Qualifio docume
 ## Publication channels
 
 Each campaign includes a minimum of one publication channel that you can choose from the three options the platform provides for publishing a campaign.
-For more information about publication channels, see [Publication channel]([[= user_doc =]]/ibexa_engage/ibexa_engage/#publication-channel) in the User Documentation.
+For more information about publication channels, see [Publication channel]([[= user_doc =]]/ibexa_engage/ibexa_engage/#publication-channel) in User Documentation.
 
 ## Use Campaign block in Page Builder
 
diff --git a/docs/ibexa_engage/install_ibexa_engage.md b/docs/ibexa_engage/install_ibexa_engage.md
index 491688e513..3a6dd28cd1 100644
--- a/docs/ibexa_engage/install_ibexa_engage.md
+++ b/docs/ibexa_engage/install_ibexa_engage.md
@@ -3,7 +3,7 @@ description: Install and configure Ibexa Engage.
 edition: experience
 ---
 
-# Ibexa Engage
+# [[= product_name_engage =]]
 
 [[= product_name_engage =]] is a data collection tool. It enables you to engage your audiences by using the [Qualifio](https://qualifio.com/) tools.
 You can use interactive content to gather valuable data, for example, customer data or recent orders list, and create connections.
@@ -15,7 +15,7 @@ For more information, see [Qualifio Developers documentation](https://developers
 To use [[= product_name_engage =]], you must make arrangements with [[= product_name =]] to define the initial configuration.
 [[= product_name_base =]] team creates and provides user account. An invitation link is sent during the setup process.
 
-For more information, see [Ibexa Engage in User documentation]([[= user_doc =]]/ibexa_engage/ibexa_engage/#request-access).
+For more information, see [[[= product_name_engage =]] in User Documentation]([[= user_doc =]]/ibexa_engage/ibexa_engage/#request-access).
 
 ## Install [[= product_name_engage =]]
 
diff --git a/docs/ibexa_engage/integrate_ibexa_connect.md b/docs/ibexa_engage/integrate_ibexa_connect.md
index 8f1c00f6b8..c232161571 100644
--- a/docs/ibexa_engage/integrate_ibexa_connect.md
+++ b/docs/ibexa_engage/integrate_ibexa_connect.md
@@ -3,13 +3,13 @@ description: Integrate Ibexa Engage with Ibexa Connect.
 edition: experience
 ---
 
-# Use Ibexa Connect
+# Use [[= product_name_connect =]]
 
-You can create workflows using [Ibexa Connect](https://doc.ibexa.co/projects/connect/en/latest/general/ibexa_connect/).
+You can create workflows using [[[= product_name_connect =]]](https://doc.ibexa.co/projects/connect/en/latest/general/ibexa_connect/).
 [[= product_name_engage =]] collects user data and passes it directly to [[= product_name_connect =]].
 With this data, you can create scenarios, for example, to add a user to newsletter, or to specific user segment group.
 
-For more information, see [Ibexa Connect documentation](https://doc.ibexa.co/projects/connect/en/latest/).
+For more information, see [[[= product_name_connect =]] documentation](https://doc.ibexa.co/projects/connect/en/latest/).
 
 ## Integrate [[= product_name_engage =]] with [[= product_name_connect =]]
 
diff --git a/docs/ibexa_products/editions.md b/docs/ibexa_products/editions.md
index f23b56d9a7..3ab8f47700 100644
--- a/docs/ibexa_products/editions.md
+++ b/docs/ibexa_products/editions.md
@@ -45,7 +45,7 @@ Compare all features available in [[= product_name_headless =]], [[= product_nam
 | [Customer Portal](customer_portal_guide.md) |  | &#10004; | &#10004; |
 | [Segments](segments_admin_panel.md) |  | &#10004; | &#10004; |
 | [Recent activity](recent_activity.md) |  | &#10004; | &#10004; |
-| [Ibexa Engage add-on]([[= user_doc =]]/ibexa_engage/ibexa_engage/) |  | &#10004; | &#10004; |
+| [[[= product_name_engage =]] add-on]([[= user_doc =]]/ibexa_engage/ibexa_engage/) |  | &#10004; | &#10004; |
 | [Customer Data Platform (CDP) add-on](cdp_guide.md) |  | &#10004; | &#10004; |
 | [Order management](order_management.md) |  |  | &#10004; |
 | [Payment management](payment.md) |  |  | &#10004; |
diff --git a/docs/ibexa_products/ibexa_commerce.md b/docs/ibexa_products/ibexa_commerce.md
index af76988d45..9970b8efec 100644
--- a/docs/ibexa_products/ibexa_commerce.md
+++ b/docs/ibexa_products/ibexa_commerce.md
@@ -20,6 +20,7 @@ You can completely revamp your online stores and give your consumers exceptional
 ## Availability
 
 To start using [[= product_name_com =]], you need to purchase a product license.
+
 For more information, see [[[= product_name_com =]] license pricing](https://www.ibexa.co/products/pricing?tab=3).
 You can also [contact us](https://www.ibexa.co/about-ibexa/contact-us) or [one of our partners](https://www.ibexa.co/partners).
 
@@ -32,7 +33,7 @@ With an active license, you can start the [installation process](install_ibexa_d
 [[= product_name_com =]] is based on [Symfony]([[= symfony_doc =]]).
 With a help of documentation and trainings, any developer familiar with Symfony or even PHP alone can learn how to use available extension points and extend the platform.
 
-Version control systems and environment variables allow you to deploy your extensions and settings on several environments, such as [Ibexa Cloud](ibexa_cloud_guide.md).
+Version control systems and environment variables allow you to deploy your extensions and settings on several environments, such as [[[= product_name_cloud =]]](ibexa_cloud_guide.md).
 
 [[= product_name_com =]] is built on [[[= product_name_exp =]]](ibexa_experience.md) and includes all bundles, APIs, and features that come with both [Headless](ibexa_headless.md#core-features) and [Experience](ibexa_experience.md#core-features) editions.
 
diff --git a/docs/ibexa_products/ibexa_experience.md b/docs/ibexa_products/ibexa_experience.md
index 321ec21b00..d87d502eb4 100644
--- a/docs/ibexa_products/ibexa_experience.md
+++ b/docs/ibexa_products/ibexa_experience.md
@@ -18,6 +18,7 @@ It also provides tools for using segmentation and targeting, and it can be widel
 ## Availability
 
 To start using [[= product_name_exp =]], you need to purchase a product license.
+
 For more information, see [[[= product_name_exp =]] license pricing](https://www.ibexa.co/products/pricing?tab=2).
 You can also [contact us](https://www.ibexa.co/about-ibexa/contact-us) or [one of our partners](https://www.ibexa.co/partners).
 
@@ -32,7 +33,7 @@ With a help of documentation and trainings, any developer familiar with Symfony
 
 [[= product_name_exp =]] is built on top of [[[= product_name_headless =]]](ibexa_headless.md), therefore it includes all bundles, APIs, and [features that come with Headless edition](ibexa_headless.md#core-features), but also more advanced features for digital experience management.
 
-Version control systems and environment variables allow you to deploy your projects and settings on several environments, such as Ibexa Cloud.
+Version control systems and environment variables allow you to deploy your projects and settings on several environments, such as [[= product_name_cloud =]].
 
 ## Capabilities and benefits
 
@@ -102,7 +103,7 @@ You can assign users to different recommendation groups and create advanced logi
 
 #### Customer Data Platform (CDP)
 
-[Ibexa CDP](cdp_guide.md) is an add-on available for both Experience and [Commerce](ibexa_commerce.md) editions of [[= product_name =]].
+[[[= product_name_cdp =]]](cdp_guide.md) is an add-on available for both Experience and [Commerce](ibexa_commerce.md) editions of [[= product_name =]].
 To use it, you must make arrangements with [[= product_name_base =]] to define the initial configuration.
 Once you activate [[= product_name_cdp =]], you can create complete customer profiles, including their interactions, behavior, and preferences.
 It helps you improve user engagement, conversion rates, and return on investment by segmenting your audience and delivering tailored campaigns and experiences.
@@ -112,11 +113,11 @@ This central data storage supports business growth with a scalable infrastructur
 
 ![CDP](cdp.png)
 
-#### Ibexa Engage
+#### [[= product_name_engage =]]
 
-Another add-on available for Experience and [Commerce](ibexa_commerce.md) edition is [Ibexa Engage](ibexa_engage.md).
+Another add-on available for Experience and [Commerce](ibexa_commerce.md) edition is [[[= product_name_engage =]]](ibexa_engage.md).
 To use it, you must make arrangements with [[= product_name_base =]] to define the initial configuration, and then get and set up a user account.
-Ibexa Engage is a data collection tool.
+[[= product_name_engage =]] is a data collection tool.
 It gives you the ability to use the [Qualifio](https://qualifio.com/) tools to engage your audiences. You can use Qualifio's existing templates and interactive elements, such as quizzes, pools, and forms, to create visually appealing, customized campaigns and collect important data.
 To promote your campaign, you can add a Campaign block to a page in Page Builder or embed a campaign within the Rich Text field by using a Campaign custom tag.
 
diff --git a/docs/ibexa_products/ibexa_headless.md b/docs/ibexa_products/ibexa_headless.md
index 18a6aaeb18..eecedaa13d 100644
--- a/docs/ibexa_products/ibexa_headless.md
+++ b/docs/ibexa_products/ibexa_headless.md
@@ -18,6 +18,7 @@ It's provided without a default front office, but with a complete back office an
 ## Availability
 
 To start using [[= product_name_headless =]] you must purchase a product license.
+
 For more information, see [[[= product_name_headless =]] license pricing](https://www.ibexa.co/products/pricing?tab=1).
 You can [contact us](https://www.ibexa.co/about-ibexa/contact-us) or [contact one of our partners](https://www.ibexa.co/partners).
 
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
index b94931dabb..6ea9ddbc7e 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
@@ -368,7 +368,7 @@ that .vcl code for Varnish V6.x doesn't likely work as-is on Fastly.
 This section describes to how to debug problems related to HTTP cache. 
 	You must be able to look both at responses and headers [[= product_name =]] sends to HTTP cache, and not so much at responses and headers
 	the HTTP cache sends to the client (web browser).
-	It means you must be able to send requests to your origin (web server) that do not go through Varnish or Fastly.
+	It means you must be able to send requests to your origin (web server) that don't go through Varnish or Fastly.
 	If you run Nginx and Varnish on premise, you should know what host and port number both Varnish and Nginx runs on.
   If you perform tests on Fastly enabled environment on [[= product_name_cloud =]] provided by Platform.sh, you need to use the Platform.sh
 	dashboard to obtain the endpoint for Nginx.
@@ -405,7 +405,7 @@ Typically, you can add a `gw` to the hostname and use nslookup to find it.
    Address:  1.2.3.4
 ```
 
-You can also use the [Ibexa Cloud CLI](https://cli.ibexa.co/) (which has the same command as the Platform.sh CLI) to find [the endpoint](https://docs.platform.sh/domains/steps/dns.html):
+You can also use the [[[= product_name_cloud =]] CLI](https://cli.ibexa.co/) (which has the same command as the Platform.sh CLI) to find [the endpoint](https://docs.platform.sh/domains/steps/dns.html):
 
 ```bash
     ibexa_cloud environment:info edge_hostname
@@ -602,4 +602,4 @@ The `Set-Cookie` here may cause the problem. A ESI fragment should never set a c
 
 - It means that it's not recommended to always initiate a session when loading the front page.
 
-You must ensure that you do not unintendedly start a session in a controller used by ESIs, for example, when trying to access as session variable before a session has been initiated yet.
+You must ensure that you don't unintendedly start a session in a controller used by ESIs, for example, when trying to access as session variable before a session has been initiated yet.
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md b/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md
index 846f01ecb0..b08114a87f 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md
@@ -7,23 +7,23 @@ description: Configure Fastly for use with Ibexa DXP.
 You can configure Fastly by using API calls or through the Fastly Web Interface. 
 Fastly provides a [Fastly CLI](https://developer.fastly.com/reference/cli/) for configuring Fastly through its API.
 
-Ibexa Cloud is delivered with Fastly preconfigured. 
+[[= product_name_cloud =]] is delivered with Fastly preconfigured. 
 It means that you don't have to do any changes to the Fastly configuration to make your site work. 
-The information provided here is only applicable if you want to change the default Fastly configuration on Ibexa Cloud, 
-or if you're not using Ibexa Cloud and want to configure Fastly to work with [[= product_name =]] on premise.
+The information provided here is only applicable if you want to change the default Fastly configuration on [[= product_name_cloud =]], 
+or if you're not using [[= product_name_cloud =]] and want to configure Fastly to work with [[= product_name =]] on premise.
 
-!!! note "The Fastly Web Interface isn't available for Ibexa Cloud"
-    It's recommend for Ibexa Cloud customers to use the Fastly CLI instead of using the Fastly API directly with `curl`, and so on.
+!!! note "The Fastly Web Interface isn't available for [[= product_name_cloud =]]"
+    It's recommend for [[= product_name_cloud =]] customers to use the Fastly CLI instead of using the Fastly API directly with `curl`, and so on.
 
 !!! note "Disable Varnish when you use Fastly"
-    Varnish is automatically provisioned on Ibexa Cloud. Varnish needs to be disabled on all environments that use
+    Varnish is automatically provisioned on [[= product_name_cloud =]]. Varnish needs to be disabled on all environments that use
     Fastly. See [documentation on how to do that](https://docs.platform.sh/guides/ibexa/fastly.html).
 
 ## Prepare for using Fastly locally
 
-These steps aren't needed when you use Ibexa Cloud, because Fastly is preconfigured in it.
+These steps aren't needed when you use [[= product_name_cloud =]], because Fastly is preconfigured in it.
 
-### Get Fastly credentials from Ibexa Cloud installation
+### Get Fastly credentials from [[= product_name_cloud =]] installation
 
 To use Fastly CLI or Fastly API directly, you need to obtain the credentials for your site.
 To obtain the credentials, connect to your Fastly-enabled environment (for example, production or staging) through SSH and run the following command:
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md b/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
index 964c68b7d6..e0d3df381f 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
@@ -314,7 +314,7 @@ the following happens when a page has been soft purged:
 
 - Next request hitting the cache triggers an asynchronous lookup to the back end.
 - If cache is still within grace period, first and subsequent requests for the content are served from cache,
-and do not wait for the asynchronous lookup to finish.
+and don't wait for the asynchronous lookup to finish.
 - The back-end lookup finishes and refreshes the cache so any subsequent requests get a fresh cache.
 
 By default, [[= product_name =]] always soft purges content on reverse proxies that support it (Varnish and Fastly),
diff --git a/docs/infrastructure_and_maintenance/cache/persistence_cache.md b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
index 0a8b7a210d..73e7a66843 100644
--- a/docs/infrastructure_and_maintenance/cache/persistence_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
@@ -160,7 +160,7 @@ Out of the box in `config/packages/cache_pool/cache.redis.yaml` you'll find a de
 
 !!! note "[[= product_name_cloud =]]"
 
-    For Ibexa Cloud/Platform.sh: This is automatically configured in `vendor/ibexa/core/src/bundle/Core/DependencyInjection/IbexaCoreExtension.php` if you have enabled Redis as `rediscache` Platform.sh service.
+    For [[= product_name_cloud =]]/Platform.sh: This is automatically configured in `vendor/ibexa/core/src/bundle/Core/DependencyInjection/IbexaCoreExtension.php` if you have enabled Redis as `rediscache` Platform.sh service.
 
 For anything else, you can enable it with environment variables.
 For instance, if you set the following environment variables `export CACHE_POOL="cache.redis" CACHE_DSN="secret@example.com:1234/13"`, it results in config like this:
diff --git a/docs/infrastructure_and_maintenance/clustering/clustering_with_ddev.md b/docs/infrastructure_and_maintenance/clustering/clustering_with_ddev.md
index bf2c88e792..a5386e78e0 100644
--- a/docs/infrastructure_and_maintenance/clustering/clustering_with_ddev.md
+++ b/docs/infrastructure_and_maintenance/clustering/clustering_with_ddev.md
@@ -6,7 +6,7 @@ description: Use DDEV to run a cluster infrastructure locally.
 
 !!! caution
 
-    Do not use this procedure in production.
+    Don't use this procedure in production.
     A staging environment for validation before production should exactly replicate the production environment.
     This is meant for development environment only.
 
@@ -25,7 +25,7 @@ The `ddev config --php-version` option should set the same PHP version as the pr
 
    Discover more commands in [DDEV documentation](https://ddev.readthedocs.io/en/latest/users/usage/commands/).
 
-To run an [[= product_name_cloud =]] project locally, you may refer to [DDEV and Ibexa Cloud](ddev_and_ibexa_cloud.md) instead.
+To run an [[= product_name_cloud =]] project locally, you may refer to [DDEV and [[= product_name_cloud =]]](ddev_and_ibexa_cloud.md) instead.
 
 ## Install search engine
 
@@ -54,7 +54,7 @@ You can now check whether Elasticsearch works.
 
 For example, the `ddev exec curl -s "http://elasticsearch:9200/_count"` command checks whether the `web` server can access the `elasticsearch` server and displays the number of indexed documents.
 
-See [ddev/ddev-elasticsearch README](https://github.com/ddev/ddev-elasticsearch) for more information on topics such as memory management.
+For more information on topics such as memory management, see [ddev/ddev-elasticsearch README](https://github.com/ddev/ddev-elasticsearch).
 
 See [Elasticsearch REST API reference](https://www.elastic.co/guide/en/elasticsearch/reference/current/rest-apis.html) for more request options, like, for example:
 
diff --git a/docs/infrastructure_and_maintenance/devops.md b/docs/infrastructure_and_maintenance/devops.md
index d4696e4f1e..e06d59a85b 100644
--- a/docs/infrastructure_and_maintenance/devops.md
+++ b/docs/infrastructure_and_maintenance/devops.md
@@ -16,7 +16,7 @@ php bin/console --env=prod cache:clear -h
 
 !!! note
 
-    If you do not specify an environment, by default `cache:clear` clears the cache for the `dev` environment. If you want to clear it for `prod` you need to use the `--env=prod` option.
+    If you don't specify an environment, by default `cache:clear` clears the cache for the `dev` environment. If you want to clear it for `prod` you need to use the `--env=prod` option.
 
 !!! caution "Clustering"
 
diff --git a/docs/infrastructure_and_maintenance/security/reporting_issues.md b/docs/infrastructure_and_maintenance/security/reporting_issues.md
index bb66751cbd..e20407e329 100644
--- a/docs/infrastructure_and_maintenance/security/reporting_issues.md
+++ b/docs/infrastructure_and_maintenance/security/reporting_issues.md
@@ -4,15 +4,16 @@ description: Learn how to report security issues in Ibexa DXP.
 
 # Reporting security issues in Ibexa products
 
-The security of our software is a primary concern and we take it seriously.
-For more information on security in our products, see [Ibexa Security Policy](https://www.ibexa.co/software-information/security).
+The security of [[= product_name_base =]] software is a primary concern and we take it seriously.
+
+For more information on security in [[= product_name_base =]] products, see [Ibexa Security Policy](https://www.ibexa.co/software-information/security).
 
 No engineering team is perfect though, and if you do discover a security issue in one of our products we are very grateful for your help in reporting it to us privately, and refraining from public disclosure until we have found the solution and distributed it. Thank you!
 
 ## Channels
 
-- If you're a customer or partner, please log in to your Service Portal at <https://support.ibexa.co/>, click "New Ticket", and report the issue as you would report a normal support request. Ibexa Product Support responds, takes care of the report, and keeps you informed of the developments.
-- If you're not a customer or partner, please log in to the Ibexa JIRA issue tracker: <https://issues.ibexa.co/>. Create an account if you don't have one, it's free. Click the "Create" button in the top menu to create your report. For "Project", select "Ibexa IBX", or "eZ Publish / Platform", or "eZ Platform Enterprise Edition", depending on which product is affected by the bug. **Important: Select "Security Level": "Security"!** The engineering team takes care of your report.
+- If you're a customer or partner, please log in to your Service Portal at <https://support.ibexa.co/>, click "New Ticket", and report the issue as you would report a normal support request. [[= product_name_base =]] Product Support responds, takes care of the report, and keeps you informed of the developments.
+- If you're not a customer or partner, please log in to the [[= product_name_base =]] JIRA issue tracker: <https://issues.ibexa.co/>. Create an account if you don't have one, it's free. Click the "Create" button in the top menu to create your report. For "Project", select "[[= product_name_base =]] IBX", or "eZ Publish / Platform", or "eZ Platform Enterprise Edition", depending on which product is affected by the bug. **Important: Select "Security Level": "Security"!** The engineering team takes care of your report.
 - It's also possible to report security issues by email to <security@ibexa.co> - this requires no account.
 
 ## Verbosity
diff --git a/docs/infrastructure_and_maintenance/security/security_checklist.md b/docs/infrastructure_and_maintenance/security/security_checklist.md
index 443fc5a0f5..6b9f0eb604 100644
--- a/docs/infrastructure_and_maintenance/security/security_checklist.md
+++ b/docs/infrastructure_and_maintenance/security/security_checklist.md
@@ -19,8 +19,8 @@ make sure that your setup is secure.
 
 `APP_SECRET` needs to be a strong, random, securely stored value.
 
-- Do not use a default value like `ff6dc61a329dc96652bb092ec58981f7` or `ThisTokenIsNotSoSecretChangeIt`.
-- The secret must be secured against unwanted access. Do not commit the value to a version control system.
+- Don't use a default value like `ff6dc61a329dc96652bb092ec58981f7` or `ThisTokenIsNotSoSecretChangeIt`.
+- The secret must be secured against unwanted access. Don't commit the value to a version control system.
 - The secret must be long enough. 32 characters is minimum, longer is better.
 
 !!! tip
@@ -36,15 +36,10 @@ make sure that your setup is secure.
 ### Symfony production mode
 
 Only expose Symfony production mode openly on the internet.
-Do not expose the dev mode on the internet, otherwise you may disclose things like `phpinfo` and environment variables.
+Don't expose the dev mode on the internet, otherwise you may disclose things like `phpinfo` and environment variables.
 Exposing the dev mode exposes things like `phpinfo`, environment variables and so on.
 
-!!! tip "More information about Symfony security"
-
-    For more information about securing Symfony-based systems, see:
-    
-    - [Authentication and authorisation]([[= symfony_doc =]]/security.html), and [more on this subject]([[= symfony_doc =]]/security.html#learn-more)
-    - Symfony's [secrets management system]([[= symfony_doc =]]/configuration/secrets.html)
+For more information about securing Symfony-based systems, see [Authentication and authorisation]([[= symfony_doc =]]/security.html), [more on this subject]([[= symfony_doc =]]/security.html#learn-more), and Symfony's [secrets management system]([[= symfony_doc =]]/configuration/secrets.html).
 
 ## PHP
 
@@ -52,7 +47,7 @@ Exposing the dev mode exposes things like `phpinfo`, environment variables and s
 
 PHP 7.4 introduced the `zend.exception_ignore_args` setting in `php.ini`.
 The default value is 0 (disabled) for backwards compatibility.
-On production sites this should be set to 1 (enabled), to ensure stack traces do not include arguments passed to functions.
+On production sites this should be set to 1 (enabled), to ensure stack traces don't include arguments passed to functions.
 Such arguments could include passwords or other sensitive information.
 You should also make sure no stack trace is ever visible to end users of production sites,
 though visible arguments are unsafe even if the stack traces only show up in log files.
@@ -94,7 +89,7 @@ This is specially important for admin accounts and other privileged users.
 
 - Never go online with admin password set to `publish` or any other default value.
 - Introduce password quality checks. Make sure the checks are strict enough (length/complexity).
-- 16 characters is a quite secure minimum length. Do not go below 10.
+- 16 characters is a quite secure minimum length. Don't go below 10.
 - If using [[= product_name =]] v4.5 or newer, enable the password rule that rejects any password which has been exposed in a public breach.
 
 !!! tip "Password rules"
@@ -173,7 +168,7 @@ Use the following checklist to ensure the roles and policies are secure:
 - Is there a clear role separation between the organisation's internal and external users?
 - Is access to user data properly restricted, in accordance with GDPR?
 
-### Do not use "hide" for read access restriction
+### Don't use "hide" for read access restriction
 
 The [visibility switcher](https://doc.ibexa.co/en/latest/content_management/locations/#location-visibility) is a convenient feature for withdrawing content from the frontend.
 It acts as a filter in the frontend by default. You can choose to respect it or ignore it in your code.
@@ -191,7 +186,7 @@ Security should be a multi-layered exercise. It's wise to minimize what features
 
 - If possible, make the back office unavailable on the open internet.
 - [Symfony FOSJsRoutingBundle](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle) is required in those releases where it's included, to expose routes to JavaScript. It exposes only the required routes, nothing more. It's only required in the back office SiteAccess though, so you can consider blocking it in other SiteAccesses. You should also go through your own custom routes, and decide for each if you need to expose them or not. See the documentation on [YAML route definitions for exposure](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle/blob/master/Resources/doc/usage.rst#generating-uris).
-- By default, a [Powered-By header](https://doc.ibexa.co/en/latest/update_and_migration/from_1.x_2.x/update_db_to_2.5/#powered-by-header) is set. It specifies what version of the DXP is running. For example, `x-powered-by: Ibexa Experience v4`. This doesn't expose anything that couldn't be detected through other means. But if you wish to obscure this, you can either omit the version number, or disable the header entirely.
+- By default, a [Powered-By header](https://doc.ibexa.co/en/latest/update_and_migration/from_1.x_2.x/update_db_to_2.5/#powered-by-header) is set. It specifies what version of the DXP is running. For example, `x-powered-by: [[= product_name_exp =]] v4`. This doesn't expose anything that couldn't be detected through other means. But if you wish to obscure this, you can either omit the version number, or disable the header entirely.
 - Consider whether certain interfaces must be left available on the open internet. For example:
     - The `/search` and `/graphql` endpoints
     - The REST API endpoints
diff --git a/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md b/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md
index 687e929b05..e1f3bce162 100644
--- a/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md
+++ b/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md
@@ -35,7 +35,7 @@ The language of the back office is based on the browser language.
 To change it you should install the proper package for your language (see [language packages list](https://github.com/ezplatform-i18n)).
 Once you have language packages installed, you can switch the language of the back office in the User Settings menu.
 
-If you do not have a language defined in the browser, it's selected based on the `parameters.locale_fallback` parameter located in `config/packages/ibexa.yaml`.
+If you don't have a language defined in the browser, it's selected based on the `parameters.locale_fallback` parameter located in `config/packages/ibexa.yaml`.
 
 To read more about language managing in [[= product_name =]], see the following doc pages:
 
diff --git a/docs/multisite/languages/back_office_translations.md b/docs/multisite/languages/back_office_translations.md
index 7a829e1819..438988bed3 100644
--- a/docs/multisite/languages/back_office_translations.md
+++ b/docs/multisite/languages/back_office_translations.md
@@ -42,7 +42,7 @@ Once you have language packages enabled, you can switch the language of the back
 in the User Settings menu.
 
 Otherwise, the language is selected based on the browser language.
-If you do not have a language defined in the browser, the language is selected
+If you don't have a language defined in the browser, the language is selected
 based on `parameters.locale_fallback` in `config/packages/ibexa.yaml`.
 
 ## Custom string translations
diff --git a/docs/multisite/languages/languages.md b/docs/multisite/languages/languages.md
index 8a43b2ad67..1377b1d753 100644
--- a/docs/multisite/languages/languages.md
+++ b/docs/multisite/languages/languages.md
@@ -40,7 +40,9 @@ For example, let's say that you need to store information about marathon contest
 
 ### Access control
 
-You can control whether a user or user group is able to translate content or not. You do this by adding a [Language limitation](limitation_reference.md#language-limitation) to policies that allow creating or editing content. This limitation enables you to define which role can work with which languages in the system. (For more information of the permissions system, see [Permissions](permissions.md).)
+You can control whether a user or user group is able to translate content or not. You do this by adding a [Language limitation](limitation_reference.md#language-limitation) to policies that allow creating or editing content. This limitation enables you to define which role can work with which languages in the system.
+
+For more information of the permissions system, see [Permissions](permissions.md).
 
 In addition, you can also control the access to the global translation list by using the Content/Translations policy. This policy allows users to add and remove languages from the global translation list.
 
@@ -178,6 +180,6 @@ If the `translation_siteaccesses` setting isn't provided, implicit *related S
 
 When setting up SiteAccesses with different language versions, you can specify a list of preset languages for each SiteAccess. When this SiteAccess is used, the system goes through this list. If a content item is unavailable in the first (prioritized) language, it attempts to use the next language in the list, and so on. Thanks to this you can have a fallback in case of a lacking translation.
 
-You can also assign a Default content availability flag to content types (available in the **Admin** panel). When this flag is assigned, content items of this type are available even when they do not have a language version in any of the languages configured for the current SiteAccess.
+You can also assign a Default content availability flag to content types (available in the **Admin** panel). When this flag is assigned, content items of this type are available even when they don't have a language version in any of the languages configured for the current SiteAccess.
 
 If a language isn't provided in the list of prioritized languages and it's not the content item's first language, the URL alias for this content in this language isn't generated.
diff --git a/docs/multisite/multisite_configuration.md b/docs/multisite/multisite_configuration.md
index 1d64126d26..24c16f7359 100644
--- a/docs/multisite/multisite_configuration.md
+++ b/docs/multisite/multisite_configuration.md
@@ -39,7 +39,7 @@ A SiteAccess can be part of several groups. SiteAccess configuration has always
 #### `admin` SiteAccess
 
 The predefined `admin` SiteAccess in `admin_group` (configured in `config/packages/ibexa_admin_ui.yaml`) serves the back office.
-Do not remove this group.
+Don't remove this group.
 If you need a multisite setup with multiple back offices, add any additional administration SiteAccesses to `admin_group`.
 
 In cases where the sites are on separate databases, each needs its own [repository](repository_configuration.md)
@@ -64,7 +64,8 @@ ibexa:
 ### SiteAccess matching
 
 The `match` setting defines the rule or set of rules by which SiteAccesses are matched.
-See [SiteAccess matching](siteaccess_matching.md) for more information.
+
+For more information, see [SiteAccess matching](siteaccess_matching.md).
 
 ``` yaml
 ibexa:
@@ -171,7 +172,7 @@ ibexa:
 
 #### SiteAccess switching in Page Builder
 
-If you need to change between SiteAccesses in Site mode, do not use any functions in the page itself (for example, a language switcher).
+If you need to change between SiteAccesses in Site mode, don't use any functions in the page itself (for example, a language switcher).
 This may cause unexpected errors. Instead, switch between SiteAccesses using the SiteAccess bar above the page.
 
 ## Location tree
diff --git a/docs/multisite/site_factory/site_factory.md b/docs/multisite/site_factory/site_factory.md
index 52a034bd5e..470b586786 100644
--- a/docs/multisite/site_factory/site_factory.md
+++ b/docs/multisite/site_factory/site_factory.md
@@ -168,7 +168,7 @@ ibexa:
                 sites_location_id: 42
 ```
 
-Now, all new directories are created under "Ibexa DXP".
+Now, all new directories are created under "[[= product_name =]]".
 
 ### Provide access
 
@@ -184,7 +184,7 @@ Set the below policies to allow users to:
 
 For full documentation on how permissions work and how to set them up, see [the permissions section](permissions.md).
 
-To learn how to use Site Factory, see [User documentation]([[= user_doc =]]/site_organization/site_factory/).
+To learn how to use Site Factory, see [User Documentation]([[= user_doc =]]/site_organization/site_factory/).
 
 ## Disable Site Factory
 
diff --git a/docs/multisite/site_factory/site_factory_configuration.md b/docs/multisite/site_factory/site_factory_configuration.md
index d78a48ee13..0dadf77586 100644
--- a/docs/multisite/site_factory/site_factory_configuration.md
+++ b/docs/multisite/site_factory/site_factory_configuration.md
@@ -89,7 +89,7 @@ ibexa_site_factory:
 ```
 
 Manage the permissions associated to the user group skeleton by [assigning roles](https://doc.ibexa.co/projects/userguide/en/latest/site_organization/organizing_the_site/#managing-permissions).
-Make sure that the roles that you assign to the user group skeleton do not contain Location-based limitations. 
+Make sure that the roles that you assign to the user group skeleton don't contain Location-based limitations. 
 User group skeletons cannot contain individual user content items either.
 
 User group skeletons are retained after deleting the site.
@@ -110,4 +110,4 @@ ibexa_site_factory:
     update_roles: [Anonymous, Administrator]
 ```
 
-For more information about roles and policies, see [Permissions](permissions.md). 
+For more information about roles and policies, see [Permissions](permissions.md).
diff --git a/docs/multisite/siteaccess/siteaccess_aware_configuration.md b/docs/multisite/siteaccess/siteaccess_aware_configuration.md
index d61993c81d..533dd875fb 100644
--- a/docs/multisite/siteaccess/siteaccess_aware_configuration.md
+++ b/docs/multisite/siteaccess/siteaccess_aware_configuration.md
@@ -170,7 +170,7 @@ parameters:
 
 #### Merging hash values between scopes
 
-When you define a hash as semantic config, you sometimes do not want the SiteAccess settings to replace the default or group values,
+When you define a hash as semantic config, you sometimes don't want the SiteAccess settings to replace the default or group values,
 but enrich them by appending new entries. This is possible by using `$processor->mapConfigArray()`,
 which you must call outside the closure (before or after), so that it's called only once.
 
@@ -259,7 +259,7 @@ that ensures the array setting has unique values. It only works on normal arrays
 Instead of passing a callable to `$processor->mapConfig()`, you can pass an instance of
 `Ibexa\Bundle\Core\DependencyInjection\Configuration\SiteAccessAware\ConfigurationMapperInterface`.
 
-This can be useful if you have a lot of configuration to map and do not want to pollute 
+This can be useful if you have a lot of configuration to map and don't want to pollute 
 your service container extension class (it's better for maintenance).
 
 #### Merging hash values between scopes
diff --git a/docs/multisite/siteaccess/siteaccess_matching.md b/docs/multisite/siteaccess/siteaccess_matching.md
index bd324a2f83..cee515cb6b 100644
--- a/docs/multisite/siteaccess/siteaccess_matching.md
+++ b/docs/multisite/siteaccess/siteaccess_matching.md
@@ -294,7 +294,7 @@ You can define this environment variable directly in web server configuration:
 !!! tip
 
     You can configure the variable by using the PHP-FPM configuration file.
-    See [PHP-FPM documentation](https://www.php.net/manual/en/install.fpm.configuration.php#example-25) for more information.
+    For more information, see [PHP-FPM documentation](https://www.php.net/manual/en/install.fpm.configuration.php#example-25).
 
 !!! note "Precedence"
 
diff --git a/docs/permissions/limitation_reference.md b/docs/permissions/limitation_reference.md
index 3e690e3521..36aec10ae9 100644
--- a/docs/permissions/limitation_reference.md
+++ b/docs/permissions/limitation_reference.md
@@ -334,13 +334,11 @@ This limitation can be used as a role limitation.
 
 ### Usage notes
 
-For more information on how to restrict user's access to part of the Subtree 
-follow [the example in the Admin management section](permission_use_cases.md#restrict-editing-to-part-of-the-tree).
+For more information on how to restrict user's access to part of the Subtree, see [the example in the Admin management section](permission_use_cases.md#restrict-editing-to-part-of-the-tree).
 
 ## Version Lock limitation
 
-The Version Lock (`VersionLock`) limitation specifies whether the user can perform actions, for example, edit 
-or unlock, on content items that are in a workflow.
+The Version Lock (`VersionLock`) limitation specifies whether the user can perform actions, for example, edit or unlock, on content items that are in a workflow.
 
 This limitation can be used as a role limitation.
 
diff --git a/docs/permissions/permission_use_cases.md b/docs/permissions/permission_use_cases.md
index 363c92df5d..44f1072da4 100644
--- a/docs/permissions/permission_use_cases.md
+++ b/docs/permissions/permission_use_cases.md
@@ -60,7 +60,7 @@ Further manipulation of Trash requires the `content/restore` policy to restore i
 
 !!! caution
 
-    With the `content/cleantrash` policy, the User can empty the Trash even if they do not have access to the trashed content,
+    With the `content/cleantrash` policy, the User can empty the Trash even if they don't have access to the trashed content,
     for example, because it belonged to a Section that the User does not have permissions for.
 
 ## Restrict editing to part of the tree
diff --git a/docs/personalization/api_reference/content_api.md b/docs/personalization/api_reference/content_api.md
index 096116eac5..5e61f89e60 100644
--- a/docs/personalization/api_reference/content_api.md
+++ b/docs/personalization/api_reference/content_api.md
@@ -139,7 +139,7 @@ To check how many digits the fractional unit of a currency has, see the [ISO 421
 
 Items with defined validity are recommended only in the specified timeframe. 
 Values in the `validto` and `validfrom` attributes must follow the [XSD format](https://www.w3.org/TR/xmlschema-2/#dateTime) 
-and do not include the time zone. 
+and don't include the time zone. 
 Time zone is always your time zone.
 
 ##### Category path
diff --git a/docs/personalization/api_reference/recommendation_api.md b/docs/personalization/api_reference/recommendation_api.md
index f470aec773..809cfc1c61 100644
--- a/docs/personalization/api_reference/recommendation_api.md
+++ b/docs/personalization/api_reference/recommendation_api.md
@@ -9,8 +9,7 @@ that rely on the HTTP GET method.
 The result can a list of item IDs that can then be used to call the underlying 
 CMS or shop system and postload the necessary information for the rendering process.
 
-For more information about Personalization, see [Introduction](personalization.md), 
-[Basic integration](recommendation_integration.md).
+For more information about Personalization, see [Introduction](personalization.md) and [Basic integration](recommendation_integration.md).
 
 !!! note "Authentication"
 
@@ -69,9 +68,8 @@ You can use the following parameters to customize a request:
 
 ##### Submodel parameters
 
-If your recommendation model uses submodels to group content items/products based 
-on an attribute, you can pass the following parameters to request recommendations 
-for a specific group. 
+If your recommendation model uses submodels to group content items/products based on an attribute, you can pass the following parameters to request recommendations for a specific group.
+
 For more information, see [Submodels]([[= user_doc =]]/personalization/recommendation_models/#submodels).
 
 |Parameter|Example|Description|Value|
@@ -105,6 +103,7 @@ items and an array of recommendation objects in JSON or JSONP format.
 The result can be integrated into any webpage on the client side by using script code. 
 To track user actions like "clickrecommended" and "rendered", use the links 
 delivered in the response.
+
 For more information, see inline comments below.
 
 !!! note "Previewing recommendations"
@@ -113,8 +112,7 @@ For more information, see inline comments below.
     and how they're rendered in the user interface.
     For more information, see [Previewing scenario results]([[= user_doc =]]/personalization/previewing_scenario).
     
-For more information about integrating recommendations in the web page, 
-see [Best practices](recommendation_integration.md).
+For more information about integrating recommendations in the web page, see [Best practices](recommendation_integration.md).
 
 ### Response object format
 
diff --git a/docs/personalization/api_reference/tracking_api.md b/docs/personalization/api_reference/tracking_api.md
index 5d2b86cc52..a97612ebb5 100644
--- a/docs/personalization/api_reference/tracking_api.md
+++ b/docs/personalization/api_reference/tracking_api.md
@@ -14,16 +14,18 @@ The most popular user events are:
 - Login - When a user logs in on a website
 - Clickrecommended - When a user clicks a recommendation
 
-For a complete list of events, see [Event types]([[= user_doc =]]/personalization/event_types) in the user documentation. 
+For a complete list of events, see [Event types]([[= user_doc =]]/personalization/event_types) in User Documentation. 
 Depending on the event type, some additional parameters, such as item price
 or user rating, must be provided.
 
 Importing historical user data can help you reduce the delay in delivery of high
 quality recommendations.
+
 For more information, see [Importing historical user tracking data](importing_historical_user_tracking_data.md).
 
 Apart from the tracking API, you can add tracking to the website by integrating
 a JavaScript library.
+
 For more information, see [Tracking with ibexa-tracker.js](tracking_with_ibexa-tracker.md).
 
 ## Definitions
@@ -127,7 +129,7 @@ In the case of bestsellers, this could lead to the appearance of a shirt
 in size L on position 2 and the same shirt in size M on position 4.
 
 Customer B decides to use the UPC as item identifiers.
-This results in recommendations that do not contain variations of the currently shown item.
+This results in recommendations that don't contain variations of the currently shown item.
 Therefore, the detail page of shirt X does not contain a recommendation
 for the same shirt in a different size.
 And the same shirt does not show up twice on a list of bestseller recommendations.
@@ -174,8 +176,7 @@ Multiple category locations of an item (multi-homing) are therefore possible.
     Events are forwarded to the Personalization server with HTTP or HTTPS requests
     (or [RESTful-Requests](https://en.wikipedia.org/wiki/Representational_state_transfer)).
     Both GET and POST methods are allowed for the event tracking.
-    Make sure that all embedded and query string parameters are URL encoded and
-    do not use a backslash, encoded as %5C\.
+    Make sure that all embedded and query string parameters are URL encoded and don't use a backslash, encoded as %5C\.
 
 ### Event parameters
 
@@ -211,7 +212,7 @@ This event has no query string parameters.
 
 ### Blacklist event
 
-If a website offers a link or button that allows feedback similar to "do not
+If a website offers a link or button that allows feedback similar to "don't
 recommend this product to me anymore", a user could express that they have bought
 it already in another shop.
 
@@ -257,6 +258,7 @@ The price must be a price the user paid for the item, including all taxes and di
 
 If product price filtering is activated, the information provided over the product
 import is used.
+
 For more information, see [Content API](content_api.md).
 
 The currency is stored with the price and normalized only when statistic information
@@ -290,7 +292,7 @@ Some optional request parameters can be set over query string parameters (GET pa
 
 |Name|Description|Values|
 |---|---|---|
-|`categorypath`|The forward slash-separated path of categories of the item. Like all other parameters it must be URL-encoded, for example `%2FCameras%26Foto%2FCompact%20Cameras%2FCanon`.</br>For use cases, see [Category path filters]([[= user_doc =]]/personalization/filters/#category-path-filters) in the user documentation.|URL-encoded string.</br>Initial and trailing slashes are ignored: "/Cameras/" is the same as "Cameras".|
+|`categorypath`|The forward slash-separated path of categories of the item. Like all other parameters it must be URL-encoded, for example `%2FCameras%26Foto%2FCompact%20Cameras%2FCanon`.</br>For use cases, see [Category path filters]([[= user_doc =]]/personalization/filters/#category-path-filters) in User Documentation.|URL-encoded string.</br>Initial and trailing slashes are ignored: "/Cameras/" is the same as "Cameras".|
 
 ### Consume event
 
diff --git a/docs/personalization/api_reference/user_api.md b/docs/personalization/api_reference/user_api.md
index d7fed95279..991d46ec42 100644
--- a/docs/personalization/api_reference/user_api.md
+++ b/docs/personalization/api_reference/user_api.md
@@ -111,6 +111,6 @@ The following attribute types are supported:
 
 - DATE - An XSD-formatted date, for example, "2014-08-07"
 - DATETIME - An XSD-formatted time without a time zone, for example, "2014-08-07T14:43:12"
-- NOMINAL - A value from a fixed length list, for example "gender" or "favorite film genre". If you do not set the attribute type, this is the default value
+- NOMINAL - A value from a fixed length list, for example "gender" or "favorite film genre". If you don't set the attribute type, this is the default value
 - NUMERIC - A decimal value, for example, "1.23" or "-2345"
 - TEXT - A longer text, usually free form
diff --git a/docs/personalization/enable_personalization.md b/docs/personalization/enable_personalization.md
index ea160bb3ad..30f948115f 100644
--- a/docs/personalization/enable_personalization.md
+++ b/docs/personalization/enable_personalization.md
@@ -52,8 +52,7 @@ the Personalization server.
 Its job is to track the way visitors use the website and recommend content 
 based on their behavior.
 
-For more information about integrating the Personalization service,
-see [Developer guide](tracking_api.md) and [Best practices](tracking_integration.md).
+For more information about integrating the Personalization service, see [Developer guide](tracking_api.md) and [Best practices](tracking_integration.md).
 
 ### Set up item type tracking
 
@@ -117,7 +116,7 @@ ibexa:
     For data exchange purposes, basic authentication is enabled by default. 
     To change this, contact support@ibexa.co.
     For security reasons, [store the authentication credentials in the ENV file](#set-up-customer-credentials), 
-    and do not commit them to the Version Control System.
+    and don't commit them to the Version Control System.
     Then, use environment variables to pull them into the YAML file.
 
 | Parameter                            | Description                                               |
diff --git a/docs/personalization/integrate_recommendation_service.md b/docs/personalization/integrate_recommendation_service.md
index 372017f63d..4b9613ffcb 100644
--- a/docs/personalization/integrate_recommendation_service.md
+++ b/docs/personalization/integrate_recommendation_service.md
@@ -218,6 +218,6 @@ You can configure integration at a more advanced level to track more events,
 use additional parameters, apply custom scenario configurations, filters,
 and enable additional features.
 
-For more information about available functionalities, see the [User Documentation]([[= user_doc =]]/personalization/personalization).
+For more information about available functionalities, see [User Documentation]([[= user_doc =]]/personalization/personalization).
 
 For more information about integrating the Personalization service, see [tracking API](tracking_api.md) and [tracking integration](tracking_integration.md) documentation.
diff --git a/docs/personalization/legacy_recommendation_api.md b/docs/personalization/legacy_recommendation_api.md
index 90f8eed750..7e7debe2a1 100644
--- a/docs/personalization/legacy_recommendation_api.md
+++ b/docs/personalization/legacy_recommendation_api.md
@@ -36,7 +36,7 @@ The result is a list of item IDs that can be used to call the underlying CMS
 or shop system, to retrieve the necessary information for the rendering process.
 
 To allow the customer to retrieve different types of recommendations based on different methods (for example, Collaborative Filtering, Content Based, Stereotype, etc.) the Recommendation System uses scenario IDs relating to a predefined set of configurations inside the system.
-These configurations are a combination of methods and filters that should be applied including possible fallbacks if the requested methods do not deliver a result.
+These configurations are a combination of methods and filters that should be applied including possible fallbacks if the requested methods don't deliver a result.
 
 A recommendation request looks like this:
 
@@ -47,7 +47,7 @@ The embedded parameters `solutionid`, `clientid` and `userid` are the same as us
 | Parameter Name | Description | Values |
 |-----|-----|------|
 | `scenarioid` | The ID of the scenario used for providing recommendations. It's configured or predefined in the Administration GUI. | alphanumeric |
-| `extension` | The format the server generates the response in. There are three formats supported: JSON, XML and JSONP. See the chapter [Response Handling](#response-handling) below for more information | json, xml or jsonp |
+| `extension` | The format the server generates the response in. There are three formats supported: JSON, XML and JSONP. For more information, see [Response Handling](#response-handling). | json, xml or jsonp |
 
 ## Basic Request Parameters
 
@@ -221,7 +221,7 @@ The last modification timestamp indicates a change that could influence the reco
 | Also consumed read articles in the last hour | current article | 30 minutes | Models with a short scope are usually built several times a day or even per hour. In this case the expiration time is set to the half of the model build frequency/period. |
 | Personalized recommendation based on the user's statistic | customers click history | now | Although the statistic model isn't updated within minutes, it's very likely that the context is changed shortly (customer clicks another product and therefore the click is added to his history). The expiration time should not be much longer than the user activity on the web page. |
 
-In most cases you do not need to calculate the expiration time manually. The table above is provided for the orientation, how the Expires header of the HTTP response is calculated by the recommendation engine and already provided to your caching system. You just need to make sure that the Expires header is used in the configuration of your caching system instead of a static value out of your configuration.
+In most cases you don't need to calculate the expiration time manually. The table above is provided for the orientation, how the Expires header of the HTTP response is calculated by the recommendation engine and already provided to your caching system. You just need to make sure that the Expires header is used in the configuration of your caching system instead of a static value out of your configuration.
 
 ## Integration best Practices
 
diff --git a/docs/personalization/personalization_guide.md b/docs/personalization/personalization_guide.md
index 30fed7bf76..5ac6746336 100644
--- a/docs/personalization/personalization_guide.md
+++ b/docs/personalization/personalization_guide.md
@@ -76,7 +76,7 @@ Use segments to get content targeted at particular user groups. Segments calcula
 
 Personalization includes interface as API that you can use to interact with stored data and to send requests and export data from the service.
 
-For more information see documentation for API operations available for Personalization:
+For more information, see documentation for API operations available for Personalization:
 
 - [Tracking API](api_reference/tracking_api.md/)
 - [Content API](api_reference/content_api.md/)
diff --git a/docs/pim/pim_guide.md b/docs/pim/pim_guide.md
index 53c5b574e6..2c952882a8 100644
--- a/docs/pim/pim_guide.md
+++ b/docs/pim/pim_guide.md
@@ -181,7 +181,7 @@ Catalogs can be created just like with the local PIM, but the criteria are limit
 
 #### Limitations
 
-The default implementation, which serves as a basis for the example remote PIM package, has some limitations: certain functionalities either do not operate or operate within defined constraints.
+The default implementation, which serves as a basis for the example remote PIM package, has some limitations: certain functionalities either don't operate or operate within defined constraints.
 Therefore, if your specific requirements aren't met, you may need to extend [[= product_name =]].
 
 ##### Editing product types, products and product attributes
@@ -203,7 +203,7 @@ Therefore, if your specific requirements aren't met, you must extend the applica
 ##### Simplified presentation of PIM-related blocks and views
 
 Enabling Remote PIM impacts a number of application views and blocks, such as Product view, Product list, Catalog and Product Collection.
-they're simplified, for example, they do not include thumbnails and other assets, or refer to URL aliases.
+they're simplified, for example, they don't include thumbnails and other assets, or refer to URL aliases.
 You can customize them by extending the default implementation.
 
 ##### Limited HTTP Caching
@@ -220,7 +220,7 @@ For this, the following configuration is required:
 - at least one price added for the product,
 - availability of the product set with positive or infinitive stock.
 
-Next, follow steps from [product management in user documentation]([[= user_doc =]]/persona_paths/manage_products/).
+Next, follow steps from [product management in User Documentation]([[= user_doc =]]/persona_paths/manage_products/).
 
 ## Benefits
 
diff --git a/docs/release_notes/ez_platform_v1.11.0.md b/docs/release_notes/ez_platform_v1.11.0.md
index b20bdef658..c1150b2962 100644
--- a/docs/release_notes/ez_platform_v1.11.0.md
+++ b/docs/release_notes/ez_platform_v1.11.0.md
@@ -42,7 +42,8 @@ It enables you to manually select a set of content items to be displayed.
 
     To enable adding content to a Collection block in a clean installation,
     you need to configure the views for the block and define which content types can be embedded in it.
-    See [block templates](https://doc.ibexa.co/en/latest/content_management/pages/page_blocks/#block-templates) for more information and an example.
+    
+    For more information and an example, see [block templates](https://doc.ibexa.co/en/latest/content_management/pages/page_blocks/#block-templates).
 
 #### RecommendationBundle adapted for YooChoose v2
 
diff --git a/docs/release_notes/ez_platform_v1.12.0.md b/docs/release_notes/ez_platform_v1.12.0.md
index 3c1bb24d1c..1b014c2be0 100644
--- a/docs/release_notes/ez_platform_v1.12.0.md
+++ b/docs/release_notes/ez_platform_v1.12.0.md
@@ -16,19 +16,20 @@ You also have new options to format your text using subscript, superscript, quot
 
 ![New text formatting options](oe-formatting-new-options.png)
 
-See [EZP-28030](https://issues.ibexa.co/browse/EZP-28030) for more information.
+For more information, see [EZP-28030](https://issues.ibexa.co/browse/EZP-28030).
 
 #### Improved full text search capabilities
 
-See [EZP-26806](https://issues.ibexa.co/browse/EZP-26806) for more information.
+For more information, see [EZP-26806](https://issues.ibexa.co/browse/EZP-26806).
 
 #### Deleting translations
 
 You can now remove translations from content item Versions through the PHP API.
 
-See the section on [deleting translations](https://doc.ibexa.co/en/latest/api/public_php_api_creating_content/#deleting-a-translation) for more information.
+For more information, see the section on [deleting translations](https://doc.ibexa.co/en/latest/api/public_php_api_creating_content/#deleting-a-translation).
 
-You also have a new endpoint available for deleting a single Version, see [EZP-27864](https://issues.ibexa.co/browse/EZP-27864) for more information.
+You also have a new endpoint available for deleting a single Version.
+For more information, see [EZP-27864](https://issues.ibexa.co/browse/EZP-27864).
 
 #### Improved Security for password storage
 
@@ -100,4 +101,4 @@ To update to this version, follow the [updating guide](https://doc.ibexa.co/en/
     This release changes the way of loading React to avoid a case where it was loaded twice and caused errors.
     Take this into consideration if you user React in your own implementation.
 
-    See [this PR](https://github.com/ezsystems/PlatformUIBundle/pull/906) for more information.
+    For more information, see [this PR](https://github.com/ezsystems/PlatformUIBundle/pull/906).
diff --git a/docs/release_notes/ez_platform_v2.1.0.md b/docs/release_notes/ez_platform_v2.1.0.md
index 29315c96ca..1f695598e0 100644
--- a/docs/release_notes/ez_platform_v2.1.0.md
+++ b/docs/release_notes/ez_platform_v2.1.0.md
@@ -16,7 +16,7 @@ You can now add custom tags to RichText fields.
 
 Custom tags enable you to extend the menu of available elements when editing a RichText field with the Online Editor.
 
-See [Custom tags](https://doc.ibexa.co/en/2.5/guide/extending/extending_online_editor/#custom-tags) for more information.
+For more information, see [Custom tags](https://doc.ibexa.co/en/2.5/guide/extending/extending_online_editor/#custom-tags).
 
 ### Object states
 
diff --git a/docs/release_notes/ez_platform_v2.2.0.md b/docs/release_notes/ez_platform_v2.2.0.md
index b37e23459a..819ef97ba7 100644
--- a/docs/release_notes/ez_platform_v2.2.0.md
+++ b/docs/release_notes/ez_platform_v2.2.0.md
@@ -60,7 +60,7 @@ You can find the list of all bookmarks in *Browse content* section. There, you c
 ### Standard design
 
 eZ Platform now comes with two designs using the [design engine](https://doc.ibexa.co/en/2.5/guide/design_engine): `standard` for content view and `admin` for the back office.
-See [default designs](https://doc.ibexa.co/en/2.5/guide/design_engine/#default-designs) for more information.
+For more information, see [default designs](https://doc.ibexa.co/en/2.5/guide/design_engine/#default-designs).
 
 !!! caution
 
@@ -87,7 +87,7 @@ Database charset is changed from UTF8 to UTF8MB4, to support 4-byte characters.
 
 You can now select the pattern that is used to generate URL patterns.
 
-See [URL alias patterns](https://doc.ibexa.co/en/2.5/guide/url_management/#url-alias-patterns) for more information about the available settings.
+For more information about the available settings, see [URL alias patterns](https://doc.ibexa.co/en/2.5/guide/url_management/#url-alias-patterns).
 
 !!! caution "Default URL generation pattern"
 
diff --git a/docs/release_notes/ez_platform_v2.3.md b/docs/release_notes/ez_platform_v2.3.md
index f5adf40815..342bd016c7 100644
--- a/docs/release_notes/ez_platform_v2.3.md
+++ b/docs/release_notes/ez_platform_v2.3.md
@@ -33,7 +33,7 @@
 
     The timeline also shows other events, such a Content published using the date-based publisher.
 
-For more information, check [advanced publishing options](https://doc.ibexa.co/projects/userguide/en/2.5/publishing/advanced_publishing_options) in User Documentation.
+For more information, see [advanced publishing options](https://doc.ibexa.co/projects/userguide/en/2.5/publishing/advanced_publishing_options) in User Documentation.
 
 ### Form Builder
 
@@ -49,13 +49,13 @@ For more information, check [advanced publishing options](https://doc.ibexa.co/p
 
     See [Extending Form Builder](https://doc.ibexa.co/en/2.5/guide/extending/extending_form_builder) for information on how to modify and create Form fields.
 
-Fore more information, check [forms](https://doc.ibexa.co/projects/userguide/en/2.5/creating_content_advanced/#forms) in User Documentation.
+For more information, see [forms](https://doc.ibexa.co/projects/userguide/en/2.5/creating_content_advanced/#forms) in User Documentation.
 
 ### ImageAsset field type
 
 You can now create a single source media library with images that can be reused across the system.
 
-See [Reusing images](https://doc.ibexa.co/en/2.5/guide/images/#reusing-images) and [ImageAsset field type reference](https://doc.ibexa.co/en/2.5/api/field_types_reference/imageassetfield) for more information.
+For more information, see [Reusing images](https://doc.ibexa.co/en/2.5/guide/images/#reusing-images) and [ImageAsset field type reference](https://doc.ibexa.co/en/2.5/api/field_types_reference/imageassetfield).
 
 ![Set up multiple relations with image](2.3_image_asset.png)
 
@@ -64,7 +64,7 @@ See [Reusing images](https://doc.ibexa.co/en/2.5/guide/images/#reusing-images) a
 A new `ezplatform:urls:regenerate-aliases` command enables you to regenerate all URL aliases.
 You can use it after changing URL alias configuration, or in case of database corruption.
 
-See [Regenerating URL aliases](https://doc.ibexa.co/en/2.5/guide/url_management/#regenerating-url-aliases) for more information.
+For more information, see [Regenerating URL aliases](https://doc.ibexa.co/en/2.5/guide/url_management/#regenerating-url-aliases).
 
 ### User preferences
 
@@ -100,7 +100,7 @@ There are three new ways you can now contribute to back office translations:
 - translate in-context with console
 - translate directly on the Crowdin website
 
-See [How to translate the interface using Crowdin](https://doc.ibexa.co/en/2.5/community_resources/translations/#how-to-translate-the-interface-using-crowdin) for more information.
+For more information, see [How to translate the interface using Crowdin](https://doc.ibexa.co/en/2.5/community_resources/translations/#how-to-translate-the-interface-using-crowdin).
 
 ## Full list of new features, improvements and bug fixes since v2.2.0
 
diff --git a/docs/release_notes/ez_platform_v2.4.md b/docs/release_notes/ez_platform_v2.4.md
index 3145d45ee4..9d05a8a449 100644
--- a/docs/release_notes/ez_platform_v2.4.md
+++ b/docs/release_notes/ez_platform_v2.4.md
@@ -88,7 +88,7 @@ When you translate Content of this type, the content type information is display
 
 New multi-file content management functionalities enable you to move and delete multiple files at the same time.
 
-See [Multi-file content management](https://doc.ibexa.co/projects/userguide/en/2.5/multi_file_content_management/#multi-file-content-management) for more information.
+For more information, see[Multi-file content management](https://doc.ibexa.co/projects/userguide/en/2.5/multi_file_content_management/#multi-file-content-management).
 
 !!! dxp
 
@@ -110,13 +110,13 @@ The list of all drafts can now be found in the **Administrator User** menu under
 
 ![Administrator User list of all Drafts](2.4_drafts_admin_user.png "Administrator User list of all Drafts")
 
-See [Reviewing a draft](https://doc.ibexa.co/projects/userguide/en/2.5/publishing/flex_workflow/#reviewing-a-draft) for more information.
+For more information, see [Reviewing a draft](https://doc.ibexa.co/projects/userguide/en/2.5/publishing/flex_workflow/#reviewing-a-draft).
 
 ### Subtree search filter
 
 A new filter enables you to filter search results by Subtree.
 
-See [Simplified Filtered search](https://doc.ibexa.co/projects/userguide/en/2.5/search/#simplified-filtered-search) for more information.
+For more information, see [Simplified Filtered search](https://doc.ibexa.co/projects/userguide/en/2.5/search/#simplified-filtered-search).
 
 ### Sub-items limit
 
@@ -148,7 +148,7 @@ This release introduces a few simplifications to API use for content types:
 
 - Exposes `content->getContentType()` for easier use, including from Twig as `content.contentType`. When iterating over the result set of content/Locations these are effectively loaded all at once.
 - Adds possibility to load several content types in bulk using `ContentTypeService->loadContentTypeList()`.
-- `UserService` now exposes `isUser()` and `isUserGroup()`. They do not need to do a lookup to the database to tell if a content item is of type user or user group.
+- `UserService` now exposes `isUser()` and `isUserGroup()`. They don't need to do a lookup to the database to tell if a content item is of type user or user group.
 
 #### Load multiple Locations
 
@@ -210,7 +210,9 @@ you're now able to load multiple Locations at once, using `LocationService->load
                  enabled: false
     ```
 
-    By default `HS256` is used as signature algorithm for generated token but we strongly recommend switching to SSH keys. For more information see [`LexikJWTAuthenticationBundle` installation instruction](https://github.com/lexik/LexikJWTAuthenticationBundle/blob/master/Resources/doc/index.md#installation).
+    By default `HS256` is used as signature algorithm for generated token but we strongly recommend switching to SSH keys.
+    
+    For more information, see [`LexikJWTAuthenticationBundle` installation instruction](https://github.com/lexik/LexikJWTAuthenticationBundle/blob/master/Resources/doc/index.md#installation).
 
     3\. Add `EzSystems\EzPlatformPageBuilder\Security\EditorialMode\TokenAuthenticator` authentication provider to `ezpublish_front` firewall before `form_login` in `app/config/security.yml`:
 
diff --git a/docs/release_notes/ez_platform_v2.5.md b/docs/release_notes/ez_platform_v2.5.md
index 0c5491ba01..62a079bd7d 100644
--- a/docs/release_notes/ez_platform_v2.5.md
+++ b/docs/release_notes/ez_platform_v2.5.md
@@ -21,9 +21,9 @@ Each content item has a unique icon that helps you identify it without opening.
 
 ![Content tree in the menu](left_menu_tree.png "Content tree in the menu")
 
-For more information on custom configuration, see [content tree](https://doc.ibexa.co/en/2.5/guide/config_back_office/#content-tree) in the developer documentation.
+For more information on custom configuration, see [content tree](https://doc.ibexa.co/en/2.5/guide/config_back_office/#content-tree) in Developer Documentation.
 
-For full description of the interface, see [content tree](https://doc.ibexa.co/projects/userguide/en/2.5/content_model/#content-tree) in the user documentation.
+For full description of the interface, see [content tree](https://doc.ibexa.co/projects/userguide/en/2.5/content_model/#content-tree) in User Documentation.
 
 ### Webpack Encore
 
@@ -44,7 +44,7 @@ Database schema is now created based on [YAML configuration](https://github.com/
 You can now take advantage of [GraphQL](https://doc.ibexa.co/en/2.5/api/graphql) to query and operate on content.
 It uses a domain schema based on your content model.
 
-See [GraphQL documentation](https://graphql.org/) for more information about GraphQL in general.
+For more information, see [GraphQL documentation](https://graphql.org/).
 
 ### Matrix field type
 
diff --git a/docs/release_notes/ez_platform_v3.0.md b/docs/release_notes/ez_platform_v3.0.md
index 2429456e20..7af5ea752f 100644
--- a/docs/release_notes/ez_platform_v3.0.md
+++ b/docs/release_notes/ez_platform_v3.0.md
@@ -50,10 +50,9 @@ For details, see [Bundles](https://doc.ibexa.co/en/latest/guide/bundles).
     The new Site management User Interface is now integrated with back office.
     It enables you to easily create and manage multiple sites from the back office without editing the configuration files.
 
-    For more information about:
+    For more information about enabling and configuring, see [Enable Site Factory](https://doc.ibexa.co/en/latest/guide/multisite/site_factory/#enable-site-factory).
 
-    - enabling and configuring, see [Enable Site Factory](https://doc.ibexa.co/en/latest/guide/multisite/site_factory/#enable-site-factory)
-    - using the Site Factory, see [User Guide]([[= user_doc =]]/site_organization/site_factory)
+    For more information about using the Site Factory, see [User Documentation]([[= user_doc =]]/site_organization/site_factory)
 
     ### Scheduling
 
@@ -183,7 +182,7 @@ They can be defined per SiteAccess, or per content view.
 Five built-in ready-to-use Query Types have been added: `Children`, `Siblings`, `Ancestors`, `RelatedToContent`, and `GeoLocation`.
 
 You can now use the `ez_render_content_query` and `ez_render_location_query` Twig functions
-to make use of Query Types that do not use the current content or Location.
+to make use of Query Types that don't use the current content or Location.
 
 ### Grouping blocks in Page Builder
 
@@ -200,6 +199,7 @@ You can now add custom tooltips to provide more information for the users when t
 ### Thumbnails
 
 The new thumbnails API allows you to easily choose an image for each content.
+
 For more information, see [Extending thumbnails](https://doc.ibexa.co/en/latest/extending/extending_thumbnails).
 
 ### Type hints for public PHP API
diff --git a/docs/release_notes/ez_platform_v3.0_deprecations.md b/docs/release_notes/ez_platform_v3.0_deprecations.md
index 682564dd87..a71a0f5d5d 100644
--- a/docs/release_notes/ez_platform_v3.0_deprecations.md
+++ b/docs/release_notes/ez_platform_v3.0_deprecations.md
@@ -467,7 +467,7 @@ Using dynamic settings (through `$setting$`) and getting settings from the [Conf
 or method call has been dropped.
 
 You should use the ConfigResolver instead.
-Do not store the values globally. Every time the value is needed call `ConfigResolverInterface::getParameter`.
+Don't store the values globally. Every time the value is needed call `ConfigResolverInterface::getParameter`.
 
 ### Controllers
 
diff --git a/docs/release_notes/ez_platform_v3.1.md b/docs/release_notes/ez_platform_v3.1.md
index 35cca92347..708e00f219 100644
--- a/docs/release_notes/ez_platform_v3.1.md
+++ b/docs/release_notes/ez_platform_v3.1.md
@@ -12,7 +12,7 @@
 
 [eZ Commerce](https://github.com/ezsystems/ezcommerce) now uses Symfony 5 and is fully integrated into the eZ Platform back office.
 
-Refer to [eZ Commerce documentation](https://doc.ezplatform.com/projects/ezcommerce/en/latest/) for more information.
+For more information, see [eZ Commerce documentation](https://doc.ezplatform.com/projects/ezcommerce/en/latest/).
 
 ## New features
 
diff --git a/docs/release_notes/ibexa_dxp_v3.2.md b/docs/release_notes/ibexa_dxp_v3.2.md
index d757720ba4..640e3ec828 100644
--- a/docs/release_notes/ibexa_dxp_v3.2.md
+++ b/docs/release_notes/ibexa_dxp_v3.2.md
@@ -29,6 +29,7 @@ and use assets such as images directly from the DAM in your content.
 ### Autosave
 
 [[= product_name_base =]] Platform can now save your edits in a content item or product automatically to help you preserve the progress in an event of a failure.
+
 For more information, see [Autosave](https://doc.ibexa.co/projects/userguide/en/latest/publishing/publishing/#autosave).
 
 ### Aggregation API
@@ -39,7 +40,7 @@ to group search results and get the count of results per aggregation type.
 You can aggregate results by general conditions such as content type or Section,
 or by Field aggregations such as the value of specific Fields.
 
-See [Aggregation API](https://doc.ibexa.co/en/latest/api/public_php_api_search/#aggregation) for more information.
+For more information, see [Aggregation API](https://doc.ibexa.co/en/latest/api/public_php_api_search/#aggregation).
 
 ### Targeting block and Segmentation API [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
@@ -60,7 +61,7 @@ Use `ez_render_content(content)` and `ez_render_location(location)` to render th
 
 You can also use `ez_render()` and provide it with either a content or Location object.
 
-See [Using `ez_render` Twig helpers](https://doc.ibexa.co/en/latest/guide/templates/#using-ez_render-twig-helpers) for more information.
+For more information, see [Using `ez_render` Twig helpers](https://doc.ibexa.co/en/latest/guide/templates/#using-ez_render-twig-helpers).
 
 ### JWT authentication
 
@@ -69,9 +70,9 @@ and [GraphQL](https://doc.ibexa.co/en/latest/api/graphql/#jwt-authentication).
 
 See [JWT authentication](https://doc.ibexa.co/en/latest/guide/security/#jwt-authentication) to learn how to configure this authentication method.
 
-### Searching in Ibexa Commerce with Elasticsearch [[% include 'snippets/commerce_badge.md' %]]
+### Searching in [[= product_name_com =]] with Elasticsearch [[% include 'snippets/commerce_badge.md' %]]
 
-You can now use Elasticsearch for searching in Ibexa Commerce.
+You can now use Elasticsearch for searching in [[= product_name_com =]].
 
 See [Install Ibexa Platform](https://doc.ibexa.co/en/latest/getting_started/install_ez_platform/#install-and-configure-a-search-engine) to learn how to install and configure the search engine.
 
@@ -83,7 +84,7 @@ You can now define user group skeletons where you define policies and limitation
 You can then associate a number of such skeletons with a site template. 
 User group skeletons survive deleting a site.
 
-See [Configure user group skeleton](https://doc.ibexa.co/en/latest/guide/multisite/site_factory_configuration/#user-group-skeletons) for more information.
+For more information, see [Configure user group skeleton](https://doc.ibexa.co/en/latest/guide/multisite/site_factory_configuration/#user-group-skeletons).
 
 ### Calendar widget improvements
 
@@ -96,7 +97,7 @@ For more information, see [Calendar widget](https://doc.ibexa.co/projects/usergu
 
 ### Cloning content types
 
-When creating content types in the back office, you do not have to start from scratch.
+When creating content types in the back office, you don't have to start from scratch.
 You can now clone an existing content type instead.
 
 To do this, click the **Copy** icon located next to the content type that you want to clone.
@@ -109,6 +110,6 @@ to [get Object states and Object state groups](https://doc.ibexa.co/en/latest/ap
 
 ## Full changelog
 
-| Ibexa Platform  | Ibexa DXP  | Ibexa Commerce |
+| Ibexa Platform  | [[= product_name =]]  | [[= product_name_com =]] |
 |--------------|------------|------------|
-| [Ibexa Platform v3.2.0](https://github.com/ezsystems/ezplatform/releases/tag/v3.2.0) | [Ibexa DXP v3.2.0](https://github.com/ezsystems/ezplatform-ee/releases/tag/v3.2.0) | [Ibexa Commerce v3.2.0](https://github.com/ezsystems/ezcommerce/releases/tag/v3.2.0)
+| [Ibexa Platform v3.2.0](https://github.com/ezsystems/ezplatform/releases/tag/v3.2.0) | [[[= product_name =]] v3.2.0](https://github.com/ezsystems/ezplatform-ee/releases/tag/v3.2.0) | [[[= product_name_com =]] v3.2.0](https://github.com/ezsystems/ezcommerce/releases/tag/v3.2.0)
diff --git a/docs/release_notes/ibexa_dxp_v3.3.md b/docs/release_notes/ibexa_dxp_v3.3.md
index b16bb78bfc..b18f723d5d 100644
--- a/docs/release_notes/ibexa_dxp_v3.3.md
+++ b/docs/release_notes/ibexa_dxp_v3.3.md
@@ -34,6 +34,7 @@ The Image Editor is available when browsing the Media library, or creating or ed
 that contain an `ezimage` or `ezimageasset` Field.
 
 You can modify the Image Editor's default settings to change its appearance or behavior.
+
 For more information, see [Configuring the Image Editor](https://doc.ibexa.co/en/3.3/guide/image_editor).
 
 ### Migration bundle
@@ -82,13 +83,14 @@ framework:
 
 See [list of changes in Symfony 5.2](https://symfony.com/blog/symfony-5-2-curated-new-features).
 
-| Ibexa Content  | Ibexa Experience  | Ibexa Commerce |
+| [[= product_name_content =]]  | [[= product_name_exp =]]  | [[= product_name_com =]] |
 |--------------|------------|------------|
-| [Ibexa Content v3.3.0](https://github.com/ibexa/content/releases/tag/v3.3.0) | [Ibexa Experience v3.3.0](https://github.com/ibexa/experience/releases/tag/v3.3.0) | [Ibexa Commerce v3.3.0](https://github.com/ibexa/commerce/releases/tag/v3.3.0)|
+| [[[= product_name_content =]] v3.3.0](https://github.com/ibexa/content/releases/tag/v3.3.0) | [[[= product_name_exp =]] v3.3.0](https://github.com/ibexa/experience/releases/tag/v3.3.0) | [[[= product_name_com =]] v3.3.0](https://github.com/ibexa/commerce/releases/tag/v3.3.0)|
 
 ## v3.3.15 
 
 ### Symfony 5.4
 
 The version v3.3.15 moves [[= product_name =]] to Symfony 5.4.
+
 For more information, see [Symfony 5.4 documentation](https://symfony.com/releases/5.4) and [update documentation](update_from_3.3.md#3315).
diff --git a/docs/release_notes/ibexa_dxp_v4.0.md b/docs/release_notes/ibexa_dxp_v4.0.md
index 9c7ae07b89..a29dc6bcfa 100644
--- a/docs/release_notes/ibexa_dxp_v4.0.md
+++ b/docs/release_notes/ibexa_dxp_v4.0.md
@@ -1,6 +1,6 @@
 <!-- vale VariablesVersion = NO -->
 
-# Ibexa DXP v4.0
+# [[= product_name =]] v4.0
 
 **Version number**: v4.0
 
@@ -60,7 +60,7 @@ You can now configure and use the locking feature to lock a draft of a content i
 so that only an assigned person can edit it, and no other user can take it over. 
 
 For more information, see the [Draft locking](https://doc.ibexa.co/en/latest/guide/workflow/workflow/#draft-locking)
-and the relevant [user documentation](https://doc.ibexa.co/projects/userguide/en/latest/publishing/editorial_workflow/#releasing-locked-drafts).
+and relevant [User Documentation](https://doc.ibexa.co/projects/userguide/en/latest/publishing/editorial_workflow/#releasing-locked-drafts).
 
 ### Online Editor is now based on CKEditor
 
@@ -81,24 +81,26 @@ See [Managing migrations](https://doc.ibexa.co/en/latest/api/public_php_api_mana
 
 ### Decide whether alternative text for Image field is optional
 
-Alternative text for an Image field is now optional by default. 
+Alternative text for an Image field is now optional by default.
 You can set it as required when adding the Image field to a content type.
 
 ### Configure what elements are available in the Page Builder for the content type [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
 You can now select which page blocks, page layout and what edit mode are available in the Editor mode for the content type.
+
 For more information, see [Working with Page](https://doc.ibexa.co/projects/userguide/en/latest/site_organization/working_with_page/#configure-block-display).
 
 ### Purge all submissions of given form [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
-You can purge all submissions of a given form. 
+You can purge all submissions of a given form.
+
 For more information, see [Forms](https://doc.ibexa.co/en/latest/guide/form_builder/forms/#form-submission-purging).
 
 ### External datasource handling
 
 Pesronalization has been given an option to fetch content feed from external sources.
 
-### Category exclusion 
+### Category exclusion
 
 Personalization service has been enhanced with a feature which allows to exclude categories from the recommendation response.
 See [Exclusions](https://doc.ibexa.co/projects/userguide/en/latest/personalization/filters/#exclusions).
@@ -115,6 +117,6 @@ for full details of changes and how they influence your project.
 
 ## Full changelog
 
-| Ibexa Content  | Ibexa Experience  | Ibexa Commerce |
+| [[= product_name_content =]]  | [[= product_name_exp =]]  | [[= product_name_com =]] |
 |--------------|------------|------------|
-| [Ibexa Content v4.0](https://github.com/ibexa/content/releases/tag/v4.0.0) | [Ibexa Experience v4.0](https://github.com/ibexa/experience/releases/tag/v4.0.0) | [Ibexa Commerce v4.0](https://github.com/ibexa/commerce/releases/tag/v4.0.0)
+| [[[= product_name_content =]] v4.0](https://github.com/ibexa/content/releases/tag/v4.0.0) | [[[= product_name_exp =]] v4.0](https://github.com/ibexa/experience/releases/tag/v4.0.0) | [[[= product_name_com =]] v4.0](https://github.com/ibexa/commerce/releases/tag/v4.0.0)
diff --git a/docs/release_notes/ibexa_dxp_v4.1.md b/docs/release_notes/ibexa_dxp_v4.1.md
index 162d36c79f..51572ecb30 100644
--- a/docs/release_notes/ibexa_dxp_v4.1.md
+++ b/docs/release_notes/ibexa_dxp_v4.1.md
@@ -86,6 +86,6 @@ which prevents multiple processes from executing the same migration and causing
 
 ## Full changelog
 
-| Ibexa Content  | Ibexa Experience  | Ibexa Commerce |
+| [[= product_name_content =]]  | [[= product_name_exp =]]  | [[= product_name_com =]] |
 |--------------|------------|------------|
-| [Ibexa Content v4.1](https://github.com/ibexa/content/releases/tag/v4.1.0) | [Ibexa Experience v4.1](https://github.com/ibexa/experience/releases/tag/v4.1.0) | [Ibexa Commerce v4.1](https://github.com/ibexa/commerce/releases/tag/v4.1.0)
+| [[[= product_name_content =]] v4.1](https://github.com/ibexa/content/releases/tag/v4.1.0) | [[[= product_name_exp =]] v4.1](https://github.com/ibexa/experience/releases/tag/v4.1.0) | [[[= product_name_com =]] v4.1](https://github.com/ibexa/commerce/releases/tag/v4.1.0)
diff --git a/docs/release_notes/ibexa_dxp_v4.2.md b/docs/release_notes/ibexa_dxp_v4.2.md
index a52431591f..bdeea89b01 100644
--- a/docs/release_notes/ibexa_dxp_v4.2.md
+++ b/docs/release_notes/ibexa_dxp_v4.2.md
@@ -219,13 +219,13 @@ a `SegmentGroup` and `Segment` objects respectively, instead of numerical IDs.
 
 ## Full changelog
 
-| Ibexa Content  | Ibexa Experience  | Ibexa Commerce |
+| [[= product_name_content =]] | [[= product_name_exp =]]  | [[= product_name_com =]] |
 |--------------|------------|------------|
-| [Ibexa Content v4.2](https://github.com/ibexa/content/releases/tag/v4.2.0) | [Ibexa Experience v4.2](https://github.com/ibexa/experience/releases/tag/v4.2.0) | [Ibexa Commerce v4.2](https://github.com/ibexa/commerce/releases/tag/v4.2.0)|
+| [[[= product_name_content =]] v4.2](https://github.com/ibexa/content/releases/tag/v4.2.0) | [[[= product_name_exp =]] v4.2](https://github.com/ibexa/experience/releases/tag/v4.2.0) | [[[= product_name_com =]] v4.2](https://github.com/ibexa/commerce/releases/tag/v4.2.0)|
 
 ## v4.2.1
 
-### Ibexa CDP
+### [[= product_name_cdp =]]
 
 [[= product_name_base =]] Customer Data Center allows you to collect, connect and organize customer data from multiple sources.
 You can use them to build segments that allow you to create personalized customer experience for your brand.
diff --git a/docs/release_notes/ibexa_dxp_v4.3.md b/docs/release_notes/ibexa_dxp_v4.3.md
index b3f72f6153..3fad23ff6f 100644
--- a/docs/release_notes/ibexa_dxp_v4.3.md
+++ b/docs/release_notes/ibexa_dxp_v4.3.md
@@ -89,6 +89,7 @@ and can be used for recommendation engine filtering.
 
 This release brings you a new content type for private customers registering from the front page.
 We also prepared a migration command for already existing users to ease your upgrade process.
+
 For more information, refer to upgrade documentation.
 
 ### API improvements
@@ -119,9 +120,9 @@ The `TaxonomyEntryId` Search Criterion isn't available in Legacy search Engine.
 
 ## Full changelog
 
-| Ibexa Content  | Ibexa Experience  | Ibexa Commerce |
+| [[= product_name_content =]]  | [[= product_name_exp =]]  | [[= product_name_com =]] |
 |--------------|------------|------------|
-| [Ibexa Content v4.3](https://github.com/ibexa/content/releases/tag/v4.3.0) | [Ibexa Experience v4.3](https://github.com/ibexa/experience/releases/tag/v4.3.0) | [Ibexa Commerce v4.3](https://github.com/ibexa/commerce/releases/tag/v4.3.0)|
+| [[[= product_name_content =]] v4.3](https://github.com/ibexa/content/releases/tag/v4.3.0) | [[[= product_name_exp =]] v4.3](https://github.com/ibexa/experience/releases/tag/v4.3.0) | [[[= product_name_com =]] v4.3](https://github.com/ibexa/commerce/releases/tag/v4.3.0)|
 
 ## v4.3.1
 
diff --git a/docs/release_notes/ibexa_dxp_v4.4.md b/docs/release_notes/ibexa_dxp_v4.4.md
index d780d5cb4a..1d9056a707 100644
--- a/docs/release_notes/ibexa_dxp_v4.4.md
+++ b/docs/release_notes/ibexa_dxp_v4.4.md
@@ -21,7 +21,7 @@ A new welcome page greets you when opening Ibexa Digital Experience Platform.
 
 ![New Welcome Page](4.4_welcome_page.png)
 
-### All-new Ibexa Commerce packages [[% include 'snippets/commerce_badge.md' %]]
+### All-new [[= product_name_com =]] packages [[% include 'snippets/commerce_badge.md' %]]
 
 This release deprecates all Commerce packages that you've known from previous releases 
 and brings a redesigned and reconstructed Commerce offering:
@@ -89,14 +89,14 @@ For more information, see [Requesting access to the server](https://doc.ibexa.co
 Personalization engine introduces two new recommendation models: [predictive](https://doc.ibexa.co/projects/userguide/en/4.4/personalization/recommendation_models/#predictive) and [recurring purchase](https://doc.ibexa.co/projects/userguide/en/4.4/personalization/recommendation_models/#recurring-purchase). These two new models, based on mathematical approach, help to predict clients behavior and
 provide the best recommendations.
 
-## Ibexa Connect
+## [[= product_name_connect =]]
 
-You can now take advantage of [Ibexa Connect](https://www.ibexa.co/products/ibexa-connect),
+You can now take advantage of [[[= product_name_connect =]]](https://www.ibexa.co/products/ibexa-connect),
 an iPaaS (integration platform-as-a-service) which allows you to connect [[= product_name =]] with third-party applications.
 [[= product_name_connect =]] features a low-code drag-and-drop interface and hundreds of connectors to different services
 that help you automate business processes.
 
-See [Ibexa Connect documentation](https://doc.ibexa.co/projects/connect/en/latest/).
+See [[[= product_name_connect =]] documentation](https://doc.ibexa.co/projects/connect/en/latest/).
 
 ![Example of an Ibexa Connect scenario](4.4_connect_scenario_example.png)
 
@@ -107,6 +107,7 @@ See [Ibexa Connect documentation](https://doc.ibexa.co/projects/connect/en/lates
 The codebase has undergone significant upgrades to rely on Flysystem v2.
 The Flysystem Adapter implementation now supports dynamic paths
 described by complex settings resolvable for the SiteAccess context.
+
 For more information, see [Configuring the DFS IO handler](https://doc.ibexa.co/en/4.4/infrastructure_and_maintenance/clustering/clustering/#configuring-the-dfs-io-handler).
 
 If your custom project relies directly on a Flysystem features instead of using our IO abstraction, it requires an upgrade as well,
@@ -115,7 +116,8 @@ using [these instructions](https://flysystem.thephpleague.com/docs/upgrade-from-
 ### Dedicated migration type for Corporate Accounts
 
 To simplify data migration, you can now create a corporate account with underlying objects such as members group and address book.
-You can also extract those objects as references. 
+You can also extract those objects as references.
+
 For more information on data migration actions, see [Data migration actions](https://doc.ibexa.co/en/4.4/content_management/data_migration/data_migration_actions/#data-migration-actions).
 
 ### API improvements
@@ -144,7 +146,7 @@ The following Commerce packages are deprecated as of this release and will be re
 - `ibexa/commerce-shop-ui`
 
 They will be maintained by [[= product_name_name =]] with fixes, including security fixes, but they won't be further developed.
-Old packages are replaced by [the all-new Ibexa Commerce packages](#all-new-ibexa-commerce-packages) with more
+Old packages are replaced by [the all-new [[= product_name_com =]] packages](#all-new-ibexa-commerce-packages) with more
 to come in the upcoming releases.
 
 #### Flysystem
@@ -154,6 +156,6 @@ to come in the upcoming releases.
 
 ## Full changelog
 
-| Ibexa Content          | Ibexa Experience          | Ibexa Commerce          |
+| [[= product_name_content =]]          | [[= product_name_exp =]]          | [[= product_name_com =]]         |
 |------------------------|---------------------------|-------------------------|
-| [Ibexa Content v4.4](https://github.com/ibexa/content/releases/tag/v4.4.0) | [Ibexa Experience v4.4](https://github.com/ibexa/experience/releases/tag/v4.4.0) | [Ibexa Commerce v4.4](https://github.com/ibexa/commerce/releases/tag/v4.4.0) |
+| [[[= product_name_content =]] v4.4](https://github.com/ibexa/content/releases/tag/v4.4.0) | [[[= product_name_exp =]] v4.4](https://github.com/ibexa/experience/releases/tag/v4.4.0) | [[[= product_name_com =]]  v4.4](https://github.com/ibexa/commerce/releases/tag/v4.4.0) |
diff --git a/docs/release_notes/ibexa_dxp_v4.5.md b/docs/release_notes/ibexa_dxp_v4.5.md
index 6e8e6c845a..cfe05563c3 100644
--- a/docs/release_notes/ibexa_dxp_v4.5.md
+++ b/docs/release_notes/ibexa_dxp_v4.5.md
@@ -16,7 +16,7 @@ description: Ibexa DXP v4.5 adds new features to Ibexa Commerce, translation com
 
 ## Notable changes
 
-### All-new Ibexa Commerce packages [[% include 'snippets/commerce_badge.md' %]]
+### All-new [[= product_name_com =]] packages [[% include 'snippets/commerce_badge.md' %]]
 
 This release brings new packages to complement the redesigned and reconstructed Commerce offering.
 You can use them to further enhance your e-commerce presence:
@@ -125,6 +125,7 @@ and allows supporting other transport types accepted by CDP.
 Currently, only `stream_file` transport is supported and can be initialized from the configuration.
 
 [[= product_name =]] v4.5 adds the abstraction that allows you to implement other transport types from third parties.
+
 For more information, see [CDP configuration](https://doc.ibexa.co/en/4.5/cdp/cdp_activation/#configuration).
 
 ### API improvements
@@ -206,9 +207,9 @@ It's no longer necessary to take other taxonomies into account when creating tag
 You can now enhance password security with a setting that prevents using passwords that have been exposed in a public breach.
 To do it, the system checks the password against known password dumps by using the https://haveibeenpwned.com/ API.
 
-See [Breached passwords](https://doc.ibexa.co/en/4.5/users/user_management/#breached-passwords) for more information.
+For more information, see [Breached passwords](https://doc.ibexa.co/en/4.5/users/user_management/#breached-passwords).
 
-### Ibexa Connect
+### [[= product_name_connect =]]
 
 For list of changes in [[= product_name_connect =]], see [Ibexa app release notes](https://doc.ibexa.co/projects/connect/en/latest/general/ibexa_app_release_notes/).
 
@@ -228,9 +229,9 @@ Deprecations:
 
 ## Full changelog
 
-| Ibexa Content | Ibexa Experience | Ibexa Commerce|
+| [[= product_name_content =]] | [[= product_name_exp =]] | [[= product_name_com =]]|
 |---------------|------------------|---------------|
-| [Ibexa Content v4.5](https://github.com/ibexa/content/releases/tag/v4.5.0) | [Ibexa Experience v4.5](https://github.com/ibexa/experience/releases/tag/v4.5.0) | [Ibexa Commerce v4.5](https://github.com/ibexa/commerce/releases/tag/v4.5.0) |
+| [[[= product_name_content =]] v4.5](https://github.com/ibexa/content/releases/tag/v4.5.0) | [[[= product_name_exp =]] v4.5](https://github.com/ibexa/experience/releases/tag/v4.5.0) | [[[= product_name_com =]] v4.5](https://github.com/ibexa/commerce/releases/tag/v4.5.0) |
 
 ## v4.5.1
 
diff --git a/docs/release_notes/ibexa_dxp_v4.6.md b/docs/release_notes/ibexa_dxp_v4.6.md
index 33c21a8ba0..b8ccb3eeb2 100644
--- a/docs/release_notes/ibexa_dxp_v4.6.md
+++ b/docs/release_notes/ibexa_dxp_v4.6.md
@@ -16,7 +16,7 @@ description: Ibexa DXP v4.6 brings improvements to Commerce, PIM and Personaliza
 
 ## Notable changes
 
-### Ibexa Headless
+### [[= product_name_headless =]]
 
 [[= product_name_content =]] changes name to [[= product_name_headless =]] to emphasize [[= product_name_base =]]'s capacity for headless architecture.
 
@@ -70,6 +70,7 @@ For more information, see [Edit embedded content items](https://doc.ibexa.co/pro
 
 With multiple changes to the back office UI intended to expose the most important information and actions, editors can now better focus on their work.
 The UI is now more friendly and appealing for marketers and editors, with simplified Content structure, designed with new and non-advanced users in mind.
+
 For more information, see [Focus mode](https://doc.ibexa.co/projects/userguide/en/latest/getting_started/discover_ui/#focus-mode).
 
 ![Focus mode](img/4.6_focus_mode.png "Focus mode")
@@ -141,9 +142,7 @@ on the dashboard within Recent activity block, or on the user profile.
 
 ![Recent activity log](img/4.6_activity_list.png "Recent activity log")
 
-For more information,
-see feature's [user documentation](https://doc.ibexa.co/projects/userguide/en/master/recent_activity/recent_activity/),
-and [developer documentation](https://doc.ibexa.co/en/master/administration/recent_activity/recent_activity/).
+For more information, see feature's [User Documentation](https://doc.ibexa.co/projects/userguide/en/master/recent_activity/recent_activity/), and [Developer Documentation](https://doc.ibexa.co/en/master/administration/recent_activity/recent_activity/).
 
 #### back office search
 
@@ -157,9 +156,7 @@ If a relevant suggestion occurs, it can be clicked, or navigated too with up/dow
 In the search result page, a spellcheck suggestion can be made.
 For example, if the searched text is "Comany", the result page may ask "Did you mean company?", which is clickable to relaunch the search with this word.
 
-For more information,
-see [user documentation](https://doc.ibexa.co/projects/userguide/en/master/search/search_for_content/),
-and how to [customize autocompletion suggestions](https://doc.ibexa.co/en/master/administration/back_office/customize_search_suggestion/).
+For more information, see [User Documentation](https://doc.ibexa.co/projects/userguide/en/master/search/search_for_content/), and how to [customize autocompletion suggestions](https://doc.ibexa.co/en/master/administration/back_office/customize_search_suggestion/).
 
 ##### Filtering and sorting
 
@@ -167,9 +164,7 @@ The search result page can be sorted in other orders than relevance. Name, publi
 
 Filters can be applied to the search page to narrow down the results.
 
-For more information,
-see [user documentation](https://doc.ibexa.co/projects/userguide/en/master/search/search_for_content/#filtered-search),
-and how to [customize search sorting](https://doc.ibexa.co/en/master/administration/back_office/customize_search_sorting/).
+For more information, see [User Documentation](https://doc.ibexa.co/projects/userguide/en/master/search/search_for_content/#filtered-search), and how to [customize search sorting](https://doc.ibexa.co/en/master/administration/back_office/customize_search_sorting/).
 
 #### New and updated content type icons
 
@@ -455,7 +450,7 @@ Any third party code that extends `\Ibexa\Contracts\Rest\Output\Generator` needs
 
 A new helper method `ibexa.helpers.contentType.getContentTypeDataByHref` has been introduced to help you get content type data in JavaScript.
 
-### Ibexa Connect
+### [[= product_name_connect =]]
 
 For a list of changes in [[= product_name_connect =]], see [Ibexa app release notes](https://doc.ibexa.co/projects/connect/en/latest/general/ibexa_app_release_notes/).
 
@@ -465,11 +460,13 @@ New [[= product_name_connect =]] scenario block retrieves and displays data from
 Scenario block is a regular Page block and can be configured on field definition level as any other block.
 You also need to configure scenario block in the Page Builder. To do it, you need to provide name for the block, enter webhook link for the [[= product_name_connect =]] webhook and select the template to be used to present the webhook.
 
-For more information, see [Ibexa Connect scenario block](https://doc.ibexa.co/en/master/content_management/pages/ibexa_connect_scenario_block/).
+For more information, see [[[= product_name_connect =]] scenario block](https://doc.ibexa.co/en/master/content_management/pages/ibexa_connect_scenario_block/).
 
 ### DDEV
 
-[[[= product_name =]] can officially be run on DDEV](https://ddev.readthedocs.io/en/latest/users/quickstart/#ibexa-dxp). For more information, see the [DDEV guide](https://doc.ibexa.co/en/master/getting_started/install_with_ddev/), which offers a step-by-step walkthrough for installing [[= product_name =]].
+[[[= product_name =]] can officially be run on DDEV](https://ddev.readthedocs.io/en/latest/users/quickstart/#ibexa-dxp).
+
+For more information, see the [DDEV guide](https://doc.ibexa.co/en/master/getting_started/install_with_ddev/), which offers a step-by-step walkthrough for installing [[= product_name =]].
 
 ### Customer Data Platform (CDP)
 
diff --git a/docs/resources/contributing/report_and_follow_issues.md b/docs/resources/contributing/report_and_follow_issues.md
index 11b6e1786a..3434946b9b 100644
--- a/docs/resources/contributing/report_and_follow_issues.md
+++ b/docs/resources/contributing/report_and_follow_issues.md
@@ -16,7 +16,7 @@ If you find any, update them with your comment or additional information instead
 
 !!! caution "Security issues"
 
-    If you discover a security issue, please do not report it using regular channels, but instead take a look at [Security section](reporting_issues.md).
+    If you discover a security issue, please don't report it using regular channels, but instead take a look at [Security section](reporting_issues.md).
 
 If you have an [[= product_name =]] subscription, report your issues through the [support portal](https://support.ibexa.co) instead of JIRA.
 This ensures the issue can be quickly prioritized according to its impact.
@@ -27,7 +27,7 @@ Click **Create** at the top of the bugtracker window and fill in the following f
 |||
 |------|------|
 |**Project**|Select **Ibexa IBX**.|
-|**Issue type**|Choose **Bug** or **Improvement** depending on what you're reporting, do not use other issue types (they're for internal use only).|
+|**Issue type**|Choose **Bug** or **Improvement** depending on what you're reporting, don't use other issue types (they're for internal use only).|
 |**Summary**|Write a short sentence describing what you're reporting.|
 |**Priority**|Select the priority you consider the issue to be. Please try to keep a cool head while selecting it. A 1 pixel alignment bug isn't a "blocker".|
 |**Component/s**|This is important, as it makes your issue appear on the radar (dashboards, filters) of people dealing with various parts of Ibexa projects.|
diff --git a/docs/resources/new_in_doc.md b/docs/resources/new_in_doc.md
index dcbce2baaf..7f0c85e521 100644
--- a/docs/resources/new_in_doc.md
+++ b/docs/resources/new_in_doc.md
@@ -10,8 +10,8 @@ This page contains recent highlights and notable changes in [[= product_name =]]
 
 ### Product guides
 
-- [Ibexa Experience product guide](https://doc.ibexa.co/en/master/ibexa_products/ibexa_experience/)
-- [Ibexa Commerce product guide](https://doc.ibexa.co/en/master/ibexa_products/ibexa_commerce/)
+- [[[= product_name_exp =]] product guide](https://doc.ibexa.co/en/master/ibexa_products/ibexa_experience/)
+- [[[= product_name_com =]] product guide](https://doc.ibexa.co/en/master/ibexa_products/ibexa_commerce/)
 - Added [page collecting all feature product guides](https://doc.ibexa.co/en/master/product_guides/product_guides/)
 
 ### Content management
@@ -40,23 +40,23 @@ This page contains recent highlights and notable changes in [[= product_name =]]
 - Added a note about multi-repository scenario in [Managing migration](https://doc.ibexa.co/en/master/content_management/data_migration/managing_migrations/#migration-folders)
 - Updated the instructions for [Importing data](https://doc.ibexa.co/en/master/content_management/data_migration/importing_data/#built-in-functions) by mentioning the `env` function and a possibility of swapping content items assigned to a location
 
-### Ibexa Cloud
+### [[= product_name_cloud =]]
 
-- Placed all articles about Ibexa Cloud [in a common location](https://doc.ibexa.co/en/master/ibexa_cloud/ibexa_cloud/)
+- Placed all articles about [[= product_name_cloud =]] [in a common location](https://doc.ibexa.co/en/master/ibexa_cloud/ibexa_cloud/)
 
-### Ibexa Engage
+### [[= product_name_engage =]]
 
-- [Added a landing page in the Ibexa Engage area](https://doc.ibexa.co/en/master/ibexa_engage/ibexa_engage/)
+- [Added a landing page in the [[= product_name_engage =]] area](https://doc.ibexa.co/en/master/ibexa_engage/ibexa_engage/)
 
 ### Product guides
 
-- [Ibexa Cloud product guide](https://doc.ibexa.co/en/master/ibexa_cloud/ibexa_cloud_guide/)
+- [[[= product_name_cloud =]] product guide](https://doc.ibexa.co/en/master/ibexa_cloud/ibexa_cloud_guide/)
 
 ## June 2024
 
-### Ibexa Engage
+### [[= product_name_engage =]]
 
-- [Learn more about Ibexa Engage](https://doc.ibexa.co/en/master/ibexa_engage/install_ibexa_engage/)
+- [Learn more about [[= product_name_engage =]]](https://doc.ibexa.co/en/master/ibexa_engage/install_ibexa_engage/)
 
 ### Search
 
@@ -69,7 +69,7 @@ This page contains recent highlights and notable changes in [[= product_name =]]
 
 ### Infrastructure and maintenance
 
-- [Updated Ibexa Cloud domain to ibexa.cloud](https://doc.ibexa.co/en/master/getting_started/install_on_ibexa_cloud/#4-push-the-project)
+- [Updated [[= product_name_cloud =]] domain to ibexa.cloud](https://doc.ibexa.co/en/master/getting_started/install_on_ibexa_cloud/#4-push-the-project)
 - [v4.6.3 to v4.6.4 update instructions](https://doc.ibexa.co/en/master/update_and_migration/from_4.5/update_from_4.5/#v464)
 
 ### Documentation
@@ -90,7 +90,7 @@ This page contains recent highlights and notable changes in [[= product_name =]]
 
 ### Product guides
 
-- [Ibexa CDP product guide](https://doc.ibexa.co/en/master/cdp/cdp_guide/)
+- [[[= product_name_cdp =]] product guide](https://doc.ibexa.co/en/master/cdp/cdp_guide/)
 
 ### Infrastructure and maintenance
 
@@ -142,11 +142,11 @@ This page contains recent highlights and notable changes in [[= product_name =]]
 
 ### Dashboard
 
-- New dashboard sections in user documentation:
+- New dashboard sections in User Documentation:
     - [Dashboard](https://doc.ibexa.co/projects/userguide/en/master/getting_started/dashboard/dashboard/)
     - [Work with dashboard](https://doc.ibexa.co/projects/userguide/en/master/getting_started/dashboard/work_with_dashboard/)
     - [Dashboard block reference](https://doc.ibexa.co/projects/userguide/en/master/getting_started/dashboard/dashboard_block_reference/)
-- Dashboard section in developer documentation:
+- Dashboard section in Developer Documentation:
     - [Configure default dashboard](https://doc.ibexa.co/en/master/administration/dashboard/configure_default_dashboard/)
     - [Customize dashboard](https://doc.ibexa.co/en/master/administration/dashboard/customize_dashboard/)
     - [PHP API Dashboard service](https://doc.ibexa.co/en/master/administration/dashboard/php_api_dashboard_service/)
@@ -181,7 +181,7 @@ This page contains recent highlights and notable changes in [[= product_name =]]
 - New sections in taxonomy documentation:
     - [How to hide the delete button in large subtrees](https://doc.ibexa.co/en/master/content_management/taxonomy/taxonomy/#hide-delete-button-on-large-subtree)
     - [How to remove orphaned content items](https://doc.ibexa.co/en/master/content_management/taxonomy/taxonomy/#remove-orphaned-content-items)
-- Updated information in user documentation:
+- Updated information in User Documentation:
     - [Enhanced create and edit pages article](https://doc.ibexa.co/projects/userguide/en/master/content_management/create_edit_pages/)
     - [Edit embedded content items](https://doc.ibexa.co/projects/userguide/en/master/content_management/create_edit_content_items/#edit-embedded-content-items)
 
@@ -192,7 +192,7 @@ This page contains recent highlights and notable changes in [[= product_name =]]
 ### Getting started
 
 - [[[= product_name_headless =]] product guide](https://doc.ibexa.co/en/master/ibexa_products/headless/)
-- [Enhanced get started article](https://doc.ibexa.co/projects/userguide/en/master/getting_started/get_started/#edit-user-profile) in user documentation
+- [Enhanced get started article](https://doc.ibexa.co/projects/userguide/en/master/getting_started/get_started/#edit-user-profile) in User Documentation
 
 ### Image management
 
@@ -219,7 +219,7 @@ This page contains recent highlights and notable changes in [[= product_name =]]
 
 ### PIM
 
-- [Reorganized and updated information in user documentation](https://doc.ibexa.co/projects/userguide/en/master/pim/pim/)
+- [Reorganized and updated information in User Documentation](https://doc.ibexa.co/projects/userguide/en/master/pim/pim/)
 
 ### Templating
 
@@ -254,7 +254,7 @@ This page contains recent highlights and notable changes in [[= product_name =]]
 ### Others
 
 - [Redesigned requirements page](https://doc.ibexa.co/en/master/getting_started/requirements/)
-- [Updated Ibexa Cloud CLI](https://doc.ibexa.co/en/master/getting_started/install_on_ibexa_cloud/)
+- [Updated [[= product_name_cloud =]] CLI](https://doc.ibexa.co/en/master/getting_started/install_on_ibexa_cloud/)
 - [Updated React app block procedure](https://doc.ibexa.co/en/master/content_management/pages/react_app_block/)
 - [Added fulltext features in search](https://doc.ibexa.co/en/master/search/criteria_reference/fulltext_criterion/#supported-syntax)
 
@@ -300,7 +300,7 @@ This page contains recent highlights and notable changes in [[= product_name =]]
 
 - [Updated configuration for triggers](https://doc.ibexa.co/en/master/personalization/api_reference/tracking_api/#tracking-events-based-on-recommendations)
 - [Send messages with recommendations](https://doc.ibexa.co/en/master/personalization/integrate_recommendation_service/#send-messages-with-recommendations)
-- [Email triggers](https://doc.ibexa.co/projects/userguide/en/master/personalization/triggers/) in user documentation 
+- [Email triggers](https://doc.ibexa.co/projects/userguide/en/master/personalization/triggers/) in User Documentation 
 
 ### PIM
 
@@ -322,7 +322,7 @@ This page contains recent highlights and notable changes in [[= product_name =]]
 
 ### Others
 
-- Product guides integrated into developer documentation
+- Product guides integrated into Developer Documentation
     - [Content management](https://doc.ibexa.co/en/master/content_management/content_management_guide/)
     - [Customer portal](https://doc.ibexa.co/en/master/customer_management/customer_portal/)
     - [Form Builder](https://doc.ibexa.co/en/master/content_management/forms/form_builder_guide/)
@@ -336,7 +336,7 @@ This page contains recent highlights and notable changes in [[= product_name =]]
 
 ### New home page
 
-- Redesigned [home page for the user documentation](https://doc.ibexa.co/projects/userguide/en/master/)
+- Redesigned [home page for User Documentation](https://doc.ibexa.co/projects/userguide/en/master/)
 
 ### Administration
 
@@ -379,15 +379,15 @@ This page contains recent highlights and notable changes in [[= product_name =]]
 
 ### New home page
 
-- Redesigned [home page for the developer documentation](https://doc.ibexa.co/en/master/)
+- Redesigned [home page for Developer Documentation](https://doc.ibexa.co/en/master/)
 
 ### Getting started
 
-- New cautions in [Install on Ibexa Cloud](https://doc.ibexa.co/en/master/getting_started/install_on_ibexa_cloud/) about using `cloud.ibexa.co` instead of `platform.sh`
+- New cautions in [Install on [[= product_name_cloud =]]](https://doc.ibexa.co/en/master/getting_started/install_on_ibexa_cloud/) about using `cloud.ibexa.co` instead of `platform.sh`
 
 ### Content management
 
-- New Page block [Ibexa Connect scenario block](https://doc.ibexa.co/en/master/content_management/pages/ibexa_connect_scenario_block/)
+- New Page block [[[= product_name_connect =]] scenario block](https://doc.ibexa.co/en/master/content_management/pages/ibexa_connect_scenario_block/)
 - Updated [Create custom Page blocks](https://doc.ibexa.co/en/master/content_management/pages/create_custom_page_block/#add-block-javascript)
 
 ### Customer Portal
@@ -397,14 +397,14 @@ This page contains recent highlights and notable changes in [[= product_name =]]
 ### Personalization
 
 - [Multiple attributes in submodel computation](https://doc.ibexa.co/en/master/personalization/api_reference/recommendation_api/#submodel-parameters)
-- [Multiple attributes in submodel computation](https://doc.ibexa.co/projects/userguide/en/master/personalization/recommendation_models/#submodels) in user documentation
+- [Multiple attributes in submodel computation](https://doc.ibexa.co/projects/userguide/en/master/personalization/recommendation_models/#submodels) in User Documentation
 
 ### PIM
 
 - Updated [Enable purchasing products](https://doc.ibexa.co/en/master/pim/enable_purchasing_products/#region-and-currency)
 - [Virtual products](https://doc.ibexa.co/en/master/pim/products/#product-types)
-- [Virtual products in user documentation](https://doc.ibexa.co/projects/userguide/en/master/pim/create_virtual_product/)
-- [Work with product attributes](https://doc.ibexa.co/projects/userguide/en/master/pim/work_with_product_attributes/) in user documentation
+- [Virtual products in User Documentation](https://doc.ibexa.co/projects/userguide/en/master/pim/create_virtual_product/)
+- [Work with product attributes](https://doc.ibexa.co/projects/userguide/en/master/pim/work_with_product_attributes/) in User Documentation
 
 ### REST API
 - Added example of input payload in JSON format for [ContentTypeCreate in REST API reference](https://doc.ibexa.co/en/master/api/rest_api/rest_api_reference/rest_api_reference.html#managing-content-create-content-type)
@@ -444,7 +444,7 @@ This page contains recent highlights and notable changes in [[= product_name =]]
 ### Personalization
 
 - [Email triggers](https://doc.ibexa.co/en/master/personalization/integrate_recommendation_service/#send-messages-with-recommendations)
-- [Email triggers](https://doc.ibexa.co/projects/userguide/en/master/personalization/triggers/) in user documentation
+- [Email triggers](https://doc.ibexa.co/projects/userguide/en/master/personalization/triggers/) in User Documentation
 
 ### Search
 
@@ -455,8 +455,8 @@ This page contains recent highlights and notable changes in [[= product_name =]]
 
 ### Commerce
 
-- [Shipping methods management](https://doc.ibexa.co/projects/userguide/en/master/commerce/shipping_management/work_with_shipping_methods/) in user documentation
-- [Payment methods management](https://doc.ibexa.co/projects/userguide/en/master/commerce/payment/work_with_payments/) in user documentation
+- [Shipping methods management](https://doc.ibexa.co/projects/userguide/en/master/commerce/shipping_management/work_with_shipping_methods/) in User Documentation
+- [Payment methods management](https://doc.ibexa.co/projects/userguide/en/master/commerce/payment/work_with_payments/) in User Documentation
 - Stock Search Criteria and Aggregation:
     - [ProductStockRangeAggregation](https://doc.ibexa.co/en/master/search/aggregation_reference/productstockrange_aggregation/)
     - [ProductStock](https://doc.ibexa.co/en/master/search/criteria_reference/productstock_criterion/)
diff --git a/docs/resources/phpstorm_plugin.md b/docs/resources/phpstorm_plugin.md
index 7a43117a75..9a0a6833da 100644
--- a/docs/resources/phpstorm_plugin.md
+++ b/docs/resources/phpstorm_plugin.md
@@ -35,7 +35,7 @@ and select the downloaded file.
 ## Configuration
 
 Plugin configuration is available in PhpStorm settings/preferences (depending on your system), 
-under **PHP** > **Frameworks** > **Ibexa DXP**.
+under **PHP** > **Frameworks** > **[[= product_name =]]**.
 
 You can use it to:
 
@@ -60,20 +60,20 @@ on wizard data.
 ### Project wizard
 
 The plugin enables creating a new [[= product_name =]] project directly from PhpStorm.
-To do it, select **File** > **New Project...** > **Ibexa DXP**.
+To do it, select **File** > **New Project...** > **[[= product_name =]]**.
 
 In project settings form you can choose:
 
 - Location of the project
-- Product edition: Ibexa OSS, Ibexa Content, [[= product_name_exp =]], [[= product_name_com =]]
+- Product edition: [[= product_name_oss =]], [[= product_name_content =]], [[= product_name_exp =]], [[= product_name_com =]]
 - Authentication token (for Content, Experience and Commerce editions)
 - Product version: Default (latest LTS version), Latest (fast track or LTS), Latest LTS and "Next 3.x" (unstable, based on the 3.x branch) and "Next 4.x" (unstable, based on the 4.x branch)
-- Generate [Ibexa Cloud configuration](install_on_ibexa_cloud.md) 
+- Generate [[[= product_name_cloud =]] configuration](install_on_ibexa_cloud.md) 
 - Composer settings
 
 ![Create a project](phpstorm_plugin_create_project.png)
 
-If you do not provide credentials for https://updates.ibexa.co/, the plugin uses the installation key and token password stored in global Composer configuration. Otherwise, it creates an `auth.json` file.
+If you don't provide credentials for https://updates.ibexa.co/, the plugin uses the installation key and token password stored in global Composer configuration. Otherwise, it creates an `auth.json` file.
 
 You can find details of the installation procedure in Composer log window.
 
@@ -104,7 +104,7 @@ The plugin provides the following built-in file templates:
 | Value object visitor | REST value visitor class based on `Ibexa\Contracts\Rest\Output\ValueObjectVisitor` |
 | Workflow action listener | Workflow action listener class based on `Ibexa\Contracts\Workflow\Event\Action\AbstractTransitionWorkflowActionListener` |
 
-The templates are available in, for example, the context menu in **Project window** > **New** > **Ibexa DXP**.
+The templates are available in, for example, the context menu in **Project window** > **New** > **[[= product_name =]]**.
 
 The list of available file templates depends on the [[= product_name =]] edition used by the project.
 
@@ -170,7 +170,7 @@ To customize live templates, go to **File** > **Settings**/**Preferences** > **E
 
 ### Autocompletion in configuration files
 
-Plugin provides autocompletion for Ibexa DXP configuration structure in YAML files placed in `config/packages/`.
+Plugin provides autocompletion for [[= product_name =]] configuration structure in YAML files placed in `config/packages/`.
 
 Besides configuration structure, for the following YAML keys addition suggestions are available:
 
diff --git a/docs/search/aggregation_reference/rawrange_aggregation.md b/docs/search/aggregation_reference/rawrange_aggregation.md
index fb7e2465b7..8084c89b3f 100644
--- a/docs/search/aggregation_reference/rawrange_aggregation.md
+++ b/docs/search/aggregation_reference/rawrange_aggregation.md
@@ -12,7 +12,7 @@ The [RawRangeAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Cont
 
 !!! caution
 
-    To keep your project search engine independent, do not use the `RawRangeAggregation` Aggregation in production code.
+    To keep your project search engine independent, don't use the `RawRangeAggregation` Aggregation in production code.
     Valid use cases are: testing, or temporary (one-off) tools.
 
 ## Example
diff --git a/docs/search/aggregation_reference/rawstats_aggregation.md b/docs/search/aggregation_reference/rawstats_aggregation.md
index 6350c476f9..a4b76c65b1 100644
--- a/docs/search/aggregation_reference/rawstats_aggregation.md
+++ b/docs/search/aggregation_reference/rawstats_aggregation.md
@@ -18,7 +18,7 @@ and provides statistical information for the values. You can use the provided ge
 
 !!! caution
 
-    To keep your project search engine independent, do not use the `RawStatsAggregation` Aggregation in production code.
+    To keep your project search engine independent, don't use the `RawStatsAggregation` Aggregation in production code.
     Valid use cases are: testing, or temporary (one-off) tools.
 
 ## Example
diff --git a/docs/search/aggregation_reference/rawterm_aggregation.md b/docs/search/aggregation_reference/rawterm_aggregation.md
index 3eb69544df..c7ce430b46 100644
--- a/docs/search/aggregation_reference/rawterm_aggregation.md
+++ b/docs/search/aggregation_reference/rawterm_aggregation.md
@@ -11,7 +11,7 @@ The [RawTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contr
 
 !!! caution
 
-    To keep your project search engine independent, do not use the `RawTermAggregation` Aggregation in production code.
+    To keep your project search engine independent, don't use the `RawTermAggregation` Aggregation in production code.
     Valid use cases are: testing, or temporary (one-off) tools.
 
 ## Example
diff --git a/docs/search/criteria_reference/customprice_criterion.md b/docs/search/criteria_reference/customprice_criterion.md
index 3afc709501..93e8ab12ca 100644
--- a/docs/search/criteria_reference/customprice_criterion.md
+++ b/docs/search/criteria_reference/customprice_criterion.md
@@ -7,7 +7,7 @@ The `CustomPrice` Search Criterion searches for products by their custom price f
 - `value` - a `Money\Money` object representing the price in a specific currency
 - (optional) `operator` - Operator constant (EQ, GT, GTE, LT, LTE, default EQ)
 - (optional) `customerGroup` - a `CustomerGroupInterface` object representing the customer group to show prices for.
-If you do not provide a customer group, the query uses the group related to the current user.
+If you don't provide a customer group, the query uses the group related to the current user.
 
 ## Limitations
 
diff --git a/docs/search/criteria_reference/isfieldempty_criterion.md b/docs/search/criteria_reference/isfieldempty_criterion.md
index 0151abf906..3cccbedb25 100644
--- a/docs/search/criteria_reference/isfieldempty_criterion.md
+++ b/docs/search/criteria_reference/isfieldempty_criterion.md
@@ -25,7 +25,7 @@ $query->query = new Criterion\IsFieldEmpty('title');
 
 ## Use case
 
-You can use the `IsFieldEmpty` Criterion to search for articles that do not have an image:
+You can use the `IsFieldEmpty` Criterion to search for articles that don't have an image:
 
 ``` php hl_lines="4"
 $query = new LocationQuery;
diff --git a/docs/search/criteria_reference/search_criteria_reference.md b/docs/search/criteria_reference/search_criteria_reference.md
index 83d3ce4df1..bf98c31017 100644
--- a/docs/search/criteria_reference/search_criteria_reference.md
+++ b/docs/search/criteria_reference/search_criteria_reference.md
@@ -11,7 +11,7 @@ Criteria can take some of the following arguments:
 
 - `target` - when the Criterion supports targeting a specific field, example: `FieldDefinition` or Metadata identifier
 - `value` - the value(s) to filter on, typically a scalar or array of scalars
-- `operator` - constants on `Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator`: `IN`, `EQ`, `GT`, `GTE`, `LT`, `LTE`, `LIKE`, `BETWEEN`, `CONTAINS`. Most Criteria do not expose this and select `EQ` or `IN` depending on whether the value is scalar or an array. `IN` and `BETWEEN` always act on an array of values, while the other operators act on single scalar value
+- `operator` - constants on `Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator`: `IN`, `EQ`, `GT`, `GTE`, `LT`, `LTE`, `LIKE`, `BETWEEN`, `CONTAINS`. Most Criteria don't expose this and select `EQ` or `IN` depending on whether the value is scalar or an array. `IN` and `BETWEEN` always act on an array of values, while the other operators act on single scalar value
 - `valueData` - additional value data, required by some Criteria, for instance `MapLocationDistance`
 
 Support and capabilities of individual Criteria can depend on the search engine.
diff --git a/docs/search/search_criteria_and_sort_clauses.md b/docs/search/search_criteria_and_sort_clauses.md
index 57adec1227..3d8d0f70ce 100644
--- a/docs/search/search_criteria_and_sort_clauses.md
+++ b/docs/search/search_criteria_and_sort_clauses.md
@@ -30,7 +30,7 @@ In such cases you can implement a custom Criterion or Sort Clause, together with
 
 !!! caution "Using Field Criterion or Sort Clause with large databases"
 
-    Field Criterion and Sort Clause do not perform well by design when using SQL database.
+    Field Criterion and Sort Clause don't perform well by design when using SQL database.
     If you have a large database and want to use them, you either need to use the Solr search engine,
     or develop your own Custom Criterion or Sort Clause. This way you can avoid using the attributes (fields) database table,
     and instead use a custom simplified table which can handle the amount of data you have.
diff --git a/docs/search/search_engines/elastic_search/configure_elastic_search.md b/docs/search/search_engines/elastic_search/configure_elastic_search.md
index cb594c7079..b33b98e615 100644
--- a/docs/search/search_engines/elastic_search/configure_elastic_search.md
+++ b/docs/search/search_engines/elastic_search/configure_elastic_search.md
@@ -171,7 +171,7 @@ For more information, see [Set retries](https://www.elastic.co/guide/en/elastics
 ## Configure Elasticsearch Cloud
 
 As an alternative to using your own cluster, you can use Elasticsearch Cloud, a commercial SaaS solution.
-With Elasticsearch Cloud you do not have to build or manage your own Elasticsearch cluster.
+With Elasticsearch Cloud you don't have to build or manage your own Elasticsearch cluster.
 Also, you do all the configuration and administration in a graphical user interface.
 
 To connect to a cloud solution with [[= product_name =]], you must set the `elastic_cloud_id` parameter by
@@ -283,7 +283,7 @@ ibexa_elasticsearch:
                     pass: ~
 ```
 
-If you do not have a client certificate signed by public certificate authority,
+If you don't have a client certificate signed by public certificate authority,
 but you have a self-signed CA certificate generated by `elasticsearch-certutil` or another tool (for example for development purposes),
 use the following `ssl` configuration:
 
@@ -387,6 +387,7 @@ Index names use the following pattern:
   ```
 
 - `settings` - Settings under this key control all aspects related to an index.
+
 For more information and a list of available settings, see [Elasticsearch documentation](https://www.elastic.co/guide/en/elasticsearch/reference/7.x/index-modules.html#index-modules-settings).
 
     For example, you can define settings that convert text into a format that is optimized for
@@ -409,6 +410,7 @@ For more information and a list of available settings, see [Elasticsearch docume
   ```
 
 - `mappings` - Settings under this key define mapping for fields in the index.
+
 For more information about mappings, see [Elasticsearch documentation](https://www.elastic.co/guide/en/elasticsearch/reference/7.x/mapping.html).
 
     When you create a custom index template, with settings for your own field and document
@@ -501,6 +503,7 @@ In your copy of the default template, change the pattern as follows:
 ```
 
 This pattern matches on English.
+
 For more information about specifying the pattern for your language, see [Define a template](#define-a-template).
 
 #### Create config for language specific analyzer
diff --git a/docs/search/search_engines/elastic_search/install_elastic_search.md b/docs/search/search_engines/elastic_search/install_elastic_search.md
index 9d31f97254..9818606777 100644
--- a/docs/search/search_engines/elastic_search/install_elastic_search.md
+++ b/docs/search/search_engines/elastic_search/install_elastic_search.md
@@ -64,9 +64,12 @@ All configuration is made in the `/config/packages/ibexa_elasticsearch.yaml` fil
     the Elasticsearch documentation.
 
 First, decide how [[= product_name =]] connects to Elasticsearch and configure other connection settings.
+
 For more information, see [Configuring connections](configure_elastic_search.md#configure-connections).
 
-Then, define a field type mappings template that instructs Elasticsearch to interpret [[= product_name =]] fields as specific types. For more information, see [Configuring field type mappings](configure_elastic_search.md#define-field-type-mapping-templates).
+Then, define a field type mappings template that instructs Elasticsearch to interpret [[= product_name =]] fields as specific types.
+
+For more information, see [Configuring field type mappings](configure_elastic_search.md#define-field-type-mapping-templates).
 
 ## Push the templates
 
@@ -88,5 +91,5 @@ php bin/console ibexa:reindex
 
 !!! caution "Risks of premature indexing"
 
-    Do not reindex your data before you create index templates.
+    Don't reindex your data before you create index templates.
     Otherwise Elasticsearch attempts to use its [dynamic field mapping](https://www.elastic.co/guide/en/elasticsearch/reference/7.7/dynamic-field-mapping.html) feature to create type mappings automatically.
\ No newline at end of file
diff --git a/docs/search/search_engines/legacy_search_engine/legacy_search_overview.md b/docs/search/search_engines/legacy_search_engine/legacy_search_overview.md
index dfc084b434..1a2eebf753 100644
--- a/docs/search/search_engines/legacy_search_engine/legacy_search_overview.md
+++ b/docs/search/search_engines/legacy_search_engine/legacy_search_overview.md
@@ -8,6 +8,7 @@ Legacy search engine is the default search engine. it's SQL-based and uses Doctr
 The connections are defined in the same way as for storage engine, and no further specific configuration is needed.
 Legacy search engine is recommended for basic needs and isn't intended in production.
 It allows you to use filtering and fulltext search, but with some limitations.
+
 For more information, check [search engine comparison](search_engines.md#search-engines-comparison)
 
 !!! tip
diff --git a/docs/search/search_engines/solr_search_engine/install_solr.md b/docs/search/search_engines/solr_search_engine/install_solr.md
index 02c3f380b3..8477f3e79d 100644
--- a/docs/search/search_engines/solr_search_engine/install_solr.md
+++ b/docs/search/search_engines/solr_search_engine/install_solr.md
@@ -71,7 +71,7 @@ This setting is **required** if you want to see the changes after publish. it's
 ### Generate Solr configuration automatically
 
 The command line tool `bin/generate-solr-config.sh` generates Solr 7 configuration automatically.
-It can be used for deploying to Ibexa Cloud (Platform.sh) and on-premise installs.
+It can be used for deploying to [[= product_name_cloud =]] (Platform.sh) and on-premise installs.
 
 Execute the script from the [[= product_name =]] root directory for further information:
 
@@ -227,7 +227,10 @@ ibexa_solr:
 This solution uses the default SolrCloud [document routing strategy: `compositeId`](https://lucene.apache.org/solr/guide/7_7/shards-and-indexing-data-in-solrcloud.html#ShardsandIndexingDatainSolrCloud-DocumentRouting).
 
 ### Solr Basic HTTP Authorization
-Solr core can be secured with Basic HTTP Authorization. See more information here: [Solr Basic Authentication Plugin](https://cwiki.apache.org/confluence/display/solr/Basic+Authentication+Plugin).
+Solr core can be secured with Basic HTTP Authorization.
+
+For more information, see [Solr Basic Authentication Plugin](https://cwiki.apache.org/confluence/display/solr/Basic+Authentication+Plugin).
+
 In the example below we configured Solr Bundle to work with secured Solr core.
 
 ``` yaml
diff --git a/docs/search/sort_clause_reference/customfield_sort_clause.md b/docs/search/sort_clause_reference/customfield_sort_clause.md
index ed8d9ff9a7..c171ba524c 100644
--- a/docs/search/sort_clause_reference/customfield_sort_clause.md
+++ b/docs/search/sort_clause_reference/customfield_sort_clause.md
@@ -12,7 +12,7 @@ sorts search results by raw search index fields.
 
 !!! caution
 
-    To keep your project search engine independent, do not use the `CustomField` Sort Clause in production code.
+    To keep your project search engine independent, don't use the `CustomField` Sort Clause in production code.
     Valid use cases are: testing, or temporary (one-off) tools.
 
 The `CustomField` Sort Clause isn't available in [Repository filtering](search_api.md#repository-filtering).
diff --git a/docs/search/sort_clause_reference/customprice_sort_clause.md b/docs/search/sort_clause_reference/customprice_sort_clause.md
index e0e126a763..1c43f029fa 100644
--- a/docs/search/sort_clause_reference/customprice_sort_clause.md
+++ b/docs/search/sort_clause_reference/customprice_sort_clause.md
@@ -7,7 +7,7 @@ The `CustomPrice` Sort Clause sorts search results by the product's custom price
 - `currency` - a `CurrencyInterface` object representing the currency to check price for
 [[= include_file('docs/snippets/sort_direction.md') =]]
 - (optional) `customerGroup` - a `CustomerGroupInterface` object representing the customer group to check prices for.
-If you do not provide a customer group, the query uses the group related to the current user.
+If you don't provide a customer group, the query uses the group related to the current user.
 
 ## Limitations
 
diff --git a/docs/search/sort_clause_reference/field_sort_clause.md b/docs/search/sort_clause_reference/field_sort_clause.md
index ef63a746ce..8145a59188 100644
--- a/docs/search/sort_clause_reference/field_sort_clause.md
+++ b/docs/search/sort_clause_reference/field_sort_clause.md
@@ -4,7 +4,7 @@ The [`Field` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Cont
 sorts search results by the value of one of the content items' fields.
 
 Search results of the provided content type are sorted in field value order.
-Results of the query that do not belong to the content type are ranked lower.
+Results of the query that don't belong to the content type are ranked lower.
 
 ## Arguments
 
diff --git a/docs/snippets/update/db/db_backup_warning.md b/docs/snippets/update/db/db_backup_warning.md
index 4b94a1f91f..9f5bf1df31 100644
--- a/docs/snippets/update/db/db_backup_warning.md
+++ b/docs/snippets/update/db/db_backup_warning.md
@@ -4,6 +4,6 @@
 
     After updating the database, clear the cache.
     
-    Do not use `--force` argument for `mysql` / `psql` commands when performing update queries.
+    Don't use `--force` argument for `mysql` / `psql` commands when performing update queries.
     If there is any problem during the update, it's best if the query fails immediately, so you can fix the underlying problem before you execute the update again.
     If you leave this for later you risk ending up with an incompatible database, though the problems might not surface immediately.
diff --git a/docs/snippets/update/finish_the_update.md b/docs/snippets/update/finish_the_update.md
index ed81a423ce..0fef50769c 100644
--- a/docs/snippets/update/finish_the_update.md
+++ b/docs/snippets/update/finish_the_update.md
@@ -1,6 +1,6 @@
 ### A. Platform.sh changes
 
-If you're hosting your site on Ibexa Cloud be aware of the fact that Varnish is enabled by default as of v1.13.5, v2.4.3 and v2.5.0.
+If you're hosting your site on [[= product_name_cloud =]] be aware of the fact that Varnish is enabled by default as of v1.13.5, v2.4.3 and v2.5.0.
 If you're using Fastly, read about [how to disable Varnish](https://docs.platform.sh/frameworks/ibexa/fastly.html#remove-varnish-configuration).
 
 ### B. Dump assets
@@ -26,7 +26,7 @@ yarn encore prod
 When you resolve all conflicts and update `composer.lock`, commit the merge.
 
 You may or may not keep `composer.lock`, depending on your version management workflow.
-If you do not want to keep it, run `git reset HEAD composer.lock` to remove it from the changes.
+If you don't want to keep it, run `git reset HEAD composer.lock` to remove it from the changes.
 Run `git commit`, and adapt the message if necessary.
 
 Go back to `master`, and merge the `update-[[= target_version =]]` branch:
diff --git a/docs/snippets/update/merge_composer.md b/docs/snippets/update/merge_composer.md
index 7b60320efd..27079ad0a0 100644
--- a/docs/snippets/update/merge_composer.md
+++ b/docs/snippets/update/merge_composer.md
@@ -12,7 +12,7 @@ It's easiest to check out the version of `composer.lock` from the tag and add it
 git checkout --theirs composer.lock && git add composer.lock
 ```
 
-If you do not keep a copy of `composer.lock` in the branch, you may also remove it by running:
+If you don't keep a copy of `composer.lock` in the branch, you may also remove it by running:
 
 ``` bash
 git rm composer.lock
@@ -38,7 +38,7 @@ Use `git checkout -p` to selectively cancel those changes (and retain your addit
 git checkout -p composer.json
 ```
 
-Answer `no` (do not discard) to the requirement changes of `ezsystems` / `ibexa`  dependencies.
+Answer `no` (don't discard) to the requirement changes of `ezsystems` / `ibexa`  dependencies.
 Answer `yes` (discard) to removals of your changes.
 
 After you're done, inspect the file (you can use an editor or run `git diff composer.json`).
diff --git a/docs/templating/design_engine/add_new_design.md b/docs/templating/design_engine/add_new_design.md
index e884cf8aa6..0cb5f8c672 100644
--- a/docs/templating/design_engine/add_new_design.md
+++ b/docs/templating/design_engine/add_new_design.md
@@ -118,4 +118,4 @@ it uses the template from the next configured design.
 In the case above, the engine does not find the footer template for the `campaign` SiteAccess,
 so it uses the one from `standard`.
 
-This way you do not need to provide all templates for a new design, but only those that you want to be different than the fallback one.
+This way you don't need to provide all templates for a new design, but only those that you want to be different than the fallback one.
diff --git a/docs/templating/layout/add_search_form.md b/docs/templating/layout/add_search_form.md
index abf5522f4d..349ac13cec 100644
--- a/docs/templating/layout/add_search_form.md
+++ b/docs/templating/layout/add_search_form.md
@@ -63,5 +63,5 @@ Create the `parts/search_form.html.twig` file:
 ```
 
 This template renders only a basic query field and a submit button.
-`'render_rest': false` ensures that the fields you do not explicitly add to the template aren't rendered
+`'render_rest': false` ensures that the fields you don't explicitly add to the template aren't rendered
 (in this case, date selection, content type, and so on).
diff --git a/docs/templating/queries_and_controllers/controllers.md b/docs/templating/queries_and_controllers/controllers.md
index 6bdbca89bd..ade94ecd62 100644
--- a/docs/templating/queries_and_controllers/controllers.md
+++ b/docs/templating/queries_and_controllers/controllers.md
@@ -18,8 +18,8 @@ You indicate which controller to use in the [content view configuration](templat
 
 For a full example of using a custom controller, see [Embed content](embed_content.md#embed-relations-with-a-custom-controller).
 
-If you do not want to use the default view controller and only use a custom one,
-use the same configuration, but do not provide the `template` key.
+If you don't want to use the default view controller and only use a custom one,
+use the same configuration, but don't provide the `template` key.
 You have to indicate the template to use from the controller itself.
 
 !!! tip "Permissions for custom controllers"
diff --git a/docs/templating/queries_and_controllers/create_custom_query_type.md b/docs/templating/queries_and_controllers/create_custom_query_type.md
index be3700841e..7f235d1b57 100644
--- a/docs/templating/queries_and_controllers/create_custom_query_type.md
+++ b/docs/templating/queries_and_controllers/create_custom_query_type.md
@@ -32,8 +32,8 @@ The name defined in `getName()` is the one you use to identify the Query type in
     Query type name must be unique.
 
 The `getQuery()` method constructs the query based on Search Criteria and Sort Clauses.
-See [Content search](search_api.md) for more information about queries
-and [Search reference](search_criteria_reference.md) for a reference of available Criteria and Sort Clauses.
+
+For more information, see [Content search](search_api.md) and [Search reference](search_criteria_reference.md).
 
 The `getSupportedParameters()` method provides the parameters you can set in content view configuration.
 
diff --git a/docs/templating/twig_function_reference/cart_twig_functions.md b/docs/templating/twig_function_reference/cart_twig_functions.md
index 4cdac70bc7..7028194154 100644
--- a/docs/templating/twig_function_reference/cart_twig_functions.md
+++ b/docs/templating/twig_function_reference/cart_twig_functions.md
@@ -10,7 +10,7 @@ You can use cart Twig functions to check whether products can be added to cart,
 
 ### `ibexa_can_be_added_to_cart()`
 
-The `ibexa_can_be_added_to_cart()` function checks whether the provided product can be added to cart. It eliminates products that aren't available, products that do not have a price that corresponds to a currency selected for the cart, and products, for which VAT category isn't set. It also eliminates products that have variants but aren't one of those variants.
+The `ibexa_can_be_added_to_cart()` function checks whether the provided product can be added to cart. It eliminates products that aren't available, products that don't have a price that corresponds to a currency selected for the cart, and products, for which VAT category isn't set. It also eliminates products that have variants but aren't one of those variants.
 
 ``` html+twig
 {% set is_disabled = (is_disabled or ibexa_can_be_added_to_cart(product) == false)|default(false) %}
diff --git a/docs/templating/urls_and_routes/custom_breadcrumbs.md b/docs/templating/urls_and_routes/custom_breadcrumbs.md
index 8a8c8c667e..4777eb7485 100644
--- a/docs/templating/urls_and_routes/custom_breadcrumbs.md
+++ b/docs/templating/urls_and_routes/custom_breadcrumbs.md
@@ -64,7 +64,7 @@ which implements this interface and provides access to the WhiteOctober breadcru
 Every breadcrumb generator has to add a `translationParameters` array with `type`, `identifier` and `content_type_id`.
 Always create all three keys and leave the elements empty if not needed.
 
-If you can't or do not want to use `AbstractWhiteOctoberBreadcrumbsGenerator`,
+If you can't or don't want to use `AbstractWhiteOctoberBreadcrumbsGenerator`,
 your generator's `renderBreadcrumbs()` method must handle rendering the HTML code for the breadcrumbs.
 
 The highest priority generator which matches `canRender()` renders the breadcrumbs for the current request.
diff --git a/docs/tutorials/beginner_tutorial/4_display_single_content_item.md b/docs/tutorials/beginner_tutorial/4_display_single_content_item.md
index f7048b30e3..d51ae5c28b 100644
--- a/docs/tutorials/beginner_tutorial/4_display_single_content_item.md
+++ b/docs/tutorials/beginner_tutorial/4_display_single_content_item.md
@@ -79,7 +79,7 @@ Go back to `config/packages/ibexa.yaml` and add the following configuration (und
 site:
     content_view:
         full:
-            # existing keys, do not change them
+            # existing keys, don't change them
             ride:
                 template: full/ride.html.twig
                 match:
@@ -90,7 +90,7 @@ This tells the application to use this template whenever it renders the full vie
 
 ### Check the Ride full view
 
-Because you do not have a list of Rides on the front page yet, you cannot simply click a Ride to preview it.
+Because you don't have a list of Rides on the front page yet, you cannot simply click a Ride to preview it.
 But you still can see how the template works in two ways:
 
 #### Preview in the back office
diff --git a/docs/tutorials/beginner_tutorial/5_display_a_list_of_content_items.md b/docs/tutorials/beginner_tutorial/5_display_a_list_of_content_items.md
index 1bb83b4f18..9cd8d436e2 100644
--- a/docs/tutorials/beginner_tutorial/5_display_a_list_of_content_items.md
+++ b/docs/tutorials/beginner_tutorial/5_display_a_list_of_content_items.md
@@ -49,6 +49,7 @@ To get this list, you use a Query Type.
 ## Create a QueryType for the home page
 
 QueryType objects are used to limit and sort results for content item queries.
+
 For more information, see [Built-In Query Types](built-in_query_types.md).
 
 Here, you need to display `ride` objects that have been published (are visible).
@@ -101,7 +102,7 @@ In the view configuration for the home page indicate that this view uses the Que
 site:
     content_view:
         full:
-            # existing keys, do not change them
+            # existing keys, don't change them
             home_page:
                 controller: ibexa_query::pagingQueryAction
                 template: full/home_page.html.twig
diff --git a/docs/tutorials/beginner_tutorial/8_enable_account_registration.md b/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
index 35579ace6f..e178f21197 100644
--- a/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
+++ b/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
@@ -171,7 +171,7 @@ The User you have just created has the roles assigned to this group.
 !!! tip
 
     You can change the group in which new Users are placed (but you don't need to do it for this tutorial).
-    See [Registering new users](user_registration.md) for more information.
+    For more information, see [Registering new users](user_registration.md).
 
 At this point you don't want anyone who registers to be able to add content to the website.
 That's why you'll create a new user group with additional permissions.
diff --git a/docs/tutorials/generic_field_type/2_define_point2d_field_type.md b/docs/tutorials/generic_field_type/2_define_point2d_field_type.md
index aa6e1b68fc..c2d0d1da0f 100644
--- a/docs/tutorials/generic_field_type/2_define_point2d_field_type.md
+++ b/docs/tutorials/generic_field_type/2_define_point2d_field_type.md
@@ -8,6 +8,7 @@ description: Learn how to create the Type class which contains the logic for the
 
 The Type contains logic of the field type: validating data, transforming from various formats, describing the validators, etc.
 In this example Point 2D field type extends the `Ibexa\Contracts\Core\FieldType\Generic\Type` class.
+
 For more information about the Type class of a field type, see [Type class](type_and_value.md#type-class).
 
 ## Field type identifier
diff --git a/docs/tutorials/generic_field_type/3_create_form_for_point2d.md b/docs/tutorials/generic_field_type/3_create_form_for_point2d.md
index ad6ab18cfb..a6df29922a 100644
--- a/docs/tutorials/generic_field_type/3_create_form_for_point2d.md
+++ b/docs/tutorials/generic_field_type/3_create_form_for_point2d.md
@@ -17,8 +17,9 @@ This method adds fields for `x` and `y` coordinates.
 
 ## Add a Form Mapper Interface
 
-The FormMapper adds the field definitions into Symfony forms using the `add()` method. 
+The FormMapper adds the field definitions into Symfony forms using the `add()` method.
 The `FieldValueFormMapperInterface` provides an edit form for your field type in the administration interface.
+
 For more information about the FormMappers, see [field type form and template](form_and_template.md).
 
 First, implement a `FieldValueFormMapperInterface` interface (`Ibexa\Contracts\ContentForms\FieldType\FieldValueFormMapperInterface`) to field type definition in the `src/FieldType/Point2D/Type.php`.
diff --git a/docs/tutorials/generic_field_type/4_introduce_a_template.md b/docs/tutorials/generic_field_type/4_introduce_a_template.md
index 353b390785..b429e4ef3c 100644
--- a/docs/tutorials/generic_field_type/4_introduce_a_template.md
+++ b/docs/tutorials/generic_field_type/4_introduce_a_template.md
@@ -12,7 +12,8 @@ In this case the most important variable is the `field`, an instance of `Ibexa\C
 In addition to its own metadata (`id`, `fieldDefIdentifier`, etc.), it exposes the field Value through the `value` property.
 
 Remember that field type templates can be overridden to tweak what is displayed and how.
-For more information, see the documentation about [field type templates](form_and_template.md#content-view-templates).
+
+For more information, see [field type templates](form_and_template.md#content-view-templates).
 
 First, create a `point2d_field.html.twig` template in the `templates` directory.
 It defines the default display of a Point 2D.
diff --git a/docs/tutorials/generic_field_type/creating_a_point2d_field_type.md b/docs/tutorials/generic_field_type/creating_a_point2d_field_type.md
index 4dfafe5a6d..d636436282 100644
--- a/docs/tutorials/generic_field_type/creating_a_point2d_field_type.md
+++ b/docs/tutorials/generic_field_type/creating_a_point2d_field_type.md
@@ -14,7 +14,7 @@ Field types are responsible for:
 - Making the data searchable (if applicable)
 - Displaying fields
 
-You can find more information in [field type documentation](field_types.md).
+For more information, see [field type documentation](field_types.md).
 It describes how each component of a field type interacts with the various layers of the system, and how to implement them.
 
 ## Intended audience
diff --git a/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md b/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md
index 85dd6bd28b..f2c76a909a 100644
--- a/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md
+++ b/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md
@@ -11,7 +11,7 @@ To set up the starter website, you need to follow these steps:
 
 To begin the tutorial, you need a clean installation of [[= product_name_exp =]].
 
-Get it by following the [Install Ibexa DXP](install_ibexa_dxp.md) guide.
+Get it by following the [Install [[= product_name =]]](install_ibexa_dxp.md) guide.
 
 ## Add content types
 
@@ -112,7 +112,7 @@ First, you can hide unneeded content items from the project root.
 Go to **Content structure** and select "Ibexa Digital Experience Platform".
 In the **Sub-items** tab, select all the current sub-items and click the **Hide** icon:
 
-![Hiding content items you do not need](enterprise_tut_hide_content.png)
+![Hiding content items you don't need](enterprise_tut_hide_content.png)
 
 Next, under "Ibexa Digital Experience Platform", create three Folders. Call them 'All Articles', 'Dog Breed Catalog' and 'All Tips'.
 Remember that you can **Save and close** them, but you should use the **Publish** button.
diff --git a/docs/tutorials/page_and_form_tutorial/3_use_existing_blocks.md b/docs/tutorials/page_and_form_tutorial/3_use_existing_blocks.md
index 455311bcb2..d39b3e45a7 100644
--- a/docs/tutorials/page_and_form_tutorial/3_use_existing_blocks.md
+++ b/docs/tutorials/page_and_form_tutorial/3_use_existing_blocks.md
@@ -109,7 +109,7 @@ At this point you can add a new Content Scheduler block to your Page and fill it
 
 !!! tip
 
-    If you do not see the featured block template, you may need to clear the cache (using `php bin/console cache:clear`) and/or reload the app.
+    If you don't see the featured block template, you may need to clear the cache (using `php bin/console cache:clear`) and/or reload the app.
 
 Go back to editing the Home Page and drag a Content Scheduler block from the pane on the right to the main zone in the layout, above the Content List block.
 Select the block and click the Block Settings icon.
diff --git a/docs/update_and_migration/from_1.x_2.x/update_app_to_2.5.md b/docs/update_and_migration/from_1.x_2.x/update_app_to_2.5.md
index ce025b7cdf..687a5f9706 100644
--- a/docs/update_and_migration/from_1.x_2.x/update_app_to_2.5.md
+++ b/docs/update_and_migration/from_1.x_2.x/update_app_to_2.5.md
@@ -24,7 +24,9 @@ You need to install [Node.js](https://nodejs.org/en) and [Yarn](https://classic.
 In v2.5 it's still possible to use Assetic, like in earlier versions.
 However, if you're using the latest Bootstrap version, [`scssphp`](https://github.com/leafo/scssphp)
 doesn't compile correctly with Assetic.
-In this case, use Webpack Encore. See [Importing assets from a bundle](importing_assets_from_bundle.md) for more information.
+In this case, use Webpack Encore.
+
+For more information, see [Importing assets from a bundle](importing_assets_from_bundle.md).
 
 If you experience issues during the update, see [Troubleshooting](troubleshooting.md#cloning-failed-using-an-ssh-key).
 
diff --git a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
index 0f73ab798a..5f35d929a1 100644
--- a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
+++ b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
@@ -118,7 +118,7 @@ Typically, what you previously would do in `getTemplateParameters()`, you'll now
 
 The definition of block parameters has to be moved from `createBlockDefinition()` to the [YAML configuration](create_custom_page_block.md) for your custom blocks.
 
-For more information about how custom blocks are implemented in Page Builder, have a look at [Creating custom Page blocks](create_custom_page_block.md) for your custom blocks.
+For more information about how custom blocks are implemented in Page Builder, see [Creating custom Page blocks](create_custom_page_block.md) for your custom blocks.
 
 For the migration of blocks from landing page to Page Builder, you'll need to provide a converter for attributes of custom blocks. For simple blocks you can use `\EzSystems\EzPlatformPageMigration\Converter\AttributeConverter\DefaultConverter`.
 Custom converters must implement the `\EzSystems\EzPlatformPageMigration\Converter\AttributeConverter\ConverterInterface` interface.
@@ -779,7 +779,7 @@ The introduction of [support for PostgreSQL](databases.md#using-postgresql) incl
 It's now created based on [YAML configuration](https://github.com/ezsystems/ezpublish-kernel/blob/master/eZ/Bundle/EzPublishCoreBundle/Resources/config/storage/legacy/schema.yaml), using the new [`DoctrineSchemaBundle`](https://github.com/ezsystems/doctrine-dbal-schema).
 
 If you're updating your application according to the usual procedure, no additional actions are required.
-However, if you do not update your meta-repository, you need to take two additional steps:
+However, if you don't update your meta-repository, you need to take two additional steps:
 
 - enable `EzSystems\DoctrineSchemaBundle\DoctrineSchemaBundle()` in `AppKernel.php`
 - add [`ez_doctrine_schema`](https://github.com/ezsystems/ezplatform/blob/2.5/app/config/config.yml#L33) configuration
diff --git a/docs/update_and_migration/from_2.5/to_3.3.latest.md b/docs/update_and_migration/from_2.5/to_3.3.latest.md
index f563756254..0eadbcb1a3 100644
--- a/docs/update_and_migration/from_2.5/to_3.3.latest.md
+++ b/docs/update_and_migration/from_2.5/to_3.3.latest.md
@@ -164,7 +164,7 @@ Run the following scripts:
 
 !!! tip
 
-    Even if you do not plan to use Fastly shielding, it's recommended to update the VCL files for future compatibility.
+    Even if you don't plan to use Fastly shielding, it's recommended to update the VCL files for future compatibility.
 
 1. Locate the `vendor/ezsystems/ezplatform-http-cache-fastly/fastly/ez_main.vcl` file and update your VCL file with the recent changes.
 2. Do the same with `vendor/ezsystems/ezplatform-http-cache-fastly/fastly/ez_user_hash.vcl`.
diff --git a/docs/update_and_migration/from_2.5/to_3.3.md b/docs/update_and_migration/from_2.5/to_3.3.md
index 81688d60ac..fe1335aea3 100644
--- a/docs/update_and_migration/from_2.5/to_3.3.md
+++ b/docs/update_and_migration/from_2.5/to_3.3.md
@@ -47,7 +47,7 @@ If you haven't done it before, add the relevant meta-repository as an `upstream`
 
 Merge the current skeleton into your project:
 
-=== "Ibexa Content"
+=== "[[= product_name_content =]]t"
 
     ``` bash
     git remote add content-skeleton https://github.com/ibexa/content-skeleton.git
@@ -55,7 +55,7 @@ Merge the current skeleton into your project:
     git merge v[[= latest_tag =]] --allow-unrelated-histories
     ```
 
-=== "Ibexa Experience"
+=== "[[= product_name_exp =]]"
 
     ``` bash
     git remote add experience-skeleton https://github.com/ibexa/experience-skeleton.git
@@ -63,7 +63,7 @@ Merge the current skeleton into your project:
     git merge v[[= latest_tag =]] --allow-unrelated-histories
     ```
 
-=== "Ibexa Commerce"
+=== "[[= product_name_com =]]"
 
     ``` bash
     git remote add commerce-skeleton https://github.com/ibexa/commerce-skeleton.git
diff --git a/docs/update_and_migration/from_3.3/to_4.0.md b/docs/update_and_migration/from_3.3/to_4.0.md
index 0fa54faaa0..018a0ed264 100644
--- a/docs/update_and_migration/from_3.3/to_4.0.md
+++ b/docs/update_and_migration/from_3.3/to_4.0.md
@@ -108,7 +108,7 @@ php bin/console cache:clear
 
 Apply the following database update script:
 
-### Ibexa DXP
+### [[= product_name =]]
 
 === "MySQL"
     ``` bash
diff --git a/docs/update_and_migration/from_3.3/update_from_3.3.md b/docs/update_and_migration/from_3.3/update_from_3.3.md
index 076a5bc274..cc5175fd86 100644
--- a/docs/update_and_migration/from_3.3/update_from_3.3.md
+++ b/docs/update_and_migration/from_3.3/update_from_3.3.md
@@ -372,7 +372,7 @@ See [Update Flex server](#update-flex-server).
 
 !!! tip
 
-    Even if you do not plan to use Fastly shielding, it's recommended to update the VCL files for future compatibility.
+    Even if you don't plan to use Fastly shielding, it's recommended to update the VCL files for future compatibility.
 
 1. Locate the `vendor/ezsystems/ezplatform-http-cache-fastly/fastly/ez_main.vcl` file and update your VCL file with the recent changes.
 2. Do the same with `vendor/ezsystems/ezplatform-http-cache-fastly/fastly/ez_user_hash.vcl`.
diff --git a/docs/update_and_migration/from_4.3/update_from_4.3.md b/docs/update_and_migration/from_4.3/update_from_4.3.md
index 10ef903ab7..f86204efc7 100644
--- a/docs/update_and_migration/from_4.3/update_from_4.3.md
+++ b/docs/update_and_migration/from_4.3/update_from_4.3.md
@@ -8,11 +8,11 @@ This update procedure applies if you're using the newest v4.3 installation.
 
 This release deprecates all Commerce packages in[[= product_name =]]. They will be removed in v5.
 Until that time, they will be maintained by Ibexa with fixes, including security fixes, but they won't be further developed.
-Old packages are replaced by [the all-new Ibexa Commerce packages](ibexa_dxp_v4.4.md#all-new-ibexa-commerce-packages).
+Old packages are replaced by [the all-new [[= product_name_com =]] packages](ibexa_dxp_v4.4.md#all-new-ibexa-commerce-packages).
 
 For that reason, there are two update routes you can take.
 
-A. If you do not use Commerce functionalities, you can proceed with removing them.
+A. If you don't use Commerce functionalities, you can proceed with removing them.
 
 B. If you use Commerce functionalities based on the deprecated packages, you can continue to use them for the time being.
 
diff --git a/docs/update_and_migration/from_4.3/update_from_4.3_new_commerce.md b/docs/update_and_migration/from_4.3/update_from_4.3_new_commerce.md
index d55e776226..576482e6fc 100644
--- a/docs/update_and_migration/from_4.3/update_from_4.3_new_commerce.md
+++ b/docs/update_and_migration/from_4.3/update_from_4.3_new_commerce.md
@@ -3,7 +3,7 @@ description: Update procedure to v4.4 for people who don't use Commerce packages
 ---
 # Update with new Commerce packages
 
-This update procedure applies if you have a v4.3 installation, and you do not use Commerce packages.
+This update procedure applies if you have a v4.3 installation, and you don't use Commerce packages.
 
 [[% include 'snippets/update/temporary_v4_conflicts.md' %]]
 
@@ -145,7 +145,7 @@ composer recipe:install --force --reset -- oneup/flysystem-bundle
 ### Remove `ibexa/commerce-*` packages with dependencies
 
 Remove the following bundles from `config/bundles.php`.
-You do not have to remove third-party bundles (`FOS\` to `JMS\`) if they're used by your installation.
+You don't have to remove third-party bundles (`FOS\` to `JMS\`) if they're used by your installation.
 
 === "[[= product_name_content =]]"
 
@@ -246,7 +246,7 @@ You do not have to remove third-party bundles (`FOS\` to `JMS\`) if they're used
     ```
 
 Next, remove related extensions' configuration.
-You do not have to remove third-party bundles (for example `config/packages/fos_rest.yaml`) if they're used by your installation.
+You don't have to remove third-party bundles (for example `config/packages/fos_rest.yaml`) if they're used by your installation.
 
 === "[[= product_name_content =]]"
 
@@ -299,8 +299,8 @@ Finally, remove related routes by deleting `config/routes/ibexa_commerce.yaml` f
 
 ### Update the database
 
-Next, update the database if you're using Ibexa Commerce.
-Ibexa Content and Ibexa Experience do not require the database update.
+Next, update the database if you're using [[= product_name_com =]].
+[[= product_name_content =]] and [[= product_name_exp =]] don't require the database update.
 
 [[% include 'snippets/update/db/db_backup_warning.md' %]]
 
@@ -320,7 +320,7 @@ Apply the following database update scripts:
 
 #### Ibexa Open Source
 
-If you have no access to Ibexa DXP's `ibexa/installer` package, database upgrade isn't necessary.
+If you have no access to [[= product_name =]]'s `ibexa/installer` package, database upgrade isn't necessary.
 
 ## Ensure password safety
 
@@ -339,7 +339,7 @@ composer run post-install-cmd
 
 ### Customer Portal self-registration
 
-If you're using Ibexa Experience or Ibexa Commerce,
+If you're using [[= product_name_exp =]] or [[= product_name_com =]],
 you can now run data migration required by the Customer Portal applications feature to finish the update process:
 
 ```bash
diff --git a/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md b/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md
index d1f7f335b3..6aad2dfb49 100644
--- a/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md
+++ b/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md
@@ -8,7 +8,7 @@ This update procedure applies if you have a v4.3 installation, you use Commerce
 
 All commerce packages as of v4.4 are deprecated and will be removed in v5.
 Until that time, they will be maintained by Ibexa with fixes, including security fixes, but they won't be further developed.
-Old packages are replaced by [the all-new Ibexa Commerce packages](ibexa_dxp_v4.4.md#all-new-ibexa-commerce-packages).
+Old packages are replaced by [the all-new [[= product_name_com =]] packages](ibexa_dxp_v4.4.md#all-new-ibexa-commerce-packages).
 
 [[% include 'snippets/update/temporary_v4_conflicts.md' %]]
 
@@ -174,8 +174,8 @@ ibexa:
 
 ### Update the database
 
-Next, update the database if you're using Ibexa Commerce.
-Ibexa Content and Ibexa Experience do not require the database update.
+Next, update the database if you're using [[= product_name_com =]].
+[[= product_name_content =]] and [[= product_name_exp=]] don't require the database update.
 
 [[% include 'snippets/update/db/db_backup_warning.md' %]]
 
@@ -215,7 +215,7 @@ composer run post-install-cmd
 
 ### Customer Portal self-registration
 
-If you're using Ibexa Experience or Ibexa Commerce,
+If you're using [[= product_name_exp =]] or [[= product_name_com =]],
 run data migration required by the Customer Portal applications feature:
 
 ```bash
diff --git a/docs/update_and_migration/from_4.4/update_from_4.4.md b/docs/update_and_migration/from_4.4/update_from_4.4.md
index c3efd53566..d2ad50bff2 100644
--- a/docs/update_and_migration/from_4.4/update_from_4.4.md
+++ b/docs/update_and_migration/from_4.4/update_from_4.4.md
@@ -84,7 +84,8 @@ ibexa_measurement:
             my_unit: { symbol: my, is_base_unit: true }
 ```
 
-Next, add unit conversion to `src/bundle/Resources/config/services/conversion.yaml`. 
+Next, add unit conversion to `src/bundle/Resources/config/services/conversion.yaml`.
+
 For more information, see [Modify and add Measurement types and units](measurementfield.md#modify-and-add-measurement-types-and-units).
 
 ### Update the database
@@ -193,7 +194,7 @@ composer run post-install-cmd
 
 ## Run data migration
 
-If you're using Ibexa Experience or Ibexa Commerce,
+If you're using [[= product_name_exp =]] or [[= product_name_com =]],
 you can now run data migration required by the Customer Portal and Commerce features to finish the update process:
 
 - Customer Portal [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
diff --git a/docs/update_and_migration/from_4.5/update_from_4.5.md b/docs/update_and_migration/from_4.5/update_from_4.5.md
index ab123f76ae..6ca6ac795e 100644
--- a/docs/update_and_migration/from_4.5/update_from_4.5.md
+++ b/docs/update_and_migration/from_4.5/update_from_4.5.md
@@ -565,7 +565,7 @@ A command to deal with duplicated database entries, as reported in [IBX-8562](ht
 
 ## v4.6.11
 
-### Ibexa Cloud
+### [[= product_name_cloud =]]
 
 Update Platform.sh configuration for PHP and Varnish.
 
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/common_issues.md b/docs/update_and_migration/migrate_to_ibexa_dxp/common_issues.md
index 036294e53d..909ec1f1f5 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/common_issues.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/common_issues.md
@@ -22,7 +22,8 @@ issues that can occur after migration to [[= product_name =]].
 ## Regenerating URL aliases
 
 To regenerate URL aliases, use the `ibexa:urls:regenerate-aliases` command.
-See [Regenerating URL aliases](url_management.md#regenerating-url-aliases) for more information.
+
+For more information, see [Regenerating URL aliases](url_management.md#regenerating-url-aliases).
 
 !!! note
 
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish.md b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish.md
index 831f207988..9deefb8e9c 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish.md
@@ -47,7 +47,7 @@ See Upgrade documentation on how to perform the actual upgrade: [Upgrade (eZ Pub
 !!! caution "Avoid exception when migrating the database"
 
     If you plan to migrate from from eZ Publish through eZ Publish Platform 5.4 to eZ Platform and further, an exception may occur when you try to migrate the database while it contains internal drafts of landing pages.
-    This can happen because such drafts do not have an expected row in the `ezcontentobject_name` table.<a id="migration_exception"></a> 
+    This can happen because such drafts don't have an expected row in the `ezcontentobject_name` table.<a id="migration_exception"></a> 
     
     To avoid this exception, you must remove all internal drafts before you migrate. 
     First, in `content.ini`, set the `InternalDraftsCleanUpLimit` and `InternalDraftsDuration` values to 0. 
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
index f102abe807..e0142e272f 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
@@ -17,7 +17,7 @@ You can then proceed with consecutive upgrades to further versions: v1.13 LTS an
 
 !!! caution "Things to be aware of when planning a migration"
 
-    1. While the instructions below are fully supported, we are aware that the community, partners and customers come from a wide range of different versions of eZ Publish, some with issues that do not surface before attempting a migration. That's why we and the community are actively gathering feedback on Slack and/or support channels for Enterprise customers to gradually improve the migration scripts and instructions. Reach out before you start so others who have done this before you can support you.
+    1. While the instructions below are fully supported, we are aware that the community, partners and customers come from a wide range of different versions of eZ Publish, some with issues that don't surface before attempting a migration. That's why we and the community are actively gathering feedback on Slack and/or support channels for Enterprise customers to gradually improve the migration scripts and instructions. Reach out before you start so others who have done this before you can support you.
 
     1. As of eZ Platform v1.11, Legacy Bridge is a supported option for 1.x and future 2.x series. This means you can plan for a more gradual migration if you want, just like you could on eZ Publish Platform 5.x, with a more feature-rich version of eZ Platform and (with 2.x) also more recent version of Symfony. This is a great option for those who want the latest features and are comfortable with more frequent releases.
 
@@ -188,12 +188,12 @@ As eZ Publish legacy is installed via composer, we need to take care of placing
 The easiest way to upgrade the distribution files is to copy the directories that contain site-specific files from the existing 5.4 installation into `/<ezplatform>/ezpublish_legacy`. Make sure you copy the following directories:
 
 - `<old-ez-root>/ezpublish_legacy/design/<your_designs>` => `<new-ez-root>/src/legacy_files/design/<your_designs>`
-    - *Do NOT include built-in designs: admin, base, standard or admin2*
+    - *Don't include built-in designs: admin, base, standard or admin2*
 - `<old-ez-root>/ezpublish_legacy/settings/siteaccess/<your_siteaccesses>` => `<new-ez-root>/src/legacy_files/settings/siteaccess/<your_siteaccesses>`
 - `<old-ez-root>/ezpublish_legacy/settings/override/*` => `<new-ez-root>/src/legacy_files/settings/override/*`
 - Other folders to move over *(or potentially set up symlinks for)* if applicable:
     - ezpublish_legacy/var/storage/packages
-    - ezpublish_legacy/extension/\* *(do NOT include the built-in / composer provided ones, like: ezflow, ezjscore, ezoe, ezodf, ezie, ezmultiupload, ezmbpaex, ez_network, ezprestapiprovider, ezscriptmonitor, ezsi, ezfind)*
+    - ezpublish_legacy/extension/\* *(don't include the built-in / composer provided ones, like: ezflow, ezjscore, ezoe, ezodf, ezie, ezmultiupload, ezmbpaex, ez_network, ezprestapiprovider, ezscriptmonitor, ezsi, ezfind)*
     - ezpublish_legacy/config.php and ezpublish_legacy/config.cluster.php
 
 !!! note
@@ -248,7 +248,7 @@ The field types unsupported in eZ Platform are:
 - [Page](#322-migrate-page-field-to-page-ez-enterprise-only)
 - Star Rating
 
-For field types which do not have specific procedures below, you must take one of the following actions:
+For field types which don't have specific procedures below, you must take one of the following actions:
 
 - implement them yourself in eZ Platform
 - remove them from all content types that use them
@@ -273,7 +273,7 @@ Run the conversion script on a copy of your production database as the script is
 - `--dry-run` prevents the conversion script from writing anything back to the database. It just tests if it's able to convert all the `ezxmltext` documents.
 - `--export-dir` specifies a directory where it dumps the `ezxmltext` for content object attributes which the conversion script finds problems with
 - `--export-dir-filter` specifies what severity the problems found needs to be before the script dumps the `ezxmltext`:
-    - `notice`: `ezxmltext` contains problems which the conversion tool was able to fix automatically and likely do not need manual intervention
+    - `notice`: `ezxmltext` contains problems which the conversion tool was able to fix automatically and likely don't need manual intervention
     - `warning`: the conversion tool was able to convert the `ezxmltext` to valid `richtext`, but data could have been altered/removed/added in the process. Manual supervision recommended
     - `error`: the `ezxmltext` text cannot be converted and manual changes are required.
 - `--concurrency 4` specifies that the conversion script spawns four child processes which run the conversion. If you have dedicated hardware for running the conversion, you should use concurrency level that matches the number of logical CPUs on your system. If your system needs to do other tasks while running the conversion, you should run with a smaller number.
@@ -426,7 +426,9 @@ When the conversion tool detects links with no reference it issues a warning and
 
 **`<literal>`**
 
-The `<literal>` tag isn't yet supported in eZ Platform. For more information about this, please have a look at [EZP-29328](https://issues.ibexa.co/browse/EZP-29328) and [EZP-29027](https://issues.ibexa.co/browse/EZP-29027).
+The `<literal>` tag isn't yet supported in eZ Platform.
+
+For more information, see [EZP-29328](https://issues.ibexa.co/browse/EZP-29328) and [EZP-29027](https://issues.ibexa.co/browse/EZP-29027).
 
 When you're ready to migrate your eZ Publish XmlText content to the eZ Platform RichText format and start using pure eZ Platform setup, start the conversion script without the `--dry-run` option. Execute the following from &lt;new-ez-root&gt;:
 
@@ -462,7 +464,9 @@ Below is a table of the tags that are currently supported, and their correspondi
 
 #### 3.2.2 Migrate Page field to Page (eZ Enterprise only)
 
-**If** you use Page field (ezflow) and an eZ Enterprise subscription, and are ready to migrate your eZ Publish Flow content to the eZ Enterprise Page format, you can use a script to migrate your old Page content to new Page, to start using a pure eZ Enterprise setup. See [Migrating legacy Page field (ezflow) to new Page (Enterprise)](#migrating-legacy-page-field-ezflow-to-new-page-enterprise) for more information.
+**If** you use Page field (ezflow) and an eZ Enterprise subscription, and are ready to migrate your eZ Publish Flow content to the eZ Enterprise Page format, you can use a script to migrate your old Page content to new Page, to start using a pure eZ Enterprise setup.
+
+For more information, see [Migrating legacy Page field (ezflow) to new Page (Enterprise)](#migrating-legacy-page-field-ezflow-to-new-page-enterprise).
 
 #### 3.2.3 Add other eZ Enterprise schemas (eZ Enterprise only)
 
diff --git a/docs/users/login_methods.md b/docs/users/login_methods.md
index 405763221a..5e349e6f98 100644
--- a/docs/users/login_methods.md
+++ b/docs/users/login_methods.md
@@ -54,4 +54,4 @@ For example, to ensure that user names can only contain lowercase letters, set `
 ![Setting a user name pattern](username_pattern.png)
 
 To check that all existing user accounts have names that fit the current pattern, run the `ibexa:user:audit-database` command.
-It checks all user accounts in the database and lists those that do not fit the pattern.
\ No newline at end of file
+It checks all user accounts in the database and lists those that don't fit the pattern.
\ No newline at end of file
diff --git a/docs/users/oauth_client.md b/docs/users/oauth_client.md
index 4f9f8f64ff..1f072f5e19 100644
--- a/docs/users/oauth_client.md
+++ b/docs/users/oauth_client.md
@@ -73,7 +73,7 @@ To use `ResourceOwnerToExistingOrNewUserMapper`, you need to extend it in your c
 !!! tip "OAuth user content type"
 
     When you implement your own mapper for external login, it's good practice to create a special user content type for users registered in this way.
-    The users who register through an external service do not have a separate password in the system.
+    The users who register through an external service don't have a separate password in the system.
     Instead, they log in by their external service's password.
 
     To avoid issues with password restrictions in the built-in user content type, create a special content type (for example, "OAuth user"), without restrictions on the password.
diff --git a/docs/users/oauth_server.md b/docs/users/oauth_server.md
index a3ed42b91d..bb1a482d7c 100644
--- a/docs/users/oauth_server.md
+++ b/docs/users/oauth_server.md
@@ -49,9 +49,11 @@ return [
 ### Keys
 
 To configure the server, you need private and public keys.
+
 For more information, see [Generating public and private keys](https://oauth2.thephpleague.com/installation/#generating-public-and-private-keys).
 
 You also need an encryption key.
+
 For more information, see [Generating encryption keys](https://oauth2.thephpleague.com/installation/#generating-encryption-keys).
 
 Set the following environment variables:
diff --git a/docs/users/passwords.md b/docs/users/passwords.md
index 1a290245b5..56016808a9 100644
--- a/docs/users/passwords.md
+++ b/docs/users/passwords.md
@@ -36,7 +36,7 @@ You can use the following additional options with the command:
 
 - `--force|-f` - commits the change, otherwise the command only performs a dry run
 - `--iteration-count|-c` - defines how many users are fetched at once. Lowering this value helps with memory issues
-- `--password-ttl|-t` - number of days after which new passwords expire. Used when the command enables password expiration for user content types that do not use it yet.
+- `--password-ttl|-t` - number of days after which new passwords expire. Used when the command enables password expiration for user content types that don't use it yet.
 
 For example, to revoke the passwords of all users of the `user` content type, run:
 
@@ -113,4 +113,5 @@ It does not check existing passwords, so it won't block login for anyone. It app
 !!! note
 
     The password itself isn't sent to the https://haveibeenpwned.com/ API, which makes this check secure.
+
     For more information on how that is possible, see [Validating Leaked Passwords with k-Anonymity](https://blog.cloudflare.com/validating-leaked-passwords-with-k-anonymity/).
diff --git a/docs/users/user_authentication.md b/docs/users/user_authentication.md
index 99b3694905..9eebe34a38 100644
--- a/docs/users/user_authentication.md
+++ b/docs/users/user_authentication.md
@@ -69,7 +69,7 @@ services:
             - { name: kernel.event_subscriber } 
 ```
 
-Do not mix `MVCEvents::INTERACTIVE_LOGIN` event (specific to [[= product_name =]]) and `SecurityEvents::INTERACTIVE_LOGIN` event (fired by Symfony security component).
+Don't mix `MVCEvents::INTERACTIVE_LOGIN` event (specific to [[= product_name =]]) and `SecurityEvents::INTERACTIVE_LOGIN` event (fired by Symfony security component).
 
 ``` php
 <?php

From 560215087bd72dbb060ceed6942d925d5b636c6d Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Tue, 15 Oct 2024 15:11:47 +0200
Subject: [PATCH 18/77] More fixes

---
 .../content_management_api/section_api.md                 | 2 +-
 docs/content_management/content_model.md                  | 2 +-
 docs/content_management/data_migration/exporting_data.md  | 4 ++--
 .../field_types/field_type_reference/authorfield.md       | 2 +-
 .../field_types/field_type_reference/dateandtimefield.md  | 2 +-
 .../field_types/field_type_reference/datefield.md         | 2 +-
 .../field_types/field_type_reference/emailaddressfield.md | 2 +-
 .../field_types/field_type_reference/floatfield.md        | 2 +-
 .../field_types/field_type_reference/imagefield.md        | 2 +-
 .../field_types/field_type_reference/integerfield.md      | 2 +-
 .../field_types/field_type_reference/matrixfield.md       | 2 +-
 .../field_types/field_type_reference/nullfield.md         | 2 +-
 .../field_types/field_type_reference/relationlistfield.md | 2 +-
 .../field_types/field_type_reference/richtextfield.md     | 2 +-
 .../field_types/field_type_reference/textblockfield.md    | 2 +-
 .../field_types/field_type_reference/timefield.md         | 2 +-
 .../field_types/field_type_reference/urlfield.md          | 4 ++--
 docs/content_management/field_types/field_type_storage.md | 2 +-
 docs/content_management/field_types/type_and_value.md     | 4 ++--
 docs/content_management/images/configure_image_editor.md  | 2 +-
 docs/content_management/images/extend_image_editor.md     | 4 ++--
 docs/content_management/images/images.md                  | 2 +-
 docs/content_management/locations.md                      | 6 +++---
 docs/content_management/url_management/url_management.md  | 4 ++--
 docs/content_management/workflow/workflow.md              | 7 +++----
 docs/getting_started/first_steps.md                       | 4 ++--
 docs/getting_started/install_ibexa_dxp.md                 | 2 +-
 docs/getting_started/requirements.md                      | 6 +++---
 docs/getting_started/troubleshooting.md                   | 2 +-
 .../cache/http_cache/content_aware_cache.md               | 8 +++-----
 .../cache/http_cache/context_aware_cache.md               | 8 ++++----
 .../cache/http_cache/fastly.md                            | 2 +-
 .../cache/http_cache/reverse_proxy.md                     | 8 ++++----
 .../cache/persistence_cache.md                            | 4 ++--
 docs/infrastructure_and_maintenance/logging.md            | 2 +-
 .../security/security_checklist.md                        | 2 +-
 docs/multisite/languages/languages.md                     | 2 +-
 docs/multisite/set_up_translation_siteaccess.md           | 4 ++--
 docs/multisite/site_factory/site_factory_configuration.md | 2 +-
 docs/multisite/siteaccess/siteaccess_matching.md          | 4 ++--
 docs/permissions/limitation_reference.md                  | 4 ++--
 docs/permissions/permission_overview.md                   | 4 ++--
 docs/permissions/permission_use_cases.md                  | 8 ++++----
 docs/permissions/policies.md                              | 2 +-
 docs/personalization/api_reference/tracking_api.md        | 6 +++---
 docs/personalization/enable_personalization.md            | 2 +-
 docs/personalization/legacy_recommendation_api.md         | 2 +-
 docs/pim/products.md                                      | 4 ++--
 docs/release_notes/ez_platform_v1.11.0.md                 | 4 ++--
 docs/release_notes/ez_platform_v2.2.0.md                  | 2 +-
 docs/release_notes/ez_platform_v2.5.md                    | 4 ++--
 docs/resources/contributing/package_structure.md          | 2 +-
 docs/search/criteria_reference/languagecode_criterion.md  | 2 +-
 docs/search/criteria_reference/logicalnot_criterion.md    | 2 +-
 docs/search/search_api.md                                 | 6 +++---
 .../elastic_search/configure_elastic_search.md            | 2 +-
 docs/search/search_engines/search_engines.md              | 2 +-
 .../search_engines/solr_search_engine/install_solr.md     | 6 +++---
 .../url_search_reference/logicalnot_url_criterion.md      | 2 +-
 docs/snippets/catalog_permissions_note.md                 | 2 +-
 docs/templating/design_engine/add_new_design.md           | 2 +-
 docs/templating/embed_and_list_content/render_images.md   | 4 ++--
 docs/templating/image_variations.md                       | 4 ++--
 docs/templating/render_content/customize_product_view.md  | 2 +-
 .../twig_function_reference/content_twig_functions.md     | 2 +-
 .../twig_function_reference/field_twig_functions.md       | 8 ++++----
 .../twig_function_reference/image_twig_functions.md       | 2 +-
 .../beginner_tutorial/3_customize_the_front_page.md       | 4 ++--
 .../beginner_tutorial/6_improve_configuration.md          | 2 +-
 .../1_implement_the_point2d_value_class.md                | 2 +-
 .../update_and_migration/from_1.x_2.x/update_db_to_2.5.md | 2 +-
 docs/update_and_migration/from_4.0/to_4.1.md              | 6 +++---
 .../migrate_to_ibexa_dxp/common_issues.md                 | 2 +-
 .../migrate_to_ibexa_dxp/migrating_from_ez_publish.md     | 2 +-
 .../migrating_from_ez_publish_platform.md                 | 2 +-
 docs/users/invitations.md                                 | 2 +-
 docs/users/passwords.md                                   | 2 +-
 docs/users/user_authentication.md                         | 2 +-
 78 files changed, 123 insertions(+), 126 deletions(-)

diff --git a/docs/content_management/content_management_api/section_api.md b/docs/content_management/content_management_api/section_api.md
index 3abb9cde5d..b905648601 100644
--- a/docs/content_management/content_management_api/section_api.md
+++ b/docs/content_management/content_management_api/section_api.md
@@ -49,4 +49,4 @@ You need to provide it with the `ContentInfo` object of the content item, and th
 [[= include_file('code_samples/api/public_php_api/src/Command/SectionCommand.php', 64, 67) =]]
 ```
 
-Assigning a section to content does not automatically assign it to the content item's children.
+Assigning a section to content doesn't automatically assign it to the content item's children.
diff --git a/docs/content_management/content_model.md b/docs/content_management/content_model.md
index 06e9bb7fce..1cbeb0d696 100644
--- a/docs/content_management/content_model.md
+++ b/docs/content_management/content_model.md
@@ -66,7 +66,7 @@ Accepts up to 100 characters. Cannot contain non-printable characters and contro
 It's recommended to either let this value be generated by the Public PHP API as an MD5 hash, or at least to generate it as a hash (e.g. one from SHA family).
 
 **`mainLanguageCode`** - the main language code of the content item.
-If the `alwaysAvailable` flag is set to true, the content item is shown in this language when the requested language does not exist.
+If the `alwaysAvailable` flag is set to true, the content item is shown in this language when the requested language doesn't exist.
 
 **`mainLocationId`** - identifier of the content item's main [Location](locations.md).
 
diff --git a/docs/content_management/data_migration/exporting_data.md b/docs/content_management/data_migration/exporting_data.md
index b0169e7d13..e54cdc7b60 100644
--- a/docs/content_management/data_migration/exporting_data.md
+++ b/docs/content_management/data_migration/exporting_data.md
@@ -169,8 +169,8 @@ The mandatory `--mode` option defines the action that importing the file perform
 The following modes are available:
 
 - `create` - creates new items
-- `update` - updates an existing item. Only covers specified fields and properties. If the item does not exist, causes an error.
-- `delete` - deletes an existing item. If the item does not exist, causes an error.
+- `update` - updates an existing item. Only covers specified fields and properties. If the item doesn't exist, causes an error.
+- `delete` - deletes an existing item. If the item doesn't exist, causes an error.
 
 If you don't provide the `--mode` option, the command asks you to select the mode.
 
diff --git a/docs/content_management/field_types/field_type_reference/authorfield.md b/docs/content_management/field_types/field_type_reference/authorfield.md
index 08c49198f1..17403c3b64 100644
--- a/docs/content_management/field_types/field_type_reference/authorfield.md
+++ b/docs/content_management/field_types/field_type_reference/authorfield.md
@@ -62,7 +62,7 @@ Example: `John Doe john@doe.com`
 
 ### Validation
 
-This field type does not perform any special validation of the input value.
+This field type doesn't perform any special validation of the input value.
 
 ### Settings
 
diff --git a/docs/content_management/field_types/field_type_reference/dateandtimefield.md b/docs/content_management/field_types/field_type_reference/dateandtimefield.md
index f8a7c7108b..fe493746bc 100644
--- a/docs/content_management/field_types/field_type_reference/dateandtimefield.md
+++ b/docs/content_management/field_types/field_type_reference/dateandtimefield.md
@@ -68,7 +68,7 @@ $hash = [
 
 ### Validation
 
-This field type does not perform any special validation of the input value.
+This field type doesn't perform any special validation of the input value.
 
 ### Settings
 
diff --git a/docs/content_management/field_types/field_type_reference/datefield.md b/docs/content_management/field_types/field_type_reference/datefield.md
index 982b29d40e..30bf32ab5e 100644
--- a/docs/content_management/field_types/field_type_reference/datefield.md
+++ b/docs/content_management/field_types/field_type_reference/datefield.md
@@ -70,7 +70,7 @@ $hash = [
 
 ### Validation
 
-This field type does not perform any special validation of the input value.
+This field type doesn't perform any special validation of the input value.
 
 ### Settings
 
diff --git a/docs/content_management/field_types/field_type_reference/emailaddressfield.md b/docs/content_management/field_types/field_type_reference/emailaddressfield.md
index 3f013b87d0..4554ee5975 100644
--- a/docs/content_management/field_types/field_type_reference/emailaddressfield.md
+++ b/docs/content_management/field_types/field_type_reference/emailaddressfield.md
@@ -62,4 +62,4 @@ If the validations fail, a `ValidationError` is thrown, specifying the error m
 
 ### Settings
 
-This field type does not support settings.
+This field type doesn't support settings.
diff --git a/docs/content_management/field_types/field_type_reference/floatfield.md b/docs/content_management/field_types/field_type_reference/floatfield.md
index 38a6971f45..8bc9378a0a 100644
--- a/docs/content_management/field_types/field_type_reference/floatfield.md
+++ b/docs/content_management/field_types/field_type_reference/floatfield.md
@@ -79,4 +79,4 @@ $floatFieldCreateStruct->validatorConfiguration = [
 
 ### Settings
 
-This field type does not support settings.
+This field type doesn't support settings.
diff --git a/docs/content_management/field_types/field_type_reference/imagefield.md b/docs/content_management/field_types/field_type_reference/imagefield.md
index f87c690ab5..b8b386e7cb 100644
--- a/docs/content_management/field_types/field_type_reference/imagefield.md
+++ b/docs/content_management/field_types/field_type_reference/imagefield.md
@@ -36,7 +36,7 @@ The `value` property of an Image field returns an `Ibexa\Core\FieldType\Image\V
 
 ### Settings
 
-This field type does not support settings.
+This field type doesn't support settings.
 
 ### Image Variations
 
diff --git a/docs/content_management/field_types/field_type_reference/integerfield.md b/docs/content_management/field_types/field_type_reference/integerfield.md
index 0eed6f2712..4e59346f36 100644
--- a/docs/content_management/field_types/field_type_reference/integerfield.md
+++ b/docs/content_management/field_types/field_type_reference/integerfield.md
@@ -72,4 +72,4 @@ $validatorConfiguration = [
 
 ### Settings
 
-This field type does not support settings.
+This field type doesn't support settings.
diff --git a/docs/content_management/field_types/field_type_reference/matrixfield.md b/docs/content_management/field_types/field_type_reference/matrixfield.md
index 4f57166d65..691e800096 100644
--- a/docs/content_management/field_types/field_type_reference/matrixfield.md
+++ b/docs/content_management/field_types/field_type_reference/matrixfield.md
@@ -41,7 +41,7 @@ The minimum number of rows is set on content type level for each field.
 
 Validation checks for empty rows. A row is considered empty if it contains only empty cells (or cells containing only spaces). Empty rows are removed.
 
-If, after removing empty rows, the number of rows does not fulfill the configured `Minimum number of rows`, the field doesn't validate.
+If, after removing empty rows, the number of rows doesn't fulfill the configured `Minimum number of rows`, the field doesn't validate.
 
 For example, the following input doesn't validate if `Minimum number of rows` is set to 3, because the second row is empty:
 
diff --git a/docs/content_management/field_types/field_type_reference/nullfield.md b/docs/content_management/field_types/field_type_reference/nullfield.md
index 51f1424262..b3d3b6521c 100644
--- a/docs/content_management/field_types/field_type_reference/nullfield.md
+++ b/docs/content_management/field_types/field_type_reference/nullfield.md
@@ -15,7 +15,7 @@ Null field type accepts anything provided as a value and is usually combined wit
 - NullConverter: Makes it not store anything to the legacy storage engine (database), nor it reads any data.
 - Unindexed: Indexable class making sure nothing is indexed to configured search engine.
 
-This field type does not have its own fixed internal name. Its identifier is instead configured as needed by passing it as an argument to the constructor.
+This field type doesn't have its own fixed internal name. Its identifier is instead configured as needed by passing it as an argument to the constructor.
 
 ### Example for usage of Null field type
 
diff --git a/docs/content_management/field_types/field_type_reference/relationlistfield.md b/docs/content_management/field_types/field_type_reference/relationlistfield.md
index 6bf2fe0943..c9f0948e38 100644
--- a/docs/content_management/field_types/field_type_reference/relationlistfield.md
+++ b/docs/content_management/field_types/field_type_reference/relationlistfield.md
@@ -57,7 +57,7 @@ $relationListValue = new RelationList\Value(
 
 This field type validates if:
 
-- the `selectionMethod` specified is `\Ibexa\Core\FieldType\RelationList\Type::SELECTION_BROWSE` or `\Ibexa\Core\FieldType\RelationList\Type::SELECTION_DROPDOWN`. A validation error is thrown if the value does not match.
+- the `selectionMethod` specified is `\Ibexa\Core\FieldType\RelationList\Type::SELECTION_BROWSE` or `\Ibexa\Core\FieldType\RelationList\Type::SELECTION_DROPDOWN`. A validation error is thrown if the value doesn't match.
 - the `selectionDefaultLocation` specified is `null`, `string` or `integer`. If the type validation fails a validation error is thrown.
 - the value specified in `selectionContentTypes` is an `array`. If not, a validation error in given.
 - the number of content items selected in the field isn't greater than the `selectionLimit`.
diff --git a/docs/content_management/field_types/field_type_reference/richtextfield.md b/docs/content_management/field_types/field_type_reference/richtextfield.md
index 7ea222dd52..24fa3c86d6 100644
--- a/docs/content_management/field_types/field_type_reference/richtextfield.md
+++ b/docs/content_management/field_types/field_type_reference/richtextfield.md
@@ -30,7 +30,7 @@ This field type validates and stores structured rich text, and exposes it in sev
 
 The field type expects an XML value as input, in the form of a string, `DOMDocument` object, or field type's `Value` object.
 The field type's `Value` object must hold the value in the field type's [internal format](#internal-format).
-For a string of a `DOMDocument` object, if the input does not conform to this format, it's converted into it.
+For a string of a `DOMDocument` object, if the input doesn't conform to this format, it's converted into it.
 
 ##### Internal format
 
diff --git a/docs/content_management/field_types/field_type_reference/textblockfield.md b/docs/content_management/field_types/field_type_reference/textblockfield.md
index 478f8f6a11..7cfdf43ceb 100644
--- a/docs/content_management/field_types/field_type_reference/textblockfield.md
+++ b/docs/content_management/field_types/field_type_reference/textblockfield.md
@@ -34,7 +34,7 @@ The constructor for this Value object initializes a new Value object with the va
 
 ### Validation
 
-This field type does not perform any special validation of the input value.
+This field type doesn't perform any special validation of the input value.
 
 ### Settings
 
diff --git a/docs/content_management/field_types/field_type_reference/timefield.md b/docs/content_management/field_types/field_type_reference/timefield.md
index 3ee3a86c38..f3f829abb7 100644
--- a/docs/content_management/field_types/field_type_reference/timefield.md
+++ b/docs/content_management/field_types/field_type_reference/timefield.md
@@ -58,7 +58,7 @@ Example: `36000`
 
 ### Validation
 
-This field type does not perform validation of the input value.
+This field type doesn't perform validation of the input value.
 
 ### Settings
 
diff --git a/docs/content_management/field_types/field_type_reference/urlfield.md b/docs/content_management/field_types/field_type_reference/urlfield.md
index 133272c47a..ff887f83c7 100644
--- a/docs/content_management/field_types/field_type_reference/urlfield.md
+++ b/docs/content_management/field_types/field_type_reference/urlfield.md
@@ -61,8 +61,8 @@ $hash = [
 
 ### Validation
 
-This field type does not perform validation.
+This field type doesn't perform validation.
 
 ### Settings
 
-This field type does not have settings.
+This field type doesn't have settings.
diff --git a/docs/content_management/field_types/field_type_storage.md b/docs/content_management/field_types/field_type_storage.md
index 73da67dac2..1b64fb928b 100644
--- a/docs/content_management/field_types/field_type_storage.md
+++ b/docs/content_management/field_types/field_type_storage.md
@@ -122,7 +122,7 @@ The interface `Ibexa\Contracts\Core\FieldType\StorageGateway` is implemented by
 |------|-----------|
 |`setConnection()`|The registry mechanism uses this method to set the SPI storage connection (e.g. the database connection to the Legacy Storage database) into the gateway, which might be used to store external data. The connection is retrieved from the `$context` array automatically by the registry.|
 
-The Gateway implementation itself must take care of validating that it received a usable connection. If it does not, it should throw a `RuntimeException`.
+The Gateway implementation itself must take care of validating that it received a usable connection. If it doesn't, it should throw a `RuntimeException`.
 
 The registry mechanism is realized as a base class for `FieldStorage` implementations: `Ibexa\Core\FieldType\GatewayBasedStorage`. For managing `StorageGateway`s, the following methods are already implemented in the base class:
 
diff --git a/docs/content_management/field_types/type_and_value.md b/docs/content_management/field_types/type_and_value.md
index cd00b660e4..4088902372 100644
--- a/docs/content_management/field_types/type_and_value.md
+++ b/docs/content_management/field_types/type_and_value.md
@@ -37,7 +37,7 @@ This method retrieves via public PHP API a schema for the field type settings. A
 
 #### `getValidatorConfigurationSchema()`
 
-In addition to normal settings, the field type should provide schema settings for its validation process. The schema describes what kind of validation can be performed by the field type and which settings the user can specify to these validation methods. For example, the `ezstring` type can validate minimum and maximum length of the string. It therefore provides a schema to indicate to the user that they might specify the corresponding restrictions, when creating a `FieldDefinition` with this type. The schema does not underlie any regulations, except for that it must be serializable.
+In addition to normal settings, the field type should provide schema settings for its validation process. The schema describes what kind of validation can be performed by the field type and which settings the user can specify to these validation methods. For example, the `ezstring` type can validate minimum and maximum length of the string. It therefore provides a schema to indicate to the user that they might specify the corresponding restrictions, when creating a `FieldDefinition` with this type. The schema doesn't underlie any regulations, except for that it must be serializable.
 
 #### `validateFieldSettings()`
 
@@ -72,7 +72,7 @@ For example: a user provides an HTTP link as a string, `acceptValue()` converts
 
 !!! note
 
-    `acceptValue()` asserts structural consistency of the value, but does not validate plausibility of the value.
+    `acceptValue()` asserts structural consistency of the value, but doesn't validate plausibility of the value.
 
 #### `getEmptyValue()`
 
diff --git a/docs/content_management/images/configure_image_editor.md b/docs/content_management/images/configure_image_editor.md
index 354a0fb771..22930ab734 100644
--- a/docs/content_management/images/configure_image_editor.md
+++ b/docs/content_management/images/configure_image_editor.md
@@ -10,7 +10,7 @@ For more information, see [User Documentation]([[= user_doc =]]/editing_images/)
 
 !!! note
 
-    The Image Editor does not support images that come from a Digital Asset Management (DAM) system.
+    The Image Editor doesn't support images that come from a Digital Asset Management (DAM) system.
 
 !!! note
 
diff --git a/docs/content_management/images/extend_image_editor.md b/docs/content_management/images/extend_image_editor.md
index 5b39e59f9e..3c780f3dd9 100644
--- a/docs/content_management/images/extend_image_editor.md
+++ b/docs/content_management/images/extend_image_editor.md
@@ -19,7 +19,7 @@ In `assets/random_dot/`, create the `random-dot.js` file with the following code
 [[= include_file('code_samples/back_office/image_editor/assets/random_dot/random-dot-stem.js') =]]
 ```
 
-The code does not perform any action yet, you add the action in the following steps.
+The code doesn't perform any action yet, you add the action in the following steps.
 
 ## Add configuration
 
@@ -46,7 +46,7 @@ At this point you should be able to see a new button in the Image Editor's UI.
 
 ## Expand the React component
 
-The button that you created above does not initiate any action yet.
+The button that you created above doesn't initiate any action yet.
 You must modify the JavaScript component to add a function to the button.
 
 ### Contexts
diff --git a/docs/content_management/images/images.md b/docs/content_management/images/images.md
index 4567e63dc1..c427c6e33e 100644
--- a/docs/content_management/images/images.md
+++ b/docs/content_management/images/images.md
@@ -62,7 +62,7 @@ For more information, see the [bundle's documentation](https://symfony.com/bundl
 !!! caution "Code injection in image EXIF"
 
     EXIF metadata of an image may contain for example, HTML, JavaScript, or PHP code. 
-    [[= product_name =]] is itself does not parse EXIF metadata, but third-party bundles must be secured against this eventuality.
+    [[= product_name =]] is itself doesn't parse EXIF metadata, but third-party bundles must be secured against this eventuality.
     Images must be treated like any other user-submitted data - make sure that metadata is properly escaped before use.
 
 ### Image URL resolution
diff --git a/docs/content_management/locations.md b/docs/content_management/locations.md
index 4b32cfeebf..c22e7a54bd 100644
--- a/docs/content_management/locations.md
+++ b/docs/content_management/locations.md
@@ -12,7 +12,7 @@ Every published content item has a Location and, as a consequence, also a place
 ![Content tree - locations](content_management_tree_locations.png "Content tree - locations")
 
 A content item receives a Location only once it has been published.
-This means that a new unpublished draft does not have a Location yet.
+This means that a new unpublished draft doesn't have a Location yet.
 You can find drats in the **Drafts** tab in the **Content** menu.
 
 ![Drafts](content_management_drafts.png "Drafts")
@@ -125,9 +125,9 @@ it's unavailable on the front page.
 The difference is that a Location Hidden by superior cannot be revealed separately from their parent(s).
 It only becomes visible once all of its parent Locations are made visible again.
 
-A Hidden by superior status does not override a Hidden status.
+A Hidden by superior status doesn't override a Hidden status.
 This means that if a Location is Hidden manually and later one of its ancestors is hidden as well,
-the first Location's status does not change – it remains Hidden (not Hidden by superior).
+the first Location's status doesn't change – it remains Hidden (not Hidden by superior).
 If the ancestor Location is made visible again, the first Location still remains hidden.
 
 The way visibility works can be illustrated using the following scenarios:
diff --git a/docs/content_management/url_management/url_management.md b/docs/content_management/url_management/url_management.md
index d55a523a8b..bd46311251 100644
--- a/docs/content_management/url_management/url_management.md
+++ b/docs/content_management/url_management/url_management.md
@@ -146,7 +146,7 @@ For each URL alias definition the history of changes is preserved, so that users
 
 !!! caution "Legacy storage engine limitation"
 
-    The [Legacy storage engine](field_type_storage.md#legacy-storage-engine) does not archive URL aliases, which initially had the same name in multiple languages.
+    The [Legacy storage engine](field_type_storage.md#legacy-storage-engine) doesn't archive URL aliases, which initially had the same name in multiple languages.
     For more information, see [the Jira ticket](https://issues.ibexa.co/browse/EZP-31818).
 
 URL aliases aren't SiteAccess-aware. When creating an alias, you can select a SiteAccess to base it on.
@@ -196,7 +196,7 @@ Use it when:
 
 - you change URL alias configuration and want to regenerate old aliases
 - you encounter database corruption
-- you have content that does not have a URL alias
+- you have content that doesn't have a URL alias
 
 !!! caution
 
diff --git a/docs/content_management/workflow/workflow.md b/docs/content_management/workflow/workflow.md
index c5555f6a83..c61b953de2 100644
--- a/docs/content_management/workflow/workflow.md
+++ b/docs/content_management/workflow/workflow.md
@@ -45,7 +45,7 @@ If set to `published`, applies for Content that has already been published (for
 
 Each stage in the workflow has an identifier and can have a label and a color.
 
-The optional `last_stage` key indicates that content in this stage does not appear on the dashboard or in Review Queue.
+The optional `last_stage` key indicates that content in this stage doesn't appear on the dashboard or in Review Queue.
 
 One stage, listed under `initial_stage`, is the one that the workflow starts with.
 
@@ -113,8 +113,7 @@ To do so, configure the `publish` action for the transition:
 
 ### Disable Quick Review
 
-You can disable the default workflow, for example, if your project does not use 
-workflows, or Quick Review entries clog your database:
+You can disable the default workflow, for example, if your project doesn't use workflows, or Quick Review entries clog your database:
 
 ``` yaml
 [[= include_file('code_samples/workflow/custom_workflow/config/packages/workflows.yaml', 0, 4) =]][[= include_file('code_samples/workflow/custom_workflow/config/packages/workflows.yaml', 63, 67) =]]
@@ -171,7 +170,7 @@ For example, you can use it to only allow a legal team to edit content in the `l
 
 ### Validate form before workflow transition
 
-By default, sending content to the next stage of the workflow does not validate the form in UI,
+By default, sending content to the next stage of the workflow doesn't validate the form in UI,
 so with the publish action, the form isn't verified for errors in UI.
 However, during the publish action, the sent form is validated in the service.
 
diff --git a/docs/getting_started/first_steps.md b/docs/getting_started/first_steps.md
index dceb94d924..7c7627a59f 100644
--- a/docs/getting_started/first_steps.md
+++ b/docs/getting_started/first_steps.md
@@ -128,10 +128,10 @@ The SiteAccess is automatically matched using the last part of the URI.
 !!! note "Log in"
 
     At this point you need to log in to preview the new SiteAccess,
-    because an anonymous visitor does not have permissions to view it.
+    because an anonymous visitor doesn't have permissions to view it.
     See [section about permissions below](#set-up-permissions).
 
-For now the new SiteAccess does not differ from the main site.
+For now the new SiteAccess doesn't differ from the main site.
 
 For more information, see [Multisite](multisite.md) and [SiteAccess matchers](siteaccess_matching.md#available-siteaccess-matchers).
 
diff --git a/docs/getting_started/install_ibexa_dxp.md b/docs/getting_started/install_ibexa_dxp.md
index 507123f870..bdcf288daf 100644
--- a/docs/getting_started/install_ibexa_dxp.md
+++ b/docs/getting_started/install_ibexa_dxp.md
@@ -227,7 +227,7 @@ and for creating signed URIs when using [ESI (Edge Side Includes)]([[= symfony_d
     php -r "print bin2hex(random_bytes(32));"
     ```
 
-    Don't commit the secret to version control systems, or share it with anyone who does not strictly need it.
+    Don't commit the secret to version control systems, or share it with anyone who doesn't strictly need it.
     If you have any suspicion that the secret may have been exposed, replace it with a new one.
     The same goes for other secrets, like database password, Varnish invalidate token, JWT passphrase, etc.
     
diff --git a/docs/getting_started/requirements.md b/docs/getting_started/requirements.md
index addc377f6f..a2918a7623 100644
--- a/docs/getting_started/requirements.md
+++ b/docs/getting_started/requirements.md
@@ -380,7 +380,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
     !!! note
 
-        As Platform.sh does not support a configuration with multiple PostgreSQL databases,
+        As Platform.sh doesn't support a configuration with multiple PostgreSQL databases,
         for [[= product_name_cloud =]] / Platform.sh it's impossible to have a DFS table in a separate database.
 
     ### Recommended [[= product_name_cloud =]] setup
@@ -427,7 +427,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
     !!! note
 
-        As Platform.sh does not support a configuration with multiple PostgreSQL databases,
+        As Platform.sh doesn't support a configuration with multiple PostgreSQL databases,
         for [[= product_name_cloud =]] / Platform.sh it's impossible to have a DFS table in a separate database.
 
     ### Recommended [[= product_name_cloud =]] setup
@@ -503,7 +503,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
         
     !!! note
 
-        As Platform.sh does not support a configuration with multiple PostgreSQL databases,
+        As Platform.sh doesn't support a configuration with multiple PostgreSQL databases,
         for eZ Platform Cloud / Platform.sh it's impossible to have a DFS table in a separate database.
 
     ### Custom integrations
diff --git a/docs/getting_started/troubleshooting.md b/docs/getting_started/troubleshooting.md
index 4aec5a8a1f..6e5f4b5277 100644
--- a/docs/getting_started/troubleshooting.md
+++ b/docs/getting_started/troubleshooting.md
@@ -84,7 +84,7 @@ This means there is a known security bug in the specific version of the package,
 In most cases this means that a fix is available in a newer version.
 If you increase your requirement to that version, the conflict is resolved.
 
-In the rare case when there is no fixed version, you can revert your requirement to an older version which does not have the bug.
+In the rare case when there is no fixed version, you can revert your requirement to an older version which doesn't have the bug.
 If you have to use the version with the bug (not recommended) you can use `composer remove roave/security-advisories`.
 In such case, require it again when the bug is fixed and the package is updated: `composer require roave/security-advisories:dev-master` 
 
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
index 6ea9ddbc7e..b73f3ff0e8 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
@@ -373,7 +373,7 @@ This section describes to how to debug problems related to HTTP cache.
   If you perform tests on Fastly enabled environment on [[= product_name_cloud =]] provided by Platform.sh, you need to use the Platform.sh
 	dashboard to obtain the endpoint for Nginx.
 
-The following example shows how to debug and check why Fastly does not cache the front page properly. 
+The following example shows how to debug and check why Fastly doesn't cache the front page properly. 
 If you run the command multiple times:
 
 `curl -IXGET https://www.staging.foobar.com.us-2.platformsh.site`
@@ -583,10 +583,8 @@ X-Cache-Debug: 1
 Surrogate-Key: ez-all
 ```
 
-The `Cache-Control` and `Vary` headers look correct. The request is handled by a custom controller and the `Surrogate-Key` only contains the default `ez-all` value. 
-This isn't a problem as long as the controller
-does not return values from any Content in the [[= product_name =]] repository. If it does, the controller should also add
-the corresponding IDs to such objects in that header.
+The `Cache-Control` and `Vary` headers look correct. The request is handled by a custom controller and the `Surrogate-Key` only contains the default `ez-all` value.
+This isn't a problem as long as the controller doesn't return values from any Content in the [[= product_name =]] repository. If it does, the controller should also add the corresponding IDs to such objects in that header.
 
 The `Set-Cookie` here may cause the problem. A ESI fragment should never set a cookie because:
 - Clients only receive the headers set in the "mother" document (the headers in the "/" response in this case).
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
index 431d754369..90c286b8a8 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
@@ -27,7 +27,7 @@ This expands steps covered in [FOSHttpCacheBundle documentation on user context
 1. The caching proxy receives the hash response, copies the hash header to the client's original request for `/foo` and restarts the modified original request.
 1. If the response to `/foo` should differ per user context, the application sets a `Vary: X-Context-User-Hash` header, which makes Proxy store the variations of this cache varying on the hash value.
 
-The next time a request comes in from the same user, application lookup for the hash (step 3) does not take place,
+The next time a request comes in from the same user, application lookup for the hash (step 3) doesn't take place,
 as the hash lookup itself is cached by the cache proxy as described below.
 
 ### User context hash caching
@@ -60,8 +60,8 @@ It also varies on `Authorization` to cover any possible basic authorization head
     the default SiteAccess on the domain needs to point to the same repository (database), 
     because `/_fos_user_context_hash` isn't SiteAccess-aware by default (see 
     `ibexa.rest.default_router.non_siteaccess_aware_routes` parameter).
-    This occurs because reverse proxy does not have knowledge about SiteAccesses 
-    and it does not pass the whole URL to be able to cache the user context hash response.
+    This occurs because reverse proxy doesn't have knowledge about SiteAccesses 
+    and it doesn't pass the whole URL to be able to cache the user context hash response.
 
     The only known workaround is to make it SiteAccess aware, and have custom VCL logic tied to your SiteAccess
     matching with Varnish/Fastly, to send the SiteAccess prefix as URI.
@@ -109,7 +109,7 @@ Example:
 
 2\. Ajax/JS lookup to "uncached" custom Symfony controllers:
 
-This method does not consume memory in Varnish. 
+This method doesn't consume memory in Varnish. 
 It can optionally be cached with custom logic: Symfony Cache on server side and/or with client side caching techniques. 
 This should be done as Ajax/JS lookup to avoid the uncached request that slows down the whole delivery of Vanish if it's done as ESI.
 
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md b/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md
index b08114a87f..fbd1bcd7c1 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md
@@ -304,7 +304,7 @@ fastly service-version activate --version=latest
 ### Get diff between two versions
 
 You can easily view the diff between two different versions by using the Fastly web interface.
-Unfortunately, Fastly CLI does not support this functionality.
+Unfortunately, Fastly CLI doesn't support this functionality.
 However, Fastly API and GNU diff can help you get an identical result.
 
 Use the Fastly API to download the generated `.vcl` file. It includes the VCL configuration that Fastly generates
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md b/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
index e0d3df381f..59fa7cb26a 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
@@ -40,7 +40,7 @@ Using a different proxy is highly recommended as they provide better performance
 
 !!! note
 
-    Use of Varnish or Fastly is a requirement for a [Clustering](clustering.md) setup, as Symfony Proxy does not support sharing cache between several application servers.
+    Use of Varnish or Fastly is a requirement for a [Clustering](clustering.md) setup, as Symfony Proxy doesn't support sharing cache between several application servers.
 
 ## VCL base files
 
@@ -88,7 +88,7 @@ framework:
 
 !!! caution "Careful when trusting dynamic IP using `REMOTE_ADDR` value or similar"
 
-    On Platform.sh, Varnish does not have a static IP, like with [AWS LB](https://symfony.com/doc/5.1/deployment/proxies.html#but-what-if-the-ip-of-my-reverse-proxy-changes-constantly).
+    On Platform.sh, Varnish doesn't have a static IP, like with [AWS LB](https://symfony.com/doc/5.1/deployment/proxies.html#but-what-if-the-ip-of-my-reverse-proxy-changes-constantly).
     For this reason, the `TRUSTED_PROXIES` env variable supports being set to value `REMOTE_ADDR`, which is equal to:
   
     ```php
@@ -153,7 +153,7 @@ ibexa:
 
 If your installation uses Varnish and you want users to be able to configure and use Captcha in their forms, 
 you must enable sending Captcha data as a response to an Ajax request. 
-Otherwise, Varnish does not allow for the transfer of Captcha data to the form, and as a result, users see an empty image.
+Otherwise, Varnish doesn't allow for the transfer of Captcha data to the form, and as a result, users see an empty image.
 
 To enable sending Captcha over Ajax, add the following configuration:
 
@@ -306,7 +306,7 @@ fastcgi_param FASTLY_KEY "token"
 Stale cache, or grace mode in Varnish, occurs when:
 
 - Cache is served some time after the TTL expired.
-- When the back-end server does not respond.
+- When the back-end server doesn't respond.
 
 This has several benefits for high traffic installations to reduce load to the back end. 
 Instead of creating several concurrent requests for the same page to the back end, 
diff --git a/docs/infrastructure_and_maintenance/cache/persistence_cache.md b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
index 73e7a66843..28e7cefd48 100644
--- a/docs/infrastructure_and_maintenance/cache/persistence_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
@@ -183,7 +183,7 @@ See `.env`, `config/packages/ibexa.yaml` and `config/packages/cache_pool/cache.r
 
 !!! caution "Clearing Redis cache"
 
-    The regular `php bin/console cache:clear` command does not clear Redis persistence cache.
+    The regular `php bin/console cache:clear` command doesn't clear Redis persistence cache.
     Use a dedicated Symfony command to clear the pool you have configured: `php bin/console cache:pool:clear cache.redis`.
 
 ##### Redis Clustering
@@ -259,7 +259,7 @@ See `config/default_parameters.yaml` and `config/cache_pool/cache.memcached.yaml
 
 !!! caution "Clearing Memcached cache"
 
-    The regular `php bin/console cache:clear` command does not clear Memcached persistence cache.
+    The regular `php bin/console cache:clear` command doesn't clear Memcached persistence cache.
     Use a dedicated Symfony command to clear the pool you have configured: `php bin/console cache:pool:clear cache.memcached`.
 
 
diff --git a/docs/infrastructure_and_maintenance/logging.md b/docs/infrastructure_and_maintenance/logging.md
index 78623f065d..d028c27a5c 100644
--- a/docs/infrastructure_and_maintenance/logging.md
+++ b/docs/infrastructure_and_maintenance/logging.md
@@ -8,7 +8,7 @@ description: Ensure that your logs are secure and GDPR compliant by clearing the
 
 Some logs can contain personal information such as User ID or password.
 
-By default, [[= product_name =]] does not log User IDs.
+By default, [[= product_name =]] doesn't log User IDs.
 You can change this behavior by modifying the following setting:
 
 ``` yaml
diff --git a/docs/infrastructure_and_maintenance/security/security_checklist.md b/docs/infrastructure_and_maintenance/security/security_checklist.md
index 6b9f0eb604..21d1f8a7b1 100644
--- a/docs/infrastructure_and_maintenance/security/security_checklist.md
+++ b/docs/infrastructure_and_maintenance/security/security_checklist.md
@@ -109,7 +109,7 @@ When using the "forgot password" feature, a token is created which expires if th
 link that gets mailed to them in time. The time before it expires is set in the parameter
 `ibexa.site_access.config.default.security.token_interval_spec`. By nature this feature must be available to users
 before they have logged in, including would-be attackers. If an attacker uses this feature with someone else's email
-address, the attacker does not receive the email. But they could still try to guess the password reset link. That's why
+address, the attacker doesn't receive the email. But they could still try to guess the password reset link. That's why
 this interval should be as short as possible. 5 minutes is often enough.
 
 [[= product_name =]] allows you to create and send invitations to create an account in the frontend as a customer, the back office
diff --git a/docs/multisite/languages/languages.md b/docs/multisite/languages/languages.md
index 1377b1d753..cb89b0d261 100644
--- a/docs/multisite/languages/languages.md
+++ b/docs/multisite/languages/languages.md
@@ -32,7 +32,7 @@ yarn encore <environment>
 
 Language versions consist of translated values of the content item's fields. In the content type definition every field is set to be Translatable or not.
 
-[[= product_name =]] does not decide by itself which fields can be translated and which cannot. For some field values the need for a translation can be obvious, for example for the body of an article. In other cases, for instance images without text, integer numbers or e-mail addresses, translation is usually unnecessary. Despite that, [[= product_name =]] gives you the possibility to mark any field as translatable regardless of its field type. It's only your decision to exclude the translation possibility for those fields where it makes no sense.
+[[= product_name =]] doesn't decide by itself which fields can be translated and which cannot. For some field values the need for a translation can be obvious, for example for the body of an article. In other cases, for instance images without text, integer numbers or e-mail addresses, translation is usually unnecessary. Despite that, [[= product_name =]] gives you the possibility to mark any field as translatable regardless of its field type. It's only your decision to exclude the translation possibility for those fields where it makes no sense.
 
 When a field isn't flagged as Translatable, its value is copied from the initial/main translation when a new language version is created. This copied value cannot be modified. When a field is Translatable, you have to enter its value in a new language version manually.
 
diff --git a/docs/multisite/set_up_translation_siteaccess.md b/docs/multisite/set_up_translation_siteaccess.md
index 6018853e28..e4a4931c72 100644
--- a/docs/multisite/set_up_translation_siteaccess.md
+++ b/docs/multisite/set_up_translation_siteaccess.md
@@ -64,13 +64,13 @@ ibexa:
 ```
 
 With this configuration, the main English site displays content in English and ignores French content.
-The French site displays content in French, but also in English, if it does not exist in French.
+The French site displays content in French, but also in English, if it doesn't exist in French.
 
 Clear the cache by running: `php bin/console cache:clear`.
 
 ## Set permissions
 
-By default, the Anonymous user role does not have permissions for new SiteAccesses.
+By default, the Anonymous user role doesn't have permissions for new SiteAccesses.
 As a next step, allow Anonymous users to read content on the new SiteAccesses:
 
 1. In the back office, go to **Admin** -> **Roles**.
diff --git a/docs/multisite/site_factory/site_factory_configuration.md b/docs/multisite/site_factory/site_factory_configuration.md
index 0dadf77586..f87834c227 100644
--- a/docs/multisite/site_factory/site_factory_configuration.md
+++ b/docs/multisite/site_factory/site_factory_configuration.md
@@ -46,7 +46,7 @@ After that, you cannot copy the Site skeleton again, for example in the edit vie
 You can create as many skeletons as you need and assign them to templates.
 Remember that one template can only have one Site skeleton.
 
-If the design does not have a defined Site skeleton, a directory of the new site is created in a standard Site Factory process.
+If the design doesn't have a defined Site skeleton, a directory of the new site is created in a standard Site Factory process.
 
 To define a Site skeleton, add the `site_skeleton_id` or `site_skeleton_remote_id` key to the site template definition.
 This can be either a Location ID (e.g. `5966`), or a remote Location ID (e.g. `3bed95afb1f8126f06a3c464e461e1ae66`).
diff --git a/docs/multisite/siteaccess/siteaccess_matching.md b/docs/multisite/siteaccess/siteaccess_matching.md
index cee515cb6b..9233ba2f9f 100644
--- a/docs/multisite/siteaccess/siteaccess_matching.md
+++ b/docs/multisite/siteaccess/siteaccess_matching.md
@@ -43,7 +43,7 @@ ibexa:
                 my.site: mysite
 ```
 
-If the matcher class does not start with a backslash (`\`), it's relative to `Ibexa\Core\MVC\Symfony\SiteAccess\Matcher`
+If the matcher class doesn't start with a backslash (`\`), it's relative to `Ibexa\Core\MVC\Symfony\SiteAccess\Matcher`
 (for example, `Map\URI` refers to `Ibexa\Core\MVC\Symfony\SiteAccess\Matcher\Map\URI`)
 
 You can specify [custom matchers](#custom-matchers) by using a fully qualified class name (e.g. `\My\SiteAccess\Matcher`)
@@ -190,7 +190,7 @@ Example URL `http://my_site.com:8080/content` matches SiteAccess `site`.
 ### `Ibexa\SiteFactory\SiteAccessMatcher` [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
 Enables the use of [Site Factory](site_factory.md).
-Does not take any parameters in configuration:
+Doesn't take any parameters in configuration:
 
 ``` yaml
 ibexa:
diff --git a/docs/permissions/limitation_reference.md b/docs/permissions/limitation_reference.md
index 36aec10ae9..7f1a1718a9 100644
--- a/docs/permissions/limitation_reference.md
+++ b/docs/permissions/limitation_reference.md
@@ -11,14 +11,14 @@ A generic limitation type to use when no other limitation has been implemented.
 Without any Limitation assigned, a `LimitationNotFoundException` is thrown.
 
 It's called "blocking" because it always informs the permissions system that 
-the user does not have access to any policy the limitation is assigned to, making 
+the user doesn't have access to any policy the limitation is assigned to, making 
 the permissions system move on to the next policy.
 
 ### Possible values
 
 |Value|UI value|Description|
 |------|------|------|
-|`<mixed>`|`<mixed>`|This is a generic limitation which does not validate the values provided to it. Make sure that you validate the values passed to this limitation in your own logic.|
+|`<mixed>`|`<mixed>`|This is a generic limitation which doesn't validate the values provided to it. Make sure that you validate the values passed to this limitation in your own logic.|
 
 ### Configuration
 
diff --git a/docs/permissions/permission_overview.md b/docs/permissions/permission_overview.md
index 6c7693a697..8eb4eb0902 100644
--- a/docs/permissions/permission_overview.md
+++ b/docs/permissions/permission_overview.md
@@ -4,7 +4,7 @@ description: The permission system is based on policies that you assign to users
 
 # Permission overview
 
-A new user does not have permissions for any part of the system, unless they're explicitly given access.
+A new user doesn't have permissions for any part of the system, unless they're explicitly given access.
 To get access they need to inherit roles, typically assigned to the user group they belong to.
 
 Each role can contain one or more **Policies**. A policy is a rule that gives access to a single **function** in a **module**.
@@ -34,7 +34,7 @@ The more role assignments and complex policies you add for a given user, the mor
 
 You can control access to a custom controller by implementing the `performAccessCheck()` method.
 
-In the following example the user does not have access to the controller unless they have the `section/view` policy:
+In the following example the user doesn't have access to the controller unless they have the `section/view` policy:
 
 ``` php
 use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute;
diff --git a/docs/permissions/permission_use_cases.md b/docs/permissions/permission_use_cases.md
index 44f1072da4..3db1d2d3df 100644
--- a/docs/permissions/permission_use_cases.md
+++ b/docs/permissions/permission_use_cases.md
@@ -29,7 +29,7 @@ To publish, they must send the content for review to another User with proper pe
 - `content/edit`
 
 Use this setup with [[= product_name_exp =]] or [[= product_name_com =]] only,
-as [[= product_name_headless =]] does not allow the User to continue working with their content.
+as [[= product_name_headless =]] doesn't allow the User to continue working with their content.
 
 ## Create and publish content
 
@@ -61,7 +61,7 @@ Further manipulation of Trash requires the `content/restore` policy to restore i
 !!! caution
 
     With the `content/cleantrash` policy, the User can empty the Trash even if they don't have access to the trashed content,
-    for example, because it belonged to a Section that the User does not have permissions for.
+    for example, because it belonged to a Section that the user doesn't have permissions for.
 
 ## Restrict editing to part of the tree
 
@@ -74,7 +74,7 @@ Let's assume you have two Folders under your Home: Blog and Articles.
 You can let a User create content for the blogs, but not in Articles, by adding a `Section` limitation to 
 the Blog content item.
 This allows the User to publish content anywhere under this Location in the structure.
-Section does not have to belong to the same Subtree of Location in the content structure, any Locations can be assigned to it.
+Section doesn't have to belong to the same Subtree of Location in the content structure, any Locations can be assigned to it.
 
 ### Location limitation
 
@@ -112,7 +112,7 @@ The vegetarian editors should now see the following content tree:
 
 ![Limited subtree file structure](subtree_usability_notes_2.png)
 
-When a policy has more than one limitation, all of them have to apply, or the policy does not work.
+When a policy has more than one limitation, all of them have to apply, or the policy doesn't work.
 For example, a `Location` limitation on Location `1/2` and `Subtree of Location` limitation on `1/2/55` cannot work together,
 because no Location can satisfy both those requirements at the same time.
 To combine more than one limitation with the *or* relation, not *and*,
diff --git a/docs/permissions/policies.md b/docs/permissions/policies.md
index 40602e556b..1071ba60e3 100644
--- a/docs/permissions/policies.md
+++ b/docs/permissions/policies.md
@@ -185,7 +185,7 @@ which define, which parts of the application or website the user has access to.
 
 | Module                 | Function                          | Effect                                                                                                                                  | Possible limitations                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
 |------------------------|-----------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| <nobr>`content`</nobr> | <nobr>`cleantrash`</nobr>         | empty the Trash (even when the User does not have access to individual content items)                                                   |
+| <nobr>`content`</nobr> | <nobr>`cleantrash`</nobr>         | empty the Trash (even when the User doesn't have access to individual content items)                                                   |
 |                        | <nobr>`create`</nobr>             | create new content. Note: even without this Policy the User is able to enter edit mode, but cannot finalize work with the content item. | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Language](limitation_reference.md#language-limitation)</br>[Owner of Parent](limitation_reference.md#owner-of-parent-limitation)</br>[Content type Group of Parent](limitation_reference.md#content-type-group-of-parent-limitation)</br>[Content type of Parent](limitation_reference.md#content-type-of-parent-limitation)</br>[Parent Depth](limitation_reference.md#parent-depth-limitation)</br>[Field Group](limitation_reference.md#field-group-limitation)</br>[Change Owner](limitation_reference.md#change-owner-limitation)             |
 |                        | <nobr>`diff`</nobr>               | unused                                                                                                                                  |
 |                        | <nobr>`edit`</nobr>               | edit existing content                                                                                                                   | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Content type Group](limitation_reference.md#content-type-group-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Language](limitation_reference.md#language-limitation)</br>[Object State](limitation_reference.md#object-state-limitation)</br>[Workflow Stage](limitation_reference.md#workflow-stage-limitation)</br>[Field Group](limitation_reference.md#field-group-limitation)</br>[Version Lock](limitation_reference.md#version-lock-limitation)</br>[Change Owner](limitation_reference.md#change-owner-limitation) |
diff --git a/docs/personalization/api_reference/tracking_api.md b/docs/personalization/api_reference/tracking_api.md
index a97612ebb5..d00c4a90af 100644
--- a/docs/personalization/api_reference/tracking_api.md
+++ b/docs/personalization/api_reference/tracking_api.md
@@ -123,16 +123,16 @@ as item identifiers and recommendable items.
 End users who browse through the shop probably get recommendations of
 the same item that is currently displayed but in a different size and/or color,
 a so-called "variant".
-The Personalization server does not recognize relations between items, therefore,
+The Personalization server doesn't recognize relations between items, therefore,
 every single SKU is used to calculate similarities between them.
 In the case of bestsellers, this could lead to the appearance of a shirt
 in size L on position 2 and the same shirt in size M on position 4.
 
 Customer B decides to use the UPC as item identifiers.
 This results in recommendations that don't contain variations of the currently shown item.
-Therefore, the detail page of shirt X does not contain a recommendation
+Therefore, the detail page of shirt X doesn't contain a recommendation
 for the same shirt in a different size.
-And the same shirt does not show up twice on a list of bestseller recommendations.
+And the same shirt doesn't show up twice on a list of bestseller recommendations.
 
 If the size of an item or the color is selectable on a detail page of an item,
 you may prefer to use the UPC.
diff --git a/docs/personalization/enable_personalization.md b/docs/personalization/enable_personalization.md
index 30f948115f..5af31b397f 100644
--- a/docs/personalization/enable_personalization.md
+++ b/docs/personalization/enable_personalization.md
@@ -347,7 +347,7 @@ and it eventually fetches the affected content and updates it internally.
     Therefore, it's crucial that you check whether the content export was successful, 
     because certain references, for example, deeplinks and image references, are 
     included.
-    If the export fails, the Personalization server does not have full content information.
+    If the export fails, the Personalization server doesn't have full content information.
     As a result, even if the recommendations are displayed, they might miss images, 
     titles or deeplinks.
 
diff --git a/docs/personalization/legacy_recommendation_api.md b/docs/personalization/legacy_recommendation_api.md
index 7e7debe2a1..7afe65f3d1 100644
--- a/docs/personalization/legacy_recommendation_api.md
+++ b/docs/personalization/legacy_recommendation_api.md
@@ -270,5 +270,5 @@ An overview of pros and cons for each of the above techniques:
 |Works if JavaScript is disabled|Yes|depends|-|-|-|	 	 
 |Works for server without multithreading functionality|Yes|Yes|-|Yes|Yes|
 |Compatible with frontend caching on the server|-|-|-|Yes|Yes|
-|Does not delay page rendering|-|depends|depends|Yes|Yes|
+|Doesn't delay page rendering|-|depends|depends|Yes|Yes|
 |Supports authentication for recommendation fetching|Yes|Yes|Yes|-|depends|
diff --git a/docs/pim/products.md b/docs/pim/products.md
index b5f7b40bd1..ca088780cb 100644
--- a/docs/pim/products.md
+++ b/docs/pim/products.md
@@ -62,7 +62,7 @@ Codes for product variants are generated automatically based on the [selected st
 
 Each product variant has separate availability and stock information.
 Each variant can also have separate price rules.
-If a variant does not have separate price rules, it uses the price of its base product.
+If a variant doesn't have separate price rules, it uses the price of its base product.
 
 ## Product assets
 
@@ -85,7 +85,7 @@ The stock can also be set to infinite (for example, in case of digital products)
 
 !!! note
 
-    Availability does not automatically mean that a product can be ordered.
+    Availability doesn't automatically mean that a product can be ordered.
     A product can be available, but have zero stock.
 
     A product can only be ordered when it has either positive stock, or stock set to infinite.
diff --git a/docs/release_notes/ez_platform_v1.11.0.md b/docs/release_notes/ez_platform_v1.11.0.md
index c1150b2962..9f1502a594 100644
--- a/docs/release_notes/ez_platform_v1.11.0.md
+++ b/docs/release_notes/ez_platform_v1.11.0.md
@@ -42,7 +42,7 @@ It enables you to manually select a set of content items to be displayed.
 
     To enable adding content to a Collection block in a clean installation,
     you need to configure the views for the block and define which content types can be embedded in it.
-    
+
     For more information and an example, see [block templates](https://doc.ibexa.co/en/latest/content_management/pages/page_blocks/#block-templates).
 
 #### RecommendationBundle adapted for YooChoose v2
@@ -69,7 +69,7 @@ full support, maintenance, and priority security patch handling as they're used
 
 !!! note
 
-    Not supported for clean/new installs, intended for use with migrations. The Legacy Bridge integration does not have same performance,
+    Not supported for clean/new installs, intended for use with migrations. The Legacy Bridge integration doesn't have same performance,
     scalability or integrated experience as pure Platform setup. There are known edge cases where for instance cache or search index
     won't always be immediately updated across the two systems using the bridge, which is one of the many reasons why we recommend
     a pure Platform setup where that is possible.
diff --git a/docs/release_notes/ez_platform_v2.2.0.md b/docs/release_notes/ez_platform_v2.2.0.md
index 819ef97ba7..d3f8a277ff 100644
--- a/docs/release_notes/ez_platform_v2.2.0.md
+++ b/docs/release_notes/ez_platform_v2.2.0.md
@@ -18,7 +18,7 @@ This version introduces the **Page Builder** which replaces the landing page edi
 
 !!! note
 
-    The Page Builder does not offer all blocks that landing page editor did.
+    The Page Builder doesn't offer all blocks that landing page editor did.
     The removed blocks include Schedule and Form blocks.
     They will be included again in a future release.
 
diff --git a/docs/release_notes/ez_platform_v2.5.md b/docs/release_notes/ez_platform_v2.5.md
index 62a079bd7d..e7b29f81c3 100644
--- a/docs/release_notes/ez_platform_v2.5.md
+++ b/docs/release_notes/ez_platform_v2.5.md
@@ -216,14 +216,14 @@ You can now translate labels of choice attributes in Custom tags using the `ezri
 
 ### API improvements
 
-`SectionService::loadSection` has been improved to return a filtered list when user does not have access to a Section,
+`SectionService::loadSection` has been improved to return a filtered list when user doesn't have access to a Section,
 instead of throwing an exception.
 
 ## eZ Platform v2.5.4
 
 ### Permission improvements
 
-`RoleService` methods have been improved to return a filtered list when user does not have access to content,
+`RoleService` methods have been improved to return a filtered list when user doesn't have access to content,
 instead of throwing an exception. The following methods are affected:
 
 - `RoleService::loadRoles`
diff --git a/docs/resources/contributing/package_structure.md b/docs/resources/contributing/package_structure.md
index b9ee34266b..9642ce6d78 100644
--- a/docs/resources/contributing/package_structure.md
+++ b/docs/resources/contributing/package_structure.md
@@ -48,7 +48,7 @@ The general package directory structure and corresponding PHP namespace mapping
 |   +-- lib (`Ibexa\Tests\<PackageName>`)
 ```
 
-If a package does not contain some of the described parts, you can skip those directories.
+If a package doesn't contain some of the described parts, you can skip those directories.
 
 ### Implementation (lib)
 
diff --git a/docs/search/criteria_reference/languagecode_criterion.md b/docs/search/criteria_reference/languagecode_criterion.md
index 3c9a1c0586..d861abd22f 100644
--- a/docs/search/criteria_reference/languagecode_criterion.md
+++ b/docs/search/criteria_reference/languagecode_criterion.md
@@ -7,7 +7,7 @@ searches for content based on whether it's translated into the selected language
 
 - `value` - string(s) representing the language codes to search for
 - (optional) `matchAlwaysAvailable` - bool representing whether content with the `alwaysAvailable` flag
-should be returned even if it does not contain the selected language (default `true`)
+should be returned even if it doesn't contain the selected language (default `true`)
 
 ## Example
 
diff --git a/docs/search/criteria_reference/logicalnot_criterion.md b/docs/search/criteria_reference/logicalnot_criterion.md
index 1fcdd68b29..af3f583671 100644
--- a/docs/search/criteria_reference/logicalnot_criterion.md
+++ b/docs/search/criteria_reference/logicalnot_criterion.md
@@ -1,7 +1,7 @@
 # LogicalNot Criterion
 
 The [`LogicalNot` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-LogicalNot.html)
-matches content URL if the provided Criterion does not match.
+matches content URL if the provided Criterion doesn't match.
 
 It takes only one Criterion in the array parameter.
 
diff --git a/docs/search/search_api.md b/docs/search/search_api.md
index 13f2f1fdd1..b8935b9b6f 100644
--- a/docs/search/search_api.md
+++ b/docs/search/search_api.md
@@ -115,7 +115,7 @@ You can use the `ContentService::find(Filter)` method to find content items or
 `ContentService::find` returns an iterable [`ContentList`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-ContentList.html)
 while `LocationService::find` returns an iterable [`LocationList`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-LocationList.html).
 
-Filtering differs from search. It does not use the `SearchService` and isn't based on indexed data.
+Filtering differs from search. It doesn't use the `SearchService` and isn't based on indexed data.
 
 [`Filter`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Filter-Filter.html) enables you to configure a query using chained methods to select criteria, sorting, limit and offset.
 
@@ -262,7 +262,7 @@ This also shows that you can get the total number of search results using the `t
 
 You can also nest different operators to construct more complex queries.
 The example below uses the `LogicalNot` operator to search for all content containing a given phrase
-that does not belong to the provided Section:
+that doesn't belong to the provided Section:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/FindComplexCommand.php', 45, 46) =]][[= include_file('code_samples/api/public_php_api/src/Command/FindComplexCommand.php', 48, 53) =]]
@@ -389,7 +389,7 @@ $query->aggregations[] = new IntegerRangeAggregation('range', 'person', 'age',
     The beginning of the range is included and the end is excluded,
     so a range between 1 and 30 includes value `1`, but not `30`.
     
-    `null` means that a range does not have an end.
+    `null` means that a range doesn't have an end.
     In the example all values above (and including) 60 are included in the last range.
 
 See [Agrregation reference](aggregation_reference.md) for details of all available aggregations.
diff --git a/docs/search/search_engines/elastic_search/configure_elastic_search.md b/docs/search/search_engines/elastic_search/configure_elastic_search.md
index b33b98e615..a96576c397 100644
--- a/docs/search/search_engines/elastic_search/configure_elastic_search.md
+++ b/docs/search/search_engines/elastic_search/configure_elastic_search.md
@@ -133,7 +133,7 @@ For more information and a list of available choices, see [Connection pool](http
 !!! tip "Load tests recommendation"
 
     If you change the connection pool setting, it's recommended that you to perform load tests
-    to check whether the change does not negatively impact the performance of your environment.
+    to check whether the change doesn't negatively impact the performance of your environment.
 
 #### Connection selector
 
diff --git a/docs/search/search_engines/search_engines.md b/docs/search/search_engines/search_engines.md
index 7b4556a7a3..02cbae1d5a 100644
--- a/docs/search/search_engines/search_engines.md
+++ b/docs/search/search_engines/search_engines.md
@@ -21,7 +21,7 @@ Currently, they exist in their own [[= product_name =]] Bundles:
 | Index-time boosting | No | No | Query-time boosting\*\*\* |
 | Aggregations | No | Yes | Yes |
 
-\* Usage of Criteria and Sort Clauses for fields does not perform well on medium to larger 
+\* Usage of Criteria and Sort Clauses for fields doesn't perform well on medium to larger 
 amount of data with Legacy Search Engine (SQL).
 
 \*\* For more information about fulltext search syntax support, see [Fulltext Criterion](fulltext_criterion.md).
diff --git a/docs/search/search_engines/solr_search_engine/install_solr.md b/docs/search/search_engines/solr_search_engine/install_solr.md
index 8477f3e79d..25cea6ed37 100644
--- a/docs/search/search_engines/solr_search_engine/install_solr.md
+++ b/docs/search/search_engines/solr_search_engine/install_solr.md
@@ -50,7 +50,7 @@ To set SolrCloud up follow [SolrCloud reference guide](https://lucene.apache.org
 
 ### Continue Solr configuration
 
-The bundle does not commit Solr index changes directly on Repository updates, leaving it up to you to tune this using `solrconfig.xml` as best practice suggests.
+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. it's strongly recommended to set-up `solrconfig.xml` like this:
 
@@ -263,7 +263,7 @@ ibexa:
 
 ## Clear prod cache
 
-While Symfony `dev` environment keeps track of changes to YAML files, `prod` does not, so clear the cache to make sure Symfony reads the new config:
+While Symfony `dev` environment keeps track of changes to YAML files, `prod` doesn't, so clear the cache to make sure Symfony reads the new config:
 
 ``` bash
 php bin/console --env=prod cache:clear
@@ -288,7 +288,7 @@ Here are the most common issues you may encounter:
 - Exception on unsupported field types
     - Make sure to implement all field types in your installation, or to configure missing ones as [NullType](nullfield.md) if implementation isn't needed.
 - Content isn't immediately available 
-    - Solr Bundle on purpose does not commit changes directly on Repository updates *(on indexing)*, but lets you control this using Solr configuration. Adjust Solr's `autoSoftCommit` (visibility of changes to search index) and/or `autoCommit` (hard commit, for durability and replication) to balance performance and load on your Solr instance against needs you have for "[NRT](https://cwiki.apache.org/confluence/display/solr/Near+Real+Time+Searching)".
+    - Solr Bundle on purpose doesn't commit changes directly on Repository updates *(on indexing)*, but lets you control this using Solr configuration. Adjust Solr's `autoSoftCommit` (visibility of changes to search index) and/or `autoCommit` (hard commit, for durability and replication) to balance performance and load on your Solr instance against needs you have for "[NRT](https://cwiki.apache.org/confluence/display/solr/Near+Real+Time+Searching)".
 - Running out of memory during indexing
     - In general make sure to run indexing using the prod environment to avoid debuggers and loggers from filling up memory.
     - Flysystem: You can find further info in https://issues.ibexa.co/browse/EZP-25325.
\ No newline at end of file
diff --git a/docs/search/url_search_reference/logicalnot_url_criterion.md b/docs/search/url_search_reference/logicalnot_url_criterion.md
index c03b916c89..9a2c8e07b9 100644
--- a/docs/search/url_search_reference/logicalnot_url_criterion.md
+++ b/docs/search/url_search_reference/logicalnot_url_criterion.md
@@ -1,7 +1,7 @@
 # LogicalNot Criterion
 
 The [`LogicalNot` URL Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-Criterion-LogicalNot.html)
-matches a URL if the provided Criterion does not match.
+matches a URL if the provided Criterion doesn't match.
 
 It takes only one Criterion in the array parameter.
 
diff --git a/docs/snippets/catalog_permissions_note.md b/docs/snippets/catalog_permissions_note.md
index 802bfcb9fb..568d71face 100644
--- a/docs/snippets/catalog_permissions_note.md
+++ b/docs/snippets/catalog_permissions_note.md
@@ -1,4 +1,4 @@
 !!! note
 
-    By default, the anonymous user does not have permissions to view products.
+    By default, the anonymous user doesn't have permissions to view products.
     To change this, add the `Product/View` Policy to the Anonymous Role.
diff --git a/docs/templating/design_engine/add_new_design.md b/docs/templating/design_engine/add_new_design.md
index 0cb5f8c672..6efb8045fe 100644
--- a/docs/templating/design_engine/add_new_design.md
+++ b/docs/templating/design_engine/add_new_design.md
@@ -115,7 +115,7 @@ This is because you defined `standard` design as fallback for this SiteAccess:
 
 In this case, if the design engine cannot find a template for the current design,
 it uses the template from the next configured design.
-In the case above, the engine does not find the footer template for the `campaign` SiteAccess,
+In the case above, the engine doesn't find the footer template for the `campaign` SiteAccess,
 so it uses the one from `standard`.
 
 This way you don't need to provide all templates for a new design, but only those that you want to be different than the fallback one.
diff --git a/docs/templating/embed_and_list_content/render_images.md b/docs/templating/embed_and_list_content/render_images.md
index c8938cb6ae..f95e229942 100644
--- a/docs/templating/embed_and_list_content/render_images.md
+++ b/docs/templating/embed_and_list_content/render_images.md
@@ -39,7 +39,7 @@ returns the identifier of the first image Field that isn't empty.
 !!! caution
 
     This function works only for [Image](imagefield.md) Fields.
-    It does not work for [ImageAsset](imageassetfield.md) Fields.
+    It doesn't work for [ImageAsset](imageassetfield.md) Fields.
 
 ## Configure image variation
 
@@ -75,7 +75,7 @@ To use it, select the variation when rendering the image:
 ## Use focal point
 
 In the [image editor](configure_image_editor.md) you can define a focal point for an image.
-The focal point does not have an instant effect when you use the default templates.
+The focal point doesn't have an instant effect when you use the default templates.
 However, you can use it to select the part of the image the view focuses on when the image is cropped.
 
 The following example shows how to use an image contained in an Image Field as a focussed background.
diff --git a/docs/templating/image_variations.md b/docs/templating/image_variations.md
index 984d5e14c8..608e9a3e8b 100644
--- a/docs/templating/image_variations.md
+++ b/docs/templating/image_variations.md
@@ -51,8 +51,8 @@ If set to `null` or `~`, the variation takes the original image for reference.
 | `geometry/scalewidth` | `[width]` | Scales image width, both up and down. Preserves aspect ratio. |
 | `geometry/scaleheight` | `[height]` | Scales image height, both up and down. Preserves aspect ratio. |
 | `geometry/scale` | `[width, height]` | Scales image size to the provided width and height, both up and down. Preserves aspect ratio. |
-| `geometry/scaleexact` | `[width, height]` | Scales image to  exactly fit the provided width and height. Does not preserve aspect ratio. |
-| `geometry/scalepercent` | `[widthPercent, heightPercent]` | Scales width and height by the provided percent values. Does not preserve aspect ratio. |
+| `geometry/scaleexact` | `[width, height]` | Scales image to  exactly fit the provided width and height. Doesn't preserve aspect ratio. |
+| `geometry/scalepercent` | `[widthPercent, heightPercent]` | Scales width and height by the provided percent values. Doesn't preserve aspect ratio. |
 | `geometry/crop` | `[width, height, startX, startY]` | Crops the image. The result has the provided width/height, starting at the provided startX/startY |
 | `border` | `[thickBorderX, thickBorderY, color=#000]` | Adds a border around the image. Thickness is defined in px. Color is `#000` by default. |
 | `filter/noise` | `[radius=0]` | Smooths the contours of an image (`imagick`/`gmagick` only). `radius` is in px. |
diff --git a/docs/templating/render_content/customize_product_view.md b/docs/templating/render_content/customize_product_view.md
index 9aa506faad..19014106fb 100644
--- a/docs/templating/render_content/customize_product_view.md
+++ b/docs/templating/render_content/customize_product_view.md
@@ -37,7 +37,7 @@ To do it, create your own template in `templates/themes/storefront/storefront/co
 {% endif %}
 ```
 
-This template adds a "price currently unavailable" label when a product does not have a price specified.
+This template adds a "price currently unavailable" label when a product doesn't have a price specified.
 
 ## Available templates
 
diff --git a/docs/templating/twig_function_reference/content_twig_functions.md b/docs/templating/twig_function_reference/content_twig_functions.md
index 22594451c5..8e2ee2b6c1 100644
--- a/docs/templating/twig_function_reference/content_twig_functions.md
+++ b/docs/templating/twig_function_reference/content_twig_functions.md
@@ -58,7 +58,7 @@ You can pass one of the following rendering methods to `ibexa_render()`:
 `ibexa_content_name()` renders the name of a content item.
 
 The function uses prioritized languages from SiteAccess settings unless you pass another language as `forcedLanguage`.
-If the content item does not have a translation in the prioritized or passed language,
+If the content item doesn't have a translation in the prioritized or passed language,
 the function returns the name in the main language.
 
 | Argument | Type | Description |
diff --git a/docs/templating/twig_function_reference/field_twig_functions.md b/docs/templating/twig_function_reference/field_twig_functions.md
index 0a8e3ca08d..eecc2b6e7a 100644
--- a/docs/templating/twig_function_reference/field_twig_functions.md
+++ b/docs/templating/twig_function_reference/field_twig_functions.md
@@ -77,7 +77,7 @@ Some field types, like the [MapLocation field type](maplocationfield.md), expect
 
 The function returns the value of the field only.
 To render the field with default or custom templates, use [`ibexa_render_field()`](#ibexa_render_field) instead.
-If the content item does not have a translation in the prioritized or passed language,
+If the content item doesn't have a translation in the prioritized or passed language,
 the function returns the value in the main language.
 
 | Argument | Type | Description |
@@ -94,7 +94,7 @@ the function returns the value in the main language.
 
 `ibexa_field()` returns the field object.
 The field gives you access to the field value, the field's definition identifier, and field type identifier.
-If the content item does not have a translation in the prioritized or passed language,
+If the content item doesn't have a translation in the prioritized or passed language,
 the function returns the field object in the main language.
 
 | Argument | Type | Description |
@@ -119,7 +119,7 @@ You can use `ibexa_field()` to access the field type identifier:
 `ibexa_field_name()` returns the name of a content item's field.
 
 The function uses prioritized languages from SiteAccess settings unless you pass another language as `forcedLanguage`.
-If the content item does not have a translation in the prioritized or passed language,
+If the content item doesn't have a translation in the prioritized or passed language,
 the function returns the name in the main language.
 
 | Argument | Type | Description |
@@ -140,7 +140,7 @@ the function returns the name in the main language.
 `ibexa_field_description()` returns the description of a content item's field.
 
 The function uses prioritized languages from SiteAccess settings unless you pass another language as `forcedLanguage`.
-If the content item does not have a translation in the prioritized or passed language,
+If the content item doesn't have a translation in the prioritized or passed language,
 the function returns the description in the main language.
 
 | Argument | Type | Description |
diff --git a/docs/templating/twig_function_reference/image_twig_functions.md b/docs/templating/twig_function_reference/image_twig_functions.md
index 73a975b03d..c3f2751716 100644
--- a/docs/templating/twig_function_reference/image_twig_functions.md
+++ b/docs/templating/twig_function_reference/image_twig_functions.md
@@ -46,7 +46,7 @@ with the variation name passed as an argument, for example:
 !!! caution
 
     This function works only for [Image](imagefield.md) Fields.
-    It does not work for [ImageAsset](imageassetfield.md) Fields.
+    It doesn't work for [ImageAsset](imageassetfield.md) Fields.
 
 | Argument | Type | Description |
 | ------ |----- | ----- |
diff --git a/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md b/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md
index 01edb6985c..997ecb0a21 100644
--- a/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md
+++ b/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md
@@ -17,7 +17,7 @@ To use a custom template when rendering the root content, create a `content_view
 
     When pasting YAML code, pay attention to indentation and levels.
     The code blocks shown here include the full structure of the YAML file to help you learn where to place new blocks.
-    Be careful not to duplicate existing keys, because YAML does not allow it.
+    Be careful not to duplicate existing keys, because YAML doesn't allow it.
 
 Edit `config/packages/ibexa.yaml`.
 Add the following block under `site` while paying attention to indentation - `content_view` should be one level below `site`:
@@ -261,4 +261,4 @@ Refresh the page and you should see the "Hello world" placed inside a styled lay
 
 ![Homepage with a Hello world](bike_tutorial_hello_world.png)
 
-At this point, the template is static. It does not render any dynamic data from the repository.
+At this point, the template is static. It doesn't render any dynamic data from the repository.
diff --git a/docs/tutorials/beginner_tutorial/6_improve_configuration.md b/docs/tutorials/beginner_tutorial/6_improve_configuration.md
index c313794015..323a5b94c3 100644
--- a/docs/tutorials/beginner_tutorial/6_improve_configuration.md
+++ b/docs/tutorials/beginner_tutorial/6_improve_configuration.md
@@ -8,7 +8,7 @@ description: See how you can manage Ibexa DXP configuration files.
 
 Image variations are different versions of the same image. You can use them to scale images, crop them, add effects, etc.
 
-So far the images in the ride list are fitted to the templates automatically, and the result does not look good.
+So far the images in the ride list are fitted to the templates automatically, and the result doesn't look good.
 Now you can create a variation to specify how you want the images to look in detail.
 
 Create a new `config/packages/image_variations.yaml` file containing:
diff --git a/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md b/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md
index 3681254569..a05ded89da 100644
--- a/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md
+++ b/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md
@@ -39,7 +39,7 @@ The Point 2D is going to store two elements (coordinates for point 2D):
 - `x` value
 - `y` value
 
-At this point, it does not matter where they're stored. You want to focus on what the field type exposes as an API.
+At this point, it doesn't matter where they're stored. You want to focus on what the field type exposes as an API.
 
 `src/FieldType/Point2D/Value.php` should have the following properties:
 
diff --git a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
index 5f35d929a1..bdab60fd44 100644
--- a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
+++ b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
@@ -84,7 +84,7 @@ The operation is transactional and rolls back in case of errors.
 
 ##### Block migration
 
-In v2.2 Page Builder does not offer all blocks that landing page editor did. The removed blocks include Keyword, Schedule, and Form blocks.
+In v2.2 Page Builder doesn't offer all blocks that landing page editor did. The removed blocks include Keyword, Schedule, and Form blocks.
 The Places block has been removed from the clean installation and is only available in the demo out of the box.
 If you use this block in your site, re-apply its configuration based on the [demo](https://github.com/ezsystems/ezplatform-ee-demo/blob/v2.2.2/app/config/blocks.yml).
 
diff --git a/docs/update_and_migration/from_4.0/to_4.1.md b/docs/update_and_migration/from_4.0/to_4.1.md
index f62eb8151e..ee3b827bad 100644
--- a/docs/update_and_migration/from_4.0/to_4.1.md
+++ b/docs/update_and_migration/from_4.0/to_4.1.md
@@ -14,9 +14,9 @@ Go through the following steps to update to v4.1.
 
     During the update process you can encounter the following error:
 
-    `Failed to create closure from callable: class 'Ibexa\Bundle\Commerce\Eshop\Twig\SilvercommonExtension' does not have a method 'getNavigation'`
+    `Failed to create closure from callable: class 'Ibexa\Bundle\Commerce\Eshop\Twig\SilvercommonExtension' doesn't have a method 'getNavigation'`
 
-    You can ignore this error, it does not require any action on your part.
+    You can ignore this error, it doesn't require any action on your part.
 
 ## Update the app to latest version of v4.0
 
@@ -181,7 +181,7 @@ To use the legacy solution, in the `config/packages` folder,
 in YAML files with shop configuration, under the `parameters` key, 
 make sure that the `ibexa.commerce.site_access.config.eshop.default.catalog_data_provider` parameter is set to `ez5`.
   
-To use the new product catalog, since the new solution does not support the old 
+To use the new product catalog, since the new solution doesn't support the old 
 price engine out of the box, in your price engine configuration, 
 you must update the following parameters by providing the 
 `Ibexa\\ProductCatalog\\Bridge\\PriceProvider` value in the `ibexa_setting` table, 
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/common_issues.md b/docs/update_and_migration/migrate_to_ibexa_dxp/common_issues.md
index 909ec1f1f5..c0c40a46bf 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/common_issues.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/common_issues.md
@@ -45,7 +45,7 @@ php bin/console ezplatform:images:normalize-path
 
 ## Unknown relation type 0
 
-"Unknown relation type 0." error occurs only when using REST API. The issue does not occur
+"Unknown relation type 0." error occurs only when using REST API. The issue doesn't occur
 the first time article is published (upon creation). It only happens after the article is
 edited and published.
 
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish.md b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish.md
index 9deefb8e9c..90059905b6 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish.md
@@ -14,7 +14,7 @@ The release of eZ Platform brought about an inevitable disruption in backwards c
 
 ### Incompatibilities with legacy
 
-eZ Platform represents the 6th generation of eZ Publish, and while the 5th generation had* *a major focus on backwards code compatibility with the 3rd and 4th generations *(legacy)*, the 6th generation does not.
+eZ Platform represents the 6th generation of eZ Publish, and while the 5th generation had* *a major focus on backwards code compatibility with the 3rd and 4th generations *(legacy)*, the 6th generation doesn't.
 
 The 6th generation is aimed at being fully backwards compatible on the following:
 
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
index e0142e272f..829faadb7f 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
@@ -173,7 +173,7 @@ If you don't plan to migrate content directly to newer eZ Platform field types,
 
 !!! note
 
-    The Legacy Bridge integration does not have the same performance, scalability or integrated experience as a pure Platform setup. Like on eZ Publish Platform 5.x there are known edge cases where, for instance, cache or search index won't always be immediately updated across the two systems using the bridge. This is one of the many reasons why we recommend a pure Platform setup where that is possible.
+    The Legacy Bridge integration doesn't have the same performance, scalability or integrated experience as a pure Platform setup. Like on eZ Publish Platform 5.x there are known edge cases where, for instance, cache or search index won't always be immediately updated across the two systems using the bridge. This is one of the many reasons why we recommend a pure Platform setup where that is possible.
 
 #### 2.5.1 Set up symlinks for legacy folders
 
diff --git a/docs/users/invitations.md b/docs/users/invitations.md
index 5af3d6b00d..1989284d22 100644
--- a/docs/users/invitations.md
+++ b/docs/users/invitations.md
@@ -40,7 +40,7 @@ For example, use the following [configuration](configuration.md#configuration-fi
 ```
 
 Here, you can specify which template should be used for the invitation mail, and what should be the expiration time for the invitation link included in that mail.
-If a user does not click the invitation link sent to them in time, you can refresh the invitation.
+If a user doesn't click the invitation link sent to them in time, you can refresh the invitation.
 Refresh resets the time limit and changes the hash in the invitation link.
 
 You can find more registration related templates in [Register new users documentation](user_registration.md#other-user-management-templates).
\ No newline at end of file
diff --git a/docs/users/passwords.md b/docs/users/passwords.md
index 56016808a9..a74cc073cc 100644
--- a/docs/users/passwords.md
+++ b/docs/users/passwords.md
@@ -108,7 +108,7 @@ To do this, in the **User account (ezuser)** field definition, select "Password
 ![Protection against using breached passwords](password_breached.png)
 
 This rule checks the password against known password dumps by using the https://haveibeenpwned.com/ API.
-It does not check existing passwords, so it won't block login for anyone. It applies only to new passwords when users change them.
+It doesn't check existing passwords, so it won't block login for anyone. It applies only to new passwords when users change them.
 
 !!! note
 
diff --git a/docs/users/user_authentication.md b/docs/users/user_authentication.md
index 9eebe34a38..3ecfe1f4f9 100644
--- a/docs/users/user_authentication.md
+++ b/docs/users/user_authentication.md
@@ -14,7 +14,7 @@ This is mainly for the kernel to be able to manage content-related permissions (
 
 Depending on your context, you either want to create a Platform user, return an existing user, or even always use a generic user.
 
-Whenever an *external* user is matched (i.e. one that does not come from Platform repository, like coming from LDAP), [[= product_name =]] kernel initiates an `MVCEvents::INTERACTIVE_LOGIN` event.
+Whenever an *external* user is matched (i.e. one that doesn't come from Platform repository, like coming from LDAP), [[= product_name =]] kernel initiates an `MVCEvents::INTERACTIVE_LOGIN` event.
 Every service listening to this event receives an `Ibexa\Core\MVC\Symfony\Event\InteractiveLoginEvent` object which contains the original security token (that holds the matched user) and the request.
 
 Then, it's up to the listener to retrieve a Platform user from the repository and to assign it back to the event object.

From 7679df71dccc672bcdf23d2e8a006bf017920db6 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Tue, 15 Oct 2024 15:19:46 +0200
Subject: [PATCH 19/77] More fixes

---
 docs/administration/admin_panel/corporate_admin_panel.md     | 2 +-
 docs/administration/admin_panel/roles_admin_panel.md         | 5 +++--
 .../administration/admin_panel/url_management_admin_panel.md | 2 +-
 docs/administration/admin_panel/workflow_admin_panel.md      | 2 +-
 docs/content_management/file_management/file_management.md   | 4 +++-
 docs/infrastructure_and_maintenance/clustering/clustering.md | 2 +-
 docs/infrastructure_and_maintenance/devops.md                | 4 +++-
 docs/infrastructure_and_maintenance/performance.md           | 3 ++-
 docs/permissions/permission_overview.md                      | 3 +--
 docs/release_notes/ez_platform_v1.10.0.md                    | 4 +++-
 docs/release_notes/ez_platform_v1.12.0.md                    | 2 +-
 docs/release_notes/ez_platform_v3.0_deprecations.md          | 3 ++-
 docs/search/reindex_search.md                                | 2 +-
 .../search_engines/solr_search_engine/solr_overview.md       | 2 +-
 14 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/docs/administration/admin_panel/corporate_admin_panel.md b/docs/administration/admin_panel/corporate_admin_panel.md
index 11b4be2fac..702a3ed0c7 100644
--- a/docs/administration/admin_panel/corporate_admin_panel.md
+++ b/docs/administration/admin_panel/corporate_admin_panel.md
@@ -10,4 +10,4 @@ There, in the **Corporate** section, you can find basic information about existi
 
 ![Corporate section](admin_panel_corporate.png "Corporate section")
 
-See [Customer management](https://doc.ibexa.co/projects/userguide/en/latest/customer_management/manage_customers/) for further information.
\ No newline at end of file
+For more information, see [Customer management](https://doc.ibexa.co/projects/userguide/en/latest/customer_management/manage_customers/).
\ No newline at end of file
diff --git a/docs/administration/admin_panel/roles_admin_panel.md b/docs/administration/admin_panel/roles_admin_panel.md
index 6c1b5b613c..cbc6d06f1c 100644
--- a/docs/administration/admin_panel/roles_admin_panel.md
+++ b/docs/administration/admin_panel/roles_admin_panel.md
@@ -24,7 +24,8 @@ See [example use case](permission_use_cases.md#restrict-editing-to-part-of-the-t
 
     Limitation specifies what a user can do, not what they can't do.
     A `Location` limitation, for example, gives the user access to content with a specific Location, not prohibits it.
-    See [Limitation reference](limitation_reference.md) for further information.
+
+    For more information, see [Limitation reference](limitation_reference.md).
 
 **Assignments**
 
@@ -40,4 +41,4 @@ That way system is be more secure and easier to manage.
 This approach also improves performance.
 Role assignments and policies are taken into account during search/load queries.
 
-See [Permissions overview](permissions.md) for further information and [Permission use cases](permission_use_cases.md) for details on how to customize access to different parts of the back office.
\ No newline at end of file
+For more information, see [Permissions overview](permissions.md) and [Permission use cases](permission_use_cases.md).
\ No newline at end of file
diff --git a/docs/administration/admin_panel/url_management_admin_panel.md b/docs/administration/admin_panel/url_management_admin_panel.md
index 23bb6d5292..1b5fd61b87 100644
--- a/docs/administration/admin_panel/url_management_admin_panel.md
+++ b/docs/administration/admin_panel/url_management_admin_panel.md
@@ -7,6 +7,6 @@ description: URL Management lets you manage external URL addresses and URL wildc
 You can manage external URL addresses and URL wildcards in the **Admin** panel.
 Configure URL aliases to have human-readable URL addresses throughout your system.
 
-See [URL management](url_management.md) for further information.
+For more information, see [URL management](url_management.md).
 
 ![URL Management](admin_panel_url_management.png "URL Management")
\ No newline at end of file
diff --git a/docs/administration/admin_panel/workflow_admin_panel.md b/docs/administration/admin_panel/workflow_admin_panel.md
index 3aed53885a..85bc924ec4 100644
--- a/docs/administration/admin_panel/workflow_admin_panel.md
+++ b/docs/administration/admin_panel/workflow_admin_panel.md
@@ -7,6 +7,6 @@ description: The workflow functionality passes a content item version through a
 The workflow functionality passes a content item version through a series of stages.
 Each workflow consists of stages and transitions between them.
 
-See [Workflow](workflow.md) for further information.
+For more information, see [Workflow](workflow.md).
 
 ![Workflow](admin_panel_workflow.png "Workflow")
\ No newline at end of file
diff --git a/docs/content_management/file_management/file_management.md b/docs/content_management/file_management/file_management.md
index 8eabc2ec0d..8da985d99b 100644
--- a/docs/content_management/file_management/file_management.md
+++ b/docs/content_management/file_management/file_management.md
@@ -121,4 +121,6 @@ To learn how to configure other adapters, see the [bundle's online documentation
 ### DFS Cluster handler
 
 For clustering, the platform provides a custom metadata handler that stores metadata about your assets in the database.
-This is faster than accessing the remote NFS or S3 instance to read metadata. For further reading on setting this up, see [Clustering](clustering.md).
+This is faster than accessing the remote NFS or S3 instance to read metadata.
+
+For more information, see [Clustering](clustering.md).
diff --git a/docs/infrastructure_and_maintenance/clustering/clustering.md b/docs/infrastructure_and_maintenance/clustering/clustering.md
index a15134289f..d8c3f5ab6a 100644
--- a/docs/infrastructure_and_maintenance/clustering/clustering.md
+++ b/docs/infrastructure_and_maintenance/clustering/clustering.md
@@ -22,7 +22,7 @@ The minimal requirements are:
 - Shared database (using MySQL/MariaDB)
 - [Shared binary files](#shared-binary-files) (using NFS, or S3)
 
-For further details on requirements, see [Requirements page](requirements.md).
+For more information on requirements, see [Requirements page](requirements.md).
 
 It's also recommended to use:
 
diff --git a/docs/infrastructure_and_maintenance/devops.md b/docs/infrastructure_and_maintenance/devops.md
index e06d59a85b..e58ed5b42b 100644
--- a/docs/infrastructure_and_maintenance/devops.md
+++ b/docs/infrastructure_and_maintenance/devops.md
@@ -8,7 +8,9 @@ description: See various tools that can help you debug your Ibexa DXP installati
 
 ### Clearing file cache using the Symfony cache:clear command
 
-Symfony provides a command for clearing cache. It deletes all file-based caches, which mainly consist of a Twig template, a [service container](php_api.md#service-container), and the Symfony route cache, but also everything else stored in the cache folder. Out of the box on a single-server setup this includes Content cache. For further information on the command's use, see its help text:
+Symfony provides a command for clearing cache. It deletes all file-based caches, which mainly consist of a Twig template, a [service container](php_api.md#service-container), and the Symfony route cache, but also everything else stored in the cache folder. Out of the box on a single-server setup this includes Content cache. 
+
+For further information on the command's use, see its help text:
 
 ``` bash
 php bin/console --env=prod cache:clear -h
diff --git a/docs/infrastructure_and_maintenance/performance.md b/docs/infrastructure_and_maintenance/performance.md
index 164828cdd1..2a15e4feff 100644
--- a/docs/infrastructure_and_maintenance/performance.md
+++ b/docs/infrastructure_and_maintenance/performance.md
@@ -78,7 +78,8 @@ In production setups:
 
 - If you use Redis, make sure to tune it for in-memory cache usage. Its persistence feature isn't needed with cache and severely slows down execution time.
     - [For use with sessions](sessions.md#cluster-setup) however, persistence can be a good fit if you want sessions to survive service interruptions.
-    - Further tips for Redis with cache can be found in doc regarding [Redis Clustering](persistence_cache.md#redis-clustering).
+
+For more information, see [Redis Clustering](persistence_cache.md#redis-clustering).
 
 ### Search
 
diff --git a/docs/permissions/permission_overview.md b/docs/permissions/permission_overview.md
index 8eb4eb0902..3390f3c788 100644
--- a/docs/permissions/permission_overview.md
+++ b/docs/permissions/permission_overview.md
@@ -17,8 +17,7 @@ For example, a `content/publish` policy with a `ContentType` limitation on the "
 A limitation, like a policy, specifies what a user *can* do, not what they *can't do*.
 A `Section` limitation, for example, *gives* the user access to the selected Section, not *prohibits* it.
 
-See [Limitation reference](limitation_reference.md) for further information
-and [Permission use cases](permission_use_cases.md) for example permission setups.
+For more information, see [Limitation reference](limitation_reference.md) and [Permission use cases](permission_use_cases.md).
 
 ## Assigning roles to users
 
diff --git a/docs/release_notes/ez_platform_v1.10.0.md b/docs/release_notes/ez_platform_v1.10.0.md
index 2445b6244d..3cd736d438 100644
--- a/docs/release_notes/ez_platform_v1.10.0.md
+++ b/docs/release_notes/ez_platform_v1.10.0.md
@@ -23,7 +23,9 @@ This is a first step. We aim to provide more in terms of table support in the ed
 
 #### New Design Engine
 
-This is a new way to handle design, theming and design overrides, similar to what we had in eZ Publish. It enables you to define different Themes which are collections of assets and templates. You can then assemble Themes (that can override each other) to define Designs, and eventually, assign a Design to a SiteAccess. This is a powerful concept that we aim to use in our out-of-the-box templates and demo sites. It comes especially handy when using eZ Platform for a multisite installation and willing to reuse design parts. Further info can be found in the [Bundle documentation](https://github.com/ezsystems/ezplatform-design-engine/tree/master/doc).
+This is a new way to handle design, theming and design overrides, similar to what we had in eZ Publish. It enables you to define different Themes which are collections of assets and templates. You can then assemble Themes (that can override each other) to define Designs, and eventually, assign a Design to a SiteAccess. This is a powerful concept that we aim to use in our out-of-the-box templates and demo sites. It comes especially handy when using eZ Platform for a multisite installation and willing to reuse design parts.
+
+For more information, see [Bundle documentation](https://github.com/ezsystems/ezplatform-design-engine/tree/master/doc).
 
 ![](newdesigntable.png)
 
diff --git a/docs/release_notes/ez_platform_v1.12.0.md b/docs/release_notes/ez_platform_v1.12.0.md
index 1b014c2be0..dd54502e29 100644
--- a/docs/release_notes/ez_platform_v1.12.0.md
+++ b/docs/release_notes/ez_platform_v1.12.0.md
@@ -85,7 +85,7 @@ To update to this version, follow the [updating guide](https://doc.ibexa.co/en/
     - There is a new VCL
     - Requires Varnish 4.1+ with `varnish-modules` _(incl. xkey)_, or Varnish Plus where it's built in
 
-    Further reading in [doc/varnish/varnish.md](https://github.com/ezsystems/ezplatform/blob/master/doc/varnish/varnish.md).
+    For more information, see [doc/varnish/varnish.md](https://github.com/ezsystems/ezplatform/blob/master/doc/varnish/varnish.md).
 
     #### How to still use the old VCL and the old X-Location-Id headers
 
diff --git a/docs/release_notes/ez_platform_v3.0_deprecations.md b/docs/release_notes/ez_platform_v3.0_deprecations.md
index a71a0f5d5d..a362cb5e43 100644
--- a/docs/release_notes/ez_platform_v3.0_deprecations.md
+++ b/docs/release_notes/ez_platform_v3.0_deprecations.md
@@ -55,7 +55,8 @@ The following tags used to register field type features in the [service containe
 |`ezpublish.fieldType.externalStorageHandler.gateway`|`ezplatform.field_type.external_storage_handler.gateway`|
 
 Deprecated method `eZ\Publish\SPI\FieldType\FieldType::getName` is now supported with a new signature similar to `eZ\Publish\SPI\FieldType\Nameable::getFieldName()`, which has been removed.
-See [eZ Platform v3.0 project update](https://doc.ibexa.co/en/latest/updating/4_3_upgrade_field_types) for further information.
+
+For more information, see [eZ Platform v3.0 project update](https://doc.ibexa.co/en/latest/updating/4_3_upgrade_field_types).
 
 The deprecated `eZ\Publish\Core\FieldType\RichText` namespace has been removed, as it was moved to a separate bundle in v2.4.
 
diff --git a/docs/search/reindex_search.md b/docs/search/reindex_search.md
index 81c64b041c..65e4f9220f 100644
--- a/docs/search/reindex_search.md
+++ b/docs/search/reindex_search.md
@@ -22,4 +22,4 @@ php bin/console ibexa:reindex --since=yesterday
 php bin/console ibexa:reindex --content-ids=3,45,33
 ```
 
-For further info on possible options, see `php bin/console ibexa:reindex --help`.
+For more information, see `php bin/console ibexa:reindex --help`.
diff --git a/docs/search/search_engines/solr_search_engine/solr_overview.md b/docs/search/search_engines/solr_search_engine/solr_overview.md
index 760aacc3f3..b4fc8784d8 100644
--- a/docs/search/search_engines/solr_search_engine/solr_overview.md
+++ b/docs/search/search_engines/solr_search_engine/solr_overview.md
@@ -10,4 +10,4 @@ When you enable Solr and re-index your content, all your existing Search queries
 This allows you to scale up your [[= product_name =]] installation and be able to continue development locally against SQL engine, and have a test infrastructure, Staging and Prod powered by Solr. 
 By this, it also removes considerable load from your database. 
 
-For further information on the architecture of [[= product_name =]], see [Architecture](architecture.md).
\ No newline at end of file
+For more information on the architecture of [[= product_name =]], see [Architecture](architecture.md).
\ No newline at end of file

From dd8018e23cd1f68580eeeeba6e6307678f7b0868 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Tue, 15 Oct 2024 15:48:49 +0200
Subject: [PATCH 20/77] Batch of fixes

---
 .../2_create_the_content_model.md             | 24 ++++++------
 .../3_customize_the_front_page.md             | 21 ++++++----
 .../4_display_single_content_item.md          |  4 +-
 .../5_display_a_list_of_content_items.md      |  3 +-
 .../6_improve_configuration.md                | 17 +++++---
 .../beginner_tutorial/7_embed_content.md      |  5 ++-
 .../8_enable_account_registration.md          | 24 +++++++-----
 .../1_implement_the_point2d_value_class.md    |  4 +-
 .../2_define_point2d_field_type.md            |  3 +-
 .../generic_field_type/5_add_a_field.md       |  8 ++--
 .../generic_field_type/6_settings.md          |  4 +-
 .../generic_field_type/7_add_a_validation.md  |  2 +-
 .../generic_field_type/8_data_migration.md    | 10 ++---
 .../creating_a_point2d_field_type.md          |  9 +++--
 .../1_get_a_starter_website.md                | 20 ++++++----
 .../2_prepare_the_landing_page.md             | 39 +++++++++++--------
 .../3_use_existing_blocks.md                  | 23 ++++++-----
 .../4_create_a_custom_block.md                | 18 ++++++---
 .../5_create_newsletter_form.md               | 19 ++++-----
 docs/users/customer_groups.md                 |  3 +-
 docs/users/oauth_client.md                    |  3 +-
 docs/users/oauth_server.md                    |  6 +--
 docs/users/passwords.md                       |  3 +-
 docs/users/user_authentication.md             |  2 +-
 docs/users/user_management_guide.md           | 15 ++++---
 docs/users/user_registration.md               |  6 ++-
 docs/users/users.md                           |  3 +-
 27 files changed, 168 insertions(+), 130 deletions(-)

diff --git a/docs/tutorials/beginner_tutorial/2_create_the_content_model.md b/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
index a515ce1ee3..0393635c3f 100644
--- a/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
+++ b/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
@@ -4,16 +4,19 @@ description: Learn how to create a content model consisting of content types and
 
 # Step 2 — Create the content model
 
-How your content is structured is a very important part of an [[= product_name =]] project. Think of it as the database design of your application.
+How your content is structured is an important part of an [[= product_name =]] project.
+Think of it as the database design of your application.
 
 To get full information, read the [content model](content_model.md) documentation page.
 Below is a short introduction that only covers points needed for this tutorial.
 
 ## Content model overview
 
-The [[= product_name =]] content repository is centered around **content items**. A content item is a single piece of content, for example an article, a product review, a place, etc.
+The [[= product_name =]] content repository is centered around **content items**.
+A content item is a single piece of content, for example an article, a product review, a place, etc.
 
-Every content item is an instance of a content type. Content types define what **Fields** are included in each content item.
+Every content item is an instance of a content type.
+Content types define what **Fields** are included in each content item.
 For example, an article could include fields such as *title*, *image*, *abstract*, *article's body*, *publication date* and *list of authors*.
 
 Fields can belong to one of the installed **field types**, about 30 in the default distribution.
@@ -27,7 +30,7 @@ The site use two content types: **Ride** and **Landmark**.
 A Ride is a route of a bike trip. It can include one or more Landmarks - interesting places you can see along the way.
 More than one Ride can visit the same Landmark, so it's similar to an N-N relationship model in a database.
 
-In this step you'll add the first content type, Ride.
+In this step you add the first content type, Ride.
 
 Go to the admin interface (`<yourdomain>/admin`) and log in with the default username: `admin` and the default password: `publish`. 
 
@@ -63,18 +66,17 @@ Confirm the creation of the content type by clicking **Save and close**.
 
 !!! note
 
-    If you're using [[= product_name_exp =]], the root content item in your installation is
-    a Page called "Ibexa Digital Experience Platform".
-    
+    If you're using [[= product_name_exp =]], the root content item in your installation is a Page called "Ibexa Digital Experience Platform".
+
     For this tutorial, swap it with its child, a Folder called "Ibexa Platform".
-    
+
     To do this, in the main menu go to **Content** -> **Content structure** -> **Ibexa Digital Experience Platform**, select the **Locations** tab
     and in the **Swap Locations** section navigate to "Ibexa Platform".
-    
+
     You can learn how to work with Pages in [another tutorial](page_and_form_tutorial.md).
 
-Go back to the content by selecting **Content structure** in the main menu. 
-Then browse the content tree and create a Folder named *All Rides* using the **Create content** button on the top right of the screen. 
+Go back to the content by selecting **Content structure** in the main menu.
+Then browse the content tree and create a Folder named *All Rides* using the **Create content** button on the top right of the screen.
 Publish the Folder.
 
 While in the folder, create a few of Rides using the **Create content** button, add photos and publish them.
diff --git a/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md b/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md
index 997ecb0a21..bd133eba1e 100644
--- a/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md
+++ b/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md
@@ -6,7 +6,8 @@ description: Try customizing the front page by using custom templates and adding
 
 In this step you can create the global layout of your site, and display content using custom templates.
 
-First, go to the root of the site (`<yourdomain>`). You should now see the home page of the clean install, without any kind of layout.
+First, go to the root of the site (`<yourdomain>`).
+You should now see the home page of the clean install, without any kind of layout.
 You can customize this step by instructing the platform to use a custom template to render this content item.
 
 ## Content rendering configuration
@@ -41,7 +42,8 @@ This tells [[= product_name =]] to use the `template` when rendering content wit
 
 !!! note "Clear the cache"
 
-    Each time you change the YAML files, you should clear the cache. It's not mandatory in dev environment.
+    Each time you change the YAML files, you should clear the cache.
+    It's not mandatory in dev environment.
 
     To clear the cache:
 
@@ -178,7 +180,8 @@ This tutorial leads you through configuring Webpack, but first you need assets.
 
 ### Adding assets
 
-The site has no stylesheets or assets yet. You need to download [`assets.zip`](img/assets.zip) which contains the prepared asset files.
+The site has no stylesheets or assets yet.
+You need to download [`assets.zip`](img/assets.zip) which contains the prepared asset files.
 
 Then unpack its contents to the following directories:
 
@@ -193,7 +196,8 @@ Before proceeding, ensure that the structure of the added files looks like this:
 
 In [[= product_name =]], you can add assets by using [Symfony Webpack Encore]([[= symfony_doc =]]/frontend.html#webpack-encore)
 — an integration of Webpack that enables you to build bundles of CSS stylesheets and JS scripts and add them to the project.
-For more details, see [Importing assets from a bundle](importing_assets_from_bundle.md).
+
+For more information, see [Importing assets from a bundle](importing_assets_from_bundle.md).
 
 To create bundles, first, indicate which files to include in them.
 
@@ -236,9 +240,11 @@ To add one template to another, edit `templates/full/home_page.html.twig` and re
 ```
 
 The templating language Twig supports [template inheritance](https://twig.symfony.com/doc/3.x/tags/extends.html).
-Templates can contain named blocks. Any template can extend other templates, and modify the blocks defined by its parents.
+Templates can contain named blocks.
+Any template can extend other templates, and modify the blocks defined by its parents.
 
-The code above points to `main_layout.html.twig` in line 1. It also wraps your "Hello world" message in a `content` block.
+The code above points to `main_layout.html.twig` in line 1.
+It also wraps your "Hello world" message in a `content` block.
 If you look back at the main layout template, you can see an empty `{% block content %}{% endblock %}` section (lines 52-53).
 This is where the `home_page.html.twig` is rendered.
 
@@ -261,4 +267,5 @@ Refresh the page and you should see the "Hello world" placed inside a styled lay
 
 ![Homepage with a Hello world](bike_tutorial_hello_world.png)
 
-At this point, the template is static. It doesn't render any dynamic data from the repository.
+At this point, the template is static.
+It doesn't render any dynamic data from the repository.
diff --git a/docs/tutorials/beginner_tutorial/4_display_single_content_item.md b/docs/tutorials/beginner_tutorial/4_display_single_content_item.md
index d51ae5c28b..801fb8c8cb 100644
--- a/docs/tutorials/beginner_tutorial/4_display_single_content_item.md
+++ b/docs/tutorials/beginner_tutorial/4_display_single_content_item.md
@@ -4,7 +4,7 @@ description: Learn how to render content details with a custom template.
 
 # Step 4 — Display a single content item
 
-You'll render a list of all Rides here in the next step.
+You render a list of all Rides here in the next step.
 But before that, you can use the existing page layout to render the content of a single Ride.
 
 ### Create the Ride view
@@ -90,7 +90,7 @@ This tells the application to use this template whenever it renders the full vie
 
 ### Check the Ride full view
 
-Because you don't have a list of Rides on the front page yet, you cannot simply click a Ride to preview it.
+Because you don't have a list of Rides on the front page yet, you cannot click a Ride to preview it.
 But you still can see how the template works in two ways:
 
 #### Preview in the back office
diff --git a/docs/tutorials/beginner_tutorial/5_display_a_list_of_content_items.md b/docs/tutorials/beginner_tutorial/5_display_a_list_of_content_items.md
index 9cd8d436e2..c9ce080a97 100644
--- a/docs/tutorials/beginner_tutorial/5_display_a_list_of_content_items.md
+++ b/docs/tutorials/beginner_tutorial/5_display_a_list_of_content_items.md
@@ -118,8 +118,7 @@ site:
 The `query_type` parameter in line 12 indicates which Query Type to use.
 You defined the name `Ride` in the Query Type file in the `getName` method.
 
-Using the `pagingQueryAction` of the built-in `ibexa_query` controller (line 6)
-enables you to automatically get paginated results.
+Using the `pagingQueryAction` of the built-in `ibexa_query` controller (line 6) enables you to automatically get paginated results.
 You can set the limit of results per page in the `limit` parameter.
 
 ### View types
diff --git a/docs/tutorials/beginner_tutorial/6_improve_configuration.md b/docs/tutorials/beginner_tutorial/6_improve_configuration.md
index 323a5b94c3..4de4a52763 100644
--- a/docs/tutorials/beginner_tutorial/6_improve_configuration.md
+++ b/docs/tutorials/beginner_tutorial/6_improve_configuration.md
@@ -6,7 +6,8 @@ description: See how you can manage Ibexa DXP configuration files.
 
 ## Define image variations
 
-Image variations are different versions of the same image. You can use them to scale images, crop them, add effects, etc.
+Image variations are different versions of the same image.
+You can use them to scale images, crop them, add effects, etc.
 
 So far the images in the ride list are fitted to the templates automatically, and the result doesn't look good.
 Now you can create a variation to specify how you want the images to look in detail.
@@ -24,7 +25,8 @@ ibexa:
                         - {name: geometry/scaledownonly, params: [140, 100]}
 ```
 
-Next, modify the templates to use these variations. Variation names are provided as parameters when rendering the image content.
+Next, modify the templates to use these variations.
+Variation names are provided as parameters when rendering the image content.
 
 In `templates/line/rides.html.twig` add the `'alias': 'ride_list'` parameter in the following way, in lines 8-10:
 
@@ -40,17 +42,20 @@ In `templates/line/rides.html.twig` add the `'alias': 'ride_list'` parameter in
 
 This ensures that the photo displayed next to each Ride in the list is scaled down properly with proportions retained.
 
-Clear cache and refresh the front page. Photos should now have a regular size and fit in the table.
+Clear cache and refresh the front page.
+Photos should now have a regular size and fit in the table.
 
 ![Ride list with proper image variations](bike_tutorial_ride_list.png)
 
 ## Separate view configuration
 
-In a larger site there are many elements that need configuration. To keep it more organized, you can split parts of configuration into separate files.
+In a larger site there are many elements that need configuration.
+To keep it more organized, you can split parts of configuration into separate files.
 
-As an example, you can separate all content view configuration into its own file. Create a `config/packages/views.yaml` file. 
+As an example, you can separate all content view configuration into its own file.
+Create a `config/packages/views.yaml` file.
 Copy everything under `content_view` from `config/packages/ibexa.yaml` and move it to the new file.
-Remove the corresponding code from `ibexa.yaml`. 
+Remove the corresponding code from `ibexa.yaml`.
 
 The `views.yaml` file should look like this:
 
diff --git a/docs/tutorials/beginner_tutorial/7_embed_content.md b/docs/tutorials/beginner_tutorial/7_embed_content.md
index 6666dbbb87..6443e95eee 100644
--- a/docs/tutorials/beginner_tutorial/7_embed_content.md
+++ b/docs/tutorials/beginner_tutorial/7_embed_content.md
@@ -15,7 +15,8 @@ Now you need to add the second content type needed in the site, Landmark.
 
 Go to **Content types**, and in the **Content** group, add the Landmark content type.
 
-A Landmark is an interesting place that Rides go through. Each Ride may be related to multiple Landmarks.
+A Landmark is an interesting place that Rides go through.
+Each Ride may be related to multiple Landmarks.
 
 - **Name**: Landmark
 - **Identifier**: landmark
@@ -174,7 +175,7 @@ ibexa:
 
 ### Add the Landmark in the Ride full view
 
-Now modify the Ride full view template to include a list of Landmarks, and the controller that you just created.
+Now modify the Ride full view template to include a list of Landmarks, and the controller that you created.
 Add the following lines at the end of `templates/full/ride.html.twig`, before the last `</div>` and the closing tag `{% endblock %}`:
 
 ``` html+twig
diff --git a/docs/tutorials/beginner_tutorial/8_enable_account_registration.md b/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
index e178f21197..7d86163b44 100644
--- a/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
+++ b/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
@@ -8,15 +8,17 @@ In this step you enable other users to create accounts on your site, access the
 
 ## Enable registration
 
-In the main menu, go to **Admin** (gear icon) -> **Roles**, and click the **Anonymous** Role.
+In the main menu, go to **Admin** (gear icon) -> **Roles**, and click the **Anonymous** role.
 
 ![Available roles](step_8_role_mgmt_screen.png)
 
-Add the `User/Register` policy to the Anonymous User. This allows any visitor to the website to access the registration form.
+Add the `User/Register` policy to the Anonymous user.
+This allows any visitor to the website to access the registration form.
 
 ![Policies for the Anonymous Role](step8_admin_anonymous_policies.png)
 
-Then go to `<yourdomain>/register`. The registration form is unstyled, so you need to add templates to it.
+Then go to `<yourdomain>/register`.
+The registration form is unstyled, so you need to add templates to it.
 
 ## Customize registration forms
 
@@ -60,7 +62,8 @@ Create the file `templates/user/registration_form.html.twig`:
 ```
 
 In line 10 you can see that another file is imported: `registration_content_form.html.twig`.
-The second template renders the actual fields of the registration form. Create this file as well (as `templates/user/registration_content_form.html.twig`):
+The second template renders the actual fields of the registration form.
+Create this file as well (as `templates/user/registration_content_form.html.twig`):
 
 ``` html+twig
 {% macro display_form(form) %}
@@ -166,16 +169,16 @@ Fill in the form and register a user.
 ## Set up Permissions
 
 Users created through the registration form are placed in the _Guest accounts_ user group.
-The User you have just created has the roles assigned to this group.
+The user you created has the roles assigned to this group.
 
 !!! tip
 
-    You can change the group in which new Users are placed (but you don't need to do it for this tutorial).
+    You can change the group in which new users are placed (but you don't need to do it for this tutorial).
     For more information, see [Registering new users](user_registration.md).
 
 At this point you don't want anyone who registers to be able to add content to the website.
-That's why you'll create a new user group with additional permissions.
-When the administrator accepts a new User, they can move them to this new group.
+That's why you need to create a new user group with additional permissions.
+When the administrator accepts a new user, they can move them to this new group.
 
 ### Create a user group
 
@@ -207,9 +210,10 @@ Now add the following policies to the Contributors role.
     The limitations are a powerful tool for fine-tuning the permission management of the users.
     See [the documentation about limitations for more technical details](limitation_reference.md#content-type-group-limitation).
 
-Once the policies are set, go to the "Assignments" tab and assign the role to the user group *Go Bike Members*.
+Once the policies are set, go to the **Assignments** tab and assign the role to the user group *Go Bike Members*.
 
-Next, go to the Users page. Select the user you have just created and move them into the *Go Bike Members* user group.
+Next, go to the users page.
+Select the user you created and move them into the *Go Bike Members* user group.
 
 ### Create content as a Go Bike Member
 
diff --git a/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md b/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md
index a05ded89da..bb9f0891a8 100644
--- a/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md
+++ b/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md
@@ -7,9 +7,7 @@ description: Learn how to create a Value class that stores the value of the fiel
 ## Project installation
 
 To start the tutorial, you need to make a clean [[= product_name =]] installation.
-Follow the guide for your system to [install [[= product_name =]]](install_ibexa_dxp.md),
-[configure a server](requirements.md),
-and [start the web server](install_ibexa_dxp.md#use-phps-built-in-server).
+Follow the guide for your system to [install [[= product_name =]]](install_ibexa_dxp.md), [configure a server](requirements.md), and [start the web server](install_ibexa_dxp.md#use-phps-built-in-server).
 Remember to install using the `dev` environment.
 
 Open your project with a clean installation and create the base directory for a new Point 2D field type in `src/FieldType/Point2D`.
diff --git a/docs/tutorials/generic_field_type/2_define_point2d_field_type.md b/docs/tutorials/generic_field_type/2_define_point2d_field_type.md
index c2d0d1da0f..8458fd348a 100644
--- a/docs/tutorials/generic_field_type/2_define_point2d_field_type.md
+++ b/docs/tutorials/generic_field_type/2_define_point2d_field_type.md
@@ -14,7 +14,8 @@ For more information about the Type class of a field type, see [Type class](type
 ## Field type identifier
 
 First, create `src/FieldType/Point2D/Type.php`.
-Add a `getFieldTypeIdentifier()` method to it. The new method returns the string that **uniquely** identifies your field type, in this case `point2d`:
+Add a `getFieldTypeIdentifier()` method to it.
+The new method returns the string that **uniquely** identifies your field type, in this case `point2d`:
 
 ```php
 [[= include_file('code_samples/field_types/2dpoint_ft/steps/step_2/Type.php') =]]
diff --git a/docs/tutorials/generic_field_type/5_add_a_field.md b/docs/tutorials/generic_field_type/5_add_a_field.md
index c76df827e0..2d2ba60d2e 100644
--- a/docs/tutorials/generic_field_type/5_add_a_field.md
+++ b/docs/tutorials/generic_field_type/5_add_a_field.md
@@ -5,7 +5,7 @@ description: Learn how to use your custom field type by adding a field to a cont
 # Step 5 - Add a new Point 2D field
 
 All actions in this step are done in the admin interface also called the back office.
-Go to the admin interface (`<yourdomain>/admin`) and log in with the default username: `admin` and the default password: `publish`. 
+Go to the admin interface (`<yourdomain>/admin`) and log in with the default username: `admin` and the default password: `publish`.
 
 ## Add new content type
 
@@ -34,11 +34,13 @@ Save everything and go back to the **Content/Content structure** tab.
 
 ## Create your content
 
-In **Content structure**, select **Create content**. There, under **Content**, you should see Point 2D content type you just added. Click it to create new content.
+In **Content structure**, select **Create content**. There, under **Content**, you should see Point 2D content type you added.
+Click it to create new content.
 
 ![Selecting Point 2D from sidebar](menu_point2d.png)
 
-Here, you can fill in coordinates of your point, e.g. 3, 5. Provided coordinates are used as a title for a new point.
+Here, you can fill in coordinates of your point, e.g. 3, 5.
+Provided coordinates are used as a title for a new point.
 
 ![Creating Point 2D](creating_new_point2d.png)
 
diff --git a/docs/tutorials/generic_field_type/6_settings.md b/docs/tutorials/generic_field_type/6_settings.md
index 6811db5e5f..9868534843 100644
--- a/docs/tutorials/generic_field_type/6_settings.md
+++ b/docs/tutorials/generic_field_type/6_settings.md
@@ -21,7 +21,7 @@ Open `src/FieldType/Point2D/Type.php` and add a `getSettingsSchema` method accor
 
 ## Add a format field
 
-In this part you define and implement the edit form for your field type. 
+In this part you define and implement the edit form for your field type.
 
 Define a `Point2DSettingsType` class and add a `format` field in `src/Form/Type/Point2DSettingsType.php`:
 
@@ -33,7 +33,7 @@ Define a `Point2DSettingsType` class and add a `format` field in `src/Form/Type/
 
 Now, enable the user to add the coordinates which are validated.
 In `src/FieldType/Point2D/Type.php` you:
- 
+
 - implement the `FieldDefinitionFormMapperInterface` interface
 - add a `mapFieldDefinitionForm` method at the end that defines the field settings
 
diff --git a/docs/tutorials/generic_field_type/7_add_a_validation.md b/docs/tutorials/generic_field_type/7_add_a_validation.md
index 9dcb644b72..98641327da 100644
--- a/docs/tutorials/generic_field_type/7_add_a_validation.md
+++ b/docs/tutorials/generic_field_type/7_add_a_validation.md
@@ -11,6 +11,6 @@ To provide basic validation that ensures both coordinates are provided, add asse
 // ...
 ```
 
-As a result, if a user tries to publish the Point 2D with just one value, they receive an error message.
+As a result, if a user tries to publish the Point 2D with one value, they receive an error message.
 
 ![Point 2D validation](point2d_validation.png)
diff --git a/docs/tutorials/generic_field_type/8_data_migration.md b/docs/tutorials/generic_field_type/8_data_migration.md
index 01ff0a951f..49dcba77b7 100644
--- a/docs/tutorials/generic_field_type/8_data_migration.md
+++ b/docs/tutorials/generic_field_type/8_data_migration.md
@@ -4,14 +4,14 @@ description: Learn how to serialize and deserialize field data to enable sorting
 
 # Step 8 -  Data migration between field type versions
 
-Adding data migration enables you to easily change the output of the field type to fit your current needs.
+Adding data migration enables you to change the output of the field type to fit your current needs.
 This process is important when a field type needs to be compared for sorting and searching purposes.
 Serialization allows changing objects to array by normalizing them, and then to the selected format by encoding them.
 In reverse, deserialization changes different formats into arrays by decoding and then denormalizing them into objects.
 
 For more information on Serializer Components, see [Symfony documentation]([[= symfony_doc =]]/components/serializer.html).
 
-## Normalization 
+## Normalization
 
 First, you need to add support for normalization in a `src/Serializer/Point2D/ValueNormalizer.php`:
 
@@ -22,7 +22,7 @@ First, you need to add support for normalization in a `src/Serializer/Point2D/Va
 ##  Add Normalizer definition
 
 Next, add the `ValueNormalizer` service definition to the `config/services.yaml` with a `serializer.normalizer` tag:
- 
+
 ```yaml
 services:
 [[= include_file('code_samples/field_types/2dpoint_ft/config/services.yaml', 39, 42) =]]
@@ -39,7 +39,7 @@ To accept old versions of the field type you need to add support for denormaliza
 ## Add Denormalizer definition
 
 Next, add the `ValueDenormalizer` service definition to `config/services.yaml` with a `serializer.denormalizer` tag:
- 
+
 ```yaml
 services:
 [[= include_file('code_samples/field_types/2dpoint_ft/config/services.yaml', 43, 46) =]]
@@ -53,4 +53,4 @@ To change the format on the fly, you need to replace the constructor in `src/Fie
 [[= include_file('code_samples/field_types/2dpoint_ft/src/FieldType/Point2D/Value.php', 24, 31) =]]
 ```
 
-Now you can easily change the internal representation format of the Point 2D field type.
+Now you can change the internal representation format of the Point 2D field type.
diff --git a/docs/tutorials/generic_field_type/creating_a_point2d_field_type.md b/docs/tutorials/generic_field_type/creating_a_point2d_field_type.md
index d636436282..b0db2bb8ae 100644
--- a/docs/tutorials/generic_field_type/creating_a_point2d_field_type.md
+++ b/docs/tutorials/generic_field_type/creating_a_point2d_field_type.md
@@ -2,10 +2,11 @@
 description: Go through a field type tutorial to learn how to create a custom field type based on the built-in Generic field type.
 ---
 
-# Creating a Point 2D field type 
+# Creating a Point 2D field type
 
 This tutorial covers the creation and development of a custom [[= product_name =]] [field type](create_custom_generic_field_type.md).
-The Generic field type is a very powerful extension point. It enables you to easily build complex solutions on a ready-to-go field type template.
+The Generic field type is a powerful extension point.
+It enables you to build complex solutions on a ready-to-go field type template.
 
 Field types are responsible for:
 
@@ -25,10 +26,10 @@ This tutorial is aimed at developers who are familiar with [[= product_name =]]
 
 This tutorial shows you how to use the Generic field type as a template for a custom field type. You:
 
-- create a custom Point 2D field type with two coordinates as input, e.g. (4,5)
+- create a custom Point 2D field type with two coordinates as input, for example '4,5'
 - register the new field type as a service and define its template
 - add basic validation to your Point 2D
-- add data migration to the field type so you're able to easily change its output
+- add data migration to the field type so you're able to change its output
 
 ## Steps
 
diff --git a/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md b/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md
index f2c76a909a..0588ab73da 100644
--- a/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md
+++ b/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md
@@ -15,7 +15,8 @@ Get it by following the [Install [[= product_name =]]](install_ibexa_dxp.md) gui
 
 ## Add content types
 
-Log in to the back office – add `/admin` to your installation's address (`<yourdomain>/admin`) and log in using `admin` as the login and `publish` as the password. Disable the Focus mode, go to content types screen and (under the Content category) add two content types with the following settings:
+Log in to the back office – add `/admin` to your installation's address (`<yourdomain>/admin`) and log in using `admin` as the login and `publish` as the password.
+Disable the Focus mode, go to content types screen and (under the content category) add two content types with the following settings:
 
 ### Dog Breed
 
@@ -43,7 +44,8 @@ Log in to the back office – add `/admin` to your installation's address (`<y
 
 ### Modify existing Article content type
 
-You also need to modify the built-in Article content type. It makes inserting photos into articles easier.
+You also need to modify the built-in Article content type.
+It makes inserting photos into articles easier.
 Edit it to remove the Image field that has a Content Relation (ezobjectrelation) type, and create a new field in its place:
 
 | Field type | Name  | Identifier | Required | Searchable | Translatable |
@@ -56,11 +58,13 @@ Edit it to remove the Image field that has a Content Relation (ezobjectrelation)
 
 !!! tip
 
-    For an introduction on how to use templates in [[= product_name =]], take a look at the [Beginner tutorial](beginner_tutorial.md).
+    For an introduction on how to use templates in [[= product_name =]], see [Beginner tutorial](beginner_tutorial.md).
 
 First, to remove the welcome page, go to `config/packages/` and delete the `ibexa_welcome_page.yaml` file.
 
-Place the [`pagelayout.html.twig`](https://github.com/ibexa/documentation-developer/blob/master/code_samples/tutorials/page_tutorial_starting_point/templates/pagelayout.html.twig) and [`pagelayout_menu.html.twig`](https://github.com/ibexa/documentation-developer/blob/master/code_samples/tutorials/page_tutorial_starting_point/templates/pagelayout_menu.html.twig) files in the `templates` folder. Create a new folder, called `full`, in `templates`. Place further template files in it:
+Place the [`pagelayout.html.twig`](https://github.com/ibexa/documentation-developer/blob/master/code_samples/tutorials/page_tutorial_starting_point/templates/pagelayout.html.twig) and [`pagelayout_menu.html.twig`](https://github.com/ibexa/documentation-developer/blob/master/code_samples/tutorials/page_tutorial_starting_point/templates/pagelayout_menu.html.twig) files in the `templates` folder.
+Create a new folder, called `full`, in `templates`.
+Place further template files in it:
 
 - [`article.html.twig`](https://github.com/ibexa/documentation-developer/blob/master/code_samples/tutorials/page_tutorial_starting_point/templates/full/article.html.twig)
 - [`dog_breed.html.twig`](https://github.com/ibexa/documentation-developer/blob/master/code_samples/tutorials/page_tutorial_starting_point/templates/full/dog_breed.html.twig)
@@ -96,10 +100,9 @@ php bin/console cache:clear
 
 In the `src` folder create a `QueryType` subfolder and add [`QueryType/MenuQueryType.php`](https://github.com/ibexa/documentation-developer/blob/master/code_samples/tutorials/page_tutorial_starting_point/src/QueryType/MenuQueryType.php) to it.
 
-This file takes care of displaying the top menu (read up on it [in the documentation](content_queries.md#query-types)).
-it's not the scope of this tutorial and we won't go here into detail on how it works.
+This file takes care of displaying the top menu (for more information, see [the documentation](content_queries.md#query-types)).
 
-This is what the structure of the new and modified files should look like:
+The structure of the new and modified files should look like:
 
 ![File structure](enterprise_tut_file_structure.png)
 
@@ -114,7 +117,8 @@ In the **Sub-items** tab, select all the current sub-items and click the **Hide*
 
 ![Hiding content items you don't need](enterprise_tut_hide_content.png)
 
-Next, under "Ibexa Digital Experience Platform", create three Folders. Call them 'All Articles', 'Dog Breed Catalog' and 'All Tips'.
+Next, under "Ibexa Digital Experience Platform", create three Folders.
+Call them 'All Articles', 'Dog Breed Catalog' and 'All Tips'.
 Remember that you can **Save and close** them, but you should use the **Publish** button.
 
 Next, create a few content items of proper content types in each of these folders:
diff --git a/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md b/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
index 8fd898a0c2..8a39e27b30 100644
--- a/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
+++ b/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
@@ -9,7 +9,9 @@ In this step you'll prepare and configure your front page, together with its lay
 
 ## Create Page layout
 
-Go to the front page of your website (`<yourdomain>`). You can see that it looks unfinished. (You can, however, still use the menu and look around the existing content in the website).
+Go to the front page of your website (`<yourdomain>`).
+You can see that it looks unfinished.
+However, you can still use the menu and look around the existing content in the website.
 
 ![It's a Dog's World - Starting point](enterprise_tut_starting_point.png "It's a Dog's World - Starting point")
 
@@ -28,14 +30,16 @@ Here you can check what content type it belongs to: it's a landing page.
 ![Ibexa Digital Experience Platform is a landing page](enterprise_tut_home_is_an_lp.png)
 
 The page contains one Code block and is displayed without any template.
-Click Edit to enter a mode that enables you to work with Pages.
-You can see that the home Page has only one zone with the block.
+Click **Edit** to enter a mode that enables you to work with pages.
+You can see that the home page has only one zone with the block.
 
 ![Empty Page with default layout](enterprise_tut_empty_single_block.png)
 
-Remove the Tag block. Hover over it and select the trash icon from the menu.
+Remove the Tag block.
+Hover over it and select the trash icon from the menu.
 Click the **Field** button on the left of the top bar to switch to editing page fields.
-Change the Title of the page to "Home". Then, publish the Page to update its name.
+Change the Title of the page to "Home".
+Then, publish the page to update its name.
 
 The design for the website you're making needs a layout with two zones: a main column and a narrower sidebar.
 [[= product_name_exp =]] provides only a one-zone default layout, so you need to create a new one.
@@ -77,12 +81,12 @@ Create a `templates/layouts/sidebar.html.twig` file:
 [[= include_file('code_samples/tutorials/page_tutorial/templates/layouts/sidebar.html.twig') =]]
 ```
 
-The above template creates two columns and defines their widths. Each column is at the same time a zone, and each zone renders the blocks that it contains.
+The above template creates two columns and defines their widths.
+Each column is at the same time a zone, and each zone renders the blocks that it contains.
 
 !!! tip
 
-    In sites with multiple layouts you can separate the rendering of zones into a separate `zone.html.twig` template
-    to avoid repeating the same code in every layout.
+    In sites with multiple layouts you can separate the rendering of zones into a separate `zone.html.twig` template to avoid repeating the same code in every layout.
 
 !!! note
 
@@ -93,7 +97,8 @@ With these three elements: configuration, icon and template, the new layout is r
 
 ### Change Home Page layout
 
-Now you can change the Home Page to use the new layout. Edit Home and in the top bar select **Switch layout**.
+Now you can change the Home Page to use the new layout.
+Edit Home and in the top bar select **Switch layout**.
 Choose the new layout called "Main section with sidebar on the right".
 The empty zones you defined in the template are visible in the editor.
 
@@ -101,14 +106,15 @@ The empty zones you defined in the template are visible in the editor.
 
 !!! tip
 
-    If the new layout isn't available when editing the Page, you may need to clear the cache (using `php bin/console cache:clear`) and/or reload the app.
+    If the new layout isn't available when editing the page, you may need to clear the cache (using `php bin/console cache:clear`) and/or reload the app.
 
 ![Empty page with new layout](enterprise_tut_new_layout.png)
 
-Publish the Home Page. You can notice that it still has some additional text information.
-This is because the looks of a Page are controlled by two separate template files, and you have only prepared one of those.
+Publish the Home page.
+You can notice that it still has some additional text information.
+This is because the looks of a page are controlled by two separate template files, and you have only prepared one of those.
 The `sidebar.html.twig` file defines how zones are organized and how content is displayed in them.
-But you also need a general template file that is used for every Page, regardless of its layout.
+But you also need a general template file that is used for every page, regardless of its layout.
 
 Add this new template, `templates/full/landing_page.html.twig`:
 
@@ -116,16 +122,17 @@ Add this new template, `templates/full/landing_page.html.twig`:
 [[= include_file('code_samples/tutorials/page_tutorial/templates/full/landing_page.html.twig') =]]
 ```
 
-This template simply renders the page content. If there is any additional content or formatting you would like to apply to every Page, it should be placed in this template.
+This template renders the page content.
+If there is any additional content or formatting you would like to apply to every page, it should be placed in this template.
 
-Now you need to tell the app to use this template to render Pages.
+Now you need to tell the app to use this template to render pages.
 Edit the `config/packages/views.yaml` file and add the following code under the `full:` key:
 
 ``` yaml
 [[= include_file('code_samples/tutorials/page_tutorial/config/packages/views.yaml', 35, 39) =]]
 ```
 
-After adding this template you can check the new Page.
+After adding this template you can check the new page.
 The part between menu and footer should be empty, because you haven't added any content to it yet.
 
 ![Empty Page](enterprise_tut_empty_page.png)
diff --git a/docs/tutorials/page_and_form_tutorial/3_use_existing_blocks.md b/docs/tutorials/page_and_form_tutorial/3_use_existing_blocks.md
index d39b3e45a7..590e51df6d 100644
--- a/docs/tutorials/page_and_form_tutorial/3_use_existing_blocks.md
+++ b/docs/tutorials/page_and_form_tutorial/3_use_existing_blocks.md
@@ -38,11 +38,12 @@ Finally, add some styling to the block. Add the following CSS to the end of the
 
 Run `yarn encore <dev|prod>` to regenerate assets.
 
-At this point you can start adding blocks to the Page.
-You do it in the Page's Edit mode by dragging a block from the menu on the right to the correct zone on the page.
+At this point you can start adding blocks to the page.
+You do it in the page's Edit mode by dragging a block from the menu on the right to the correct zone on the page.
 
 Drag a Content List block from the menu to the left zone on the page.
-Click the block and fill in the form. Here you name the block and decide what it displays.
+Click the block and fill in the form.
+Here you name the block and decide what it displays.
 Choose the "Dog Breed Catalog" folder as the Parent, select Dog Breed as the content type to be displayed, and choose a limit (3).
 You'll display the first three Dog Breeds from the database.
 
@@ -60,7 +61,8 @@ Publish the page now and move on to creating another type of block.
 
 The next block is the Content Scheduler block that airs articles at predetermined times.
 
-First, add a configuration that points to the layout. Go to `config/packages/ibexa_fieldtype_page.yaml` again and add the following code under `blocks` on the same level as the `contentlist` key:
+First, add a configuration that points to the layout.
+Go to `config/packages/ibexa_fieldtype_page.yaml` again and add the following code under `blocks` on the same level as the `contentlist` key:
 
 ``` yaml
 [[= include_file('code_samples/tutorials/page_tutorial/config/packages/ibexa_fieldtype_page.yaml', 19, 24) =]]
@@ -74,8 +76,8 @@ Create the new file `templates/blocks/schedule/featured.html.twig`:
 ```
 
 When you look at the template, you can see three blocks, each of which render the content items using the `featured` view (line 11).
-So far you only have templates for `full` view for Articles. This means you need to create a `featured` view template,
-otherwise you get an error when trying to add Content to the block.
+So far you only have templates for `full` view for Articles.
+This means you need to create a `featured` view template, otherwise you get an error when trying to add content to the block.
 
 You need to modify the `config/packages/views.yaml` file to indicate when to use the template.
 Add the following code to this file, on the same level as the `full` key:
@@ -97,7 +99,8 @@ Add it in `config/packages/image_variations.yaml` under the `image_variations` k
 [[= include_file('code_samples/tutorials/page_tutorial/config/packages/image_variations.yaml', 18, 22) =]]
 ```
 
-The Block is already operational, but first update the stylesheet. Add the following CSS at the end of the `assets/css/style.css` file:
+The Block is already operational, but first update the stylesheet.
+Add the following CSS at the end of the `assets/css/style.css` file:
 
 ``` css
 [[= include_file('code_samples/tutorials/page_tutorial/assets/css/style.css', 177, 207) =]]
@@ -105,13 +108,13 @@ The Block is already operational, but first update the stylesheet. Add the follo
 
 Run `yarn encore <dev|prod>` to regenerate assets.
 
-At this point you can add a new Content Scheduler block to your Page and fill it with content to see how it works.
+At this point you can add a new Content Scheduler block to your page and fill it with content to see how it works.
 
 !!! tip
 
     If you don't see the featured block template, you may need to clear the cache (using `php bin/console cache:clear`) and/or reload the app.
 
-Go back to editing the Home Page and drag a Content Scheduler block from the pane on the right to the main zone in the layout, above the Content List block.
+Go back to editing the Home page and drag a Content Scheduler block from the pane on the right to the main zone in the layout, above the Content List block.
 Select the block and click the Block Settings icon.
 
 Set the Limit to three and click Select Content.
@@ -126,7 +129,7 @@ This article is listed in the queue.
 
 ![Content Scheduler with scheduled content](enterprise_tut_choosing_airtime.png)
 
-Publish the Page.
+Publish the page.
 
 Now open the Timeline at the top of the screen.
 You can move the slider to different times and preview what the Content Scheduler block looks like at different hours.
diff --git a/docs/tutorials/page_and_form_tutorial/4_create_a_custom_block.md b/docs/tutorials/page_and_form_tutorial/4_create_a_custom_block.md
index 852661c582..8647d1e1b7 100644
--- a/docs/tutorials/page_and_form_tutorial/4_create_a_custom_block.md
+++ b/docs/tutorials/page_and_form_tutorial/4_create_a_custom_block.md
@@ -23,7 +23,8 @@ In `config/packages/ibexa_fieldtype_page.yaml` add the following block under the
 [[= include_file('code_samples/tutorials/page_tutorial/config/packages/ibexa_fieldtype_page.yaml', 24, 42) =]]
 ```
 
-This configuration defines one attribute, `parent`. Use it to select the folder containing tips.
+This configuration defines one attribute, `parent`.
+Use it to select the folder containing tips.
 
 ### Block template
 
@@ -35,7 +36,8 @@ You also need to create the block template, `templates/blocks/random/default.ht
 
 ### Block listener
 
-Block listener provides the logic for the block. It's contained in `src/Event/RandomBlockListener.php`:
+Block listener provides the logic for the block.
+It's contained in `src/Event/RandomBlockListener.php`:
 
 ``` php
 [[= include_file('code_samples/tutorials/page_tutorial/src/Event/RandomBlockListener.php') =]]
@@ -43,8 +45,10 @@ Block listener provides the logic for the block. It's contained in `src/Event/Ra
 
 At this point the new custom block is ready to be used.
 
-You're left with the last cosmetic changes. First, the new Block has a broken icon in the Elements menu in Page mode.
-This is because you haven't provided this icon yet. If you look back to the YAML configuration, you can see the icon file defined as `random_block.svg` (line 4). Download [the provided file](https://github.com/ibexa/documentation-developer/blob/master/code_samples/tutorials/page_tutorial_starting_point/public/assets/images/blocks/random_block.svg) and place it in `public/assets/images/blocks`.
+You're left with the last cosmetic changes.
+First, the new Block has a broken icon in the Elements menu in page mode.
+This is because you haven't provided this icon yet.
+If you look back to the YAML configuration, you can see the icon file defined as `random_block.svg` (line 4). Download [the provided file](https://github.com/ibexa/documentation-developer/blob/master/code_samples/tutorials/page_tutorial_starting_point/public/assets/images/blocks/random_block.svg) and place it in `public/assets/images/blocks`.
 
 Finally, add some styling for the new block. Add the following to the end of the `assets/css/style.css` file:
 
@@ -54,10 +58,12 @@ Finally, add some styling for the new block. Add the following to the end of the
 
 Run `yarn encore <dev|prod>` to regenerate assets.
 
-Go back to editing the Front Page. Drag a Random Block from the Elements menu on the right to the Page's side column.
+Go back to editing the Front page.
+Drag a Random Block from the Elements menu on the right to the page's side column.
 Access the block's settings and choose the "All Tips" folder from the menu. Save and publish all the changes.
 
-Refresh the home page. The Tip of the Day block displays a random Tip from the "Tips" folder.
+Refresh the home page.
+The Tip of the Day block displays a random Tip from the "Tips" folder.
 Refresh the page a few more times and you can see the tip change randomly.
 
 ![Random Block with a Tip](enterprise_tut_random_block.png "Random Block with a Tip")
diff --git a/docs/tutorials/page_and_form_tutorial/5_create_newsletter_form.md b/docs/tutorials/page_and_form_tutorial/5_create_newsletter_form.md
index 5f656f4f60..1c7eb3b12d 100644
--- a/docs/tutorials/page_and_form_tutorial/5_create_newsletter_form.md
+++ b/docs/tutorials/page_and_form_tutorial/5_create_newsletter_form.md
@@ -8,7 +8,7 @@ edition: experience
 The final step of this tutorial assists you in adding to the home page a Form block for signing up to a newsletter.
 
 [[% include 'snippets/forms_caution.md' %]]
-    
+
 ### Add a Form block
 
 Start with creating a Form content item.
@@ -31,7 +31,7 @@ The configuration should look like this:
 ![Adding fields to Newsletter Form](enterprise_tut_form_creation.png "Adding fields to Newsletter Form")
 
 When you add all the fields, save the form and click **Publish**.
-Now you can edit the Front Page and add a Form block below the Random block.
+Now you can edit the front page and add a Form block below the Random block.
 Edit the block and select the form you created. Click **Submit**.
 
 The Page should refresh with the Form block.
@@ -59,7 +59,7 @@ Add the following configuration under the `blocks` key at the same level as othe
 ```
 
 Now you have to apply the template to the block.
-Go back to editing the Page.
+Go back to editing the page.
 Edit the Form block again.
 In the **Design** tab, select the **Newsletter Form View** and click **Submit**.
 
@@ -76,14 +76,14 @@ Create a `form_field.html.twig` file in `templates/fields/`:
 [[= include_file('code_samples/tutorials/page_tutorial/templates/fields/form_field.html.twig') =]]
 ```
 
-Next, assign the template to the Page.
+Next, assign the template to the page.
 In `config/packages/views.yaml`, at the same level as `pagelayout`, add:
 
 ``` yaml
 [[= include_file('code_samples/tutorials/page_tutorial/config/packages/views.yaml', 7, 9) =]]
 ```
 
-Clear the cache by running `bin/console cache:clear` and refresh the Page to see the results.
+Clear the cache by running `bin/console cache:clear` and refresh the page to see the results.
 
 ### Configure the Form field
 
@@ -113,22 +113,23 @@ Your newsletter form block is ready.
 
 ![Newsletter Form Block](enterprise_tut_final_form.png "Newsletter Form Block")
 
-Refresh the Page and enter a couple of mock submissions.
+Refresh the page and enter a couple of mock submissions.
 
 ### Manage the submissions
 
 You can view all submissions in the back office.
-Go to **Forms** page. From the content tree, select the Form and click the **Submissions** tab.
+Go to **Forms** page.
+From the content tree, select the Form and click the **Submissions** tab.
 There, after selecting submission(s), click **Download submissions** or **Delete submission**.
 To see details about a submission, click the view icon.
 
 ![Collect Form Submissions](enterprise_tut_form_collect_sub.png "Collect Form Submissions")
 
-For more details, see [viewing form results](https://doc.ibexa.co/projects/userguide/en/latest/content_management/work_with_forms/#view-results).
+For more information, see [viewing form results](https://doc.ibexa.co/projects/userguide/en/latest/content_management/work_with_forms/#view-results).
 
 ## Congratulations!
 
-You have finished the tutorial and created your first customized Page.
+You have finished the tutorial and created your first customized page.
 
 You have learned how to:
 
diff --git a/docs/users/customer_groups.md b/docs/users/customer_groups.md
index 4fd317c72e..fb7ca8e0d9 100644
--- a/docs/users/customer_groups.md
+++ b/docs/users/customer_groups.md
@@ -17,7 +17,6 @@ For example, you can offer a 10% discount for all products in the catalog to use
 
 ## Enabling customer groups
 
-To enable using customer groups, you need to modify the user content type's definition
-by adding a [customer group field](customergroupfield.md).
+To enable using customer groups, you need to modify the user content type's definition by adding a [customer group field](customergroupfield.md).
 
 With this field you can add a user to any of the predefined customer groups.
diff --git a/docs/users/oauth_client.md b/docs/users/oauth_client.md
index 1f072f5e19..294f73bede 100644
--- a/docs/users/oauth_client.md
+++ b/docs/users/oauth_client.md
@@ -8,8 +8,7 @@ You can use OAuth2 to securely authenticate users with external Authorization Se
 
 ![OAuth2 Client](img/oauth2-client.png)
 
-[[= product_name =]] uses an integration with [`knpuniversity/oauth2-client-bundle`](https://github.com/knpuniversity/oauth2-client-bundle)
-to provide OAuth2 authentication.
+[[= product_name =]] uses an integration with [`knpuniversity/oauth2-client-bundle`](https://github.com/knpuniversity/oauth2-client-bundle) to provide OAuth2 authentication.
 
 ## Configure OAuth2 client
 
diff --git a/docs/users/oauth_server.md b/docs/users/oauth_server.md
index bb1a482d7c..a76420fbf9 100644
--- a/docs/users/oauth_server.md
+++ b/docs/users/oauth_server.md
@@ -105,8 +105,7 @@ security:
 
 ## Resource Server configuration
 
-To allow resource routes to be accessible through OAuth authorization,
-you must define a firewall by using `Ibexa\OAuth2Server\Security\Guard\OAuth2Authenticator`.
+To allow resource routes to be accessible through OAuth authorization, you must define a firewall by using `Ibexa\OAuth2Server\Security\Guard\OAuth2Authenticator`.
 
 The following firewall example allows the REST API to be accessed as an OAuth resource.
 It must be placed before the firewall with a less restrictive pattern like `ibexa_front`.
@@ -159,8 +158,7 @@ php bin/console league:oauth2-server:update-client example-oauth2-client \
   --add-redirect-uri=https://example.com/another-oauth2-callback
 ```
 
-Other commands let you list all the configured clients (`league:oauth2-server:list-clients`)
-or delete a client (`league:oauth2-server:delete-client`).
+Other commands let you list all the configured clients (`league:oauth2-server:list-clients`) or delete a client (`league:oauth2-server:delete-client`).
 
 !!! note
 
diff --git a/docs/users/passwords.md b/docs/users/passwords.md
index a74cc073cc..c257ea1d76 100644
--- a/docs/users/passwords.md
+++ b/docs/users/passwords.md
@@ -108,7 +108,8 @@ To do this, in the **User account (ezuser)** field definition, select "Password
 ![Protection against using breached passwords](password_breached.png)
 
 This rule checks the password against known password dumps by using the https://haveibeenpwned.com/ API.
-It doesn't check existing passwords, so it won't block login for anyone. It applies only to new passwords when users change them.
+It doesn't check existing passwords, so it won't block login for anyone.
+It applies only to new passwords when users change them.
 
 !!! note
 
diff --git a/docs/users/user_authentication.md b/docs/users/user_authentication.md
index 3ecfe1f4f9..554ad27c94 100644
--- a/docs/users/user_authentication.md
+++ b/docs/users/user_authentication.md
@@ -7,7 +7,7 @@ description: Customize user authentication.
 ## Authenticate user with multiple user providers
 
 Symfony provides native support for [multiple user providers]([[= symfony_doc =]]/security/multiple_user_providers.html).
-This makes it easier to integrate any kind of login handlers, including SSO and existing third party bundles (e.g. [FR3DLdapBundle](https://github.com/Maks3w/FR3DLdapBundle), [HWIOauthBundle](https://github.com/hwi/HWIOAuthBundle), [FOSUserBundle](https://github.com/FriendsOfSymfony/FOSUserBundle), [BeSimpleSsoAuthBundle](https://github.com/BeSimple/BeSimpleSsoAuthBundle), etc.).
+This makes it easier to integrate any kind of login handlers, including SSO and existing third party bundles (for example, [FR3DLdapBundle](https://github.com/Maks3w/FR3DLdapBundle), [HWIOauthBundle](https://github.com/hwi/HWIOAuthBundle), [FOSUserBundle](https://github.com/FriendsOfSymfony/FOSUserBundle), [BeSimpleSsoAuthBundle](https://github.com/BeSimple/BeSimpleSsoAuthBundle), etc.).
 
 However, to be able to use *external* user providers with [[= product_name =]], a valid Platform user needs to be injected into the repository.
 This is mainly for the kernel to be able to manage content-related permissions (but not limited to this).
diff --git a/docs/users/user_management_guide.md b/docs/users/user_management_guide.md
index 03fa21ada1..1be65c1943 100644
--- a/docs/users/user_management_guide.md
+++ b/docs/users/user_management_guide.md
@@ -18,7 +18,7 @@ User management is available in all [[= product_name =]] versions.
 
 ## How does user management work
 
-[[= product_name =]] simplifies user management with an intuitive and powerful system of accounts, Roles, Permissions, groups, and Segments.
+[[= product_name =]] simplifies user management with an intuitive and powerful system of accounts, Roles, Permissions, groups, and segments.
 You can find all user groups and users in the **Admin** panel by selecting **Users**.
 Here, you can manage users, their relations, roles, and policies.
 
@@ -42,9 +42,7 @@ Here's how it works:
 
 ## Capabilities
 
-The detailed capabilities of [[= product_name_base =]] User Management,
-which provide organizations with the tools they need to deliver personalized, secure,
-and efficient user experiences while ensuring that user access and content delivery align with their business goals and strategies.
+The detailed capabilities of [[= product_name_base =]] user management, which provide organizations with the tools they need to deliver personalized, secure, and efficient user experiences while ensuring that user access and content delivery align with their business goals and strategies.
 
 ### User roles and permissions
 
@@ -53,7 +51,7 @@ Furthermore, you can create user groups to simplify Permission management.
 Assign multiple users to a group to ensure consistency and ease of access control.
 This helps maintain effortless security and control.
 
-To help you understand further the role each element serves, here's a brief summary: 
+To help you understand further the role each element serves, here's a brief summary:
 
 - Role - represents a collection of Permissions that can be assigned to users or user groups. Roles streamline permission management by grouping related Permissions together.
 - Permission - defines a specific action or access level that can be granted or denied within the system.
@@ -62,7 +60,8 @@ Policies allow for fine-grained control of access based on various factors, such
 
 ### Custom policies
 
-[Tailor user access control](custom_policies.md) to your unique requirements using custom policies. Define complex rules and access criteria for different users or groups.
+[Tailor user access control](custom_policies.md) to your unique requirements using custom policies.
+Define complex rules and access criteria for different users or groups.
 
 ### Limitations
 
@@ -90,9 +89,9 @@ Track the status of invitations, including when they were sent, whether they wer
 ### User segmentation and personalization
 
 [[= product_name_base =]]'s segmentation and personalization features allow organizations to deliver customized user experiences.
-Track user behavior, such as page views, search queries, and interactions, to create Segments and Segment Groups for users who share similar behaviors.
+Track user behavior, such as page views, search queries, and interactions, to create segments and segment groups for users who share similar behaviors.
 
-![Segment Groups](../administration/img/admin_panel_segment_groups.png)
+![Segment groups](../administration/img/admin_panel_segment_groups.png)
 
 Possible uses:
 
diff --git a/docs/users/user_registration.md b/docs/users/user_registration.md
index 6bc58f7d0f..c67fba0cbe 100644
--- a/docs/users/user_registration.md
+++ b/docs/users/user_registration.md
@@ -4,7 +4,8 @@ description: Register new users.
 
 # Register new users
 
-You can allow your users to create accounts by employing the `/register` route. This route leads to a registration form that, when filled in, creates a new user content item in the repository.
+You can allow your users to create accounts by employing the `/register` route.
+This route leads to a registration form that, when filled in, creates a new user content item in the repository.
 
 ## User types
 
@@ -22,7 +23,8 @@ ibexa:
 
 ## User groups
 
-By default, new users generated in this way are placed in the Guest accounts group. You can select a different default group in the following section of configuration:
+By default, new users generated in this way are placed in the Guest accounts group.
+You can select a different default group in the following section of configuration:
 
 ``` yaml
 ibexa:
diff --git a/docs/users/users.md b/docs/users/users.md
index f5cf37ba11..1198096121 100644
--- a/docs/users/users.md
+++ b/docs/users/users.md
@@ -5,8 +5,7 @@ page_type: landing_page
 
 # Users
 
-Users in [[= product_name =]] refer to all kinds of user accounts: administrators, editors,
-managers or shop customers.
+Users in [[= product_name =]] refer to all kinds of user accounts: administrators, editors, managers or shop customers.
 All such user accounts have the same underlying mechanism and enable you to control access to te application, both the back office and the website front, by using the [permission system](permissions.md).
 
 ## Invite nad manage users

From 447a3f5852e5f7522dbc8804f1b998fec1ddf1ae Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Wed, 16 Oct 2024 08:58:14 +0200
Subject: [PATCH 21/77] Tabs fixes

---
 docs/administration/admin_panel/users_admin_panel.md          | 2 +-
 docs/administration/project_organization/bundles.md           | 2 +-
 docs/content_management/forms/form_builder_guide.md           | 2 +-
 .../rich_text/create_custom_richtext_block.md                 | 2 +-
 docs/content_management/url_management/url_management.md      | 4 ++--
 docs/getting_started/first_steps.md                           | 2 +-
 .../clustering/clustering_with_aws_s3.md                      | 2 +-
 docs/permissions/policies.md                                  | 2 +-
 docs/release_notes/ez_platform_v1.9.0.md                      | 2 +-
 docs/release_notes/ez_platform_v2.3.md                        | 4 ++--
 docs/release_notes/ibexa_dxp_v4.3.md                          | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/administration/admin_panel/users_admin_panel.md b/docs/administration/admin_panel/users_admin_panel.md
index 60ba4141f6..9190dc32a8 100644
--- a/docs/administration/admin_panel/users_admin_panel.md
+++ b/docs/administration/admin_panel/users_admin_panel.md
@@ -1,5 +1,5 @@
 ---
-description: You can access all users and user groups in the users tab.
+description: You can access all users and user groups in the Users tab.
 ---
 
 # Users
diff --git a/docs/administration/project_organization/bundles.md b/docs/administration/project_organization/bundles.md
index 0860c4aec6..7c8986ca5a 100644
--- a/docs/administration/project_organization/bundles.md
+++ b/docs/administration/project_organization/bundles.md
@@ -72,7 +72,7 @@ To remove a bundle (either one you created yourself, or an out-of-the-box one th
 |ibexa/oss|Core packages|
 |ibexa/content-tree|content tree functionality|
 |ibexa/connect|[[[= product_name_connect =]]](https://doc.ibexa.co/projects/connect/en/latest/)|
-|ibexa/calendar|Calendar tab with a calendar widget|
+|ibexa/calendar|**Calendar** tab with a calendar widget|
 |ibexa/connector-dam|Connector for DAM (Digital Asset Management) systems|
 |ibexa/elasticsearch|Integration with Elasticsearch search engine|
 |ibexa/fastly|Fastly support for `http-cache`, for use on Platform.sh or standalone|
diff --git a/docs/content_management/forms/form_builder_guide.md b/docs/content_management/forms/form_builder_guide.md
index aad4fe1e29..03e7488740 100644
--- a/docs/content_management/forms/form_builder_guide.md
+++ b/docs/content_management/forms/form_builder_guide.md
@@ -137,5 +137,5 @@ This allows you to create forms that fit your needs.
 
 ### Analytic tool
 
-All the submissions can are visible in Submissions tab. 
+All the submissions can are visible in **Submissions** tab. 
 You can download them as a .CSV file for additional analysis.
\ No newline at end of file
diff --git a/docs/content_management/rich_text/create_custom_richtext_block.md b/docs/content_management/rich_text/create_custom_richtext_block.md
index 85f7c26cfe..b61ca8bd76 100644
--- a/docs/content_management/rich_text/create_custom_richtext_block.md
+++ b/docs/content_management/rich_text/create_custom_richtext_block.md
@@ -71,7 +71,7 @@ services:
 
 
 You have successfully created a custom RichText block. 
-You can now add your block in the Site tab.
+You can now add your block in the **Site** tab.
 
 ![RichText block](extending_richtext_block.png)
 
diff --git a/docs/content_management/url_management/url_management.md b/docs/content_management/url_management/url_management.md
index bd46311251..3f19b13aba 100644
--- a/docs/content_management/url_management/url_management.md
+++ b/docs/content_management/url_management/url_management.md
@@ -12,7 +12,7 @@ Configure URL aliases to have human-readable URL addresses throughout your syste
 When developing a site, users can enter links to external websites in either RichText or URL fields.
 Each such link is then displayed in the URL table. You can view and update all external links that exist within the site, without having to modify and re-publish the individual content items.
 
-The Link manager tab contains all the information about each link, including its status (valid or invalid) and the time the system last attempted to validate the URL address.
+The **Link manager** tab contains all the information about each link, including its status (valid or invalid) and the time the system last attempted to validate the URL address.
 Click an entry in the list to display its details and check which content items use this link.
 Edit the entry to update the URL address in all the occurrences throughout the website.
 
@@ -237,7 +237,7 @@ ibexa:
 
 ### Configuring URL wildcards in the back office
 
-The URL wildcards tab contains all the information about each URL wildcard. You can delete or modify existing entries, or create new ones.
+The **URL wildcards** tab contains all the information about each URL wildcard. You can delete or modify existing entries, or create new ones.
 
 !!! note
 
diff --git a/docs/getting_started/first_steps.md b/docs/getting_started/first_steps.md
index 7c7627a59f..ce0c9f4939 100644
--- a/docs/getting_started/first_steps.md
+++ b/docs/getting_started/first_steps.md
@@ -237,7 +237,7 @@ Call the group "Bloggers".
 
 ![Adding limitations to a policy](first-steps-policy-limitations.png)
 
-6\. In the Assignments tab assign the "Blogger" role to the "Bloggers" group.
+6\. In the **Assignments** tab assign the "Blogger" role to the "Bloggers" group.
 
 ![Assigning a role](first-steps-assign-roles.png)
 
diff --git a/docs/infrastructure_and_maintenance/clustering/clustering_with_aws_s3.md b/docs/infrastructure_and_maintenance/clustering/clustering_with_aws_s3.md
index d4c8f63fdc..8ca764d9b6 100644
--- a/docs/infrastructure_and_maintenance/clustering/clustering_with_aws_s3.md
+++ b/docs/infrastructure_and_maintenance/clustering/clustering_with_aws_s3.md
@@ -22,7 +22,7 @@ The example below uses EU (Ireland): `eu-west-1`
 See <https://docs.aws.amazon.com/AmazonS3/latest/userguide/s3-access-control.html>.
 1.  Then create a group and assign the user to the group.
 1.  Assign policies to the group. The `AmazonS3FullAccess` policy gives read/write access to your bucket.
-1.  Still in the IAM console, view the user you created. Click the "Security credentials" tab.
+1.  Still in the IAM console, view the user you created. Click the **Security credentials** tab.
 1.  Click "Create access key" and make note of the "Access key ID" and the "Secret access key".
 The secret key cannot be retrieved again after the key has been created, so don't lose it.
 (However, you can create new keys if needed.)
diff --git a/docs/permissions/policies.md b/docs/permissions/policies.md
index 1071ba60e3..863def3208 100644
--- a/docs/permissions/policies.md
+++ b/docs/permissions/policies.md
@@ -63,7 +63,7 @@ which define, which parts of the application or website the user has access to.
 | <nobr>`setup`</nobr> | <nobr>`administrate`</nobr> | access Admin                             |
 |                      | <nobr>`install`</nobr>      | unused                                   |
 |                      | <nobr>`setup`</nobr>        | unused                                   |
-|                      | <nobr>`system_info`</nobr>  | view the System Information tab in Admin |
+|                      | <nobr>`system_info`</nobr>  | view the **System Information** tab in Admin |
 
 #### Sites [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
diff --git a/docs/release_notes/ez_platform_v1.9.0.md b/docs/release_notes/ez_platform_v1.9.0.md
index 7ff62bd851..ddcfd175be 100644
--- a/docs/release_notes/ez_platform_v1.9.0.md
+++ b/docs/release_notes/ez_platform_v1.9.0.md
@@ -26,7 +26,7 @@ In version 1.8 we introduced a new Content Browser in the Universal Discovery Wi
 
 #### Miscellaneous
 
--   The Details tab in content view now provides information about the Section the content item belongs to.
+-   The **Details** tab in content view now provides information about the Section the content item belongs to.
 
 ![Section details in Details tab](section-details.png "Section details in Details tab")
 
diff --git a/docs/release_notes/ez_platform_v2.3.md b/docs/release_notes/ez_platform_v2.3.md
index 342bd016c7..12d45c8592 100644
--- a/docs/release_notes/ez_platform_v2.3.md
+++ b/docs/release_notes/ez_platform_v2.3.md
@@ -16,9 +16,9 @@
 
     You can now schedule content on a Page to become visible at a specific time in the future.
 
-    To do this you can use the Schedule tab in any block's configuration or a special Content Scheduler block.
+    To do this you can use the **Schedule** tab in any block's configuration or a special Content Scheduler block.
 
-    In the Schedule tab you can define when any block becomes visible and when it disappears from a Page.
+    In the **Schedule** tab you can define when any block becomes visible and when it disappears from a Page.
 
     ![Schedule tab](2.3_schedule_tab.png)
 
diff --git a/docs/release_notes/ibexa_dxp_v4.3.md b/docs/release_notes/ibexa_dxp_v4.3.md
index 3fad23ff6f..122023c7aa 100644
--- a/docs/release_notes/ibexa_dxp_v4.3.md
+++ b/docs/release_notes/ibexa_dxp_v4.3.md
@@ -67,7 +67,7 @@ You can now move assets between collections by using drag and drop.
 
 ![Moving assets between collection with drag and drop](img/4.3_collection_dnd.png)
 
-From product's Completeness tab you can now jump directly to editing the product prices in all configured currencies.
+From product's **Completeness** tab you can now jump directly to editing the product prices in all configured currencies.
 
 ![Editing product price from Completeness tab](img/4.3_edit_product_price.png)
 

From 089c485746bd1a4981c1dcea6e36341bad745e0c Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Wed, 16 Oct 2024 09:05:01 +0200
Subject: [PATCH 22/77] 'Will' fixes

---
 docs/getting_started/install_ibexa_dxp.md                   | 2 +-
 docs/getting_started/requirements.md                        | 6 +++---
 .../cache/http_cache/content_aware_cache.md                 | 2 +-
 .../cache/persistence_cache.md                              | 4 ++--
 docs/infrastructure_and_maintenance/devops.md               | 3 ++-
 .../page_and_form_tutorial/2_prepare_the_landing_page.md    | 2 +-
 .../page_and_form_tutorial/3_use_existing_blocks.md         | 4 ++--
 docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md  | 4 ++--
 docs/update_and_migration/from_2.5/adapt_code_to_v3.md      | 2 +-
 .../migrating_from_ez_publish_platform.md                   | 4 ++--
 10 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/docs/getting_started/install_ibexa_dxp.md b/docs/getting_started/install_ibexa_dxp.md
index bdcf288daf..04f286637c 100644
--- a/docs/getting_started/install_ibexa_dxp.md
+++ b/docs/getting_started/install_ibexa_dxp.md
@@ -68,7 +68,7 @@ Log in to your service portal on [support.ibexa.co](https://support.ibexa.co/),
 
 1. Select **Create token** (this requires the **Portal administrator** access level).
 2. Fill in a label describing the use of the token. This allows you to revoke access later.
-3. Save the password, **you will not get access to it again**!
+3. Save the password, **you aren't able to access it again**.
 
 !!! tip "Save the authentication token in `auth.json` to avoid re-typing it"
 
diff --git a/docs/getting_started/requirements.md b/docs/getting_started/requirements.md
index a2918a7623..d3c62669a4 100644
--- a/docs/getting_started/requirements.md
+++ b/docs/getting_started/requirements.md
@@ -335,7 +335,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
 === "[[= product_name =]] v4.6"
 
-    [[= product_name =]] is developed to work with *any* web browser that supports modern standards, on *any* screen resolution suitable for web, running on *any* device. However for the Editorial and Administration User Interfaces you'll need; a minimum of 1366-by-768 screen resolution, a desktop or tablet device, and a recommended/supported browser among the ones found below.
+    [[= product_name =]] is developed to work with *any* web browser that supports modern standards, on *any* screen resolution suitable for web, running on *any* device. However for the Editorial and Administration User Interfaces you need: a minimum of 1366-by-768 screen resolution, a desktop or tablet device, and a recommended/supported browser among the ones found below.
 
     - Mozilla® Firefox® most recent stable version (recommended)
     - Google Chrome™ most recent stable version (recommended)
@@ -344,7 +344,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
 === "[[= product_name =]] v3.3"
 
-    [[= product_name =]] is developed to work with *any* web browser that supports modern standards, on *any* screen resolution suitable for web, running on *any* device. However for the Editorial and Administration User Interfaces you'll need; a minimum of 1366-by-768 screen resolution, a desktop or tablet device, and a recommended/supported browser among the ones found below.
+    [[= product_name =]] is developed to work with *any* web browser that supports modern standards, on *any* screen resolution suitable for web, running on *any* device. However for the Editorial and Administration User Interfaces you need: a minimum of 1366-by-768 screen resolution, a desktop or tablet device, and a recommended/supported browser among the ones found below.
 
     - Mozilla® Firefox® most recent stable version (recommended)
     - Google Chrome™ most recent stable version (recommended)
@@ -353,7 +353,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
 === "eZ Platform v2.5"
 
-    eZ Platform is developed to work with *any* web browser that supports modern standards, on *any* screen resolution suitable for web, running on *any* device. However for the Editorial and Administration User Interfaces you'll need; a minimum of 1366-by-768 screen resolution, a desktop or tablet device, and a recommended/supported browser among the ones found below.
+    eZ Platform is developed to work with *any* web browser that supports modern standards, on *any* screen resolution suitable for web, running on *any* device. However for the Editorial and Administration User Interfaces you need: a minimum of 1366-by-768 screen resolution, a desktop or tablet device, and a recommended/supported browser among the ones found below.
 
     - Mozilla® Firefox® most recent stable version (recommended)
     - Google Chrome™ most recent stable version (recommended)
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
index b73f3ff0e8..35b50adfd5 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
@@ -589,7 +589,7 @@ This isn't a problem as long as the controller doesn't return values from any Co
 The `Set-Cookie` here may cause the problem. A ESI fragment should never set a cookie because:
 - Clients only receive the headers set in the "mother" document (the headers in the "/" response in this case).
 
-- Only the content of ESIs responses is returned to the client. **No headers set in the ESI response will ever reach the client**. ESI headers are only seen by the HTTP cache.
+- Only the content of ESIs responses is returned to the client. **No headers set in the ESI response ever reach the client**. ESI headers are only seen by the HTTP cache.
 
 - Symfony reverse proxy doesn't support ESIs at all, and any ESI calls (`render_esi()`) are implicitly replaced by
   sub-requests (`render()`). So any `Set-Cookie` **is** sent to the client when using Symfony reverse proxy.
diff --git a/docs/infrastructure_and_maintenance/cache/persistence_cache.md b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
index 28e7cefd48..30cbe58757 100644
--- a/docs/infrastructure_and_maintenance/cache/persistence_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
@@ -156,7 +156,7 @@ Depending on the number of lookups and latency to cache server this might affect
 
 #### Adjusting configuration
 
-Out of the box in `config/packages/cache_pool/cache.redis.yaml` you'll find a default example that can be used.
+Out of the box in `config/packages/cache_pool/cache.redis.yaml` you can find a default example that can be used.
 
 !!! note "[[= product_name_cloud =]]"
 
@@ -234,7 +234,7 @@ There is one Memcached adapter available out of the box.
 
 #### Adjusting configuration
 
-Out of the box in `config/packages/cache_pool/cache.memcached.yaml` you'll find a default example that can be used.
+Out of the box in `config/packages/cache_pool/cache.memcached.yaml` you can find a default example that can be used.
 
 !!! note "[[= product_name_cloud =]]"
 
diff --git a/docs/infrastructure_and_maintenance/devops.md b/docs/infrastructure_and_maintenance/devops.md
index e58ed5b42b..1dc63ea399 100644
--- a/docs/infrastructure_and_maintenance/devops.md
+++ b/docs/infrastructure_and_maintenance/devops.md
@@ -26,7 +26,8 @@ php bin/console --env=prod cache:clear -h
 
 ### Clearing content cache on a cluster setup
 
-For a [cluster](clustering.md) setup, the content cache ([HTTP cache](http_cache.md) and [Persistence cache](persistence_cache.md)) must be set up to be shared among the servers. And while all relevant cache is cleared for you on Repository changes when using the APIs, there might be times where you'll need to clear cache manually: 
+For a [cluster](clustering.md) setup, the content cache ([HTTP cache](http_cache.md) and [Persistence cache](persistence_cache.md)) must be set up to be shared among the servers.
+While all relevant cache is cleared for you on repository changes when using the APIs, there might be times where you need to clear cache manually: 
 
 - Varnish: [Cache purge](reverse_proxy.md#using-varnish-or-fastly)
 - Persistence Cache: [Using Cache service](persistence_cache.md#using-cache-service)
diff --git a/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md b/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
index 8a39e27b30..81065c69fe 100644
--- a/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
+++ b/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
@@ -5,7 +5,7 @@ edition: experience
 
 # Step 2 — Prepare the Page
 
-In this step you'll prepare and configure your front page, together with its layout and templates.
+In this step you can prepare and configure your front page, together with its layout and templates.
 
 ## Create Page layout
 
diff --git a/docs/tutorials/page_and_form_tutorial/3_use_existing_blocks.md b/docs/tutorials/page_and_form_tutorial/3_use_existing_blocks.md
index 590e51df6d..42f2640a35 100644
--- a/docs/tutorials/page_and_form_tutorial/3_use_existing_blocks.md
+++ b/docs/tutorials/page_and_form_tutorial/3_use_existing_blocks.md
@@ -5,7 +5,7 @@ edition: experience
 
 # Step 3 — Use existing blocks
 
-In this step you'll add a Content List block and a Content Scheduler block and customize them.
+In this step you can add a Content List block and a Content Scheduler block and customize them.
 
 ### Add a Content List block
 
@@ -45,7 +45,7 @@ Drag a Content List block from the menu to the left zone on the page.
 Click the block and fill in the form.
 Here you name the block and decide what it displays.
 Choose the "Dog Breed Catalog" folder as the Parent, select Dog Breed as the content type to be displayed, and choose a limit (3).
-You'll display the first three Dog Breeds from the database.
+Display the first three Dog Breeds from the database.
 
 ![Window with Content List options](enterprise_tut_content_list_window.png)
 
diff --git a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
index bdab60fd44..4a21005431 100644
--- a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
+++ b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
@@ -114,13 +114,13 @@ See [documentation](render_page.md#render-a-layout) for an example on usage of t
 
 Landing page blocks (from v2.1 and earlier) were defined using a class implementing `EzSystems\LandingPageFieldTypeBundle\FieldType\LandingPage\Model\AbstractBlockType`. 
 In Page Builder (from v2.2 onwards), this interface is no longer present. Instead the logic of your block must be implemented in a [Listener](page_blocks.md#block-events).
-Typically, what you previously would do in `getTemplateParameters()`, you'll now do in the `onBlockPreRender()` event handler.
+Typically, what you previously would do in `getTemplateParameters()`, you now do in the `onBlockPreRender()` event handler.
 
 The definition of block parameters has to be moved from `createBlockDefinition()` to the [YAML configuration](create_custom_page_block.md) for your custom blocks.
 
 For more information about how custom blocks are implemented in Page Builder, see [Creating custom Page blocks](create_custom_page_block.md) for your custom blocks.
 
-For the migration of blocks from landing page to Page Builder, you'll need to provide a converter for attributes of custom blocks. For simple blocks you can use `\EzSystems\EzPlatformPageMigration\Converter\AttributeConverter\DefaultConverter`.
+For the migration of blocks from landing page to Page Builder, you need to provide a converter for attributes of custom blocks. For simple blocks you can use `\EzSystems\EzPlatformPageMigration\Converter\AttributeConverter\DefaultConverter`.
 Custom converters must implement the `\EzSystems\EzPlatformPageMigration\Converter\AttributeConverter\ConverterInterface` interface.
 `convert()` parses XML `\DOMNode $node` and return an array of `\EzSystems\EzPlatformPageFieldType\FieldType\LandingPage\Model\Attribute` objects.
 
diff --git a/docs/update_and_migration/from_2.5/adapt_code_to_v3.md b/docs/update_and_migration/from_2.5/adapt_code_to_v3.md
index 09ef65e4b6..42eba7d3e4 100644
--- a/docs/update_and_migration/from_2.5/adapt_code_to_v3.md
+++ b/docs/update_and_migration/from_2.5/adapt_code_to_v3.md
@@ -29,7 +29,7 @@ This folder also contains `config/packages/ezplatform.yaml`, which contains all
 #### PHP code and bundle organization
 
 Since Symfony 4 `src/` code is no longer organized in bundles, `AppBundle` has been removed from the default eZ Platform install.
-To adapt, you'll need to move all your PHP code, such as controllers or event listeners, to the `src` folder and use the `App` namespace for your custom code instead.
+To adapt, you need to move all your PHP code, such as controllers or event listeners, to the `src` folder and use the `App` namespace for your custom code instead.
 
 !!! tip "How to make AppBundle continue to work, for now"
 
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
index 829faadb7f..5355f4c55e 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
@@ -75,7 +75,7 @@ Adapt the command with your `vendor`, `package`, version number, and add `"–d
 
 #### 2.2.2 Install XmlText field type
 
-While no longer bundled, the XmlText field type still exists and is needed to perform a migration from eZ Publish's XmlText to the new docbook-based format used by the RichText field type. If you plan to use Legacy Bridge for a while before migrating content, you'll also need this for rendering content with XMLText. From `<new-ez-root>` execute:
+While no longer bundled, the XmlText field type still exists and is needed to perform a migration from eZ Publish's XmlText to the new docbook-based format used by the RichText field type. If you plan to use Legacy Bridge for a while before migrating content, you also need this for rendering content with XMLText. From `<new-ez-root>` execute:
 
 `composer require --no-update "ezsystems/ezplatform-xmltext-fieldtype:^1.3.0"`
 
@@ -115,7 +115,7 @@ To move over your own custom configurations, follow the conventions below and ma
 
 !!! note "Make sure to adapt SiteAccess names"
 
-    In the default configurations in **ezplatform.yaml** you'll find existing SiteAccesses like `site`, and depending on installation perhaps a few others, all under a site group called `site\_group`. Make sure to change those to what you had in **ezpublish.yaml** to avoid issues with having to log in to your website, given user/login policy rules need to be updated if you change names of SiteAccess as part of the upgrade.
+    In the default configurations in **ezplatform.yaml** you can find existing SiteAccesses like `site`, and depending on installation perhaps a few others, all under a site group called `site\_group`. Make sure to change those to what you had in **ezpublish.yaml** to avoid issues with having to log in to your website, given user/login policy rules need to be updated if you change names of SiteAccess as part of the upgrade.
 
 #### 2.3.1 Image aliases
 

From ccdc2f093128c461f571d67668cf6d49d628adc2 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Wed, 16 Oct 2024 09:08:15 +0200
Subject: [PATCH 23/77] 'Won't' fixes

---
 docs/api/rest_api/rest_api_authentication.md                  | 2 +-
 docs/customer_management/cp_page_builder.md                   | 3 ++-
 docs/getting_started/install_with_ddev.md                     | 2 +-
 docs/getting_started/requirements.md                          | 2 +-
 docs/ibexa_products/ibexa_headless.md                         | 4 ++--
 docs/release_notes/ez_platform_v1.11.0.md                     | 2 +-
 .../migrating_from_ez_publish_platform.md                     | 2 +-
 docs/users/passwords.md                                       | 2 +-
 8 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/docs/api/rest_api/rest_api_authentication.md b/docs/api/rest_api/rest_api_authentication.md
index f017b6733c..9d4aa73fa5 100644
--- a/docs/api/rest_api/rest_api_authentication.md
+++ b/docs/api/rest_api/rest_api_authentication.md
@@ -365,7 +365,7 @@ If the installation has a dedicated host for REST, you can enable HTTP basic aut
     * If the back office SiteAccess matches `//admin.example.com` (through `Map\Host`, `HostElement` or `HostText`), it calls the REST API under `//admin.example.com/api/ibexa/v2`;
     * If the back office SiteAccess matches `//localhost/admin` (through `URIElement`, `Map\URI` or `Regex\URI`), it calls the REST API under `//localhost/api/ibexa/v2` because SiteAccess matching with REST isn't enabled at URL level.
 
-    If you enable basic authentication for `pattern: ^/api/ibexa/v2` to use it in your front office across both production and development environments, your development environment's back office won't work correctly.
+    If you enable basic authentication for `pattern: ^/api/ibexa/v2` to use it in your front office across both production and development environments, your development environment's back office cannot work correctly.
     This back office tries to access REST through the same URL as the front office. Even when logged in back office and using the [X-SiteAccess header](rest_requests.md#siteaccess), the firewall blocks access to REST as you're not logged through basic authentification. Therefore, some back office features don't work.
 
     If basic authentication is used only for REST API, it's better to have a dedicated domain even on a development environment. For example, map an `api.localhost` in your `hosts` file and set the firewall for `host: ^api\.(example\.com|localhost)$`.
diff --git a/docs/customer_management/cp_page_builder.md b/docs/customer_management/cp_page_builder.md
index 9e92a6550e..b91475a66a 100644
--- a/docs/customer_management/cp_page_builder.md
+++ b/docs/customer_management/cp_page_builder.md
@@ -171,7 +171,8 @@ If members of the Customer Group don't have sufficient permissions for any Custo
 
 !!! note
 
-    Customer Portal is only available to users that are members of the company. Even if user has all the sufficient permissions but isn't a member of a company, they won't see the Customer Portal.
+    Customer Portal is only available to users that are members of the company.
+    Even if user has all the sufficient permissions but isn't a member of a company, cannot see the Customer Portal.
 
 #### Build-in portal mapping
 
diff --git a/docs/getting_started/install_with_ddev.md b/docs/getting_started/install_with_ddev.md
index 09572891be..e0bbad763a 100644
--- a/docs/getting_started/install_with_ddev.md
+++ b/docs/getting_started/install_with_ddev.md
@@ -128,7 +128,7 @@ Replace `<installation-key>` and `<token-password>` with your actual installatio
 ddev composer config --global http-basic.updates.ibexa.co <installation-key> <token-password>
 ```
 
-This authentication won't persist if the project is restarted (by `ddev restart` or `ddev composer create`). You can back up the authentication file (`auth.json`) by using the following command:
+This authentication doesn't persist if the project is restarted (by `ddev restart` or `ddev composer create`). You can back up the authentication file (`auth.json`) by using the following command:
 
 ```bash
 ddev exec "mkdir -p .ddev/homeadditions/.composer; cp ~/.composer/auth.json .ddev/homeadditions/.composer"
diff --git a/docs/getting_started/requirements.md b/docs/getting_started/requirements.md
index d3c62669a4..e443bdc378 100644
--- a/docs/getting_started/requirements.md
+++ b/docs/getting_started/requirements.md
@@ -493,7 +493,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     where you or a partner take ownership of the configuration to set up the project.
 
     Such projects are possible by means of custom integrations/configuration,
-    but they may generate issues that won't be covered by eZ Enterprise subscription bug fix guarantee.
+    but they may generate issues that aren't covered by eZ Enterprise subscription bug fix guarantee.
 
     !!! tip "Use a partner with prior experience on legacy and Platform.sh"
 
diff --git a/docs/ibexa_products/ibexa_headless.md b/docs/ibexa_products/ibexa_headless.md
index eecedaa13d..5878661789 100644
--- a/docs/ibexa_products/ibexa_headless.md
+++ b/docs/ibexa_products/ibexa_headless.md
@@ -61,7 +61,7 @@ APIs summary:
 
 [[= product_name_headless =]] is a tool box with a back office.
 It comes without a default front office.
-You don't lose time to develop a theme for a provided front office before discovering it won't fit your needs.
+You don't lose time to develop a theme for a provided front office before discovering it doesn't fit your needs.
 No distraction.
 [[= product_name_headless =]] helps you focus on the content, create and organize with its straightforward user interface (UI),
 imagine its inputs/outputs, and implement them with its various layers' APIs.
@@ -128,7 +128,7 @@ Like everything in the back office, the calendar is extendable: you can add an e
 - Product variants can rapidly be created by the automatic declination of attributes that have a defined set of values.
 - With taxonomy, you can tag content items to organize them by topics in a much intuitive way for the editor than a content tree with multiple locations would.
 Tags themselves are organized in a tree, and synonyms are linked to favorite terms.
-Tag organization can be handled by a supervisor who won't need to move content items around a corporate content tree.
+Tag organization can be handled by a supervisor who doesn't need to move content items around a corporate content tree.
 At search time, tags can be keywords with a high value in relevance score to help the end user having results closer to the searched topic.
 
 #### Collaboration
diff --git a/docs/release_notes/ez_platform_v1.11.0.md b/docs/release_notes/ez_platform_v1.11.0.md
index 9f1502a594..c5fba7987e 100644
--- a/docs/release_notes/ez_platform_v1.11.0.md
+++ b/docs/release_notes/ez_platform_v1.11.0.md
@@ -71,7 +71,7 @@ full support, maintenance, and priority security patch handling as they're used
 
     Not supported for clean/new installs, intended for use with migrations. The Legacy Bridge integration doesn't have same performance,
     scalability or integrated experience as pure Platform setup. There are known edge cases where for instance cache or search index
-    won't always be immediately updated across the two systems using the bridge, which is one of the many reasons why we recommend
+    cannot always be immediately updated across the two systems using the bridge, which is one of the many reasons why we recommend
     a pure Platform setup where that is possible.
 
 ## Full list of new features, improvements and bug fixes since v1.10.0
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
index 5355f4c55e..360af4f6b7 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
@@ -173,7 +173,7 @@ If you don't plan to migrate content directly to newer eZ Platform field types,
 
 !!! note
 
-    The Legacy Bridge integration doesn't have the same performance, scalability or integrated experience as a pure Platform setup. Like on eZ Publish Platform 5.x there are known edge cases where, for instance, cache or search index won't always be immediately updated across the two systems using the bridge. This is one of the many reasons why we recommend a pure Platform setup where that is possible.
+    The Legacy Bridge integration doesn't have the same performance, scalability or integrated experience as a pure Platform setup. Like on eZ Publish Platform 5.x there are known edge cases where, for instance, cache or search index cannot always be immediately updated across the two systems using the bridge. This is one of the many reasons why we recommend a pure Platform setup where that is possible.
 
 #### 2.5.1 Set up symlinks for legacy folders
 
diff --git a/docs/users/passwords.md b/docs/users/passwords.md
index c257ea1d76..ac8eb6e6a1 100644
--- a/docs/users/passwords.md
+++ b/docs/users/passwords.md
@@ -108,7 +108,7 @@ To do this, in the **User account (ezuser)** field definition, select "Password
 ![Protection against using breached passwords](password_breached.png)
 
 This rule checks the password against known password dumps by using the https://haveibeenpwned.com/ API.
-It doesn't check existing passwords, so it won't block login for anyone.
+It doesn't check existing passwords, so it doesn't block login for anyone.
 It applies only to new passwords when users change them.
 
 !!! note

From 9a8a1d2251894a8168508c56ecb0dc43eaf39c5a Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Wed, 16 Oct 2024 09:44:48 +0200
Subject: [PATCH 24/77] 'e.g.' fixes

---
 .../back_office_elements/extending_thumbnails.md       |  6 +++---
 docs/administration/configuration/configuration.md     |  2 +-
 .../configuration/repository_configuration.md          |  4 ++--
 docs/api/graphql/graphql.md                            |  4 ++--
 docs/api/graphql/graphql_operations.md                 |  2 +-
 .../content_management/content_api/browsing_content.md |  4 ++--
 .../content_management/content_api/managing_content.md |  2 +-
 docs/content_management/content_model.md               |  2 +-
 .../field_types/field_type_reference/matrixfield.md    |  2 +-
 .../field_types/field_type_reference/pagefield.md      |  2 +-
 .../field_types/field_type_storage.md                  |  8 ++++----
 docs/content_management/field_types/field_types.md     |  4 ++--
 .../field_types/form_and_template.md                   |  2 +-
 docs/content_management/field_types/type_and_value.md  | 10 +++++-----
 docs/content_management/url_management/url_api.md      |  2 +-
 .../url_management/url_management.md                   |  2 +-
 .../create_user_registration_form.md                   |  4 ++--
 docs/getting_started/troubleshooting.md                |  4 ++--
 .../cache/http_cache/content_aware_cache.md            |  2 +-
 .../cache/persistence_cache.md                         | 10 +++++-----
 .../clustering/clustering.md                           |  2 +-
 docs/infrastructure_and_maintenance/performance.md     |  2 +-
 .../security/development_security.md                   |  2 +-
 docs/multisite/languages/back_office_translations.md   |  2 +-
 docs/multisite/languages/languages.md                  |  2 +-
 .../site_factory/site_factory_configuration.md         |  2 +-
 .../siteaccess/siteaccess_aware_configuration.md       |  2 +-
 docs/multisite/siteaccess/siteaccess_matching.md       |  4 ++--
 docs/permissions/permission_overview.md                |  4 ++--
 docs/release_notes/ez_platform_v2.5.md                 |  2 +-
 .../solr_search_engine/configure_solr.md               |  2 +-
 .../ismainlocation_sort_clause.md                      |  2 +-
 .../sort_clause_reference/visibility_sort_clause.md    |  2 +-
 docs/tutorials/generic_field_type/5_add_a_field.md     |  2 +-
 .../page_and_form_tutorial/5_create_newsletter_form.md |  2 +-
 docs/update_and_migration/from_2.5/adapt_code_to_v3.md |  2 +-
 .../from_2.5/update_code/7_update_extensions.md        |  2 +-
 37 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/docs/administration/back_office/back_office_elements/extending_thumbnails.md b/docs/administration/back_office/back_office_elements/extending_thumbnails.md
index 661086ca08..7984e1ea43 100644
--- a/docs/administration/back_office/back_office_elements/extending_thumbnails.md
+++ b/docs/administration/back_office/back_office_elements/extending_thumbnails.md
@@ -10,7 +10,7 @@ If you don't want to use custom thumbnails, `ContentType` is used instead.
 ## Thumbnail mechanism 
 
 The thumbnail mechanism has two layers, and each layer can have many implementations.
-The mechanism checks if any of the implementations returns a field e.g. `ezimage` that has function "Can be a thumbnail" turned on.
+The mechanism checks if any of the implementations returns a field, for example, `ezimage`, that has function "Can be a thumbnail" turned on.
 
 ![Can be a thumbnail setting](extending_thumbnail_can_be.png)
 
@@ -30,7 +30,7 @@ For this layer there are following default implementations:
 ### Second layer
 
 Second layer of mechanism enables selection of thumbnail from a field that the first layer has found. 
-It searches the content type for all the fields e.g. images with function "Can be a thumbnail" turned on.
+It searches the content type for all the fields, for example, images, with function "Can be a thumbnail" turned on.
 
 If there is more than one field in the content type that can be used as a thumbnail, this layer returns the first nonempty field as a thumbnail.
 
@@ -62,7 +62,7 @@ At this point you can go to the back office and check the results.
 
 ## Other fields as thumbnails
 
-Any field type can generate a thumbnail, e.g.:
+Any field type can generate a thumbnail, for example:
 
 - DateAndTime (`ezdatetime`) - you can add a mini calendar thumbnail for Appointment content type and on the day of the appointment a clock thumbnail with a specific time when it takes place
 - TextBlock (`eztext`) -  you can add a first letter of the text block that is inside
diff --git a/docs/administration/configuration/configuration.md b/docs/administration/configuration/configuration.md
index 725bf43707..9622d20ae9 100644
--- a/docs/administration/configuration/configuration.md
+++ b/docs/administration/configuration/configuration.md
@@ -20,7 +20,7 @@ Configuration is provided per package in the `config/packages` folder, and route
 `config/packages/ibexa.yaml` contains basic configuration.
 It stores, among others, [SiteAccess](multisite.md) information and content view config.
 
-Other configuration is provided in respective files, e.g. `config/packages/ibexa_admin_ui.yaml`, `config/packages/ibexa_http_cache.yaml`.
+Other configuration is provided in respective files, for example, `config/packages/ibexa_admin_ui.yaml`, `config/packages/ibexa_http_cache.yaml`.
 
 Configuration can be made environment-specific using separate folders for each environment.
 These files contain additional settings and point to the general (not environment-specific) configuration that is applied in other cases.
diff --git a/docs/administration/configuration/repository_configuration.md b/docs/administration/configuration/repository_configuration.md
index a25c8e6ada..f67951106a 100644
--- a/docs/administration/configuration/repository_configuration.md
+++ b/docs/administration/configuration/repository_configuration.md
@@ -245,11 +245,11 @@ ibexa:
 ```
 
 You can override these settings if you have other content types that should be treated as users/user groups in the back office.
-When viewing such content in the back office you're able to see e.g. the assigned policies.
+When viewing such content in the back office you're able to see, for example, the assigned policies.
 
 ## Top-level Locations
 
-You can change the default path for top-level Locations such as content or media in the back office, e.g.:
+You can change the default path for top-level Locations such as content or media in the back office, for example:
 
 ```yaml
 ibexa:
diff --git a/docs/api/graphql/graphql.md b/docs/api/graphql/graphql.md
index 29eb0d1842..9983e33a6f 100644
--- a/docs/api/graphql/graphql.md
+++ b/docs/api/graphql/graphql.md
@@ -36,7 +36,7 @@ To find identifiers that aren't included in the schema, look for "Skipped schema
 
 GraphQL for [[= product_name =]] is based on the content types (including product types), content type groups, and content items defined in the repository.
 
-For each content type the schema exposes a singular and plural field, e.g. `article` and `articles`.
+For each content type the schema exposes a singular and plural field, for example, `article` and `articles`.
 Use the singular field to query a single content item, and the plural to get a whole `Connection` (a list of content items that supports pagination).
 
 With the queries you can inspect:
@@ -52,7 +52,7 @@ You can also query content type and content type group information through the `
 
 The repository schema, accessed through `_repository`, exposes the [[= product_name =]] repository in a manner similar to the [Public PHP API](php_api.md).
 
-The `_repository` field also enables you to query e.g. Object states configured for the repository.
+The `_repository` field also enables you to query, for example, Object states configured for the repository.
 
 ### Custom schemas
 
diff --git a/docs/api/graphql/graphql_operations.md b/docs/api/graphql/graphql_operations.md
index 96b2e54351..ff2264e3ec 100644
--- a/docs/api/graphql/graphql_operations.md
+++ b/docs/api/graphql/graphql_operations.md
@@ -7,7 +7,7 @@ description: Use GraphQL operations to create, update, and delete content.
 Operations on content in GraphQL are performed using [mutations](https://graphql.org/learn/queries/#mutations).
 They include creating, updating, and deleting content items.
 
-The schema contains two mutations per content type, e.g. `createFolder` and `updateFolder`.
+The schema contains two mutations per content type, for example, `createFolder`, and `updateFolder`.
 You can also make use of the generic `deleteContent` and `uploadFiles` mutations.
 
 ## Creating content
diff --git a/docs/content_management/content_api/browsing_content.md b/docs/content_management/content_api/browsing_content.md
index cc15a0428e..7e04dc9fbd 100644
--- a/docs/content_management/content_api/browsing_content.md
+++ b/docs/content_management/content_api/browsing_content.md
@@ -39,7 +39,7 @@ It provides you with basic content metadata such as modification and publication
 
 !!! note "Retrieving content information in a controller"
 
-    To retrieve content information in a controller, you also make use of the `ContentService`, but rendering specific elements (e.g. content information or field values) is relegated to [templates](templates.md).
+    To retrieve content information in a controller, you also make use of the `ContentService`, but rendering specific elements (for example, content information or field values) is relegated to [templates](templates.md).
 
 ### Locations
 
@@ -229,4 +229,4 @@ $nameComparison = $this->comparisonService->compare($versionFrom, $versionTo)->g
 `getComparisonResult` returns a `ComparisonResult` object, which depends on the field type being compared.
 In the example of a Text Line (ezstring) field, it's an array of `StringDiff` objects.
 
-Each diff contains a section of the field to compare (e.g. a part of a text line) and its status, which can be "unchanged", "added" or "removed".
+Each diff contains a section of the field to compare (for example, a part of a text line) and its status, which can be "unchanged", "added" or "removed".
diff --git a/docs/content_management/content_api/managing_content.md b/docs/content_management/content_api/managing_content.md
index 65e5c16ffa..35980bb19d 100644
--- a/docs/content_management/content_api/managing_content.md
+++ b/docs/content_management/content_api/managing_content.md
@@ -211,7 +211,7 @@ You can process the events in a collection using the `find(Closure $predicate)`,
 
 ### Performing calendar actions
 
-You can perform a calendar action (e.g. reschedule or unschedule calendar events) using the `CalendarServiceInterface::executeAction()` method.
+You can perform a calendar action (for example, reschedule or unschedule calendar events) using the `CalendarServiceInterface::executeAction()` method.
 You must pass an `Ibexa\Contracts\Calendar\EventAction\EventActionContext` instance as argument.
 `EventActionContext` defines events on which the action is performed, and action-specific parameters, for example, a new date:
 
diff --git a/docs/content_management/content_model.md b/docs/content_management/content_model.md
index 1cbeb0d696..62b6b37fa5 100644
--- a/docs/content_management/content_model.md
+++ b/docs/content_management/content_model.md
@@ -63,7 +63,7 @@ It's [set per content type](content_availability.md).
 
 **`remoteId`** - a global unique ID of the content item.
 Accepts up to 100 characters. Cannot contain non-printable characters and control sequences (anything in ASCII range `\x00` - `\x1F`).
-It's recommended to either let this value be generated by the Public PHP API as an MD5 hash, or at least to generate it as a hash (e.g. one from SHA family).
+It's recommended to either let this value be generated by the Public PHP API as an MD5 hash, or at least to generate it as a hash (for example, one from SHA family).
 
 **`mainLanguageCode`** - the main language code of the content item.
 If the `alwaysAvailable` flag is set to true, the content item is shown in this language when the requested language doesn't exist.
diff --git a/docs/content_management/field_types/field_type_reference/matrixfield.md b/docs/content_management/field_types/field_type_reference/matrixfield.md
index 691e800096..927046cb2e 100644
--- a/docs/content_management/field_types/field_type_reference/matrixfield.md
+++ b/docs/content_management/field_types/field_type_reference/matrixfield.md
@@ -170,7 +170,7 @@ Example response:
 To create a Matrix field type you need to define field type and field definition identifiers.
 The types that are used for input are named after the Type and the field:
 
-- `{TypeIdentifier}{FieldIdentifier}RowInput` e.g. `dish.nutritionFacts`, `event.agenda`: `DishNutritionFactsRowInput`, `EventAgendaRowInput`
+- `{TypeIdentifier}{FieldIdentifier}RowInput`, for example, `dish.nutritionFacts`, `event.agenda`: `DishNutritionFactsRowInput`, `EventAgendaRowInput`
 
 The example below shows how to create a Recipe content item (belonging to a content type with a Matrix field type added) that has two fields:
 
diff --git a/docs/content_management/field_types/field_type_reference/pagefield.md b/docs/content_management/field_types/field_type_reference/pagefield.md
index 31e0874a07..ce45c39c30 100644
--- a/docs/content_management/field_types/field_type_reference/pagefield.md
+++ b/docs/content_management/field_types/field_type_reference/pagefield.md
@@ -34,7 +34,7 @@ For information on how to create and configure new blocks for the Page, see [Cre
 
 Page rendering takes place while editing or viewing.
 
-When rendering a Page, its zones are passed to the layout as a `zones` array with a `blocks` array each. You can access them using twig (e.g. `{{ zones[0].id }}` ).
+When rendering a Page, its zones are passed to the layout as a `zones` array with a `blocks` array each. You can access them using twig (for example, `{{ zones[0].id }}` ).
 
 Each div that's a zone should have the `data-ibexa-zone-id` attribute with zone ID as a value for a zone container.
 
diff --git a/docs/content_management/field_types/field_type_storage.md b/docs/content_management/field_types/field_type_storage.md
index 1b64fb928b..f0d3a68772 100644
--- a/docs/content_management/field_types/field_type_storage.md
+++ b/docs/content_management/field_types/field_type_storage.md
@@ -32,7 +32,7 @@ The Legacy storage engine uses the `ezcontentobject_attribute` table to store fi
 and `ezcontentclass_attribute` to store field definition values.
 they're both based on the same principle.
 
-Each row represents a field or a field definition, and offers several free fields of different types, where the type can store its data e.g.
+Each row represents a field or a field definition, and offers several free fields of different types, where the type can store its data.
 
 - `ezcontentobject_attribute` offers:
     - `data_int`
@@ -88,7 +88,7 @@ The tag has the following attribute:
 ## Storing data externally
 
 A field type may store arbitrary data in external data sources.
-External storage can be e.g. a web service, a file in the file system, another database
+External storage can be, for example, a web service, a file in the file system, another database
 or even the [[= product_name =]] database itself (in form of a non-standard table).
 
 To store data in external storage, the field type interacts with the Persistence SPI
@@ -107,7 +107,7 @@ calls one of the following methods to also access the external data:
 
 Each of the above methods (except `hasFieldData`) receives a `$context` array with information on the underlying storage and the environment.
 To retrieve and store data in the [[= product_name =]] data storage,
-but outside of the normal structures (e.g. a custom table in an SQL database),
+but outside of the normal structures (for example, a custom table in an SQL database),
 use [Gateway-based storage](#gateway-based-storage) with properly injected Doctrine Connection.
 
 The field type must take care on its own for being compliant with different data sources and that third parties can extend the data source support easily.
@@ -120,7 +120,7 @@ The interface `Ibexa\Contracts\Core\FieldType\StorageGateway` is implemented by
 
 |Method|Description|
 |------|-----------|
-|`setConnection()`|The registry mechanism uses this method to set the SPI storage connection (e.g. the database connection to the Legacy Storage database) into the gateway, which might be used to store external data. The connection is retrieved from the `$context` array automatically by the registry.|
+|`setConnection()`|The registry mechanism uses this method to set the SPI storage connection (for example, the database connection to the Legacy Storage database) into the gateway, which might be used to store external data. The connection is retrieved from the `$context` array automatically by the registry.|
 
 The Gateway implementation itself must take care of validating that it received a usable connection. If it doesn't, it should throw a `RuntimeException`.
 
diff --git a/docs/content_management/field_types/field_types.md b/docs/content_management/field_types/field_types.md
index 46af661cff..57dbc063a2 100644
--- a/docs/content_management/field_types/field_types.md
+++ b/docs/content_management/field_types/field_types.md
@@ -5,7 +5,7 @@ description: Field types define the fields that a content item is built of.
 # Field types
 
 Field types are the smallest building blocks of content.
-[[= product_name =]] comes with many [built-in field types](field_type_reference.md#available-field-types) that cover most common needs e.g. Text line, Email address, Author list, Content relation, Map location, Float, etc.
+[[= product_name =]] comes with many [built-in field types](field_type_reference.md#available-field-types) that cover most common needs, for example, Text line, Email address, Author list, Content relation, Map location, Float, etc.
 
 Field types are responsible for:
 
@@ -42,7 +42,7 @@ Below that, the field type must support the **public PHP API** implementation re
 - Communication with the Persistence SPI
 
 On the bottom level, a field type can additionally hook into the **Persistence SPI** to store data from a `FieldValue` in an external service.
-All non-standard [[= product_name =]] database tables (e.g. `ezurl`) are treated as [external storage](field_type_storage.md#storing-data-externally).
+All non-standard [[= product_name =]] database tables (for example, `ezurl`) are treated as [external storage](field_type_storage.md#storing-data-externally).
 
 The following sequence diagrams visualize the process of creating and publishing new content across all layers, especially focused on the interaction with a field type.
 
diff --git a/docs/content_management/field_types/form_and_template.md b/docs/content_management/field_types/form_and_template.md
index 5d9546206a..cfb15e8841 100644
--- a/docs/content_management/field_types/form_and_template.md
+++ b/docs/content_management/field_types/form_and_template.md
@@ -186,7 +186,7 @@ ibexa:
 
 For templates for previewing the field in the back office,
 using the design engine is recommended with `ibexa_standard_design.override_kernel_templates` set to `true`.
-With the design engine you can apply a template (e.g. `Resources/views/themes/admin/content_fields.html.twig`) without any extra configuration.
+With the design engine you can apply a template (for example, `Resources/views/themes/admin/content_fields.html.twig`) without any extra configuration.
 
 If you don't use the design engine, apply the following configuration:
 
diff --git a/docs/content_management/field_types/type_and_value.md b/docs/content_management/field_types/type_and_value.md
index 4088902372..7210c0d178 100644
--- a/docs/content_management/field_types/type_and_value.md
+++ b/docs/content_management/field_types/type_and_value.md
@@ -29,11 +29,11 @@ Since the public PHP API cannot know anything about these, their handling is del
 #### `getFieldTypeIdentifier()`
 
 Returns a unique identifier for the custom field type which is used to assign the type to a field definition.
-By convention it should be prefixed by a unique vendor shortcut (e.g. `ibexa` for [[= product_name =]]).
+By convention it should be prefixed by a unique vendor shortcut (for example, `ibexa` for [[= product_name =]]).
 
 #### `getSettingsSchema()`
 
-This method retrieves via public PHP API a schema for the field type settings. A typical setting would be e.g. default value. The settings structure defined by this schema is stored in the `FieldDefinition`. Since it's not possible to define a generic format for such a schema, the field type is free to return any serializable data structure from this method.
+This method retrieves via public PHP API a schema for the field type settings. A typical setting would be, for example, default value. The settings structure defined by this schema is stored in the `FieldDefinition`. Since it's not possible to define a generic format for such a schema, the field type is free to return any serializable data structure from this method.
 
 #### `getValidatorConfigurationSchema()`
 
@@ -127,7 +127,7 @@ Like most API components, field types use the [Symfony service tag mechanism]([[
 
 A service can be assigned one or several tags, with specific parameters.
 When the [service container](php_api.md#service-container) is compiled into a PHP file, tags are read by `CompilerPass` implementations that add extra handling for tagged services.
-Each service tagged as `ibexa.field_type` is added to a [registry](https://martinfowler.com/eaaCatalog/registry.html) using the `alias` key as its unique `fieldTypeIdentifier` e.g. `ezstring`.
+Each service tagged as `ibexa.field_type` is added to a [registry](https://martinfowler.com/eaaCatalog/registry.html) using the `alias` key as its unique `fieldTypeIdentifier`, for example, `ezstring`.
 Each field type must also inherit from the abstract `ibexa.field_type` service.
 This ensures that the initialization steps shared by all field types are executed.
 
@@ -143,9 +143,9 @@ To make the search engine aware of the data stored in a field type, register it
 
 It's recommended to use a simple associative array format for the settings schema returned by `Ibexa\Contracts\Core\FieldType\FieldType::getSettingsSchema()`, which follows these rules:
 
-- The key of the associative array identifies a setting (e.g. `default`)
+- The key of the associative array identifies a setting (for example, `default`)
 - Its value is an associative array describing the setting using:
-    - `type` to identify the setting type (e.g. `int` or `string`)
+    - `type` to identify the setting type (for example, `int` or `string`)
     - `default` containing the default setting value
 
 An example schema could look like this:
diff --git a/docs/content_management/url_management/url_api.md b/docs/content_management/url_management/url_api.md
index e12facc24c..e956740e91 100644
--- a/docs/content_management/url_management/url_api.md
+++ b/docs/content_management/url_management/url_api.md
@@ -12,7 +12,7 @@ To view a list of all URLs, use [`URLService::findUrls`](../../api/php_api/php_a
 `URLService::findUrls` takes as argument a [`URLQuery`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-URLQuery.html),
 in which you need to specify:
 
-- query filter e.g. Section
+- query filter, for example, Section
 - Sort Clauses for URL queries
 - offset for search hits, used for paging the results
 - query limit. If value is `0`, search query doesn't return any search hits
diff --git a/docs/content_management/url_management/url_management.md b/docs/content_management/url_management/url_management.md
index 3f19b13aba..fdff33342a 100644
--- a/docs/content_management/url_management/url_management.md
+++ b/docs/content_management/url_management/url_management.md
@@ -212,7 +212,7 @@ bin/console ibexa:urls:regenerate-aliases
 You can also extend the command with the following parameters:
 
 - `--iteration-count` — Defines how many Locations are processed at once to reduce memory usage
-- `--location-id` — Regenerates URL addresses for specific Locations only, e.g. `ibexa:urls:regenerate-aliases --location-id=1 --location-id=2`
+- `--location-id` — Regenerates URL addresses for specific Locations only, for example, `ibexa:urls:regenerate-aliases --location-id=1 --location-id=2`
 
 ## URL wildcards
 
diff --git a/docs/customer_management/create_user_registration_form.md b/docs/customer_management/create_user_registration_form.md
index 8d997cbe53..c8d3685123 100644
--- a/docs/customer_management/create_user_registration_form.md
+++ b/docs/customer_management/create_user_registration_form.md
@@ -13,8 +13,8 @@ First, make sure you [enabled user registration](permission_use_cases.md#registe
 
 In your configuration, under `allowed_field_definitions_identifiers` [configuration key](configuration.md#configuration-files),
 specify the fields that should be part of your registration form.
-You can also define what kind of user you want to create under `user_type_identifier` e.g. frontend user.
-To learn more about available users, see [user types documentation](user_registration.md#user-types). 
+You can also define what kind of user you want to create under `user_type_identifier`, for example, frontend user.
+To learn more about available users, see [user types documentation](user_registration.md#user-types).
 
 ``` yaml
 ibexa:
diff --git a/docs/getting_started/troubleshooting.md b/docs/getting_started/troubleshooting.md
index 6e5f4b5277..baf4d54405 100644
--- a/docs/getting_started/troubleshooting.md
+++ b/docs/getting_started/troubleshooting.md
@@ -24,7 +24,7 @@ That means changing `%env(resolve:DATABASE_URL)%` to `%env(DATABASE_URL)%`.
 If your password only contains letters a-z, A-Z, and numbers 0-9, you don't need to do any encoding.
 You can either create your password that way, in which case it's a good idea to make it longer to maintain entropy,
 keeping the password hard to guess for an attacker.
-Or, you can for instance convert your password with `bin2hex()`, so that e.g. `(/!=#Ƥ*;%?[` becomes `282f213d23c386c2a42a3b253f5b`.
+Or, you can for instance convert your password with `bin2hex()`, so that, for example, `(/!=#Ƥ*;%?[` becomes `282f213d23c386c2a42a3b253f5b`.
 The output from `bin2hex` is limited to 0-9 and a-f. This more than doubles the length of the password, keeping entropy similar.
 
 ## Enabling swap with limited RAM
@@ -34,7 +34,7 @@ It allows your operating system to use the hard disk to supplement RAM when it r
 
 With swap enables you're able to successfully run `php -d memory_limit=-1 bin/console ibexa:install --env prod ezplatform-clean`.
 
-When a system runs out of RAM, you may see `Killed` when trying to clear the cache (e.g. `php bin/console --env=prod cache:clear` from your project's root directory).
+When a system runs out of RAM, you may see `Killed` when trying to clear the cache (for example, `php bin/console --env=prod cache:clear` from your project's root directory).
 
 ## Upload size limit
 
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
index 35b50adfd5..28813143ec 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
@@ -199,7 +199,7 @@ See [Tagging from code](https://foshttpcachebundle.readthedocs.io/en/latest/feat
 
 4\. Use deprecated `X-Location-Id` header.
 
-For custom or built-in controllers (e.g. REST) still using `X-Location-Id`, `XLocationIdResponseSubscriber` handles translating
+For custom or built-in controllers (for example, REST) still using `X-Location-Id`, `XLocationIdResponseSubscriber` handles translating
 this header to tags. It supports singular and comma-separated Location ID value(s):
 
 ```php
diff --git a/docs/infrastructure_and_maintenance/cache/persistence_cache.md b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
index 30cbe58757..cc47ce2d0b 100644
--- a/docs/infrastructure_and_maintenance/cache/persistence_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
@@ -90,7 +90,7 @@ ibexa:
 ### In-Memory cache configuration
 
 Persistence cache layer caches selected objects in-memory for a short time.
-It avoids loading repeatedly the same data from e.g. a remote Redis instance, which can take up to 4-5ms per call due to the network latency and Redis instance load.
+It avoids loading repeatedly the same data from, for example, a remote Redis instance, which can take up to 4-5ms per call due to the network latency and Redis instance load.
 The cache is organized in 2 pools, one for metadata which isn't updated frequently, and one for content related objects that is only meant as a short-lived burst cache.
 Limit is organized using a [least frequently used (LFU)](https://en.wikipedia.org/wiki/Least_frequently_used) approach.
 It makes sure repeatedly used objects stay in-memory until expired, and those seldom used are bulk evicted from cache every time the maximum number of cache items is reached.
@@ -120,7 +120,7 @@ parameters:
 !!! caution "In-Memory cache is per-process"
 
     **TTL and Limit need to have a low value.** Setting limit high increases memory use.
-    High TTL value also increases exponentially risk for system acting on stale metadata (e.g. content type definitions).
+    High TTL value also increases exponentially risk for system acting on stale metadata (for example, content type definitions).
     The only case where it's safe to increase these values is for dev environment with single concurrency on writes.
     In prod environment you should only consider reducing them if you have heavy concurrency writes.
 
@@ -196,10 +196,10 @@ With that in mind, the following configurations of Redis are possible:
     - Shard slaves can improve availability, however [they use asynchronous replication](https://redis.io/docs/management/scaling/#redis-cluster-consistency-guarantees) so they can't be used for reads
     - Unsupported Redis features that can affect performance: [pipelining](https://github.com/phpredis/phpredis/blob/develop/cluster.md#pipelining) and [most multiple key commands](https://github.com/phpredis/phpredis/blob/develop/cluster.md#multiple-key-commands)
 - [Redis Sentinel](https://redis.io/docs/management/sentinel/)
-    - Provides high availability by providing one or several slaves (ideally 2 slaves or more, e.g. minimum 3 servers), and handle failover
+    - Provides high availability by providing one or several slaves (ideally 2 slaves or more, for example, minimum 3 servers), and handle failover
     - [Slaves are asynchronously replicated](https://redis.io/docs/management/sentinel/#fundamental-things-to-know-about-sentinel-before-deploying), so they can't be used for reads
-    - Typically used with a load balancer (e.g. HAproxy with occasional calls to Redis Sentinel API) in the front to only speak to elected master
-    - As of v3 you can also configure this [directly on the connection string]([[= symfony_doc =]]/components/cache/adapters/redis_adapter.html#configure-the-connection), **if** you use `Predis` instead of `php-redis` 
+    - Typically used with a load balancer (for example, HAproxy with occasional calls to Redis Sentinel API) in the front to only speak to elected master
+    - As of v3 you can also configure this [directly on the connection string]([[= symfony_doc =]]/components/cache/adapters/redis_adapter.html#configure-the-connection), **if** you use `Predis` instead of `php-redis`
 
 Several cloud providers have managed services that are easier to set up, handle replication and scalability for you, and might perform better. Notable services include:
 
diff --git a/docs/infrastructure_and_maintenance/clustering/clustering.md b/docs/infrastructure_and_maintenance/clustering/clustering.md
index d8c3f5ab6a..3760d7fb36 100644
--- a/docs/infrastructure_and_maintenance/clustering/clustering.md
+++ b/docs/infrastructure_and_maintenance/clustering/clustering.md
@@ -258,7 +258,7 @@ Place this before the include of `ez_params.d`/`ez_rewrite_params` in your vhost
 
 If you're migrating an existing single-server site to a cluster setup, and not setting up clustering from scratch, you need to migrate your files.
 Once you have configured your binarydata and metadata handlers, you can run the `ibexa:io:migrate-files` command.
-You can also use it when you're migrating from one data handler to another, e.g. from NFS to Amazon S3.
+You can also use it when you're migrating from one data handler to another, for example, from NFS to Amazon S3.
 
 This command shows which handlers are configured:
 
diff --git a/docs/infrastructure_and_maintenance/performance.md b/docs/infrastructure_and_maintenance/performance.md
index 2a15e4feff..0300ce4909 100644
--- a/docs/infrastructure_and_maintenance/performance.md
+++ b/docs/infrastructure_and_maintenance/performance.md
@@ -40,7 +40,7 @@ In production setups:
 ### VM
 
 - Avoid shared filesystems for code (Docker for Mac/Win, VirtualBox/*, Vagrant, etc.), because they typically slow down the application 10x or more, compared to native Linux filesystem.
-- VM in itself also adds 10-30% of overhead. However when it comes to production, e.g. AWS vs barebones, it also comes down to cost and convenience factors.
+- VM in itself also adds 10-30% of overhead. However when it comes to production, for example, AWS vs barebones, it also comes down to cost and convenience factors.
 
 ### Web server
 
diff --git a/docs/infrastructure_and_maintenance/security/development_security.md b/docs/infrastructure_and_maintenance/security/development_security.md
index 1a85936b4f..92969ba847 100644
--- a/docs/infrastructure_and_maintenance/security/development_security.md
+++ b/docs/infrastructure_and_maintenance/security/development_security.md
@@ -94,7 +94,7 @@ If you want to use this feature, you must at least extend the login template to
 
 #### Login handlers / SSO
 
-Symfony provides native support for [multiple user providers]([[= symfony_doc =]]/security/multiple_user_providers.html). This makes it easy to integrate any kind of login handlers, including SSO and existing third-party bundles (e.g. [FR3DLdapBundle](https://github.com/Maks3w/FR3DLdapBundle), [HWIOauthBundle](https://github.com/hwi/HWIOAuthBundle), [FOSUserBundle](https://github.com/FriendsOfSymfony/FOSUserBundle), [BeSimpleSsoAuthBundle](https://github.com/BeSimple/BeSimpleSsoAuthBundle), etc.).
+Symfony provides native support for [multiple user providers]([[= symfony_doc =]]/security/multiple_user_providers.html). This makes it easy to integrate any kind of login handlers, including SSO and existing third-party bundles (for example, [FR3DLdapBundle](https://github.com/Maks3w/FR3DLdapBundle), [HWIOauthBundle](https://github.com/hwi/HWIOAuthBundle), [FOSUserBundle](https://github.com/FriendsOfSymfony/FOSUserBundle), [BeSimpleSsoAuthBundle](https://github.com/BeSimple/BeSimpleSsoAuthBundle), etc.).
 
 See [Authenticating a user with multiple user provider](user_authentication.md#authenticate-user-with-multiple-user-providers) for more information.
 
diff --git a/docs/multisite/languages/back_office_translations.md b/docs/multisite/languages/back_office_translations.md
index 438988bed3..4f6072d1a9 100644
--- a/docs/multisite/languages/back_office_translations.md
+++ b/docs/multisite/languages/back_office_translations.md
@@ -84,7 +84,7 @@ private function getTranslatedDescription(): string
 The strings are provided in .xliff files.
 The file should be stored in your project's or your bundle's `Resources/translations` folder.
 
-File name corresponds to the selected domain and the language, e.g. `custom_extension.en.xliff`.
+File name corresponds to the selected domain and the language, for example, `custom_extension.en.xliff`.
 
 ``` xml
 <?xml version="1.0" encoding="utf-8"?>
diff --git a/docs/multisite/languages/languages.md b/docs/multisite/languages/languages.md
index cb89b0d261..d97340a193 100644
--- a/docs/multisite/languages/languages.md
+++ b/docs/multisite/languages/languages.md
@@ -91,7 +91,7 @@ ibexa:
 
 !!! note
 
-    The top prioritized language is always used the SiteAccess language reference (e.g. `fre-FR` for `fre` SiteAccess in the example above).
+    The top prioritized language is always used the SiteAccess language reference (for example, `fre-FR` for `fre` SiteAccess in the example above).
 
 If several translation SiteAccesses share the same language reference, **the first declared SiteAccess always applies**.
 
diff --git a/docs/multisite/site_factory/site_factory_configuration.md b/docs/multisite/site_factory/site_factory_configuration.md
index f87834c227..1784fbabf6 100644
--- a/docs/multisite/site_factory/site_factory_configuration.md
+++ b/docs/multisite/site_factory/site_factory_configuration.md
@@ -49,7 +49,7 @@ Remember that one template can only have one Site skeleton.
 If the design doesn't have a defined Site skeleton, a directory of the new site is created in a standard Site Factory process.
 
 To define a Site skeleton, add the `site_skeleton_id` or `site_skeleton_remote_id` key to the site template definition.
-This can be either a Location ID (e.g. `5966`), or a remote Location ID (e.g. `3bed95afb1f8126f06a3c464e461e1ae66`).
+This can be either a Location ID (for example, `5966`), or a remote Location ID (for example, `3bed95afb1f8126f06a3c464e461e1ae66`).
 
 ``` yaml hl_lines="7 12"
 ibexa_site_factory:
diff --git a/docs/multisite/siteaccess/siteaccess_aware_configuration.md b/docs/multisite/siteaccess/siteaccess_aware_configuration.md
index 533dd875fb..bedf93ff5a 100644
--- a/docs/multisite/siteaccess/siteaccess_aware_configuration.md
+++ b/docs/multisite/siteaccess/siteaccess_aware_configuration.md
@@ -5,7 +5,7 @@ description: Make sure your custom development's configuration can be used with
 # SiteAccess-aware configuration
 
 The [Symfony Config component]([[= symfony_doc =]]/components/config.html) makes it possible to define semantic configuration, exposed to the end developer.
-This configuration is validated by rules you define, e.g. validating type (string, array, integer, boolean and so on).
+This configuration is validated by rules you define, for example, validating type (string, array, integer, boolean and so on).
 Usually, after it's validated and processed, this semantic configuration is then mapped to internal *key/value* parameters stored in the service container.
 
 [[= product_name =]] uses this for its core configuration, but adds another configuration level, the SiteAccess.
diff --git a/docs/multisite/siteaccess/siteaccess_matching.md b/docs/multisite/siteaccess/siteaccess_matching.md
index 9233ba2f9f..42d1019ae0 100644
--- a/docs/multisite/siteaccess/siteaccess_matching.md
+++ b/docs/multisite/siteaccess/siteaccess_matching.md
@@ -46,8 +46,8 @@ ibexa:
 If the matcher class doesn't start with a backslash (`\`), it's relative to `Ibexa\Core\MVC\Symfony\SiteAccess\Matcher`
 (for example, `Map\URI` refers to `Ibexa\Core\MVC\Symfony\SiteAccess\Matcher\Map\URI`)
 
-You can specify [custom matchers](#custom-matchers) by using a fully qualified class name (e.g. `\My\SiteAccess\Matcher`)
-or a service identifier (e.g. `@my_matcher_service`).
+You can specify [custom matchers](#custom-matchers) by using a fully qualified class name (for example, `\My\SiteAccess\Matcher`)
+or a service identifier (for example, `@my_matcher_service`).
 In the case of a fully qualified class name, the matching configuration is passed in the constructor.
 In the case of a service, it must implement `Ibexa\Bundle\Core\SiteAccess\Matcher`.
 The matching configuration is passed to `setMatchingConfiguration()`.
diff --git a/docs/permissions/permission_overview.md b/docs/permissions/permission_overview.md
index 3390f3c788..86ea5e003f 100644
--- a/docs/permissions/permission_overview.md
+++ b/docs/permissions/permission_overview.md
@@ -47,8 +47,8 @@ public function performAccessCheck(): void
 
 `Attribute` accepts three arguments:
 
-- `module` is the policy module (e.g. `content`)
-- `function` is the function inside the module (e.g. `read`)
+- `module` is the policy module (for example,`content`)
+- `function` is the function inside the module (for example, `read`)
 - `limitations` are optional limitations to check against. Here you can provide two keys:
     - `valueObject` is the object you want to check for, for example `ContentInfo`.
     - `targets` are a table of value objects that are the target of the operation.
diff --git a/docs/release_notes/ez_platform_v2.5.md b/docs/release_notes/ez_platform_v2.5.md
index e7b29f81c3..361093094f 100644
--- a/docs/release_notes/ez_platform_v2.5.md
+++ b/docs/release_notes/ez_platform_v2.5.md
@@ -149,7 +149,7 @@ New API improvements include:
 - new `loadLanguageListByCode()` and `loadLanguageListById()` endpoints for bulk loading of languages
 - new method `ContentService->loadContentInfoList()` for bulk loading Content information
     - it can be used with `ContentService->loadContentListByContentInfo()` to bulk load Content
-    - v2.5 also takes advantage of it in e.g. `RelationList` and `ParameterProvider`
+    - v2.5 also takes advantage of it in, for example, `RelationList` and `ParameterProvider`
 - now Persistence cache layer also caches selected metadata objects in-memory
 - indexation of related objects in the full text search
 
diff --git a/docs/search/search_engines/solr_search_engine/configure_solr.md b/docs/search/search_engines/solr_search_engine/configure_solr.md
index e3a00e663a..97d145e901 100644
--- a/docs/search/search_engines/solr_search_engine/configure_solr.md
+++ b/docs/search/search_engines/solr_search_engine/configure_solr.md
@@ -52,7 +52,7 @@ The configuration above results in the following boosting (content type / Field)
 !!! tip "How to configure boosting on specific fields"
 
     Currently, boosting on particular fields is missing.
-    However, it could be configured using 3rd party [Novactive/NovaeZSolrSearchExtraBundle](https://github.com/Novactive/NovaeZSolrSearchExtraBundle) in case of custom search implementation, e.g. to handle your front-end search form.
+    However, it could be configured using 3rd party [Novactive/NovaeZSolrSearchExtraBundle](https://github.com/Novactive/NovaeZSolrSearchExtraBundle) in case of custom search implementation, for example, to handle your front-end search form.
     Unfortunately, this doesn't affect search performed in the administration interface.
 
     The following example presents boosting configuration for Folder's `name` and `description` fields.
diff --git a/docs/search/sort_clause_reference/ismainlocation_sort_clause.md b/docs/search/sort_clause_reference/ismainlocation_sort_clause.md
index a3867e7ad1..5ead5b6df8 100644
--- a/docs/search/sort_clause_reference/ismainlocation_sort_clause.md
+++ b/docs/search/sort_clause_reference/ismainlocation_sort_clause.md
@@ -3,7 +3,7 @@
 The [`Location\IsMainLocation` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-IsMainLocation.html)
 sorts search results by whether their Location is the main Location of the content item.
 
-Locations that aren't main Locations are ranked as lower values (e.g. with ascending order they are returned first).
+Locations that aren't main Locations are ranked as lower values (for example, with ascending order they are returned first).
 
 ## Arguments
 
diff --git a/docs/search/sort_clause_reference/visibility_sort_clause.md b/docs/search/sort_clause_reference/visibility_sort_clause.md
index 3f06734da3..18f6971e8c 100644
--- a/docs/search/sort_clause_reference/visibility_sort_clause.md
+++ b/docs/search/sort_clause_reference/visibility_sort_clause.md
@@ -3,7 +3,7 @@
 The [`Location\Visibility` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-Visibility.html)
 sorts search results by whether the Location is visible or not.
 
-Locations that aren't visible are ranked as higher values (e.g. with ascending order they're returned last).
+Locations that aren't visible are ranked as higher values (for example, with ascending order they're returned last).
 
 ## Arguments
 
diff --git a/docs/tutorials/generic_field_type/5_add_a_field.md b/docs/tutorials/generic_field_type/5_add_a_field.md
index 2d2ba60d2e..ab78608c3e 100644
--- a/docs/tutorials/generic_field_type/5_add_a_field.md
+++ b/docs/tutorials/generic_field_type/5_add_a_field.md
@@ -39,7 +39,7 @@ Click it to create new content.
 
 ![Selecting Point 2D from sidebar](menu_point2d.png)
 
-Here, you can fill in coordinates of your point, e.g. 3, 5.
+Here, you can fill in coordinates of your point, for example, 3, 5.
 Provided coordinates are used as a title for a new point.
 
 ![Creating Point 2D](creating_new_point2d.png)
diff --git a/docs/tutorials/page_and_form_tutorial/5_create_newsletter_form.md b/docs/tutorials/page_and_form_tutorial/5_create_newsletter_form.md
index 1c7eb3b12d..c667c5aa1c 100644
--- a/docs/tutorials/page_and_form_tutorial/5_create_newsletter_form.md
+++ b/docs/tutorials/page_and_form_tutorial/5_create_newsletter_form.md
@@ -52,7 +52,7 @@ Create a `newsletter.html.twig` file in `templates/blocks/form/`:
 This template extends the default block layout by adding an additional class (line 1) that shares CSS styling with the Random block.
 
 Append the new template to the block by adding it to `config/packages/ibexa_fieldtype_page.yaml`.
-Add the following configuration under the `blocks` key at the same level as other block names, e.g. `random`:
+Add the following configuration under the `blocks` key at the same level as other block names, for example, `random`:
 
 ``` yaml hl_lines="1"
 [[= include_file('code_samples/tutorials/page_tutorial/config/packages/ibexa_fieldtype_page.yaml', 42, 47) =]]
diff --git a/docs/update_and_migration/from_2.5/adapt_code_to_v3.md b/docs/update_and_migration/from_2.5/adapt_code_to_v3.md
index 42eba7d3e4..4f1ad360a1 100644
--- a/docs/update_and_migration/from_2.5/adapt_code_to_v3.md
+++ b/docs/update_and_migration/from_2.5/adapt_code_to_v3.md
@@ -23,7 +23,7 @@ When updating to eZ Platform v3 you need to move your files and modify file path
 #### Configuration
 
 Configuration files have been moved from `app/Resources/config` to `config`.
-Package-specific configuration is placed in `config/packages` (e.g. `config/packages/ezplatform_admin_ui.yaml`).
+Package-specific configuration is placed in `config/packages` (for example, `config/packages/ezplatform_admin_ui.yaml`).
 This folder also contains `config/packages/ezplatform.yaml`, which contains all settings coming in from Kernel.
 
 #### PHP code and bundle organization
diff --git a/docs/update_and_migration/from_2.5/update_code/7_update_extensions.md b/docs/update_and_migration/from_2.5/update_code/7_update_extensions.md
index 8095c9282e..3aff7545eb 100644
--- a/docs/update_and_migration/from_2.5/update_code/7_update_extensions.md
+++ b/docs/update_and_migration/from_2.5/update_code/7_update_extensions.md
@@ -3,7 +3,7 @@
 ## Universal Discovery Widget
 
 If you extended the Universal Discovery Widget
-(e.g. added your own tabs or triggered opening the UDW for your own customizations),
+(for example, added your own tabs or triggered opening the UDW for your own customizations),
 you need to rewrite this extension using the [new YAML configuration](https://doc.ibexa.co/en/3.3/extending/extending_udw/).
 
 ## Back office extensibility

From b598eacd0b102c6d4c6f34b12ee98b73d088249e Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Wed, 16 Oct 2024 10:08:41 +0200
Subject: [PATCH 25/77] Fixes in 'back office' section

---
 docs/administration/back_office/add_user_setting.md |  9 +++------
 .../back_office/back_office_configuration.md        |  3 +--
 .../back_office_elements/custom_components.md       |  2 +-
 .../back_office_elements/extending_thumbnails.md    | 13 +++++++------
 .../formatting_date_and_time.md                     |  4 ++--
 .../importing_assets_from_bundle.md                 | 10 ++++------
 .../back_office_menus/back_office_menus.md          |  6 +++---
 .../back_office_tabs/back_office_tabs.md            |  3 ++-
 .../back_office/browser/add_browser_tab.md          |  8 +++++---
 docs/administration/back_office/browser/browser.md  |  8 +++++---
 .../back_office/content_tab_switcher.md             |  1 +
 .../back_office/customize_calendar.md               |  2 +-
 .../back_office/customize_search_suggestion.md      |  3 ++-
 docs/administration/back_office/multifile_upload.md |  3 +--
 docs/administration/back_office/notifications.md    |  6 +++---
 15 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/docs/administration/back_office/add_user_setting.md b/docs/administration/back_office/add_user_setting.md
index 6f72b0040f..c994960139 100644
--- a/docs/administration/back_office/add_user_setting.md
+++ b/docs/administration/back_office/add_user_setting.md
@@ -8,11 +8,9 @@ description: Add the option to select a custom preference in user menu.
 
 You can add new preferences to the **User Settings** menu in the back office.
 
-To do so, create a setting class implementing two interfaces:
-`ValueDefinitionInterface` and `FormMapperInterface`.
+To do so, create a setting class implementing two interfaces: `ValueDefinitionInterface` and `FormMapperInterface`.
 
-In this example the class is located in `src/Setting/Unit.php`
-and enables the user to select their preference for metric or imperial unit systems.
+In this example the class is located in `src/Setting/Unit.php` and enables the user to select their preference for metric or imperial unit systems.
 
 ``` php
 [[= include_file('code_samples/back_office/settings/src/Setting/Unit.php') =]]
@@ -45,8 +43,7 @@ The value of the setting is accessible with `ez_user_settings['unit']`.
 
 ## Create template for editing settings
 
-You can override a template used when editing the new setting
-under the `ibexa.system.<scope>.user_settings_update_view` [configuration key](configuration.md#configuration-files):
+You can override a template used when editing the new setting under the `ibexa.system.<scope>.user_settings_update_view` [configuration key](configuration.md#configuration-files):
 
 ``` yaml
 [[= include_file('code_samples/back_office/settings/config/packages/user_settings.yaml') =]]
diff --git a/docs/administration/back_office/back_office_configuration.md b/docs/administration/back_office/back_office_configuration.md
index 2426d99e49..68d58c32f4 100644
--- a/docs/administration/back_office/back_office_configuration.md
+++ b/docs/administration/back_office/back_office_configuration.md
@@ -49,8 +49,7 @@ You can copy subtree from CLI using the command: `bin/console ibexa:copy-subtree
 
 ## Default Locations
 
-Default Location IDs for [Content structure, Media and Users](locations.md#top-level-locations) in the menu are configured
-using the `ibexa.system.<scope>.location_ids` [configuration key](configuration.md#configuration-files):
+Default Location IDs for [Content structure, Media and Users](locations.md#top-level-locations) in the menu are configured using the `ibexa.system.<scope>.location_ids` [configuration key](configuration.md#configuration-files):
 
 ``` yaml
 ibexa:
diff --git a/docs/administration/back_office/back_office_elements/custom_components.md b/docs/administration/back_office/back_office_elements/custom_components.md
index 5f490bc4fc..f191f0a6a9 100644
--- a/docs/administration/back_office/back_office_elements/custom_components.md
+++ b/docs/administration/back_office/back_office_elements/custom_components.md
@@ -61,7 +61,7 @@ appbundle.components.my_twig_component:
 
 This renders the `path/to/file.html.twig` template with `first_param` and `second_param` as parameters.
 
-With `LinkComponent` and `ScriptComponent` you provide `$href` and `$src` as arguments, respectively:
+With `LinkComponent` and `ScriptComponent` you provide `$href` and `$src` as arguments:
 
 ``` yaml
 app.components.my_link_component:
diff --git a/docs/administration/back_office/back_office_elements/extending_thumbnails.md b/docs/administration/back_office/back_office_elements/extending_thumbnails.md
index 7984e1ea43..9155ac153a 100644
--- a/docs/administration/back_office/back_office_elements/extending_thumbnails.md
+++ b/docs/administration/back_office/back_office_elements/extending_thumbnails.md
@@ -4,10 +4,10 @@ description: Customize thumbnails use for content items in the back office.
 
 # Extending thumbnails
 
-The thumbnails API enable you to easily choose an image for a specific content.
+The thumbnails API enable you to choose an image for a specific content.
 If you don't want to use custom thumbnails, `ContentType` is used instead.
 
-## Thumbnail mechanism 
+## Thumbnail mechanism
 
 The thumbnail mechanism has two layers, and each layer can have many implementations.
 The mechanism checks if any of the implementations returns a field, for example, `ezimage`, that has function "Can be a thumbnail" turned on.
@@ -29,14 +29,14 @@ For this layer there are following default implementations:
 
 ### Second layer
 
-Second layer of mechanism enables selection of thumbnail from a field that the first layer has found. 
+Second layer of mechanism enables selection of thumbnail from a field that the first layer has found.
 It searches the content type for all the fields, for example, images, with function "Can be a thumbnail" turned on.
 
 If there is more than one field in the content type that can be used as a thumbnail, this layer returns the first nonempty field as a thumbnail.
 
 This mechanism can be modified to fit your site needs, so you can decide from where and how the thumbnails is downloaded.
 
-### Create a thumbnail mechanism 
+### Create a thumbnail mechanism
 
 First, create base strategy for returning custom thumbnails from a static file.
 Create `StaticStrategy.php` in `src/Strategy`.
@@ -46,7 +46,7 @@ Create `StaticStrategy.php` in `src/Strategy`.
 ```
 
 Next, add the strategy with the `ibexa.repository.thumbnail.strategy.content` tag and `priority: 100` to `config/services.yaml`:
- 
+
 ```yaml
 [[= include_file('code_samples/back_office/thumbnails/config/custom_services.yaml') =]]
 ```
@@ -57,7 +57,8 @@ At this point you can go to the back office and check the results.
 
 !!! note "Thumbnail mechanism "
 
-    This strategy overrides all generated thumbnails. You can specify a specific content type. See the example [here](https://github.com/ibexa/user/blob/main/src/lib/Strategy/DefaultThumbnailStrategy.php)
+    This strategy overrides all generated thumbnails. You can specify a specific content type.
+    See the example [here](https://github.com/ibexa/user/blob/main/src/lib/Strategy/DefaultThumbnailStrategy.php)
 
 
 ## Other fields as thumbnails
diff --git a/docs/administration/back_office/back_office_elements/formatting_date_and_time.md b/docs/administration/back_office/back_office_elements/formatting_date_and_time.md
index ba1992338f..499d3216d8 100644
--- a/docs/administration/back_office/back_office_elements/formatting_date_and_time.md
+++ b/docs/administration/back_office/back_office_elements/formatting_date_and_time.md
@@ -54,7 +54,7 @@ class MyService
 Then, add the following to `config/services.yaml`:
 
 ``` yaml
-services:    
+services:
     App\Service\MyService:
         arguments:
             $shortDateTimeFormatter: '@ibexa.user.settings.short_datetime_format.formatter'
@@ -62,7 +62,7 @@ services:
 
 ## Using User settings menu
 
-Users can set their preferred date and time formats in the User settings menu.
+Users can set their preferred date and time formats in the user settings menu.
 This format is used throughout the back office.
 
 You can set the list of available formats under the `ibexa.system.<scope>.user_preferences` [configuration key](configuration.md#configuration-files):
diff --git a/docs/administration/back_office/back_office_elements/importing_assets_from_bundle.md b/docs/administration/back_office/back_office_elements/importing_assets_from_bundle.md
index 833bff03ef..1b4287e39a 100644
--- a/docs/administration/back_office/back_office_elements/importing_assets_from_bundle.md
+++ b/docs/administration/back_office/back_office_elements/importing_assets_from_bundle.md
@@ -12,7 +12,7 @@ To import assets from a bundle, configure them in an `ibexa.config.js` file that
 
 ``` js
 const path = require('path');
- 
+
 module.exports = (Encore) => {
 	Encore.addEntry('<entry-name>', [
 		path.resolve(__dirname, '<path_to_file>'),
@@ -32,8 +32,7 @@ To import CSS files only, use:
 
     After you add new files, run `php bin/console cache:clear`.
 
-    For a full example of importing asset configuration,
-    see [`ibexa.config.js`](https://github.com/ibexa/admin-ui/blob/main/src/bundle/Resources/encore/ibexa.config.js)
+    For a full example of importing asset configuration, see [`ibexa.config.js`](https://github.com/ibexa/admin-ui/blob/main/src/bundle/Resources/encore/ibexa.config.js)
 
 To edit existing configuration entries, either in the bundle's `Resources/encore/` folder, or in the `encore` folder in the root folder of your project, create an `ibexa.config.manager.js` file:
 
@@ -75,8 +74,7 @@ module.exports = (ibexaConfig, ibexaConfigManager) => {
 
     After you add new files, run `php bin/console cache:clear`.
 
-    For a full example of overriding configuration,
-    see [`ibexa.config.manager.js`](https://github.com/ibexa/fieldtype-matrix/blob/main/src/bundle/Resources/encore/ibexa.config.manager.js).
+    For a full example of overriding configuration, see [`ibexa.config.manager.js`](https://github.com/ibexa/fieldtype-matrix/blob/main/src/bundle/Resources/encore/ibexa.config.manager.js).
 
 To add a new configuration under your own namespace and with its own dependencies, create an `ibexa.webpack.custom.config.js` file that you create either in the bundle's `Resources/encore/` folder, or in the `encore` folder in the root directory of your project, for example:
 
@@ -107,7 +105,7 @@ To add a new configuration under your own namespace and with its own dependencie
 
 If you prefer to include the asset configuration in the main project files, add it in [`webpack.config.js`](https://github.com/ibexa/recipes/blob/master/ibexa/oss/4.0/encore/webpack.config.js#L31).
 
-To overwrite the built-in assets, use the following configuration to replace, remove or add asset files in `webpack.config.js`:
+To overwrite the built-in assets, use the following configuration to replace, remove, or add asset files in `webpack.config.js`:
 
 ``` js
 ibexaConfigManager.replace({
diff --git a/docs/administration/back_office/back_office_menus/back_office_menus.md b/docs/administration/back_office/back_office_menus/back_office_menus.md
index a3c1f4fc5d..b034ae674f 100644
--- a/docs/administration/back_office/back_office_menus/back_office_menus.md
+++ b/docs/administration/back_office/back_office_menus/back_office_menus.md
@@ -35,7 +35,7 @@ You can listen to the following events:
 || `ConfigureMenuEvent::CONTENT_CREATE_SIDEBAR_RIGHT` |
 || `ConfigureMenuEvent::CONTENT_SIDEBAR_LEFT` |
 | Trash | `ConfigureMenuEvent::TRASH_SIDEBAR_RIGHT` |
-| Section | `ConfigureMenuEvent::SECTION_EDIT_SIDEBAR_RIGHT` 
+| Section | `ConfigureMenuEvent::SECTION_EDIT_SIDEBAR_RIGHT`
 || `ConfigureMenuEvent::SECTION_CREATE_SIDEBAR_RIGHT` |
 | Policies and permissions | `ConfigureMenuEvent::POLICY_EDIT_SIDEBAR_RIGHT` |
 || `ConfigureMenuEvent::POLICY_CREATE_SIDEBAR_RIGHT` |
@@ -63,7 +63,8 @@ You can listen to the following events:
 
 ## Adding menu items
 
-To add a menu item, use the `addChild()` method. Provide the method with the new menu item's identifier and, optionally, with parameters.
+To add a menu item, use the `addChild()` method.
+Provide the method with the new menu item's identifier and, optionally, with parameters.
 
 To add an inactive menu section, don't add a route to its parameters.
 
@@ -135,4 +136,3 @@ To remove a menu item, for example, to remove the **Copy subtree** item from the
 ``` php
 [[= include_file('code_samples/back_office/menu/menu_item/src/EventSubscriber/MyMenuSubscriber.php', 44, 45) =]]
 ```
-
diff --git a/docs/administration/back_office/back_office_tabs/back_office_tabs.md b/docs/administration/back_office/back_office_tabs/back_office_tabs.md
index ddd1857a67..05f3a89f46 100644
--- a/docs/administration/back_office/back_office_tabs/back_office_tabs.md
+++ b/docs/administration/back_office/back_office_tabs/back_office_tabs.md
@@ -53,7 +53,7 @@ Tabs are displayed according to this value in ascending order.
 
 !!! tip
 
-    It is good practice to reserve some distance between these values, for example to stagger them by step of 10.
+    It's a good practice to reserve some distance between these values, for example to stagger them by step of 10.
     It may come useful if you later need to place something between the existing tabs.
 
 You can also influence tab display (for example, order tabs, remove, or modify them) by using the following event listeners:
@@ -73,4 +73,5 @@ To create a tab group, register it as a service:
 
 Tag the group with `ibexa.admin_ui.component`.
 `group` indicates where the group is rendered.
+
 For a list of possible rendering places, see [Injecting custom components](custom_components.md).
diff --git a/docs/administration/back_office/browser/add_browser_tab.md b/docs/administration/back_office/browser/add_browser_tab.md
index 79585a81b5..a2225e28ae 100644
--- a/docs/administration/back_office/browser/add_browser_tab.md
+++ b/docs/administration/back_office/browser/add_browser_tab.md
@@ -4,7 +4,8 @@ description: Add a custom tab displaying selected data to the content browser.
 
 # Add browser tab
 
-The Universal Discovery Widget (UDW) is a separate React module. By default, it contains two tabs: Browse and Bookmarks.
+The Universal Discovery Widget (UDW) is a separate React module.
+By default, it contains two tabs: Browse and Bookmarks.
 
 ![UDW default tabs](udw_tabs.png)
 
@@ -120,8 +121,9 @@ ibexaConfigManager.add({
 
 ## Check results
 
-In the back office go to **Content** -> **Dashboard**. On the top right, click the **Create content** button.
-In the UDW a new **Images** tab appears, listing all images from the Repository.
+In the back office go to **Content** -> **Dashboard**.
+On the top right, click the **Create content** button.
+In the UDW a new **Images** tab appears, listing all images from the repository.
 
 ![Image tab in UDW](udw_image_tab.png)
 
diff --git a/docs/administration/back_office/browser/browser.md b/docs/administration/back_office/browser/browser.md
index 318123c085..a0da7896d4 100644
--- a/docs/administration/back_office/browser/browser.md
+++ b/docs/administration/back_office/browser/browser.md
@@ -4,12 +4,13 @@ description: Customize the configuration of the content browser.
 
 # Browser
 
-Browsing the content structure and selecting content from the Repository uses the module Universal Discovery Widget (UDW).
+Browsing the content structure and selecting content from the repository uses the module Universal Discovery Widget (UDW).
 UDW has an interactive interface which allows you to create, move or copy content items.
 
 ## Using UDW
 
-UDW requires that you provide configuration by using the `ibexa_udw_config` Twig helper. This configuration must be spread to the props of the component itself.
+UDW requires that you provide configuration by using the `ibexa_udw_config` Twig helper.
+This configuration must be spread to the props of the component itself.
 
 ```html+twig
 <button data-udw-config="{{ ibexa_udw_config('single') }}">
@@ -17,7 +18,8 @@ UDW requires that you provide configuration by using the `ibexa_udw_config` Twig
 </button>
 ```
 
-`single` configuration is one of the default configuration provided. You can also do your [own configuration](#add-new-configuration).
+`single` configuration is one of the default configuration provided.
+You can also do your [own configuration](#add-new-configuration).
 
 With plain JS:
 
diff --git a/docs/administration/back_office/content_tab_switcher.md b/docs/administration/back_office/content_tab_switcher.md
index a7c9af48a0..f163d245e1 100644
--- a/docs/administration/back_office/content_tab_switcher.md
+++ b/docs/administration/back_office/content_tab_switcher.md
@@ -39,6 +39,7 @@ ibexa:
 The default configuration makes the `ibexa_taxonomy_entry_assignment` field always visible in the Meta tab in the content form.
 With this new feature, you can indicate what field types, previously set in the back office content type, are shown in the Meta tab section in the content form.
 You can automatically move all field types from Metadata group to the Meta tab in the content form.
+
 To do it, use the following configuration:
 
 ```yaml
diff --git a/docs/administration/back_office/customize_calendar.md b/docs/administration/back_office/customize_calendar.md
index b3def31e15..d8b1680842 100644
--- a/docs/administration/back_office/customize_calendar.md
+++ b/docs/administration/back_office/customize_calendar.md
@@ -83,7 +83,7 @@ To add an in-memory collection as an event source, create `src/Calendar/Holidays
         $this->createEvent("Event 1", new DateTime("2024-01-01")),
         $this->createEvent("Event 2", new DateTime("2024-01-02")),
         // ...
-    ```    
+    ```
 
 Next, register the event source as a service:
 
diff --git a/docs/administration/back_office/customize_search_suggestion.md b/docs/administration/back_office/customize_search_suggestion.md
index 3c6e66f1dd..426353baa5 100644
--- a/docs/administration/back_office/customize_search_suggestion.md
+++ b/docs/administration/back_office/customize_search_suggestion.md
@@ -30,6 +30,7 @@ After this event, the suggestion collection is sorted by score and truncated to
 !!! tip
 
     You can list listeners and subscribers with the following command:
+
     ``` shell
     php bin/console debug:event BuildSuggestionCollectionEvent
     ```
@@ -113,7 +114,7 @@ Here is a complete `assets/js/admin.search.autocomplete.product.js` from the pro
 [[= include_file('code_samples/back_office/search/assets/js/admin.search.autocomplete.product.js') =]]
 ```
 
-To be loaded in the back office layout, this file must be added to Webpack entry `ibexa-admin-ui-layout-js`. 
+To be loaded in the back office layout, this file must be added to Webpack entry `ibexa-admin-ui-layout-js`.
 At the end of `webpack.config.js`, add it by using `ibexaConfigManager`:
 
 ``` javascript
diff --git a/docs/administration/back_office/multifile_upload.md b/docs/administration/back_office/multifile_upload.md
index 9e6e4ac3ba..29fe248a7b 100644
--- a/docs/administration/back_office/multifile_upload.md
+++ b/docs/administration/back_office/multifile_upload.md
@@ -9,8 +9,7 @@ It provides an interface to publish content based on dropped files while uploadi
 
 !!! caution
 
-    If you want to load the multi-file upload module, you need to load the JS code for it in your view,
-    as it's not available by default.
+    If you want to load the multi-file upload module, you need to load the JS code for it in your view, as it's not available by default.
 
 ## Use multi-file upload
 
diff --git a/docs/administration/back_office/notifications.md b/docs/administration/back_office/notifications.md
index 73e9c7fb11..0a360391de 100644
--- a/docs/administration/back_office/notifications.md
+++ b/docs/administration/back_office/notifications.md
@@ -85,8 +85,7 @@ Finally, you need to add an entry to `config/services.yaml`:
 
 ## Notification timeout
 
-To define the timeout for hiding Back-Office notification bars, per notification type,
-use the `ibexa.system.<scope>.notifications.<notification_type>.timeout` [configuration key](configuration.md#configuration-files):
+To define the timeout for hiding Back-Office notification bars, per notification type, use the `ibexa.system.<scope>.notifications.<notification_type>.timeout` [configuration key](configuration.md#configuration-files):
 
 ``` yaml
 ibexa:
@@ -103,4 +102,5 @@ ibexa:
                     timeout: 0
 ```
 
-The values shown above are the defaults. `0` means the notification doesn't hide automatically.
+The values shown above are the defaults.
+`0` means the notification doesn't hide automatically.

From 2c1ee6b9d57a23d8b6505cd8716870fbcfb1ca74 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Wed, 16 Oct 2024 10:46:13 +0200
Subject: [PATCH 26/77] Fixes in 'configuration' section

---
 .../configuration/configuration.md            |  3 +-
 .../configuration/dynamic_configuration.md    |  2 +-
 .../configuration/repository_configuration.md | 40 +++++++++----------
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/docs/administration/configuration/configuration.md b/docs/administration/configuration/configuration.md
index 9622d20ae9..9aa24dbbeb 100644
--- a/docs/administration/configuration/configuration.md
+++ b/docs/administration/configuration/configuration.md
@@ -53,7 +53,8 @@ Basic configuration handling in [[= product_name =]] is similar to what is commo
 You can define key/value pairs in your configuration files.
 
 Internally and by convention, keys follow a *dot syntax*, where the different segments follow your configuration hierarchy.
-Keys are usually prefixed by a *namespace* corresponding to your application. All kinds of values are accepted, including arrays and deep hashes.
+Keys are usually prefixed by a *namespace* corresponding to your application.
+All kinds of values are accepted, including arrays and deep hashes.
 
 For configuration that is meant to be exposed to an end-user (or end-developer), it's usually a good idea to also [implement semantic configuration]([[= symfony_doc =]]/components/config/definition.html).
 
diff --git a/docs/administration/configuration/dynamic_configuration.md b/docs/administration/configuration/dynamic_configuration.md
index 574fd8ea67..09f9cfbf42 100644
--- a/docs/administration/configuration/dynamic_configuration.md
+++ b/docs/administration/configuration/dynamic_configuration.md
@@ -93,7 +93,7 @@ class Service
     {
         $this->configResolver = $configResolver;
     }
-    
+
     public function someMethodThatNeedConfig()
     {
         $configValue = $this->configResolver->getParameter('my_param', 'myapp');
diff --git a/docs/administration/configuration/repository_configuration.md b/docs/administration/configuration/repository_configuration.md
index f67951106a..c620fb07c2 100644
--- a/docs/administration/configuration/repository_configuration.md
+++ b/docs/administration/configuration/repository_configuration.md
@@ -1,16 +1,17 @@
 ---
-description: Configure Repository connections, archive limits, field groups and other settings.
+description: Configure repository connections, archive limits, field groups and other settings.
 ---
 
 # Repository configuration
 
-You can define several Repositories within a single application. However, you can only use one per site.
+You can define several repositories within a single application.
+However, you can only use one per site.
 
 ## Repository connection
 
 ### Using default values
 
-To use the default Repository connection, you don't need to specify its details:
+To use the default repository connection, you don't need to specify its details:
 
 ``` yaml
 ibexa:
@@ -24,13 +25,13 @@ ibexa:
 
 !!! note "Legacy storage engine"
 
-    Legacy storage engine is the default storage engine for the Repository.
+    Legacy storage engine is the default storage engine for the repository.
 
     It uses [Doctrine DBAL](https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/) (Database Abstraction Layer).
     Database settings are supplied by [DoctrineBundle](https://github.com/doctrine/DoctrineBundle).
     As such, you can refer to [DoctrineBundle's documentation](https://github.com/doctrine/DoctrineBundle/blob/2.7.x/Resources/doc/configuration.rst#doctrine-dbal-configuration).
 
-If no Repository is specified for a SiteAccess or SiteAccess group, the first Repository defined under `ibexa.repositories` is used:
+If no repository is specified for a SiteAccess or SiteAccess group, the first repository defined under `ibexa.repositories` is used:
 
 ``` yaml
 ibexa:
@@ -43,11 +44,11 @@ ibexa:
             # ...
 ```
 
-#### Multisite URI matching with multi-Repository setup
+#### Multisite URI matching with multi-repository setup
 
-You can use only one Repository (database) per domain.
-This doesn't prohibit using [different Repositories](persistence_cache.md#multi-repository-setup) on different subdomains.
-However, when using URI matching for multisite setup, all SiteAccesses sharing domain also need to share Repository.
+You can use only one repository (database) per domain.
+This doesn't prohibit using [different repositories](persistence_cache.md#multi-repository-setup) on different subdomains.
+However, when using URI matching for multisite setup, all SiteAccesses sharing domain also need to share repository.
 For example:
 
 - `ibexa.co` domain can use `ibexa_repo`
@@ -62,8 +63,7 @@ Invalid configuration causes problems for different parts of the system, for exa
 
 ### Entity manager
 
-If you use the [Doctrine entity manager](https://www.doctrine-project.org/projects/doctrine-orm/en/2.10/tutorials/getting-started.html#obtaining-the-entitymanager),
-you're unable to connect different SiteAccesses to different databases.
+If you use the [Doctrine entity manager](https://www.doctrine-project.org/projects/doctrine-orm/en/2.10/tutorials/getting-started.html#obtaining-the-entitymanager), you're unable to connect different SiteAccesses to different databases.
 
 To have this possibility, you need to use the SiteAccess-aware entity manager: `ibexa.doctrine.orm.entity_manager`.
 
@@ -84,12 +84,11 @@ For more information, see [DoctrineBundle documentation](https://symfony.com/doc
 
 !!! note
 
-    In contrast with DoctrineBundle, when using the SiteAccess-aware entity manager you need to explicitly set all options:
-    `dir` (it still accepts relative path in case of bundles), `prefix`, `type`, and `is_bundle`.
+    In contrast with DoctrineBundle, when using the SiteAccess-aware entity manager you need to explicitly set all options: `dir` (it still accepts relative path in case of bundles), `prefix`, `type`, and `is_bundle`.
 
 ### Defining custom connection
 
-You can also explicitly define a custom Repository connection:
+You can also explicitly define a custom repository connection:
 
 ``` yaml
 doctrine:
@@ -167,7 +166,8 @@ repositories:
             default: content
 ```
 
-These identifiers can be given human-readable values and can be translated. Those values are used when editing content types.
+These identifiers can be given human-readable values and can be translated.
+Those values are used when editing content types.
 The translation domain is `ibexa_fields_groups`.
 This example in `translations/ibexa_fields_groups.en.yaml` defines English names for field groups:
 
@@ -179,7 +179,7 @@ user_data: User data
 
 ## Limit of archived content versions
 
-`default_version_archive_limit` controls the number of archived versions per content item that are stored in the Repository.
+`default_version_archive_limit` controls the number of archived versions per content item that are stored in the repository.
 By default it's set to 5. This setting is configured in the following way (typically in `ibexa.yaml`):
 
 ``` yaml
@@ -223,7 +223,7 @@ The command takes the following optional parameters:
 
 - `status` or `t` - status of versions to remove: `draft`, `archived` or `all`
 - `keep` or `k` - number of versions to keep
-- `user` or `u` - the User that the command is performed as. The User must have the `content/remove`, `content/read` and `content/versionread` policies. By default the `administrator` user is applied.
+- `user` or `u` - the User that the command is performed as. The user must have the `content/remove`, `content/read` and `content/versionread` policies. By default the `administrator` user is applied.
 - `excluded-content-types` - exclude versions of one or multiple content types from the cleanup procedure and separate multiple content types identifiers with the comma.
 
 `ibexa:content:cleanup-versions --status <status name> --keep <number of versions> --user <user name> --excluded-content-types article,blog_post`
@@ -272,13 +272,13 @@ parameters:
 
 ## Repository-aware configuration
 
-In your custom development, you can create Repository-aware configuration settings.
+In your custom development, you can create repository-aware configuration settings.
 
-This enables you to use different settings for different Repositories.
+This enables you to use different settings for different repositories.
 
 !!! tip "SiteAccess-aware configuration"
 
-    If you need to use different settings per SiteAccess, not per Repository, see [SiteAccess-aware configuration](siteaccess_aware_configuration.md).
+    If you need to use different settings per SiteAccess, not per repository, see [SiteAccess-aware configuration](siteaccess_aware_configuration.md).
 
 To do this, create a parser that implements `Ibexa\Bundle\Core\DependencyInjection\Configuration\RepositoryConfigParserInterface`:
 

From 048289e9b4544dd926fa5624526a0c7832cba9e0 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Wed, 16 Oct 2024 11:04:10 +0200
Subject: [PATCH 27/77] Fixes in 'content organization' section

---
 .../content_organization/content_types.md     |  7 ++--
 .../content_organization/object_states.md     |  2 +-
 .../content_organization/sections.md          | 32 ++++++++++---------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/docs/administration/content_organization/content_types.md b/docs/administration/content_organization/content_types.md
index 484d99c1ed..90bf47672f 100644
--- a/docs/administration/content_organization/content_types.md
+++ b/docs/administration/content_organization/content_types.md
@@ -24,14 +24,15 @@ For a detailed overview of the content model, see [Content model overview](conte
 
 Each content type is characterized by a set of metadata which define the general behavior of its instances:
 
-**Name** – a user-friendly name that describes the content type. This name is used in the interface, but not internally by the system.
+**Name** – a user-friendly name that describes the content type.
+This name is used in the interface, but not internally by the system.
 It can consist of letters, digits, spaces, and special characters (it's mandatory and the maximum length is 255 characters).
 
 !!! note
 
     Even if your content type defines a field intended as a name for the content item (for example, a title of an article or product name), don't confuse it with this Name, which is a piece of metadata, not a field.
 
-**Identifier** – an identifier for internal use in configuration files, templates, PHP code, etc. 
+**Identifier** – an identifier for internal use in configuration files, templates, PHP code, etc.
 It must be unique, can only contain lowercase letters, digits, and underscores (it's mandatory and the maximum length is 50 characters).
 
 **Description** – a detailed description of the content type (optional).
@@ -42,7 +43,7 @@ Each field identifier has to be surrounded with angle brackets.
 Text outside the angle brackets is included literally.
 If no pattern is provided, the system automatically uses the first field (optional).
 
-**URL alias name pattern** – a pattern which controls how the virtual URLs of the Locations are generated when content items are created based on this content type.
+**URL alias name pattern** – a pattern which controls how the virtual URLs of the locations are generated when content items are created based on this content type.
 Only the last part of the virtual URL is affected.
 The pattern works in the same way as the content name pattern.
 Text outside the angle brackets is converted using the selected method of URL transformation.
diff --git a/docs/administration/content_organization/object_states.md b/docs/administration/content_organization/object_states.md
index 876dd54779..4ca61ef2ce 100644
--- a/docs/administration/content_organization/object_states.md
+++ b/docs/administration/content_organization/object_states.md
@@ -2,7 +2,7 @@
 description: Object states are user-defined states that can be assigned to content items.
 ---
 
-## Object States
+# Object States
 
 Object states are user-defined states that can be assigned to content items.
 they're contained in groups.
diff --git a/docs/administration/content_organization/sections.md b/docs/administration/content_organization/sections.md
index 218bd6ca78..2a2a369537 100644
--- a/docs/administration/content_organization/sections.md
+++ b/docs/administration/content_organization/sections.md
@@ -2,36 +2,38 @@
 description: Sections are used to divide content items in the tree.
 ---
 
-## Sections
+# Sections
 
 Sections are used to divide content items in the tree into groups that are more manageable by content editors.
-Division into Sections allows you, among others, to set [permissions](permission_overview.md) for only a part of the tree.
+Division into sections allows you, among others, to set [permissions](permission_overview.md) for only a part of the tree.
 
 ![Sections screen](admin_panel_sections.png "Sections screen")
 
-Technically, a Section is a number, a name, and an identifier.
-Content items are placed in Sections by being assigned the Section ID. One item can be in only one Section.
+Technically, a section is a number, a name, and an identifier.
+Content items are placed in sections by being assigned the section ID.
+One item can be in only one section.
 
-When a new content item is created, its Section ID is set to the default Section (which is usually Standard).
-When the item is published it is assigned to the same Section as its parent.
-Because content must always be in a Section, unassigning happens by choosing a different Section to move it into.
-If a content item has multiple Location assignments then it is always the Section ID of the item referenced by the parent of the main Location that is used.
-In addition, if the main Location of a content item with multiple Location assignments is changed then the Section ID of that item is updated.
+When a new content item is created, its section ID is set to the default section (which is usually Standard).
+When the item is published it is assigned to the same section as its parent.
+Because content must always be in a section, unassigning happens by choosing a different section to move it into.
+If a content item has multiple location assignments then it is always the section ID of the item referenced by the parent of the main location that is used.
+In addition, if the main location of a content item with multiple location assignments is changed then the section ID of that item is updated.
 
-When content is moved to a different Location, the item itself and all of its subtree are assigned to the Section of the new Location.
+When content is moved to a different location, the item itself and all of its subtree are assigned to the section of the new location.
 It works only for copy and move.
-Assigning a new Section to a parent content item doesn't affect the subtree, meaning that subtree cannot currently be updated this way.
+Assigning a new section to a parent content item doesn't affect the subtree, meaning that subtree cannot currently be updated this way.
 
 Sections can only be removed if no content items are assigned to them.
 Even then, it should be done carefully.
-When a Section is deleted, it's only its definition itself that is removed.
-Other references to the Section remain and thus the system most likely loses consistency.
+When a section is deleted, it's only its definition itself that is removed.
+Other references to the section remain and thus the system most likely loses consistency.
 
 !!! caution
 
-    Removing Sections may corrupt permission settings, template output and other things in the system.
+    Removing sections may corrupt permission settings, template output and other things in the system.
 
-Section ID numbers aren't recycled. If a Section is removed, its ID number cannot be reused when a new Section is created.
+Section ID numbers aren't recycled.
+If a section is removed, its ID number cannot be reused when a new section is created.
 
 ### Registering users
 

From cfc3b8dbe66b83a358e54d731a94a63cdfbd60a3 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Wed, 16 Oct 2024 11:35:27 +0200
Subject: [PATCH 28/77] Fixes

---
 .../dashboard/configure_default_dashboard.md             | 3 +--
 docs/administration/recent_activity/recent_activity.md   | 9 ++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/docs/administration/dashboard/configure_default_dashboard.md b/docs/administration/dashboard/configure_default_dashboard.md
index 7d8fa52315..b373f2ec06 100644
--- a/docs/administration/dashboard/configure_default_dashboard.md
+++ b/docs/administration/dashboard/configure_default_dashboard.md
@@ -24,8 +24,7 @@ ibexa:
                 container_content_type_identifier: folder
 ```
 
-Configuration can be set per [SiteAccess](multisite_configuration.md#siteaccess-configuration)
-or [SiteAccess group](multisite_configuration.md#siteaccess-groups).
+Configuration can be set per [SiteAccess](multisite_configuration.md#siteaccess-configuration) or [SiteAccess group](multisite_configuration.md#siteaccess-groups).
 
 All the settings in the configuration are reflected in the back office.
 
diff --git a/docs/administration/recent_activity/recent_activity.md b/docs/administration/recent_activity/recent_activity.md
index 7d9fcbbf4f..9ff3497970 100644
--- a/docs/administration/recent_activity/recent_activity.md
+++ b/docs/administration/recent_activity/recent_activity.md
@@ -45,8 +45,7 @@ For every exact hour, the cronjob line is:
 The [`activity_log/read`](policies.md#activity-log) policy gives a role the access to the **Admin** -> **Activity list**, the dashboard's **Recent activity** block, and the user profile's **Recent activity**.
 It can be limited to "Only own logs" ([`ActivityLogOwner`](limitation_reference.md#activitylogowner-limitation)).
 
-The policy should be given to every roles having access to the back office, at least with the `ActivityLogOwner` owner limitation,
-to allow them to use the "Recent activity" block in the [default dashboard](configure_default_dashboard.md) or their [custom dashboard](customize_dashboard.md).
+The policy should be given to every roles having access to the back office, at least with the `ActivityLogOwner` owner limitation, to allow them to use the "Recent activity" block in the [default dashboard](configure_default_dashboard.md) or their [custom dashboard](customize_dashboard.md).
 This policy is required to view [activity log in user profile]([[= user_doc =]]/recent_activity/recent_activity/#user-profile), if [profile]([[= user_doc =]]/getting_started/get_started/#edit-user-profile) is enabled.
 
 !!! caution
@@ -164,7 +163,7 @@ This stored name can be used at the time of displaying information whether the a
 #### Context group
 
 If you log several related entries at once, you can group them into a context.
-Context is a set of actions done for the same purpose, for example, it could group the actions of a CRON that fetches third party data and updates Content items.
+Context is a set of actions done for the same purpose, for example, it could group the actions of a CRON that fetches third party data and updates content items.
 The built-in contexts include:
 
 - `web` - groups actions made in the back office, like the update and the publishing of a new content item's version
@@ -174,10 +173,10 @@ A context group counts as one item in regard to `activity_logs_limit` configurat
 
 To open a context group, use `ActivityLogService::prepareContext` which has two arguments:
 
-- `$source` - describes, usually through a short identifier, what is triggering the set of actions. 
+- `$source` - describes, usually through a short identifier, what is triggering the set of actions.
 For example, some already existing sources are `web` (incl. actions from the back office), `graphql`, `rest` and `migration`
 - `$description` - an optional, more specific contextualisation.
-For example, `migration` context source is associated with the migration file name in its context description
+For example, `migration` context source is associated with the migration file name in its context description.
 
 To close a context group, use `ActivityLogService::dismissContext`.
 

From 078e3cba437e4123dbb4d54d4b276a2a25a0d3b7 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Wed, 16 Oct 2024 11:49:35 +0200
Subject: [PATCH 29/77] Fixes in'api' section

---
 docs/api/event_reference/event_reference.md   |  6 ++---
 docs/api/event_reference/other_events.md      |  2 +-
 docs/api/event_reference/page_events.md       |  6 ++---
 docs/api/event_reference/section_events.md    |  4 +--
 .../event_reference/segmentation_events.md    |  2 +-
 docs/api/graphql/graphql.md                   |  5 ++--
 docs/api/graphql/graphql_custom_ft.md         |  3 +--
 docs/api/graphql/graphql_customization.md     |  3 +--
 docs/api/graphql/graphql_queries.md           | 22 ++++++++--------
 docs/api/php_api/php_api.md                   | 25 ++++++++++---------
 docs/api/rest_api/rest_api_authentication.md  |  6 +++--
 .../rest_api/rest_api_usage/rest_requests.md  |  2 +-
 .../rest_api/rest_api_usage/rest_responses.md |  4 +--
 .../rest_api_usage/testing_rest_api.md        |  7 +++---
 14 files changed, 46 insertions(+), 51 deletions(-)

diff --git a/docs/api/event_reference/event_reference.md b/docs/api/event_reference/event_reference.md
index 9bae388561..014b9afec0 100644
--- a/docs/api/event_reference/event_reference.md
+++ b/docs/api/event_reference/event_reference.md
@@ -8,11 +8,9 @@ page_type: reference
 [[= product_name =]] dispatches events during different actions.
 You can subscribe to these events to extend the functionality of the system.
 
-In most cases, two events are dispatched for every action,
-one before the action is completed, and one after.
+In most cases, two events are dispatched for every action, one before the action is completed, and one after.
 
-For example, copying a content item is connected with two events:
-`BeforeCopyContentEvent` and `CopyContentEvent`.
+For example, copying a content item is connected with two events: `BeforeCopyContentEvent` and `CopyContentEvent`.
 
 ``` php
 <?php
diff --git a/docs/api/event_reference/other_events.md b/docs/api/event_reference/other_events.md
index 8abf2d95e0..c8d07ffcc0 100644
--- a/docs/api/event_reference/other_events.md
+++ b/docs/api/event_reference/other_events.md
@@ -51,7 +51,7 @@ The following events are dispatched when changing the user settings available in
 |`BeforeSetUserPreferenceEvent`|`UserPreferenceService::setUserPreference`|`UserPreferenceSetStruct[] $userPreferenceSetStructs`|
 |`SetUserPreferenceEvent`|`UserPreferenceService::setUserPreference`|`UserPreferenceSetStruct[] $userPreferenceSetStructs`|
 
-## DAM assets 
+## DAM assets
 
 | Event | Dispatched by | Properties |
 |---|---|---|
diff --git a/docs/api/event_reference/page_events.md b/docs/api/event_reference/page_events.md
index d9cb13ce08..c9c74c2231 100644
--- a/docs/api/event_reference/page_events.md
+++ b/docs/api/event_reference/page_events.md
@@ -1,5 +1,5 @@
 ---
-description: Events that are triggered when working with Pages and Page blocks.
+description: Events that are triggered when working with pages and page blocks.
 edition: experience
 page_type: reference
 ---
@@ -17,7 +17,7 @@ page_type: reference
 
 ## Page Builder
 
-The following events are dispatched when editing a Page in the Page Builder.
+The following events are dispatched when editing a page in the Page Builder.
 
 | Event | Dispatched by | Properties |
 |---|---|---|
@@ -27,7 +27,7 @@ The following events are dispatched when editing a Page in the Page Builder.
 
 ## Page blocks
 
-The following events are dispatched when editing a Page block.
+The following events are dispatched when editing a page block.
 
 | Event | Dispatched by | Properties |
 |---|---|---|
diff --git a/docs/api/event_reference/section_events.md b/docs/api/event_reference/section_events.md
index 34a010d41f..dfc7234992 100644
--- a/docs/api/event_reference/section_events.md
+++ b/docs/api/event_reference/section_events.md
@@ -1,5 +1,5 @@
 ---
-description: Events that are triggered when working with Sections.
+description: Events that are triggered when working with sections.
 page_type: reference
 ---
 
@@ -14,7 +14,7 @@ page_type: reference
 |`BeforeUpdateSectionEvent`|`SectionService::updateSection`|`Section $section`</br>`SectionUpdateStruct $sectionUpdateStruct`</br>`Section|null $updatedSection`|
 |`UpdateSectionEvent`|`SectionService::updateSection`|`Section $section`</br>`SectionUpdateStruct $sectionUpdateStruct`</br>`Section $updatedSection`|
 
-## Assigning Sections
+## Assigning sections
 
 | Event | Dispatched by | Properties |
 |---|---|---|
diff --git a/docs/api/event_reference/segmentation_events.md b/docs/api/event_reference/segmentation_events.md
index 26f5ad3a6e..91967f6d4c 100644
--- a/docs/api/event_reference/segmentation_events.md
+++ b/docs/api/event_reference/segmentation_events.md
@@ -1,5 +1,5 @@
 ---
-description: Events that are triggered when working with Segments.
+description: Events that are triggered when working with segments.
 page_type: reference
 ---
 
diff --git a/docs/api/graphql/graphql.md b/docs/api/graphql/graphql.md
index 9983e33a6f..1274a88e46 100644
--- a/docs/api/graphql/graphql.md
+++ b/docs/api/graphql/graphql.md
@@ -29,8 +29,7 @@ GraphQL schema cannot be generated for names that don't follow the [GraphQL spec
 This concerns image variations, content types, content type groups, product types, and field definition identifiers.
 
 It's recommended to rename the relevant identifiers. Failure to generate schema is registered in logs.
-To find identifiers that aren't included in the schema, look for "Skipped schema generation" log messages, for example:
-`Skipped schema generation for Image Variation`.
+To find identifiers that aren't included in the schema, look for "Skipped schema generation" log messages, for example: `Skipped schema generation for Image Variation`.
 
 ## Domain schema
 
@@ -44,7 +43,7 @@ With the queries you can inspect:
 - the existing types
 - details of content types, and their fields in the context of developing your own application
 
-You can request additional content information such as the Section or Objects states, available under the `_info` field.
+You can request additional content information such as the section or Objects states, available under the `_info` field.
 
 You can also query content type and content type group information through the `_info` and `_types` fields.
 
diff --git a/docs/api/graphql/graphql_custom_ft.md b/docs/api/graphql/graphql_custom_ft.md
index 2bee87bc74..30dc674d6d 100644
--- a/docs/api/graphql/graphql_custom_ft.md
+++ b/docs/api/graphql/graphql_custom_ft.md
@@ -47,8 +47,7 @@ Compiler pass example that should be placed in `src/DependencyInjection/Compiler
 ### Map with a custom `FieldDefinitionMapper`
 
 The `FieldDefinitionMapper` API uses service decorators.
-To register your own mapper, make it decorate the
-`Ibexa\GraphQL\Schema\Domain\Content\Mapper\FieldDefinition\DecoratingFieldDefinitionMapper` service:
+To register your own mapper, make it decorate the `Ibexa\GraphQL\Schema\Domain\Content\Mapper\FieldDefinition\DecoratingFieldDefinitionMapper` service:
 
 ```yaml
 services:
diff --git a/docs/api/graphql/graphql_customization.md b/docs/api/graphql/graphql_customization.md
index 6a2c6aa5c1..5ebf97b4f0 100644
--- a/docs/api/graphql/graphql_customization.md
+++ b/docs/api/graphql/graphql_customization.md
@@ -12,8 +12,7 @@ You can use it if your application requires custom GraphQL resources, for instan
 
 To do so, create a `config/graphql/types/Query.types.yaml` file. It is used as the GraphQL query root.
 
-In that file, add new fields that use any custom type or custom logic you require, based
-on [overblog/GraphQLBundle](https://github.com/overblog/GraphQLBundle).
+In that file, add new fields that use any custom type or custom logic you require, based on [overblog/GraphQLBundle](https://github.com/overblog/GraphQLBundle).
 
 The custom schema should be created only after generating other schemas to avoid problems, especially if the custom schema depends on other schema elements.
 For example, `Type "Domain" inherited by "Query" not found.`.
diff --git a/docs/api/graphql/graphql_queries.md b/docs/api/graphql/graphql_queries.md
index f46e604c29..e2476eabc4 100644
--- a/docs/api/graphql/graphql_queries.md
+++ b/docs/api/graphql/graphql_queries.md
@@ -10,7 +10,7 @@ You can query a single content item or a list of content items using fields defi
 
 ### Get a content item
 
-To get a specific content item by its content ID, Location ID, or URL alias, use its relevant singular field, for example `article`, `folder`, or `image`.
+To get a specific content item by its content ID, location ID, or URL alias, use its relevant singular field, for example `article`, `folder`, or `image`.
 
 ```
 {
@@ -44,10 +44,10 @@ Response:
 }
 ```
 
-You can request any Fields of the content item. In the example above, these are `title` and `author`.
+You can request any fields of the content item. In the example above, these are `title` and `author`.
 
 You can also query the generic `item` object.
-The `item` object references a content item, but you can also get its [Location information](#querying-locations).
+The `item` object references a content item, but you can also get its [location information](#querying-locations).
 The query accepts `locationId`, `remoteId`, and `urlAlias` as arguments.
 
 ```
@@ -72,7 +72,7 @@ Response:
 
 #### Get language versions
 
-To get Fields of a content item in a specific language, use the `language` argument.
+To get fields of a content item in a specific language, use the `language` argument.
 The language must be configured for the current SiteAccess.
 
 ```
@@ -246,9 +246,9 @@ Response:
 You can get the Location object from any item by querying for `_location` or `_allLocations`.
 When you use `_location`, the API returns:
 
-- the Location specified in the `locationId` or `urlAlias` argument
-- the Location based on the current SiteAccess
-- the main Location
+- the location specified in the `locationId` or `urlAlias` argument
+- the location based on the current SiteAccess
+- the main location
 
 ```
 {
@@ -312,8 +312,7 @@ Response:
 
 ## Getting children of a Location
 
-To get a [Location's](#querying-locations) children,
-it's recommended to use the [Query Field](content_queries.md#content-query-field).
+To get a [location's](#querying-locations) children, it's recommended to use the [Query field](content_queries.md#content-query-field).
 
 Alternatively, you can query the `children` property of an `item` or `content` object:
 
@@ -607,7 +606,7 @@ To filter products based on attributes:
 }
 
 ```
- 
+
 If the attribute type (in this case, `measure`) cannot be found in the schema, the response is:
 
 ```
@@ -661,8 +660,7 @@ You can also query attributes by providing the attribute type:
 
 !!! note
 
-    You need to use aliases (for example, `sizeValue`) when querying attributes by the attribute type
-    due to the conflicting return types.
+    You need to use aliases (for example, `sizeValue`) when querying attributes by the attribute type due to the conflicting return types.
 
 Response:
 
diff --git a/docs/api/php_api/php_api.md b/docs/api/php_api/php_api.md
index 68c4927b93..af237b935f 100644
--- a/docs/api/php_api/php_api.md
+++ b/docs/api/php_api/php_api.md
@@ -7,14 +7,14 @@ page_type: reference
 
 The [public PHP API](../php_api_reference/) enables you to interact with [[= product_name =]]'s Repository and content model from your PHP code.
 
-You can use it to create, read, update, manage, and delete all objects available in [[= product_name =]], namely content and related objects such as Sections, Locations, content types, or languages.
+You can use it to create, read, update, manage, and delete all objects available in [[= product_name =]], namely content and related objects such as sections, locations, content types, or languages.
 
 The PHP API is built on top of a layered architecture, including a persistence SPI that abstracts storage.
 Using the API ensures that your code is forward compatible with future releases based on other storage engines.
 
 ## Using API services
 
-The API provides access to Content, User, content types, and other features through various services.
+The API provides access to content, user, content types, and other features through various services.
 
 The full list of available services covers:
 
@@ -48,7 +48,7 @@ You can access the PHP API by injecting relevant services into your code:
 
 - By using [auto-wiring]([[=symfony_doc=]]/service_container/autowiring.html), and the service classname in the `Ibexa\Contracts` namespace (see `bin/console debug:autowiring | grep Ibexa.Contracts`).
 - By using [service parameters]([[=symfony_doc=]]/service_container.html#service-parameters), and service aliases (see `bin/console debug:autowiring | grep ibexa.api`).
-- By using the Repository's `get[ServiceName]()` methods: [`Repository::getContentService()`](php_api_reference/classes/Ibexa-Contracts-Core-Repository-Repository.html#method_getContentService), [`getUserService()`](php_api_reference/classes/Ibexa-Contracts-Core-Repository-Repository.html#method_getUserService), etc.
+- By using the repository's `get[ServiceName]()` methods: [`Repository::getContentService()`](php_api_reference/classes/Ibexa-Contracts-Core-Repository-Repository.html#method_getContentService), [`getUserService()`](php_api_reference/classes/Ibexa-Contracts-Core-Repository-Repository.html#method_getUserService), etc.
   (Prefer injecting several Repository's dedicated services instead of the whole Repository if the Repository itself isn't needed.)
 
 !!! caution
@@ -66,8 +66,8 @@ Value objects come with their own properties, such as `$content->id` or `$locati
 
 ### Creating and updating objects
 
-Value objects fetch data from the Repository and are read-only.
-To create and modify Repository values, use data structures, such as [`ContentService::newContentCreateStruct()`](https://github.com/ibexa/core/blob/v4.6.6/src/contracts/Repository/ContentService.php#L572) or [`LocationService::newLocationUpdateStruct()`](https://github.com/ibexa/core/blob/v4.6.6/src/contracts/Repository/LocationService.php#L238).
+Value objects fetch data from the repository and are read-only.
+To create and modify repository values, use data structures, such as [`ContentService::newContentCreateStruct()`](https://github.com/ibexa/core/blob/v4.6.6/src/contracts/Repository/ContentService.php#L572) or [`LocationService::newLocationUpdateStruct()`](https://github.com/ibexa/core/blob/v4.6.6/src/contracts/Repository/LocationService.php#L238).
 
 ### Value info objects
 
@@ -84,7 +84,8 @@ For instance, `ContentInfo` contains `currentVersionNo` or `remoteId`, while `Co
 
 ## Authentication
 
-One of the responsibilities of the Repository is user authentication. Every action is executed *as* a user.
+One of the responsibilities of the repository is user authentication.
+Every action is executed *as* a user.
 
 When using the PHP API, authentication is performed in three ways:
 
@@ -94,9 +95,9 @@ When using the PHP API, authentication is performed in three ways:
 
 ### Back office authentication
 
-When actions are performed through the back office, they're executed as the logged-in User.
-This User's permissions affects the behavior of the repository.
-The User may, for example, not be allowed to create content, or view a particular Section.
+When actions are performed through the back office, they're executed as the logged-in user.
+This user's permissions affects the behavior of the repository.
+The user may, for example, not be allowed to create content, or view a particular section.
 
 ### Using `sudo()`
 
@@ -117,9 +118,9 @@ $hiddenLocation = $repository->sudo(function (Repository $repository) use ($loca
 });
 ```
 
-### Setting the Repository user
+### Setting the repository user
 
-In a command line script, the Repository runs as if executed by the anonymous user.
+In a command line script, the repository runs as if executed by the anonymous user.
 While [using `sudo()`](#using-sudo) is the recommended option, you can also set the current user to a user with necessary permissions to achieve the same effect.
 
 To identify as a different user, you need to use the `UserService` together with `PermissionResolver` (in the example `admin` is the login of the administrator user):
@@ -149,7 +150,7 @@ Each API method may throw different exceptions, depending on what it does.
 
 It's good practice to cover every exception you expect to happen.
 
-For example if you're using a command which takes the Content ID as a parameter, the ID may either not exist, or the referenced content item may not be visible to the user.
+For example if you're using a command which takes the content ID as a parameter, the ID may either not exist, or the referenced content item may not be visible to the user.
 
 Both cases should be covered with error messages:
 
diff --git a/docs/api/rest_api/rest_api_authentication.md b/docs/api/rest_api/rest_api_authentication.md
index 9d4aa73fa5..216beb7965 100644
--- a/docs/api/rest_api/rest_api_authentication.md
+++ b/docs/api/rest_api/rest_api_authentication.md
@@ -366,9 +366,11 @@ If the installation has a dedicated host for REST, you can enable HTTP basic aut
     * If the back office SiteAccess matches `//localhost/admin` (through `URIElement`, `Map\URI` or `Regex\URI`), it calls the REST API under `//localhost/api/ibexa/v2` because SiteAccess matching with REST isn't enabled at URL level.
 
     If you enable basic authentication for `pattern: ^/api/ibexa/v2` to use it in your front office across both production and development environments, your development environment's back office cannot work correctly.
-    This back office tries to access REST through the same URL as the front office. Even when logged in back office and using the [X-SiteAccess header](rest_requests.md#siteaccess), the firewall blocks access to REST as you're not logged through basic authentification. Therefore, some back office features don't work.
+    This back office tries to access REST through the same URL as the front office.
+    Even when logged in back office and using the [X-SiteAccess header](rest_requests.md#siteaccess), the firewall blocks access to REST as you're not logged through basic authentification. Therefore, some back office features don't work.
 
-    If basic authentication is used only for REST API, it's better to have a dedicated domain even on a development environment. For example, map an `api.localhost` in your `hosts` file and set the firewall for `host: ^api\.(example\.com|localhost)$`.
+    If basic authentication is used only for REST API, it's better to have a dedicated domain even on a development environment.
+    For example, map an `api.localhost` in your `hosts` file and set the firewall for `host: ^api\.(example\.com|localhost)$`.
 
 ### Usage example
 
diff --git a/docs/api/rest_api/rest_api_usage/rest_requests.md b/docs/api/rest_api/rest_api_usage/rest_requests.md
index 975668d4c2..9ddd3a20e5 100644
--- a/docs/api/rest_api/rest_api_usage/rest_requests.md
+++ b/docs/api/rest_api/rest_api_usage/rest_requests.md
@@ -191,7 +191,7 @@ Most [Sort Clauses](sort_clause_reference.md#sort-clauses) are available too. Th
 The search request has a `Content-Type: application/vnd.ibexa.api.ViewInput+xml` or `+json` header to specify the format of its body's payload.
 The root node is `<ViewInput>` and it has two mandatory children: `<identifier>` and `<Query>`.
 
-You can add `version=1.1` to the `Content-Type` header to support the distinction between `ContentQuery` and `LocationQuery` instead of just `Query` which implicitly looks only for content items.
+You can add `version=1.1` to the `Content-Type` header to support the distinction between `ContentQuery` and `LocationQuery` instead of `Query` which implicitly looks only for content items.
 
 The following examples search for `article` and `news` typed content items everywhere or for content items of all types directly under Location `123`. All those content items must be in the `standard` Section.
 
diff --git a/docs/api/rest_api/rest_api_usage/rest_responses.md b/docs/api/rest_api/rest_api_usage/rest_responses.md
index 3a9614ef66..a2268f239e 100644
--- a/docs/api/rest_api/rest_api_usage/rest_responses.md
+++ b/docs/api/rest_api/rest_api_usage/rest_responses.md
@@ -151,9 +151,7 @@ To enable CORS, add regular expression for an allowed domain using the `.env` va
 
 For example, to allow the JS test above to be executed alongside this page, you could add the following to an `.env` file (like the `.env.local`): `CORS_ALLOW_ORIGIN=^https?://doc.ibexa.co`.
 
-To add several domains, filter on URIs, or change the default (like not allowing all the methods),
-refer to [NelmioCorsBundle Configuration Documentation](https://symfony.com/bundles/NelmioCorsBundle/current/index.html#configuration)
-to learn how to edit `config/packages/nelmio_cors.yaml`.
+To add several domains, filter on URIs, or change the default (like not allowing all the methods), refer to [NelmioCorsBundle Configuration Documentation](https://symfony.com/bundles/NelmioCorsBundle/current/index.html#configuration) to learn how to edit `config/packages/nelmio_cors.yaml`.
 
 ## Response body
 
diff --git a/docs/api/rest_api/rest_api_usage/testing_rest_api.md b/docs/api/rest_api/rest_api_usage/testing_rest_api.md
index 058827af62..4c8ff8403c 100644
--- a/docs/api/rest_api/rest_api_usage/testing_rest_api.md
+++ b/docs/api/rest_api/rest_api_usage/testing_rest_api.md
@@ -10,7 +10,8 @@ Depending on how your browser understands XML, it either downloads the XML file,
 
 The following examples show how to interrogate the REST API using cURL, PHP or JS.
 
-To test further, you can use browser extensions, like [Advanced REST client for Chrome](https://chrome.google.com/webstore/detail/advanced-rest-client/hgmloofddffdnphfgcellkdfbfbjeloo) or [RESTClient for Firefox](https://addons.mozilla.org/en-US/firefox/addon/restclient/), or dedicated tools. For command line users, [HTTPie](https://github.com/httpie/cli) is a good tool.
+To test further, you can use browser extensions, like [Advanced REST client for Chrome](https://chrome.google.com/webstore/detail/advanced-rest-client/hgmloofddffdnphfgcellkdfbfbjeloo) or [RESTClient for Firefox](https://addons.mozilla.org/en-US/firefox/addon/restclient/), or dedicated tools.
+For command line users, [HTTPie](https://github.com/httpie/cli) is a good tool.
 
 ## CLI
 
@@ -48,7 +49,7 @@ To test it, copy-paste this code into your browser console alongside a page from
 
     ```javascript
     const resource = '/api/ibexa/v2/content/objects/52';
-    
+
     fetch(resource, {
         headers: {'Accept': 'application/vnd.ibexa.api.ContentInfo+json'},
     }).then((response) => {
@@ -64,7 +65,7 @@ To test it, copy-paste this code into your browser console alongside a page from
     ```javascript
     const resource = '/api/ibexa/v2/content/objects/52';
     const request = new XMLHttpRequest();
-    
+
     request.open('GET', resource, true);
     request.setRequestHeader('Accept', 'application/vnd.ibexa.api.ContentInfo+json');
     request.onload = function () {

From 3dea47d855f34ad8003577b5e5776549efe68d25 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Wed, 16 Oct 2024 12:00:06 +0200
Subject: [PATCH 30/77] Fixes in 'cdp' section

---
 docs/cdp/cdp_activation/cdp_configuration.md | 6 +++---
 docs/cdp/cdp_data_customization.md           | 4 ++--
 docs/cdp/cdp_guide.md                        | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/cdp/cdp_activation/cdp_configuration.md b/docs/cdp/cdp_activation/cdp_configuration.md
index ba9c2a11b7..cba8400133 100644
--- a/docs/cdp/cdp_activation/cdp_configuration.md
+++ b/docs/cdp/cdp_activation/cdp_configuration.md
@@ -56,11 +56,11 @@ Create a segment group in the back office.
 It serves as a container for all segments data generated by [[= product_name_cdp =]].
 Go to **Admin** -> **Segments** and select **Create**.
 Fill in name and identifier for a segment group.
-Choose wisely, as once connected to CDP Segment Group cannot be changed.
+Choose wisely, as once connected to CDP segment group cannot be changed.
 
-!!! caution "[[= product_name_cdp =]] Segment Group"
+!!! caution "[[= product_name_cdp =]] segment group"
 
-    After you create the Segment Group in the back office and connect it to [[= product_name_cdp =]], you cannot change it in any way, including edit its name.
+    After you create the segment group in the back office and connect it to [[= product_name_cdp =]], you cannot change it in any way, including edit its name.
 
 ![Creating a new segment group](cdp_create_segment_group.png)
 
diff --git a/docs/cdp/cdp_data_customization.md b/docs/cdp/cdp_data_customization.md
index be0ff92c20..e2f8259135 100644
--- a/docs/cdp/cdp_data_customization.md
+++ b/docs/cdp/cdp_data_customization.md
@@ -5,13 +5,13 @@ edition: experience
 
 # Data customization
 ​
-You can customize Content and Product data exported to CDP and you can control what field type information you want to export.
+You can customize content and product data exported to CDP and you can control what field type information you want to export.
 By default, custom field types have basic export functionality.
 It casts their `Value` object to string, thanks to `\Stringable` implementation.
 ​
 ## Export field types
 ​
-Field types are exported with metadata, for example, ID, Field Definition name, type, or value.
+Field types are exported with metadata, for example, ID, field definition name, type, or value.
 You can also provide your own `\Ibexa\Contracts\Cdp\Export\Content\FieldProcessorInterface` instance to extend metadata.
 The provided implementation has to be defined as a service and tagged with `ibexa.cdp.export.content.field_processor`.
 Additionally, you can specify `priority` to override the default behavior.
diff --git a/docs/cdp/cdp_guide.md b/docs/cdp/cdp_guide.md
index 61afc531f4..8527f4ce38 100644
--- a/docs/cdp/cdp_guide.md
+++ b/docs/cdp/cdp_guide.md
@@ -83,7 +83,7 @@ For more information, see [CDP data export](https://doc.ibexa.co/en/latest/cdp/c
 
 ​You can customize content and product data exported to [[= product_name_cdp =]] and control what field type information you want to export.
 With [[= product_name_cdp =]], you can export field types and field type values.
-They're exported with metadata and attributes, for example, ID, Field Definition name, type, or value.
+They're exported with metadata and attributes, for example, ID, field definition name, type, or value.
 
 For more information, see [data customization](https://doc.ibexa.co/en/latest/cdp/cdp_data_customization/#data-customization) documentation in Developer Documentation.
 
@@ -114,7 +114,7 @@ Build extensive customer profiles that include their interactions, habits, and p
 ### Segment groups
 
 Provide a personalized customer experience, group your clients into specified audiences, and provide recommendations depending on the user data.
-Create Segment groups to deliver personalized campaigns to boost engagement and conversion rates.
+Create segment groups to deliver personalized campaigns to boost engagement and conversion rates.
 
 ### Audience Builder
 

From 2bc4569f086a8bae9eda3bbf4376e1ef7025df52 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Wed, 16 Oct 2024 12:08:40 +0200
Subject: [PATCH 31/77] Fixes in 'commerce'

---
 docs/commerce/cart/cart_api.md                 | 18 +++++++++---------
 docs/commerce/checkout/checkout_api.md         |  2 +-
 docs/commerce/checkout/customize_checkout.md   |  8 ++++----
 .../shipping_management/extend_shipping.md     |  3 ++-
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/docs/commerce/cart/cart_api.md b/docs/commerce/cart/cart_api.md
index 575d0246e2..66d2c97086 100644
--- a/docs/commerce/cart/cart_api.md
+++ b/docs/commerce/cart/cart_api.md
@@ -16,7 +16,7 @@ To get carts and work with them, use the `Ibexa\Contracts\Cart\CartServiceInterf
 - carts of registered users use database-based storage
 - anonymous user carts are stored in the PHP session
 
-From the developer's perspective, carts and entries are referenced with a UUID identifier. 
+From the developer's perspective, carts and entries are referenced with a UUID identifier.
 
 ## Get single cart by identifier
 
@@ -28,7 +28,7 @@ To access a single cart, use the `CartServiceInterface::getCart` method:
 
 ## Get multiple carts
 
-To fetch multiple carts, use the `CartServiceInterface::findCarts` method. 
+To fetch multiple carts, use the `CartServiceInterface::findCarts` method.
 It follows the same search Query pattern as other APIs:
 
 ``` php
@@ -51,8 +51,8 @@ To create a cart, use the `CartServiceInterface::createCart` method and provide
 
 ## Update cart metadata
 
-You can update cart metadata after the cart is created. 
-You could do it to support a scenario when, for example, the user changes a currency and the cart should recalculate all item prices to a new currency. 
+You can update cart metadata after the cart is created.
+You could do it to support a scenario when, for example, the user changes a currency and the cart should recalculate all item prices to a new currency.
 To update cart metadata, use the `CartServiceInterface::updateCartMetadata` method:
 
 ``` php
@@ -95,9 +95,9 @@ To remove all products from the cart in a single operation, use the `CartService
 
 ## Check cart validity
 
-Items in cart can become invalid, for example, when item price is unavailable in cart currency, or the product is no longer available. 
-To prevent checking out a cart with invalid items, check cart validity first. 
-To validate the cart, use the `CartServiceInterface::validateCart` method. 
+Items in cart can become invalid, for example, when item price is unavailable in cart currency, or the product is no longer available.
+To prevent checking out a cart with invalid items, check cart validity first.
+To validate the cart, use the `CartServiceInterface::validateCart` method.
 Validation is done with help from the `symfony/validator` component, and the method returns a `Symfony\Component\Validator\ConstraintViolationListInterface` object.
 
 ``` php
@@ -108,7 +108,7 @@ Validation is done with help from the `symfony/validator` component, and the met
 ## Add entry to cart
 
 To add entries (products) to the cart, create an `Ibexa\Contracts\Cart\Value\EntryAddStruct`, where you specify the requested quantity of the product.
-Then pass it to the `CartServiceInterface::addEntry` method: 
+Then pass it to the `CartServiceInterface::addEntry` method:
 
 ``` php
 [[= include_file('code_samples/api/commerce/src/Command/CartCommand.php', 11, 12) =]]
@@ -132,7 +132,7 @@ To remove an entry from the cart, use the `CartServiceInterface::removeEntry` me
 
 ## Update entry metadata
 
-Entries have their own metadata, for example, quantity. 
+Entries have their own metadata, for example, quantity.
 To change entry metadata, use the `CartServiceInterface::updateEntry` method and provide it with `Ibexa\Contracts\Cart\Value\EntryUpdateStruct`.
 
 ``` php
diff --git a/docs/commerce/checkout/checkout_api.md b/docs/commerce/checkout/checkout_api.md
index 2a66e649f2..b45f220587 100644
--- a/docs/commerce/checkout/checkout_api.md
+++ b/docs/commerce/checkout/checkout_api.md
@@ -11,7 +11,7 @@ With `CheckoutServiceInterface`, you manipulate checkouts that are stored in ses
 Checkouts are containers for the `Ibexa\Contracts\Cart\Value\CartInterface` object and all the data provided at each step of the [configurable checkout process](configure_checkout.md).
 
 The checkout process relies on Symfony Workflow, and you can customize each of its steps.
-Each checkout step has its own controller that allows adding forms and external API calls that process data and pass them to `CheckoutService`. 
+Each checkout step has its own controller that allows adding forms and external API calls that process data and pass them to `CheckoutService`.
 Completing a step results in submitting a form and updating the current checkout object.
 At this point Symfony Workflow advances, the next controller takes over, and the whole process continues.
 
diff --git a/docs/commerce/checkout/customize_checkout.md b/docs/commerce/checkout/customize_checkout.md
index c6aaf415c4..5c5e679b15 100644
--- a/docs/commerce/checkout/customize_checkout.md
+++ b/docs/commerce/checkout/customize_checkout.md
@@ -48,7 +48,7 @@ To create a new workflow, for example, `seat_selection_checkout`, use the defaul
 [[= include_file('code_samples/front/shop/checkout/config/packages/checkout.yaml', 17, 19) =]] [[= include_file('code_samples/front/shop/checkout/config/packages/checkout.yaml', 38, 54) =]]
 ```
 
-Then, add a list of transitions. 
+Then, add a list of transitions.
 When defining a new transition, within its metadata, map the transition to its controller, and set other necessary details, such as the next step and label.
 
 ``` yaml hl_lines="2 12"
@@ -280,11 +280,11 @@ ibexa:
         <repository_name>:
             checkout:
                 #"billing" by default
-                billing_address_format: <custom_billing_fieldtype_address_format> 
+                billing_address_format: <custom_billing_fieldtype_address_format>
                 #"shipping" by default
-                shipping_address_format: <custom_shipping_fieldtype_address_format> 
+                shipping_address_format: <custom_shipping_fieldtype_address_format>
                 #used in registration, uses given shipping/billing addresses to pre-populate address forms in select_address checkout step, "customer" by default
-                customer_content_type: <your_ct_identifier_for_customer> 
+                customer_content_type: <your_ct_identifier_for_customer>
 ```
 
 Then, define custom address formats, which, for example, don't include the `locality` field:
diff --git a/docs/commerce/shipping_management/extend_shipping.md b/docs/commerce/shipping_management/extend_shipping.md
index f194bb1fea..8da9d82183 100644
--- a/docs/commerce/shipping_management/extend_shipping.md
+++ b/docs/commerce/shipping_management/extend_shipping.md
@@ -62,7 +62,8 @@ At this point you should be able to create a shipping method based on a custom s
 
 !!! note
 
-    To use this example, you must have regions. If you don't have regions, refer to [Enable purchasing products](enable_purchasing_products.md) for instructions on how to add them.
+    To use this example, you must have regions.
+    If you don't have regions, refer to [Enable purchasing products](enable_purchasing_products.md) for instructions on how to add them.
 
 ### Create options validator
 

From 7b02cc262740b8983650b86cf8be832cf3993b98 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Wed, 16 Oct 2024 12:25:11 +0200
Subject: [PATCH 32/77] Fixes in 'content management' section

---
 .../content_api/browsing_content.md           |  4 +-
 .../content_api/managing_content.md           | 81 ++++++++-----------
 .../content_management_api/section_api.md     | 25 +++---
 .../add_data_migration_matcher.md             |  4 +-
 .../create_data_migration_action.md           |  3 +-
 .../data_migration/data_migration.md          |  6 +-
 .../data_migration/data_migration_actions.md  | 23 +++---
 .../data_migration/data_migration_api.md      |  3 +-
 .../data_migration/exporting_data.md          | 18 ++---
 .../data_migration/importing_data.md          | 49 ++++-------
 .../data_migration/managing_migrations.md     | 24 +++---
 11 files changed, 95 insertions(+), 145 deletions(-)

diff --git a/docs/content_management/content_api/browsing_content.md b/docs/content_management/content_api/browsing_content.md
index 7e04dc9fbd..a765b32b25 100644
--- a/docs/content_management/content_api/browsing_content.md
+++ b/docs/content_management/content_api/browsing_content.md
@@ -122,7 +122,7 @@ To get the creator of the current version and not the content item's owner, you
 
 ### Section
 
-You can find the Section to which a content item belongs through the [`getSection`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-ContentInfo.html#method_getSection) method of the ContentInfo object:
+You can find the section to which a content item belongs through the [`getSection`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-ContentInfo.html#method_getSection) method of the ContentInfo object:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/ViewContentMetaDataCommand.php', 111, 112) =]]
@@ -130,7 +130,7 @@ You can find the Section to which a content item belongs through the [`getSectio
 
 !!! note
 
-    Requesting Section data may be impossible for an anonymous user.
+    Requesting section data may be impossible for an anonymous user.
     Make sure to [authenticate](php_api.md#setting-the-repository-user) as a user with sufficient permissions.
 
 ### Object states
diff --git a/docs/content_management/content_api/managing_content.md b/docs/content_management/content_api/managing_content.md
index 35980bb19d..52a095a084 100644
--- a/docs/content_management/content_api/managing_content.md
+++ b/docs/content_management/content_api/managing_content.md
@@ -6,82 +6,70 @@ description: PHP API enables managing content Locations, content types, content
 
 ## Locations
 
-You can manage [Locations](locations.md) that hold content
-using [`LocationService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-LocationService.html).
+You can manage [Locations](locations.md) that hold content using [`LocationService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-LocationService.html).
 
 !!! tip "Location REST API"
 
-    To learn how to manage Locations using the REST API, see [REST API reference](../../api/rest_api/rest_api_reference/rest_api_reference.html#managing-content-create-new-location-for-content-item).
+    To learn how to manage locations using the REST API, see [REST API reference](../../api/rest_api/rest_api_reference/rest_api_reference.html#managing-content-create-new-location-for-content-item).
 
-### Adding a new Location to a content item
+### Adding a new location to a content item
 
-Every published content item must have at least one Location.
-One content item can have more that one Location, which means it's presented in more than one place
-in the content tree.
+Every published content item must have at least one location.
+One content item can have more that one location, which means it's presented in more than one place in the content tree.
 
-Creating a new Location, like creating content, requires using a struct,
-because a Location value object is read-only.
+Creating a new location, like creating content, requires using a struct, because a location value object is read-only.
 
-To add a new Location to existing content you need to create
-a [`LocationCreateStruct`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-LocationCreateStruct.html)
-and pass it to the [`LocationService::createLocation`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-LocationService.html#method_createLocation) method:
+To add a new location to existing content you need to create a [`LocationCreateStruct`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-LocationCreateStruct.html) and pass it to the [`LocationService::createLocation`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-LocationService.html#method_createLocation) method:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/AddLocationToContentCommand.php', 50, 51) =]]
 [[= include_file('code_samples/api/public_php_api/src/Command/AddLocationToContentCommand.php', 55, 57) =]]
 ```
 
-`LocationCreateStruct` must receive the parent Location ID.
-It sets the `parentLocationId` property of the new Location.
+`LocationCreateStruct` must receive the parent location ID.
+It sets the `parentLocationId` property of the new location.
 
-You can also provide other properties for the Location, otherwise they are set to their defaults:
+You can also provide other properties for the location, otherwise they are set to their defaults:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/AddLocationToContentCommand.php', 52, 54) =]]
 ```
 
-### Changing the main Location
+### Changing the main location
 
-When a content item has more that one Location, one Location is always considered the main one.
-You can change the main Location using [`ContentService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ContentService.html),
-by updating the `ContentInfo` with a [`ContentUpdateStruct`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-ContentUpdateStruct.html)
-that sets the new main Location:
+When a content item has more that one location, one location is always considered the main one.
+You can change the main location using [`ContentService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ContentService.html), by updating the `ContentInfo` with a [`ContentUpdateStruct`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-ContentUpdateStruct.html) that sets the new main location:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/SetMainLocationCommand.php', 48, 52) =]]
 ```
 
-### Hiding and revealing Locations
+### Hiding and revealing locations
 
-To hide or reveal (unhide) a Location you need to make use of
-[`LocationService::hideLocation`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-LocationService.html#method_hideLocation)
-or [`LocationService::unhideLocation`:](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-LocationService.html#method_unhideLocation)
+To hide or reveal (unhide) a location you need to make use of [`LocationService::hideLocation`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-LocationService.html#method_hideLocation) or [`LocationService::unhideLocation`:](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-LocationService.html#method_unhideLocation)
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/HideLocationCommand.php', 46, 47) =]][[= include_file('code_samples/api/public_php_api/src/Command/HideLocationCommand.php', 49, 50) =]]
 ```
 
-See [Location visibility](locations.md#location-visibility) for detailed information
-on the behavior of visible and hidden Locations.
+See [location visibility](locations.md#location-visibility) for detailed information on the behavior of visible and hidden Locations.
 
-### Deleting a Location
+### Deleting a location
 
-You can remove a Location either by deleting it, or sending it to Trash.
+You can remove a location either by deleting it, or sending it to Trash.
 
 Deleting makes use of [`LocationService::deleteLocation()`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-LocationService.html#method_deleteLocation).
-It permanently deletes the Location, together with its whole subtree.
+It permanently deletes the location, together with its whole subtree.
 
-Content which has only this one Location is permanently deleted as well.
-Content which has more Locations is still available in its other Locations.
-If you delete the [main Location](#changing-the-main-location) of a content item that has more Locations,
-another Location becomes the main one.
+Content which has only this one location is permanently deleted as well.
+Content which has more locations is still available in its other locations.
+If you delete the [main location](#changing-the-main-location) of a content item that has more locations, another location becomes the main one.
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/DeleteContentCommand.php', 44, 45) =]]
 ```
 
-To send the Location and its subtree to Trash,
-use [`TrashService::trash`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-TrashService.html#).
+To send the location and its subtree to Trash, use [`TrashService::trash`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-TrashService.html#).
 Items in Trash can be later [restored, or deleted permanently](#trash).
 
 ``` php
@@ -90,19 +78,17 @@ Items in Trash can be later [restored, or deleted permanently](#trash).
 
 ### Moving and copying a subtree
 
-You can move a Location with its whole subtree using [`LocationService::moveSubtree`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-LocationService.html#method_moveSubtree):
+You can move a location with its whole subtree using [`LocationService::moveSubtree`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-LocationService.html#method_moveSubtree):
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/MoveContentCommand.php', 46, 49) =]]
 ```
 
-[`LocationService::copySubtree`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-LocationService.html#method_copySubtree) is used in the same way,
-but it copies the Location and its subtree instead of moving it.
+[`LocationService::copySubtree`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-LocationService.html#method_copySubtree) is used in the same way, but it copies the location and its subtree instead of moving it.
 
 !!! tip
 
-    To copy a subtree you can also make use of the built-in `copy-subtree` command:
-    `bin/console ibexa:copy-subtree <sourceLocationId> <targetLocationId>`.
+    To copy a subtree you can also make use of the built-in `copy-subtree` command: `bin/console ibexa:copy-subtree <sourceLocationId> <targetLocationId>`.
 
 !!! note
 
@@ -115,19 +101,18 @@ but it copies the Location and its subtree instead of moving it.
 
     To learn how to manage Trash using the REST API, see [REST API reference](../../api/rest_api/rest_api_reference/rest_api_reference.html#managing-content-list-trash-items).
 
-To empty the Trash (remove all Locations in Trash), use [`TrashService::emptyTrash`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-TrashService.html#method_emptyTrash),
-which takes no arguments.
+To empty the Trash (remove all locations in Trash), use [`TrashService::emptyTrash`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-TrashService.html#method_emptyTrash), which takes no arguments.
 
 You can recover an item from Trash using [`TrashService::recover`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-TrashService.html#method_recover).
 You must provide the method with the ID of the object in Trash.
-Trash Location is identical to the origin Location of the object.
+Trash location is identical to the origin location of the object.
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/TrashContentCommand.php', 64, 65) =]]
 ```
 
-The content item is restored under its previous Location.
-You can also provide a different Location to restore in as a second argument:
+The content item is restored under its previous location.
+You can also provide a different location to restore in as a second argument:
 
 ``` php
 $newParent = $this->locationService->loadLocation($location);
@@ -170,8 +155,7 @@ To copy a content type, use [`ContentTypeService::copyContentType`](../../api/ph
 [[= include_file('code_samples/api/public_php_api/src/Command/CreateContentTypeCommand.php', 89, 90) =]]
 ```
 
-The copy is automatically getting an identifier based on the original content type identifier
-and the copy's ID, for example: `copy_of_folder_21`.
+The copy is automatically getting an identifier based on the original content type identifier and the copy's ID, for example: `copy_of_folder_21`.
 
 To change the identifier of the copy, use a [`ContentTypeUpdateStruct`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-ContentType-ContentTypeUpdateStruct.html):
 
@@ -202,8 +186,7 @@ You can also get the first and last event in the list by using the `first()` and
 [[= include_file('code_samples/api/public_php_api/src/Command/CalendarCommand.php', 51, 53) =]]
 ```
 
-You can process the events in a collection using the `find(Closure $predicate)`, `filter(Closure $predicate)`,
-`map(Closure $callback)` or `slice(int $offset, ?int $length = null)` methods of `EventCollection`, for example:
+You can process the events in a collection using the `find(Closure $predicate)`, `filter(Closure $predicate)`, `map(Closure $callback)` or `slice(int $offset, ?int $length = null)` methods of `EventCollection`, for example:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/CalendarCommand.php', 54, 57) =]]
diff --git a/docs/content_management/content_management_api/section_api.md b/docs/content_management/content_management_api/section_api.md
index b905648601..186415297c 100644
--- a/docs/content_management/content_management_api/section_api.md
+++ b/docs/content_management/content_management_api/section_api.md
@@ -1,39 +1,36 @@
 ---
-description: PHP API enables you to create Sections, assign content to them, and get various information about the Section.
+description: PHP API enables you to create sections, assign content to them, and get various information about the section.
 ---
 
 # Section API
 
-[Sections](sections.md) enable you to divide content into groups
-which can later be used, for example, as basis for permissions.
+[Sections](sections.md) enable you to divide content into groups which can later be used, for example, as basis for permissions.
 
-You can manage Sections by using the PHP API by using `SectionService`.
+You can manage sections by using the PHP API by using `SectionService`.
 
 !!! tip "Section REST API"
 
-    To learn how to manage Sections using the REST API, see [REST API reference](../../api/rest_api/rest_api_reference/rest_api_reference.html#managing-content-get-sections).
+    To learn how to manage sections using the REST API, see [REST API reference](../../api/rest_api/rest_api_reference/rest_api_reference.html#managing-content-get-sections).
 
-## Creating Sections
+## Creating sections
 
-To create a new Section, you need to make use of the [`SectionCreateStruct`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-SectionCreateStruct.html)
-and pass it to the [`SectionService::createSection`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-SectionService.html#method_createSection) method:
+To create a new section, you need to make use of the [`SectionCreateStruct`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-SectionCreateStruct.html) and pass it to the [`SectionService::createSection`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-SectionService.html#method_createSection) method:
 
-``` php 
+``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/SectionCommand.php', 58, 62) =]]
 ```
 
-## Getting Section information
+## Getting section information
 
-You can use `SectionService` to retrieve Section information such as whether it's in use:
+You can use `SectionService` to retrieve section information such as whether it's in use:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/SectionCommand.php', 76, 81) =]]
 ```
 
-## Listing content in a Section
+## Listing content in a section
 
-To list content items assigned to a Section you need to make a [query](search_api.md)
-for content belonging to this section, by applying the [`SearchService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-SearchService.html).
+To list content items assigned to a section you need to make a [query](search_api.md) for content belonging to this section, by applying the [`SearchService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-SearchService.html).
 You can also use the query to get the total number of assigned content items:
 
 ``` php
diff --git a/docs/content_management/data_migration/add_data_migration_matcher.md b/docs/content_management/data_migration/add_data_migration_matcher.md
index 976a5f11cc..7515fa3b56 100644
--- a/docs/content_management/data_migration/add_data_migration_matcher.md
+++ b/docs/content_management/data_migration/add_data_migration_matcher.md
@@ -5,15 +5,13 @@ description: Create a matcher for handling data migrations.
 # Create data migration matcher
 
 [Matchers in data migrations](exporting_data.md#match-property) enable you to select which data from the repository to export.
-
 In addition to the built-in matchers, you can create custom matchers for content.
 
-The following example creates a matcher for Section identifiers.
+The following example creates a matcher for section identifiers.
 
 ## Create normalizer
 
 To do this, first add a normalizer which handles the conversion between objects and the YAML format used for data migration.
-
 Matchers are instances of `FilteringCriterion`, so a custom normalizer needs to denormalize into an instance of `FilteringCriterion`.
 
 !!! tip "Normalizers"
diff --git a/docs/content_management/data_migration/create_data_migration_action.md b/docs/content_management/data_migration/create_data_migration_action.md
index 36d3f344c5..db80b4f553 100644
--- a/docs/content_management/data_migration/create_data_migration_action.md
+++ b/docs/content_management/data_migration/create_data_migration_action.md
@@ -37,8 +37,7 @@ And finally, add an executor to perform the action, in `src/Migrations/Action/As
 [[= include_file('code_samples/data_migration/src/Migrations/Action/AssignSectionExecutor.php') =]]
 ```
 
-Tag the executor with `ibexa.migrations.executor.action.<type>` tag, where `<type>` is the "type" of the step
-that executor works with (`content`, `content_type`, `location`, and so on).
+Tag the executor with `ibexa.migrations.executor.action.<type>` tag, where `<type>` is the "type" of the step that executor works with (for example, `content`, `content_type`, or `location`).
 The tag has to have a `key` property with the action type.
 
 ```yaml
diff --git a/docs/content_management/data_migration/data_migration.md b/docs/content_management/data_migration/data_migration.md
index 1c41409fa4..edc0c62786 100644
--- a/docs/content_management/data_migration/data_migration.md
+++ b/docs/content_management/data_migration/data_migration.md
@@ -12,9 +12,9 @@ Data migration allows exporting and importing selected data from an [[= product_
 Between installation, you can migrate your repository data, for example, content items, content types, languages, object states, or sections.
 
 You can use migrations in projects that require the same data to be present across multiple instances.
-They can be useful for project templates. Migrations are able to store shared data, so they can be applied for each new project you start,
-or incrementally upgrade older projects to your new standard, if needed.
-they're a developer-friendly tool that allows you to share data without writing code.
+You can use them for project templates.
+Migrations are able to store shared data, so they can be applied for each new project you start, or incrementally upgrade older projects to your new standard, if needed.
+They're a developer-friendly tool that allows you to share data without writing code.
 
 You can run data migrations either with a command, or with the [PHP API](data_migration_api.md).
 
diff --git a/docs/content_management/data_migration/data_migration_actions.md b/docs/content_management/data_migration/data_migration_actions.md
index 016b3bc530..cd0bd9b800 100644
--- a/docs/content_management/data_migration/data_migration_actions.md
+++ b/docs/content_management/data_migration/data_migration_actions.md
@@ -17,12 +17,12 @@ You can find which migration steps support actions in the table below:
 | `user_group`   |&#10004;|&#10004;||
 | `company`      |&#10004;|||
 
-Actions are optional operations that can be run after the main "body" of a migration has been executed
-(that is, content has been created / updated, Object state has been added, and so on).
+Actions are optional operations that can be run after the main "body" of a migration has been executed (for example, content has been created / updated, Object state has been added).
 Their purpose is to allow additional operations to be performed as part of this particular migration.
-they're executed inside the same transaction, so in the event of failure they cause database rollback to occur.
+They're executed inside the same transaction, so in the event of failure they cause database rollback to occur.
 
 For example, when updating a content type object, some fields might be removed:
+
 ``` yaml
 -
     type: content_type
@@ -64,9 +64,8 @@ The following migration actions are available out of the box:
 - `assign_user_group_to_role` (User group Create / Update)
 - `unassign_role_user_group` (User group Update)
 
-In contrast with Kaliop migrations, actions provide you with ability to perform additional operations and extend
-the migration functionality. 
-See [creating your own Actions](create_data_migration_action.md).
+In contrast with Kaliop migrations, actions provide you with ability to perform additional operations and extend the migration functionality.
+For more information, see [creating your own Actions](create_data_migration_action.md).
 
 ## Action usage examples
 
@@ -131,14 +130,14 @@ mode: Create and Update
 
 mode: Create and Update
 ``` yaml
-    actions: 
-        -   
+    actions:
+        -
             action: assign_user_to_role
             identifier: foo
-        -   
+        -
             action: assign_user_to_role
             id: 2
-        -   
+        -
             action: assign_user_to_role
             id: 2
             limitation:
@@ -158,7 +157,7 @@ mode: Create and Update
         -
             action: assign_user_group_to_role
             id: 2
-        -   
+        -
             action: assign_user_group_to_role
             id: 1
             limitation:
@@ -169,7 +168,7 @@ mode: Create and Update
 
 !!! note
 
-    In the `assign_user_group_to_role` action, Limitation type Section can only use Section ID.
+    In the `assign_user_group_to_role` action, limitation type section can only use section ID.
 
 mode: Update
 ``` yaml
diff --git a/docs/content_management/data_migration/data_migration_api.md b/docs/content_management/data_migration/data_migration_api.md
index 01e84812c1..e80225e725 100644
--- a/docs/content_management/data_migration/data_migration_api.md
+++ b/docs/content_management/data_migration/data_migration_api.md
@@ -8,8 +8,7 @@ You can use the PHP API to manage and run [data migrations](data_migration.md).
 
 ## Getting migration information
 
-To list all migration files available in the directory defined in configuration (by default, `src/Migrations/Ibexa`),
-use the `MigrationService:listMigrations()` method:
+To list all migration files available in the directory defined in configuration (by default, `src/Migrations/Ibexa`), use the `MigrationService:listMigrations()` method:
 
 ``` php
 [[= include_file('code_samples/api/migration/src/Command/MigrationCommand.php', 30, 33) =]]
diff --git a/docs/content_management/data_migration/exporting_data.md b/docs/content_management/data_migration/exporting_data.md
index e54cdc7b60..3a9cf8bd18 100644
--- a/docs/content_management/data_migration/exporting_data.md
+++ b/docs/content_management/data_migration/exporting_data.md
@@ -9,8 +9,7 @@ To see an example of migrations in action, export data already present in your i
 
 To export repository content, use the `ibexa:migrations:generate` command.
 This command generates a YAML file with the requested part of the repository.
-The file is located by default in the `src/Migrations/Ibexa/migrations` folder
-or in [a custom folder that you configure](managing_migrations.md#migration-folders).
+The file is located by default in the `src/Migrations/Ibexa/migrations` folder or in [a custom folder that you configure](managing_migrations.md#migration-folders).
 You can later use this file to import the data.
 
 ``` bash
@@ -70,8 +69,7 @@ You can treat it as a template for another content item for user group.
 For example, you could:
 
 - Remove `references` if you don't intend to store IDs for future use (see [migration references](managing_migrations.md#references))
-- Remove `publicationDate`, `modificationDate`, `locationRemoteId`,
-  as those are generated if not passed (like in PHP API)
+- Remove `publicationDate`, `modificationDate`, `locationRemoteId`, as those are generated if not passed (like in PHP API)
 - Add [`actions`](data_migration_actions.md)
 - Add fields for other languages present in the system.
 
@@ -170,7 +168,7 @@ The following modes are available:
 
 - `create` - creates new items
 - `update` - updates an existing item. Only covers specified fields and properties. If the item doesn't exist, causes an error.
-- `delete` - deletes an existing item. If the item doesn't exist, causes an error.
+- `delete` - deletes an existing item. If the item doesn't exist, causes an error
 
 If you don't provide the `--mode` option, the command asks you to select the mode.
 
@@ -292,15 +290,13 @@ php bin/console ibexa:migrations:generate --type=content --mode=create --file=my
 
 !!! note
 
-    When migrating multiple files at once (for example when calling `ibexa:migrations:migrate` without options),
-    they're executed in alphabetical order.
+    When migrating multiple files at once (for example when calling `ibexa:migrations:migrate` without options), they're executed in alphabetical order.
 
 ## user-context
 
-The optional `--user-context` option enables you to run the export command as a specified User.
-The command only exports repository data that the selected User has access to.
-By default the admin account is used, unless specifically overridden by this option or in
-bundle configuration (`ibexa_migrations.default_user_login`).
+The optional `--user-context` option enables you to run the export command as a specified user.
+The command only exports repository data that the selected user has access to.
+By default the admin account is used, unless specifically overridden by this option or in bundle configuration (`ibexa_migrations.default_user_login`).
 
 ``` bash
 php bin/console ibexa:migrations:generate --type=content --mode=create --user-context=jessica_andaya
diff --git a/docs/content_management/data_migration/importing_data.md b/docs/content_management/data_migration/importing_data.md
index 8dfe1c67ee..40330abca9 100644
--- a/docs/content_management/data_migration/importing_data.md
+++ b/docs/content_management/data_migration/importing_data.md
@@ -10,9 +10,7 @@ To import data from YAML migration files into repository, you run the `ibexa:mig
 
 The `ibexa:migrations:import` command automatically places migration files in the correct folder.
 
-Alternatively, you can place the files manually in the `src/Migrations/Ibexa/migrations` folder
-or in [a custom folder that you configure](managing_migrations.md#migration-folders),
-and specify the file name within this folder as parameter.
+Alternatively, you can place the files manually in the `src/Migrations/Ibexa/migrations` folder or in [a custom folder that you configure](managing_migrations.md#migration-folders), and specify the file name within this folder as parameter.
 If you don't specify the file, all files within this directory are used.
 
 ``` bash
@@ -20,17 +18,14 @@ php bin/console ibexa:migrations:migrate --file=my_data_export.yaml --siteaccess
 ```
 
 Migrations store execution metadata in the `ibexa_migrations` database table.
-This allows incremental upgrades:
-the `ibexa:migrations:migrate` command ignores files that it had previously executed.
+This allows incremental upgrades: the `ibexa:migrations:migrate` command ignores files that it had previously executed.
 
 The [`--siteaccess` option](exporting_data.md#siteaccess) usage can be relevant when multiple languages or multiple repositories are used.
 
 ## Migration step
 
-A data migration step is a single operation in data migration process
-that combines a mode (for example: `create`, `update`, `delete`)
-and a type (for example: `content`, `section`, `currency`),
-with optional additional information depending on the specific step.
+A data migration step is a single operation in data migration process that combines a mode (for example: `create`, `update`, `delete`)
+and a type (for example: `content`, `section`, `currency`), with optional additional information depending on the specific step.
 
 In a migration file, a step is an array item starting with the mandatory properties `type` and `mode`, for example:
 
@@ -88,8 +83,7 @@ A repeatable migration performs the defined migration steps as many times as the
 
 !!! tip
 
-    You can use repeatable migration steps, for example,
-    to quickly generate large numbers of content items for testing purposes.
+    You can use repeatable migration steps, for example, to quickly generate large numbers of content items for testing purposes.
 
 You can vary the operations using the iteration counter.
 
@@ -127,8 +121,7 @@ This step generates Field values with fake personal names.
 
 ### Expression syntax
 
-You can use [Symfony expression syntax]([[= symfony_doc =]]/reference/formats/expression_language.html) in data migrations,
-like in [repeatable steps](#repeatable-steps), where you can use it to generate varied content in migration steps.
+You can use [Symfony expression syntax]([[= symfony_doc =]]/reference/formats/expression_language.html) in data migrations, like in [repeatable steps](#repeatable-steps), where you can use it to generate varied content in migration steps.
 
 The expression syntax uses the following structure: `###<IDENTIFIER> <EXPRESSION> <IDENTIFIER>###`
 
@@ -189,8 +182,7 @@ Built-in expression language functions that are tagged with `ibexa.migrations.te
 
 #### Custom functions
 
-To add custom functionality into Migration's expression language declare it as a service
-and tag it with `ibexa.migrations.template.expression_language.function`.
+To add custom functionality into Migration's expression language declare it as a service and tag it with `ibexa.migrations.template.expression_language.function`.
 
 Example:
 
@@ -214,8 +206,7 @@ ibexa.migrations.template.faker:
             function: faker
 ```
 
-Service-based functions can be also added, but they must be callable,
-requiring either an `__invoke` function or a wrapping service with one.
+Service-based functions can be also added, but they must be callable, requiring either an `__invoke` function or a wrapping service with one.
 
 ## Migration examples
 
@@ -223,11 +214,11 @@ The following examples show what data you can import using data migrations.
 
 ### Content types
 
-The following example shows how to create a content type with two Field definitions.
+The following example shows how to create a content type with two field definitions.
 
 The required metadata keys are: `identifier`, `mainTranslation`, `contentTypeGroups` and `translations`.
 
-The default values of Field definition properties mirror the underlying PHP API, for example:
+The default values of field definition properties mirror the underlying PHP API, for example:
 
 - `translatable` defaults to `true`
 - `required` defaults to `false`
@@ -240,13 +231,10 @@ The default values of Field definition properties mirror the underlying PHP API,
 
 The following example shows how to create two content items: a folder and an article inside it.
 
-When creating a content item, three metadata keys are required:
-`contentType`, `mainTranslation`, and `parentLocationId`.
+When creating a content item, three metadata keys are required: `contentType`, `mainTranslation`, and `parentLocationId`.
 
-To use the Location ID of the folder, which is created automatically by the system,
-you can use a [reference](managing_migrations.md#references).
-In this case you assign the `parent_folder_location_id` reference name to the Location ID,
-and then use it when creating the article.
+To use the location ID of the folder, which is created automatically by the system, you can use a [reference](managing_migrations.md#references).
+In this case you assign the `parent_folder_location_id` reference name to the location ID, and then use it when creating the article.
 
 ``` yaml hl_lines="15 24"
 [[= include_file('code_samples/data_migration/examples/create_parent_and_child_content.yaml') =]]
@@ -254,8 +242,7 @@ and then use it when creating the article.
 
 ### Images
 
-The following example shows how to migrate an `example-image.png` located in
-`public/var/site/storage/images/3/8/3/0/383-1-eng-GB` without manually placing it in the appropriate path.
+The following example shows how to migrate an `example-image.png` located in `public/var/site/storage/images/3/8/3/0/383-1-eng-GB` without manually placing it in the appropriate path.
 
 To prevent the manual addition of images to specific DFS or local locations, such as `public/var/site/storage/images/` you can move image files to, for example `src/Migrations/images`.
 Adjust the migration file and configure the `image` field data as follows:
@@ -269,9 +256,7 @@ Adjust the migration file and configure the `image` field data as follows:
                 path: src/Migrations/images/example-image.png
 ```
 
-This migration copies the image to the appropriate directory,
-in this case `public/var/site/storage/images/3/8/3/0/254-1-eng-GB/example-image.png`,
-enabling swift file migration regardless of storage (local, DFS).
+This migration copies the image to the appropriate directory, in this case `public/var/site/storage/images/3/8/3/0/254-1-eng-GB/example-image.png`, enabling swift file migration regardless of storage (local, DFS).
 
 ### Roles
 
@@ -365,7 +350,7 @@ The following example shows how to create a product type.
 
 The main part of the migration file is the same as when creating a regular content type.
 
-A product type must also contain the definition for an `ibexa_product_specification` Field.
+A product type must also contain the definition for an `ibexa_product_specification` field.
 `fieldSettings` contains information about the product attributes.
 
 ``` yaml
@@ -396,7 +381,7 @@ The following example creates an image [content item](#content-items) from a loc
 [[= include_file('code_samples/data_migration/examples/create_product_asset.yaml') =]]
 ```
 
-This migration uses a [reference](managing_migrations.md#references) to store the created image Content ID, and then uses it while creating the asset.
+This migration uses a [reference](managing_migrations.md#references) to store the created image content ID, and then uses it while creating the asset.
 It uses an [expression syntax](#expression-syntax) to [concat (`~`)]([[= symfony_doc =]]/reference/formats/expression_language.html#string-operators)
 the mandatory scheme `ezcontent://` and the image content ID through the [`reference` function](#built-in-functions) used on the reference's name.
 
diff --git a/docs/content_management/data_migration/managing_migrations.md b/docs/content_management/data_migration/managing_migrations.md
index 0a1223b905..c719ae8194 100644
--- a/docs/content_management/data_migration/managing_migrations.md
+++ b/docs/content_management/data_migration/managing_migrations.md
@@ -7,9 +7,7 @@ month_change: true
 
 ## Converting migration files
 
-If you want to convert a file from the format used by the
-[Kaliop migration bundle](https://github.com/kaliop-uk/ezmigrationbundle)
-to the current migration format, use the `ibexa:migrations:kaliop:convert` command.
+If you want to convert a file from the format used by the [Kaliop migration bundle](https://github.com/kaliop-uk/ezmigrationbundle) to the current migration format, use the `ibexa:migrations:kaliop:convert` command.
 
 The source file must use Kaliop mode and type combinations.
 The converter handles Kaliop types that are different from [[= product_name_base =]] types.
@@ -28,8 +26,7 @@ If you don't specify the output folder, the command overwrites the input files.
 
 ## Adding migration files
 
-Use the `ibexa:migrations:import` command to add files to the migration folder defined in configuration
-(by default, `src/Migrations/Ibexa/migrations`).
+Use the `ibexa:migrations:import` command to add files to the migration folder defined in configuration (by default, `src/Migrations/Ibexa/migrations`).
 
 ``` bash
 php bin/console ibexa:migrations:import my_data_export.yaml
@@ -37,8 +34,7 @@ php bin/console ibexa:migrations:import my_data_export.yaml
 
 ## Checking migration status
 
-To check the status of migration files in the migration folder defined in configuration,
-run the following command:
+To check the status of migration files in the migration folder defined in configuration, run the following command:
 
 ``` bash
 php bin/console ibexa:migrations:status
@@ -85,11 +81,10 @@ bin/console config:dump-reference ibexa_migrations
 
 References are key-value pairs necessary when one migration depends on another.
 
-Since some migrations generate object properties (like IDs) during their execution, which cannot be known in advance,
-references provide migrations with the ability to use previously created object properties in further migrations.
+Since some migrations generate object properties (like IDs) during their execution, which cannot be known in advance, references provide migrations with the ability to use previously created object properties in further migrations.
 They can be subsequently used by passing them in their desired place with `reference:` prefix.
 
-The example below creates a content item of type "folder", and stores its Location path as `"ref_path__folder__media"`.
+The example below creates a content item of type "folder", and stores its location path as `"ref_path__folder__media"`.
 Then this reference is reused as part of a new role, as a limitation.
 
 ```yaml
@@ -142,14 +137,13 @@ Then this reference is reused as part of a new role, as a limitation.
 
 ```
 
-By default, reference files are located in a separate directory `src/Migrations/Ibexa/references`
-(see [previewing reference](#preview-configuration)
-`ibexa_migrations.migration_directory` and `ibexa_migrations.references_files_subdir` options).
+By default, reference files are located in a separate directory `src/Migrations/Ibexa/references` (for more information, see [previewing reference](#preview-configuration) `ibexa_migrations.migration_directory` and `ibexa_migrations.references_files_subdir` options).
 
-Reference files are **NOT** loaded by default. A separate step (type: "reference", mode: "load", with filename as "value")
-is required. Similarly, saving a reference file is done using type: "reference", mode: "save" step, with filename.
+Reference files are **NOT** loaded by default. A separate step (type: "reference", mode: "load", with filename as "value") is required.
+Similarly, saving a reference file is done using type: "reference", mode: "save" step, with filename.
 
 For example:
+
 ```yaml
 -
     type: reference

From 710d12b2dd47b3e9b95c41bc8f45818261532592 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Wed, 16 Oct 2024 14:00:05 +0200
Subject: [PATCH 33/77] Fixes in 'customer management'

---
 docs/customer_management/cp_applications.md   | 21 ++----
 docs/customer_management/cp_configuration.md  | 23 ++----
 docs/customer_management/cp_page_builder.md   | 24 +++---
 .../create_user_registration_form.md          |  3 +-
 docs/customer_management/customer_portal.md   |  8 +-
 .../customer_portal_guide.md                  | 73 +++++++++----------
 6 files changed, 64 insertions(+), 88 deletions(-)

diff --git a/docs/customer_management/cp_applications.md b/docs/customer_management/cp_applications.md
index 74e08b496a..8c88e1ad4a 100644
--- a/docs/customer_management/cp_applications.md
+++ b/docs/customer_management/cp_applications.md
@@ -7,8 +7,7 @@ edition: experience
 
 New business customers can apply for a company account.
 Applications go through the approval process in the back office where they can be accepted, rejected or put on hold.
-If they're accepted, the business partner receives an invitation link to the Customer Portal,
-where they can set up their team and manage their account.
+If they're accepted, the business partner receives an invitation link to the Customer Portal, where they can set up their team and manage their account.
 
 For more information on company self-registration, see [user guide documentation](https://doc.ibexa.co/projects/userguide/en/latest/customer_management/company_self_registration/).
 If provided options are too limited, you can customize an approval process by yourself.
@@ -27,8 +26,7 @@ Below, you can find possible configurations for Customer Portal applications.
 
 ### Reasons for rejecting application
 
-To change or add reasons for not accepting Corporate Portal application go to
-`vendor/ibexa/corporate-account/src/bundle/Resources/config/default_settings.yaml`.
+To change or add reasons for not accepting Corporate Portal application go to `vendor/ibexa/corporate-account/src/bundle/Resources/config/default_settings.yaml`.
 
 ```yaml
 parameters:
@@ -39,8 +37,7 @@ parameters:
 
 ### Timeout
 
-Registration form locks for 5 minutes after unsuccessful registration,
-if the user, for example, tried to use an email address that already exists in a Customer Portal clients database.
+Registration form locks for 5 minutes after unsuccessful registration, if the user, for example, tried to use an email address that already exists in a Customer Portal clients database.
 To change that duration, go to `config/packages/ibexa.yaml`.
 
 ```yaml
@@ -59,8 +56,7 @@ In this procedure, you add a new status to the approval process of business acco
 
 ### Add new status
 
-First, under the `ibexa.system.<scope>.corporate_accounts.application.states`
-add a `verify` status to the [configuration](configuration.md#configuration-files):
+First, under the `ibexa.system.<scope>.corporate_accounts.application.states` add a `verify` status to the [configuration](configuration.md#configuration-files):
 
 ```yaml
 [[= include_file('code_samples/customer_portal/config/packages/customer_portal.yaml') =]]
@@ -90,8 +86,7 @@ In line 39, you can see the `verify_form` parameter that passes the `verify` for
 
 ### Add form template
 
-To be able to see the changes you need to add
-a new template `templates/themes/admin/corporate_account/application/details.html.twig`.
+To be able to see the changes you need to add a new template `templates/themes/admin/corporate_account/application/details.html.twig`.
 
 ``` html+twig
 [[= include_file('code_samples/customer_portal/templates/themes/admin/corporate_account/application/details.html.twig') =]]
@@ -105,10 +100,8 @@ Select one application from the list and inspect application review view for a n
 
 ### Create event subscriber to verify state
 
-Now, you need to pass the information that the button has been selected
-to the list of applications to change the application status.
-Create another event subscriber that passes the information
-from the created form to the application list `src/Corporate/EventSubscriber/VerifyStateEventSubscriber.php`.
+Now, you need to pass the information that the button has been selected to the list of applications to change the application status.
+Create another event subscriber that passes the information from the created form to the application list `src/Corporate/EventSubscriber/VerifyStateEventSubscriber.php`.
 
 ``` php hl_lines="42 68"
 [[= include_file('code_samples/customer_portal/src/Corporate/EventSubscriber/VerifyStateEventSubscriber.php') =]]
diff --git a/docs/customer_management/cp_configuration.md b/docs/customer_management/cp_configuration.md
index d615d19d00..1c9d52d532 100644
--- a/docs/customer_management/cp_configuration.md
+++ b/docs/customer_management/cp_configuration.md
@@ -5,15 +5,12 @@ edition: experience
 
 # Customer Portal configuration
 
-You can overwrite the default configuration of the Customer Portal
-to fit its capabilities to the unique needs of your business.
+You can overwrite the default configuration of the Customer Portal to fit its capabilities to the unique needs of your business.
 
 ## `corporate` SiteAccess
 
-The predefined `corporate` SiteAccess in `corporate_group`
-(configured in `config/packages/ibexa.yaml`) serves the Customer Portal.
-If you need a multisite setup with multiple Customer Portals,
-add any additional SiteAccesses to `corporate_group`.
+The predefined `corporate` SiteAccess in `corporate_group` (configured in `config/packages/ibexa.yaml`) serves the Customer Portal.
+If you need a multisite setup with multiple Customer Portals, add any additional SiteAccesses to `corporate_group`.
 
 ## Customer identifier
 
@@ -28,8 +25,7 @@ ibexa:
 
 ## Roles and policies
 
-You can add custom roles to your installation
-by listing them under the `ibexa.site_access.config.default.corporate_accounts.roles` [configuration](configuration.md#configuration-files).
+You can add custom roles to your installation by listing them under the `ibexa.site_access.config.default.corporate_accounts.roles` [configuration](configuration.md#configuration-files).
 This key overwrites the default list set in `vendor/ibexa/corporate-account/src/bundle/Resources/config/default_settings.yaml` (the following example redeclares them for clarity):
 
 ```yaml
@@ -44,12 +40,10 @@ You can do it per SiteAccess or SiteAccess group by using [SiteAccess-aware conf
 
 ## Content type names
 
-You can change names of default content types by assigning what
-content types should be used to describe `Company` and `Member` in the back office.
+You can change names of default content types by assigning what content types should be used to describe `Company` and `Member` in the back office.
 Proceed only if you already have a `Company` content type in your system, and you don't want to change its identifier.
 
-Configuration for content type names is placed under the `ibexa_corporate_account` key,
-like shown in `Ibexa\Bundle\CorporateAccount\DependencyInjection\Configuration`.
+Configuration for content type names is placed under the `ibexa_corporate_account` key, like shown in `Ibexa\Bundle\CorporateAccount\DependencyInjection\Configuration`.
 To change content type names, adjust corporate account configuration in the following way:
 
 ```yaml
@@ -75,8 +69,7 @@ To learn more, see [Address field type documentation](addressfield.md).
 
 ## Templates
 
-You can also define new templates for, among others: invitation email,
-reset password message and the information screens after any of the user's actions.
+You can also define new templates for, among others: invitation email, reset password message and the information screens after any of the user's actions.
 
 ```yaml
 ibexa:
@@ -92,7 +85,7 @@ ibexa:
 
 ## Order management
 
-Reviewing pending and past orders in Customer Portal requires that you configure all currencies that any of the customers may use under the `ibexa.system.<siteaccess_name>.product_catalog.currencies` key. 
+Reviewing pending and past orders in Customer Portal requires that you configure all currencies that any of the customers may use under the `ibexa.system.<siteaccess_name>.product_catalog.currencies` key.
 The first currency from the list is then used for filtering the orders list and calculating the **Average order** and **Total amount** values.
 
 For more information, see [Enable purchasing products](enable_purchasing_products.md).
\ No newline at end of file
diff --git a/docs/customer_management/cp_page_builder.md b/docs/customer_management/cp_page_builder.md
index b91475a66a..8a1c0244e5 100644
--- a/docs/customer_management/cp_page_builder.md
+++ b/docs/customer_management/cp_page_builder.md
@@ -12,7 +12,7 @@ First, you need to decide if you want to create and configure [one portal](#crea
 
 ## Create and configure one portal
 
-This setup is recommended for simple use cases with one Customer Portal for all markets. 
+This setup is recommended for use cases with one Customer Portal for all markets.
 If you plan to expand your portal portfolio in the future, see [multiple portal configuration](#create-and-configure-multiple-portals).
 
 ### Configure Page Builder access to Customer Portal
@@ -26,8 +26,7 @@ Next, click **Publish** to see the page in the content tree.
 ![Add name and description to Customer Portal](img/cp_name_description.png)
 
 To be able to see the Customer Portal site template in the Page Builder you need to add `custom_portal` SiteAccess to the configuration.
-First, under the `ibexa.siteaccess` [configuration key](configuration.md#configuration-files) add `custom_portal` to
-the SiteAccess `list` and to `corporate_group`.
+First, under the `ibexa.siteaccess` [configuration key](configuration.md#configuration-files) add `custom_portal` to the SiteAccess `list` and to `corporate_group`.
 
 Next, add configuration for `corporate_group` and `custom_portal` under `ibexa.system`.
 Remember to specify `location_id` of your Customer Portal, you can find it under the **Technical details** tab of your new page.
@@ -40,7 +39,7 @@ ibexa:
             - site
             - admin
             - corporate
-            - custom_portal    
+            - custom_portal
         groups:
             site_group: [import, site]
             storefront_group: [site]
@@ -86,7 +85,8 @@ If members of the company don't have sufficient permissions for any Customer Por
 
 !!! note
 
-    Customer Portal is only available to users that are members of the company. Even if a user has all the sufficient permissions but isn't a member of a company, they can't see the Customer Portal.
+    Customer Portal is only available to users that are members of the company.
+    Even if a user has all the sufficient permissions but isn't a member of a company, this user cannot see the Customer Portal.
 
 ## Create and configure multiple portals
 
@@ -94,8 +94,7 @@ This setup is recommended for global markets or company specific portals, where
 
 ### Customer Portal container
 
-First, you need to create a root folder for Customer Portals,
-its location ID needs to be later specified in the configuration as [a tree root](multisite_configuration.md#location-tree).
+First, you need to create a root folder for Customer Portals, its location ID needs to be later specified in the configuration as [a tree root](multisite_configuration.md#location-tree).
 To do it, go to **Content** -> **Content structure**, and select **Create content**.
 There you can see two possibilities **Customer Portal** and **Customer Portal Page**.
 
@@ -111,8 +110,7 @@ Select **Customer Portal**, define its name and publish.
 ### Configure Page Builder access to Customer Portal
 
 To be able to see Customer Portal site template in the Page Builder you need to add `custom_portal` SiteAccess to the configuration.
-First, under the `ibexa.siteaccess` [configuration key](configuration.md#configuration-files), add `custom_portal` to
-the SiteAccess `list` and to `corporate_group`.
+First, under the `ibexa.siteaccess` [configuration key](configuration.md#configuration-files), add `custom_portal` to the SiteAccess `list` and to `corporate_group`.
 
 Next, add configuration for `corporate_group` and `custom_portal` under `ibexa.system`.
 Remember to specify `location_id` of the root folder for Customer Portals, you can find it under the **Technical details** tab.
@@ -125,7 +123,7 @@ ibexa:
             - site
             - admin
             - corporate
-            - custom_portal    
+            - custom_portal
         groups:
             site_group: [import, site]
             storefront_group: [site]
@@ -155,12 +153,12 @@ ibexa:
 ```
 
 Now, you can go back to your Customer Portal's container.
-All Landing Pages that you create in it use Customer Portal template.
+All landing pages that you create in it use Customer Portal template.
 
 ### Assign portal to Customer Group
 
 You can assign multiple Customer Portal containers or Pages to a specific Customer Group.
-First, you need to grant the following permissions to company members from the Customer Group: 
+First, you need to grant the following permissions to company members from the Customer Group:
 
 - `user/login` to `custom_portal` SiteAccess
 - `content/read` to selected Customer Portals
@@ -172,7 +170,7 @@ If members of the Customer Group don't have sufficient permissions for any Custo
 !!! note
 
     Customer Portal is only available to users that are members of the company.
-    Even if user has all the sufficient permissions but isn't a member of a company, cannot see the Customer Portal.
+    Even if user has all the sufficient permissions but isn't a member of a company, this user cannot see the Customer Portal.
 
 #### Build-in portal mapping
 
diff --git a/docs/customer_management/create_user_registration_form.md b/docs/customer_management/create_user_registration_form.md
index c8d3685123..7f82c75417 100644
--- a/docs/customer_management/create_user_registration_form.md
+++ b/docs/customer_management/create_user_registration_form.md
@@ -11,8 +11,7 @@ First, make sure you [enabled user registration](permission_use_cases.md#registe
 
 ## Configure existing form
 
-In your configuration, under `allowed_field_definitions_identifiers` [configuration key](configuration.md#configuration-files),
-specify the fields that should be part of your registration form.
+In your configuration, under `allowed_field_definitions_identifiers` [configuration key](configuration.md#configuration-files), specify the fields that should be part of your registration form.
 You can also define what kind of user you want to create under `user_type_identifier`, for example, frontend user.
 To learn more about available users, see [user types documentation](user_registration.md#user-types).
 
diff --git a/docs/customer_management/customer_portal.md b/docs/customer_management/customer_portal.md
index 5baa756ae1..bdb1520efb 100644
--- a/docs/customer_management/customer_portal.md
+++ b/docs/customer_management/customer_portal.md
@@ -6,13 +6,11 @@ page_type: landing_page
 
 # Customer Portal
 
-A Customer Portal serves as a central entry point to your services and products. 
+A Customer Portal serves as a central entry point to your services and products.
 It helps you provide a unique user experience with a single point of access to any relevant self-service options for your products and services.
 
-[[= product_name =]] Customer Portal and customer management that ships with it let you create and handle business accounts 
-and communicate with your partners in a personalized space.
-With this feature, your customers can self-register, edit their organization information, 
-invite and view members, check their order history and more.
+[[= product_name =]] Customer Portal and customer management that ships with it let you create and handle business accounts and communicate with your partners in a personalized space.
+With this feature, your customers can self-register, edit their organization information, invite and view members, check their order history, and more.
 
 [[= cards([
     "customer_management/customer_portal_guide",
diff --git a/docs/customer_management/customer_portal_guide.md b/docs/customer_management/customer_portal_guide.md
index de60c6e550..77e7178248 100644
--- a/docs/customer_management/customer_portal_guide.md
+++ b/docs/customer_management/customer_portal_guide.md
@@ -7,13 +7,11 @@ edition: experience
 
 ## What is Customer Portal
 
-A Customer Portal serves as a central entry point to your services and products. 
+A Customer Portal serves as a central entry point to your services and products.
 It helps you provide a unique user experience with a single point of access to any relevant self-service options for your products and services.
 
-[[= product_name =]] Customer Portal and customer management that ships with it let you create and handle business accounts 
-and communicate with your partners in a personalized space.
-With this feature, your customers can self-register, edit their organization information, 
-invite and view members, check their order history and more.
+[[= product_name =]] Customer Portal and customer management that ships with it let you create and handle business accounts and communicate with your partners in a personalized space.
+With this feature, your customers can self-register, edit their organization information, invite and view members, check their order history, and more.
 
 ## Availability
 
@@ -21,7 +19,7 @@ Customer Portal is available in [[= product_name_exp =]]. It's also compatible w
 
 ## How does Customer Portal work?
 
-Customer Portal is a component based on content types. 
+Customer Portal is a component based on content types.
 This means that [[= product_name =]] provides containers, user management, content management, so you can focus on business logic and general outlook of the portal for your B2B clients.
 
 ### Customer Portal
@@ -35,10 +33,9 @@ With user differentiation, company buyers can only purchase products while compa
 
 Custom Customer Portal can be created and edited in Page Builder to meet the needs of each business type, company, or market they operate on.
 
-To create a new Customer Portal, go to Content and, from the menu, select Content structure. 
-There, navigate to the root container for your Customer Portals and select Customer Portal Page. 
-In the Page Builder creation box, you see the Customer Portal layout where you can add a dedicated Customer Portal block, 
-Sales Representative, or choose from a selection of blocks available to your [[= product_name =]] version.
+To create a new Customer Portal, go to **Content** and, from the menu, select **Content structure**.
+There, navigate to the root container for your Customer Portals and select **Customer Portal Page**.
+In the Page Builder creation box, you see the Customer Portal layout where you can add a dedicated Customer Portal block, Sales Representative, or choose from a selection of blocks available to your [[= product_name =]] version.
 If the built-in page blocks aren't sufficient to fulfill your needs, you can add your own.
 
 ![Editable in Page Builder](img/cp_edit_in_page_builder.png)
@@ -59,15 +56,15 @@ The main company management takes place in the back office where each company ha
 
 ![Companies section in back office](img/cp_back_office.png)
 
-From there, they can activate and deactivate the company, edit its information, invite members, manage their roles and edit their basic information.
+From there, they can activate and deactivate the company, edit its information, invite members, manage their roles, and edit their basic information.
 
-In the roles section, you can define policies for each user group, for example, a Company buyer. 
+In the roles section, you can define policies for each user group, for example, a Company buyer.
 You can also set up policies for every user who has a business account by editing a Corporate Access role.
 
 ### Members
 
-Company members aren't standard users. They belong to a separate category called Corporate Accounts. 
-This category is located in **Admin** -> **Corporate** -> **Corporate Accounts**. 
+Company members aren't standard users. They belong to a separate category called Corporate Accounts.
+This category is located in **Admin** -> **Corporate** -> **Corporate Accounts**.
 There, you can find a list of companies and their members.
 
 This feature comes with a set of new roles:
@@ -87,36 +84,37 @@ Members can be invited to the organization from:
 
 - the Customer Portal: go to your company admin profile, select **Members** -> **Invite members**
 
-Then, in a pop-up fill out email addresses one by one, or use drag and drop to upload a file with a list of emails. 
-You also have to assign a role to each new member from a drop-down list. 
+Then, in a pop-up fill out email addresses one by one, or use drag and drop to upload a file with a list of emails.
+You also have to assign a role to each new member from a drop-down list.
 Click **Send** to send out invitations.
 
 ![Invitations](img/cp_invitations.png)
 
-Invited users receive an email message with a registration link. 
+Invited users receive an email message with a registration link.
 With it, they can register and create their account in the Customer Portal.
 
 ![Create account](img/cp_create_account.png)
 
 ### Company self-registration
 
-Self-registration allows business customers to take charge and apply for a business account by themselves. 
-Applications go through the approval process in the back office where they can be accepted, rejected or put on hold. 
+Self-registration allows business customers to take charge and apply for a business account by themselves.
+Applications go through the approval process in the back office where they can be accepted, rejected or put on hold.
 If they're accepted, the business partner receives an invitation link to the Customer Portal, where they can set up their team and manage their account.
 
-To apply for a business account, a company needs to provide their basic information, 
-contact information and billing address in an application.
+To apply for a business account, a company needs to provide their basic information, contact information and billing address in an application.
 
 ![Company self-registration](img/cp_registration.png)
 
-The approval process is customizable. You can decide which user has approval rights by granting them `Company Application/Workflow` policy, 
-you can also decide between which states the user may move applications:
+The approval process is customizable.
+You can decide which user has approval rights by granting them `Company Application/Workflow` policy, you can also decide between which states the user may move applications:
 
 - on hold
 - accept
 - reject
 
-If built-in statuses aren't sufficient, you can add custom ones. You can also edit or add reasons for not accepting the company application. Finally, you can customize the registration site itself.
+If built-in statuses aren't sufficient, you can add custom ones.
+You can also edit or add reasons for not accepting the company application.
+Finally, you can customize the registration site itself.
 
 ### REST API
 
@@ -133,7 +131,7 @@ By giving users power to manage their own accounts, you reduce the need for admi
 ### Self registration
 
 Self-registration allows your customers to take control of their business accounts.
-This not only improves customer satisfaction but also reduces the administrative burden on your team. 
+This not only improves customer satisfaction but also reduces the administrative burden on your team.
 With the ability to integrate with [[= product_name_connect =]], you're able to fully automate the process.
 
 ### Address book
@@ -154,35 +152,32 @@ It allows you to make use of customer targeting of the segments and create perso
 ### General overview
 
 The overall benefit of customer portals is the help they provide to retain customers and increase loyalty, while freeing up customer service employees time for higher-level work.
-They can achieve that by providing customers with up-to-date information about their orders and deliveries, personalize shopping experience, offer special deals available only to B2B partners and do that in one, easily accessible space.
-Currently, customer portals are a standard in global sites such as Amazon. they're the level of quality that customers just expect, and all businesses strive for.
+They can achieve that by providing customers with up-to-date information about their orders and deliveries, personalize shopping experience, offer special deals available only to B2B partners, and do that in one, accessible space.
+Currently, Customer Portals are a standard in global sites such as Amazon. they're the level of quality that customers expect, and all businesses strive for.
 
 ### Simplified shopping process
 
-Business account helps streamline the B2B shopping process with all the paperwork, payment, 
-and other administrative tasks converted into a few simple steps with prefilled forms, billing addresses, shipping addresses and more. 
+Business account helps streamline the B2B shopping process with all the paperwork, payment, and other administrative tasks converted into a few steps with prefilled forms, billing addresses, shipping addresses, and more.
 Making your site a go-to place for company orders.
 
 ### Better customer experience
 
-In the era of internet, customers expect quick, accessible and excellent quality service and user experience from every business they associate with. 
+In the era of internet, customers expect quick, accessible and excellent quality service, and user experience from every business they associate with.
 Customer portals offer a seamless self-service experience by providing complete 24/7 access to relevant, up-to-date information and customer support.
 
 ### Client encouragement
 
-Price strategies are a great way to build and maintain strong relationships with your trading partners. 
-With special prices available to B2B clients, you can offer the best deals in highly competitive markets. 
-Those discounts may be a great encouragement to convince big buyers to choose your business over other options. 
-Competitive prices impact not only the size of the customer base, 
-they affect every customer’s purchasing strategy, including the diversity, frequency, and volume of their orders.
+Price strategies are a great way to build and maintain strong relationships with your trading partners.
+With special prices available to B2B clients, you can offer the best deals in highly competitive markets.
+Those discounts may be a great encouragement to convince big buyers to choose your business over other options.
+Competitive prices impact not only the size of the customer base, they affect every customer’s purchasing strategy, including the diversity, frequency, and volume of their orders.
 
 ### Cost benefits
 
-Customer portals help you to automate tasks that otherwise would be done by your employees manually, such as customer services, checking shipment status. 
-An additional benefit of customer portals is their availability 24/7. 
+Customer portals help you to automate tasks that otherwise would be done by your employees manually, such as customer services, checking shipment status.
+An additional benefit of customer portals is their availability 24/7.
 Thus, reducing the need to allocate resources to extend working hours or hire more employees.
 
 ### Localization and personalization
 
-The use of Page Builder in the Customer Portal creation process enables you to 
-create unique experiences for each business customer based on their location, business type, company, or market they operate on.
\ No newline at end of file
+The use of Page Builder in the Customer Portal creation process enables you to create unique experiences for each business customer based on their location, business type, company, or market they operate on.
\ No newline at end of file

From 18e811aa1e526f3b2fa231a4d3470423187643e9 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Wed, 16 Oct 2024 14:19:13 +0200
Subject: [PATCH 34/77] Fixes in 'getting started' section

---
 docs/getting_started/first_steps.md           |  65 +++++----
 docs/getting_started/install_ibexa_dxp.md     |  83 +++++------
 .../install_on_mac_os_and_windows.md          |   4 +-
 docs/getting_started/install_with_ddev.md     |  36 ++---
 docs/getting_started/requirements.md          | 130 +++++++++++-------
 docs/getting_started/troubleshooting.md       |  29 ++--
 6 files changed, 182 insertions(+), 165 deletions(-)

diff --git a/docs/getting_started/first_steps.md b/docs/getting_started/first_steps.md
index ce0c9f4939..6b7e930408 100644
--- a/docs/getting_started/first_steps.md
+++ b/docs/getting_started/first_steps.md
@@ -5,19 +5,17 @@ description: Start off working with Ibexa DXP by doing initial configuration and
 # First steps
 
 This page lists first steps you can take after installing [[= product_name =]].
-These are most common actions you may need to take in a new installation.
+These steps are most common actions you may need to take in a new installation.
 
 !!! tip "Beginner tutorial"
 
-    To go through a full tutorial that leads from a clean installation to creating a full site,
-    see [Beginner tutorial](beginner_tutorial.md).
+    To go through a full tutorial that leads from a clean installation to creating a full site, see [Beginner tutorial](beginner_tutorial.md).
 
 ## Remove welcome page
 
 ![Welcome page](welcome_page.png)
 
-To remove the welcome page and get a completely clean installation to start your project with,
-remove the following files and folders from your installation:
+To remove the welcome page and get a completely clean installation to start your project with, remove the following files and folders from your installation:
 
 - Delete the file `config/packages/ibexa_welcome_page.yaml`
 - Delete the `templates/themes/standard/full/welcome_page.html.twig` file
@@ -45,9 +43,9 @@ module.exports = [ eZConfig, ibexaConfig, ...customConfigs ];
 
 2\. In the upper-right corner, click the avatar icon and in the drop-down menu disable the [Focus mode]([[= user_doc =]]/getting_started/discover_ui/#focus-mode).
 
-3\. Select Content and go to content types.
+3\. Select content and go to content types.
 
-4\. Enter the Content group and create a new content type.
+4\. Enter the content group and create a new content type.
 
 ![Creating a content type](first-steps-create-ct.png)
 
@@ -63,12 +61,11 @@ For more information, see [Content model](content_model.md).
 
 ## Create Twig templates and match then with view config
 
-To display Content in the front page you need to define content views and templates.
+To display content in the front page you need to define content views and templates.
 
 Content views decide which templates and controllers are used to display content.
 
-1\. In `config/packages/ibexa.yaml`, under `ibexa.system`
-add the following block (pay attention to indentation: `site_group` should be one level below `system`):
+1\. In `config/packages/ibexa.yaml`, under `ibexa.system` add the following block (pay attention to indentation: `site_group` should be one level below `system`):
 
 ``` yaml
 site_group:
@@ -93,11 +90,12 @@ For more information, see [Templates](templates.md) and [Twig documentation](htt
 
 ## Create content and test view templates
 
-1\. Go to the back office, activate Content/Content structure and create a new content item by clicking **Create content**.
+1\. Go to the back office, activate content/content structure and create a new content item by clicking **Create content**.
 
 ![Creating a Blog Post](first-steps-create-content.png)
 
-2\. Select a Blog Post content type. Fill in the content item and publish it.
+2\. Select a Blog Post content type.
+Fill in the content item and publish it.
 
 3\. To preview the new content item on the front page, go to `<yourdomain>/<Content-item-name>`.
 For example, if the title of the Blog post is "First blog post", the address is `<yourdomain>/first-blog-post`.
@@ -108,7 +106,8 @@ For example, if the title of the Blog post is "First blog post", the address is
 
 You can use SiteAccesses to serve different versions of the website.
 
-SiteAccesses are used depending on matching rules. they're set up in YAML configuration under the `ibexa.siteaccess.list` key.
+SiteAccesses are used depending on matching rules.
+They're set up in YAML configuration under the `ibexa.siteaccess.list` key.
 
 1\. In `config/packages/ibexa.yaml` add a new SiteAccess called `de` for the German version of the website:
 
@@ -127,8 +126,7 @@ The SiteAccess is automatically matched using the last part of the URI.
 
 !!! note "Log in"
 
-    At this point you need to log in to preview the new SiteAccess,
-    because an anonymous visitor doesn't have permissions to view it.
+    At this point you need to log in to preview the new SiteAccess, because an anonymous visitor doesn't have permissions to view it.
     See [section about permissions below](#set-up-permissions).
 
 For now the new SiteAccess doesn't differ from the main site.
@@ -139,8 +137,7 @@ For more information, see [Multisite](multisite.md) and [SiteAccess matchers](si
 
 One of the most common use cases for SiteAccesses is having different language versions of a site.
 
-1\. To set up the `de` SiteAccess to use a different language, add its configuration under `ibexa.system`,
-below `site.languages`:
+1\. To set up the `de` SiteAccess to use a different language, add its configuration under `ibexa.system`, below `site.languages`:
 
 ``` yaml
 site:
@@ -158,14 +155,16 @@ Make sure it's enabled.
 
 ![Creating a language](first-steps-create-language.png)
 
-3\. Next, go to the Content structure and open the blog post you had created earlier.
+3\. Next, go to the **Content structure** and open the blog post you had created earlier.
 Switch to the **Translations** tab and add a new translation.
 
 ![Adding a translation](first-steps-add-translation.png)
 
-4\. Select German and base the new translation on the English version. Edit the content item and publish it.
+4\. Select German and base the new translation on the English version.
+Edit the content item and publish it.
 
-5\. Go to the front page. The blog post now displays different content, depending on which SiteAccess you enter it from:
+5\. Go to the front page.
+The blog post now displays different content, depending on which SiteAccess you enter it from:
 `<yourdomain>/<content-name>` or `<yourdomain>/de/<content-name>`.
 
 ![Previewing translated Content](first-steps-translated-content.png)
@@ -192,8 +191,8 @@ ibexa_design_engine:
 
 3\. Under `site`, add `design: site_design`
 
-4\. Go back to the `content_view` configuration for the blog post. Change the path to the template so that it points to the folder for the correct design:
-`template: '@ibexadesign\full\blog_post.html.twig'`
+4\. Go back to the `content_view` configuration for the blog post.
+Change the path to the template so that it points to the folder for the correct design: `template: '@ibexadesign\full\blog_post.html.twig'`
 
 This means that the app looks for the `blog_post.html.twig` file in a folder relevant for the SiteAccess: `de_design` for the `de` SiteAccess, or `site_design` for other SiteAccesses in `site_group`.
 
@@ -201,7 +200,8 @@ This means that the app looks for the `blog_post.html.twig` file in a folder rel
 
 6\. Move the existing `full\blog_post.html.twig` file under `site_design`.
 
-7\. Copy it also under `de_design`. Modify the second one in any way (for example, add some html), so you can preview the effect.
+7\. Copy it also under `de_design`.
+Modify the second one in any way (for example, add some html), so you can preview the effect.
 
 8\. To see the difference between the different themes, compare what is displayed at `<yourdomain>/<content-name>` and `<yourdomain>/de/<content-name>`
 
@@ -209,19 +209,24 @@ This means that the app looks for the `blog_post.html.twig` file in a folder rel
 
 To allow a group of users to edit only a specific content type (in this example, blog posts), you need to set up permissions for them.
 
-Users and user groups are assigned roles. A role can contain a number of policies, which are rules that permit the user to perform a specific function.
+Users and user groups are assigned roles.
+A role can contain a number of policies, which are rules that permit the user to perform a specific function.
 Policies can be additionally restricted by limitations.
 
-1\. Go to Admin > Users. Create a new user group (the same way you create regular Content).
+1\. Go to **Admin** -> **Users**.
+Create a new user group (the same way you create regular content).
 Call the group "Bloggers".
 
-2\. In the new group create a User. Remember their username and password. Mark the user as "Enabled".
+2\. In the new group create a user.
+Remember their username and password.
+Mark the user as "Enabled".
 
 ![Creating a User](first-steps-create-user.png)
 
-3\. Go to **Admin** -> **Roles**. Create a new role called "Blogger".
+3\. Go to **Admin** -> **Roles**.
+Create a new role called "Blogger".
 
-4\. Add policies that allow the User to log in:
+4\. Add policies that allow the user to log in:
 
 - `User/Login`
 - `Content/Read`
@@ -229,7 +234,7 @@ Call the group "Bloggers".
 - `Section/View`
 - `Content/Reverserelatedlist`
 
-5\. Now add policies that allow the User to create and publish content, limited to Blog Posts:
+5\. Now add policies that allow the user to create and publish content, limited to Blog Posts:
 
 - `Content/Create` with limitation for content type Blog Post
 - `Content/Edit` with limitation for content type Blog Post
@@ -241,7 +246,7 @@ Call the group "Bloggers".
 
 ![Assigning a role](first-steps-assign-roles.png)
 
-You can now log out and log in again as the new User.
+You can now log out and log in again as the new user.
 You're able to create Blog Posts only.
 
 For more information, see [Permissions](permissions.md).
diff --git a/docs/getting_started/install_ibexa_dxp.md b/docs/getting_started/install_ibexa_dxp.md
index 04f286637c..0fa8686167 100644
--- a/docs/getting_started/install_ibexa_dxp.md
+++ b/docs/getting_started/install_ibexa_dxp.md
@@ -8,14 +8,12 @@ description: Install Ibexa DXP on a Linux system and prepare your installation f
 
     Installation for production is only supported on Linux.
 
-    To install [[= product_name =]] for development on macOS or Windows,
-    see the [installation guide for macOS and Windows](install_on_mac_os_and_windows.md).
+    To install [[= product_name =]] for development on macOS or Windows, see the [installation guide for macOS and Windows](install_on_mac_os_and_windows.md).
 
 !!! note "Installing [[= product_name_oss =]]"
 
     This installation guide shows in details how to install [[= product_name =]] for users who have a subscription agreement with [[= product_name_base =]].
-    If you want to install [[= product_name_oss =]], you don't need authentication tokens or an account on updates.ibexa.co,
-    but must adapt the steps shown here to the product edition and the `ibexa/oss-skeleton` repository.
+    If you want to install [[= product_name_oss =]], you don't need authentication tokens or an account on updates.ibexa.co, but must adapt the steps shown here to the product edition and the `ibexa/oss-skeleton` repository.
 
 ## Prepare work environment
 
@@ -25,12 +23,12 @@ You can install it by following your favorite tutorial, for example: [Install LA
 
 Additional requirements:
 
-- [Node.js](https://nodejs.org/en) and [Yarn](https://classic.yarnpkg.com/en/docs/install/#debian-stable) for asset management.
-- `git` for version control.
+- [Node.js](https://nodejs.org/en) and [Yarn](https://classic.yarnpkg.com/en/docs/install/#debian-stable) for asset management
+- `git` for version control
 
 [For production](#prepare-installation-for-production) you also need Apache or nginx as the HTTP server (Apache is used as an example below).
 
-Before getting started, make sure you review other [requirements](requirements.md) to see the systems we support and use for testing.
+Before getting started, make sure you review other [requirements](requirements.md) to see the systems that is supported and used for testing.
 
 ### Get Composer
 
@@ -59,7 +57,7 @@ composer -V
 ### Set up authentication tokens
 
 [[= product_name =]] subscribers have access to commercial packages at [updates.ibexa.co](https://updates.ibexa.co/).
-The site is password-protected. 
+The site is password-protected.
 You must set up authentication tokens to access the site.
 
 Log in to your service portal on [support.ibexa.co](https://support.ibexa.co/), go to your **Service Portal**, and look for the following on the **Maintenance and Support agreement details** screen:
@@ -67,14 +65,14 @@ Log in to your service portal on [support.ibexa.co](https://support.ibexa.co/),
 ![Authentication token](using_composer_auth_token.png)
 
 1. Select **Create token** (this requires the **Portal administrator** access level).
-2. Fill in a label describing the use of the token. This allows you to revoke access later.
+2. Fill in a label describing the use of the token.
+This allows you to revoke access later.
 3. Save the password, **you aren't able to access it again**.
 
 !!! tip "Save the authentication token in `auth.json` to avoid re-typing it"
 
     Composer asks whether you want to save the token every time you perform an update.
-    If you prefer, you can decline and create an `auth.json` file globally
-    in [`COMPOSER_HOME`](https://getcomposer.org/doc/03-cli.md#composer-home) directory for machine-wide use:
+    If you prefer, you can decline and create an `auth.json` file globally in [`COMPOSER_HOME`](https://getcomposer.org/doc/03-cli.md#composer-home) directory for machine-wide use:
 
     ``` bash
     composer config --global http-basic.updates.ibexa.co <installation-key> <token-password>
@@ -85,22 +83,23 @@ Log in to your service portal on [support.ibexa.co](https://support.ibexa.co/),
     ``` bash
     export COMPOSER_AUTH='{"http-basic":{"updates.ibexa.co": {"username": "<your-key>", "password": "<your-password>"}}}'
     ```
-    
+
     You then need to [add the contents of this variable to `auth.json`](#authentication-token).
 
 !!! tip "Different tokens for different projects on a single host"
 
-    If you configure several projects on one machine, make sure that
-    you set different tokens for each of the projects in their respective `auth.json` files.
+    If you configure several projects on one machine, make sure that you set different tokens for each of the projects in their respective `auth.json` files.
 
-After this, when running Composer to get updates, you're asked for a username and password. Use:
+After this, when running Composer to get updates, you're asked for a username and password.
+Use:
 
 - as username - your Installation key found on the **Maintenance and Support agreement details** page in the service portal
-- as password - the token password you retrieved in step 3 above.
+- as password - the token password you retrieved in step 3 above
 
 !!! note "Authentication token validation delay"
 
-    You can encounter some delay between creating the token and being able to use it in Composer. It might take up to 15 minutes.
+    You can encounter some delay between creating the token and being able to use it in Composer.
+    It might take up to 15 minutes.
 
 !!! caution "Support agreement expiry"
 
@@ -110,8 +109,7 @@ After this, when running Composer to get updates, you're asked for a username an
 
 ### Create project
 
-To use Composer to instantly create a project in the current folder with all the dependencies,
-run the following command:
+To use Composer to instantly create a project in the current folder with all the dependencies, run the following command:
 
 !!! note "Using PHP 8.3 (recommended)"
 
@@ -160,8 +158,7 @@ run the following command:
 
 !!! tip "Authentication token"
 
-    <a id="authentication-token"></a>If you added credentials to the `COMPOSER_AUTH` variable,
-    at this point add this variable to `auth.json` (for example, by running `echo $COMPOSER_AUTH > auth.json`).
+    <a id="authentication-token"></a>If you added credentials to the `COMPOSER_AUTH` variable, at this point add this variable to `auth.json` (for example, by running `echo $COMPOSER_AUTH > auth.json`).
 
 !!! tip
 
@@ -174,13 +171,12 @@ run the following command:
 
 !!! note "Platform.sh"
 
-    If you're deploying your installation on [Platform.sh](https://docs.platform.sh/guides/ibexa/deploy.html),
-    run the following command:
-    
+    If you're deploying your installation on [Platform.sh](https://docs.platform.sh/guides/ibexa/deploy.html), run the following command:
+
     ``` bash
     composer ibexa:setup --platformsh
     ```
-    
+
     This command provides the necessary configuration for using Platform.sh.
 
 #### Add project to version control
@@ -194,8 +190,7 @@ git init; git add . > /dev/null; git commit -m "init" > /dev/null
 
 ### Change installation parameters
 
-At this point configure your database via the `DATABASE_URL` in the `.env` file,
-depending of the database you're using:
+At this point configure your database via the `DATABASE_URL` in the `.env` file, depending of the database you're using:
 
 `DATABASE_URL=mysql://user:password@host:port/database_name`.
 
@@ -211,26 +206,24 @@ or
 
 ### Add entropy to improve cryptographic randomness
 
-Choose a [secret]([[= symfony_doc =]]/reference/configuration/framework.html#secret)
-and provide it in the `APP_SECRET` parameter in `.env`.
+Choose a [secret]([[= symfony_doc =]]/reference/configuration/framework.html#secret) and provide it in the `APP_SECRET` parameter in `.env`.
 It should be a random string, made up of at least 32 characters, numbers, and symbols.
-This is used by Symfony when generating [CSRF tokens]([[= symfony_doc =]]/security/csrf.html),
-[encrypting cookies]([[= symfony_doc =]]/cookbook/security/remember_me.html),
-and for creating signed URIs when using [ESI (Edge Side Includes)]([[= symfony_doc =]]/http_cache/esi.html).
+It's used by Symfony when generating [CSRF tokens]([[= symfony_doc =]]/security/csrf.html), [encrypting cookies]([[= symfony_doc =]]/cookbook/security/remember_me.html), and for creating signed URIs when using [ESI (Edge Side Includes)]([[= symfony_doc =]]/http_cache/esi.html).
 
 !!! caution
 
-    The app secret is crucial to the security of your installation. Be careful about how you generate it, and how you store it.
+    The app secret is crucial to the security of your installation.
+    Be careful about how you generate it, and how you store it.
     Here's one way to generate a 64 characters long, secure random string as your secret, from command line:
-    
+
     ``` bash
     php -r "print bin2hex(random_bytes(32));"
     ```
 
     Don't commit the secret to version control systems, or share it with anyone who doesn't strictly need it.
     If you have any suspicion that the secret may have been exposed, replace it with a new one.
-    The same goes for other secrets, like database password, Varnish invalidate token, JWT passphrase, etc.
-    
+    The same goes for other secrets, like database password, Varnish invalidate token, JWT passphrase, and more.
+
     After changing the app secret, make sure that you clear the application cache and log out all the users.
 
     For more information, see [Symfony documentation]([[= symfony_doc =]]/reference/configuration/framework.html#secret).
@@ -278,8 +271,7 @@ php bin/console ibexa:graphql:generate-schema
 
 Before executing the command make sure that the database user has sufficient permissions.
 
-If Composer asks for your token, you must log in to your GitHub account and generate a new token
-(edit your profile and go to **Developer settings** > **Personal access tokens** > **Generate new token** with default settings).
+If Composer asks for your token, you must log in to your GitHub account and generate a new token (edit your profile and go to **Developer settings** > **Personal access tokens** > **Generate new token** with default settings).
 This operation is performed only once, when you install [[= product_name =]] for the first time.
 
 ### Run post-installation script
@@ -344,15 +336,14 @@ Future files and directories created by these two users need to inherit those pe
 
 !!! caution
 
-    For security reasons, in production, the web server cannot have write access to other directories than `var`. 
+    For security reasons, in production, the web server cannot have write access to other directories than `var`.
     Skip the step above and follow the link below for production needs instead.
 
     You must also make sure that the web server cannot interpret the files in the `var` directory through PHP.
     To do so, follow the instructions on [setting up a virtual host below](#set-up-virtual-host).
 
 To set up permissions for production, it's recommended to use an ACL (Access Control List).
-See [Setting up or Fixing File Permissions]([[= symfony_doc =]]/setup/file_permissions.html) in Symfony documentation
-for information on how to do it on different systems.
+See [Setting up or Fixing File Permissions]([[= symfony_doc =]]/setup/file_permissions.html) in Symfony documentation for information on how to do it on different systems.
 
 ### Set up virtual host
 
@@ -364,8 +355,7 @@ Prepare a [virtual host configuration](https://en.wikipedia.org/wiki/Virtual_hos
     to `/etc/apache2/sites-available` as a `.conf` file and modify it to fit your project.
 
     Specify `/<your installation directory>/public` as the `DocumentRoot` and `Directory`, or ensure `BASEDIR` is set in the environment.
-    Uncomment the line that starts with `#if [APP_ENV]` and set the value to `prod` or `dev`, depending on the environment that you're configuring,
-    or ensure `APP_ENV` is set in the environment.
+    Uncomment the line that starts with `#if [APP_ENV]` and set the value to `prod` or `dev`, depending on the environment that you're configuring, or ensure `APP_ENV` is set in the environment.
 
     ```
     SetEnvIf Request_URI ".*" APP_ENV=prod
@@ -388,9 +378,7 @@ Prepare a [virtual host configuration](https://en.wikipedia.org/wiki/Virtual_hos
 
 === "nginx"
 
-    You can use [this example vhost file](https://raw.githubusercontent.com/ibexa/post-install/main/resources/templates/nginx/vhost.template)
-    and modify it to fit your project. You also need the `ibexa_params.d` files that should reside in a subdirectory below where the main file is,
-    [as is shown here](https://github.com/ibexa/post-install/tree/main/resources/templates/nginx).
+    You can use [this example vhost file](https://raw.githubusercontent.com/ibexa/post-install/main/resources/templates/nginx/vhost.template) and modify it to fit your project. You also need the `ibexa_params.d` files that should reside in a subdirectory below where the main file is, [as is shown here](https://github.com/ibexa/post-install/tree/main/resources/templates/nginx).
 
 
     Specify `/<your installation directory>/public` as the `root`, or ensure `BASEDIR` is set in the environment.
@@ -407,8 +395,7 @@ You should see the welcome page.
 
 !!! note "Security checklist"
 
-    See the [Security checklist](security_checklist.md) for a list of security-related issues
-    you should take care of before going live with a project.
+    See the [Security checklist](security_checklist.md) for a list of security-related issues you should take care of before going live with a project.
 
 ### Enable Date-based Publisher
 
diff --git a/docs/getting_started/install_on_mac_os_and_windows.md b/docs/getting_started/install_on_mac_os_and_windows.md
index 8a21f8b079..6349b8a423 100644
--- a/docs/getting_started/install_on_mac_os_and_windows.md
+++ b/docs/getting_started/install_on_mac_os_and_windows.md
@@ -11,7 +11,7 @@ This page explains how to install [[= product_name =]] on macOS or Windows.
     This procedure is **for development purposes only**.
     Installing [[= product_name =]] for production purposes is supported only on Linux.
 
-    For information about installing the product on Linux, see [Install [[= product_name =]]](install_ibexa_dxp.md).  
+    For information about installing the product on Linux, see [Install [[= product_name =]]](install_ibexa_dxp.md).
 
 ### Prepare work environment
 
@@ -39,7 +39,7 @@ The instructions below assume that you're using Apache.
     ``` bash
     zend_extension=opcache.so
     ```
-    
+
     You can install Apache as a Windows service by running the following command in CMD as administrator:
 
     ``` bash
diff --git a/docs/getting_started/install_with_ddev.md b/docs/getting_started/install_with_ddev.md
index e0bbad763a..dd3960c78b 100644
--- a/docs/getting_started/install_with_ddev.md
+++ b/docs/getting_started/install_with_ddev.md
@@ -52,12 +52,13 @@ To use MySQL instead, run the following command:
 ddev config --database=mysql:8.0
 ```
 
-You can also use other versions of MariaDB, Mysql or PostgreSQL. 
+You can also use other versions of MariaDB, Mysql or PostgreSQL.
 See [DDEV database types documentation](https://ddev.readthedocs.io/en/latest/users/extend/database-types/) for available version ranges.
 
 #### Configure database connection
 
-Now, configure the database connection for your [[= product_name =]] project. Depending on your database of choice (MySQL or PostgreSQL), use the appropriate command below.
+Now, configure the database connection for your [[= product_name =]] project.
+Depending on your database of choice (MySQL or PostgreSQL), use the appropriate command below.
 
 !!! note
 
@@ -89,7 +90,8 @@ Now, configure the database connection for your [[= product_name =]] project. De
 
 #### Enable Mutagen (optional)
 
-If you're using macOS or Windows, you might want to enable [Mutagen](https://ddev.readthedocs.io/en/latest/users/install/performance/#mutagen) to improve performance. You can do this by running the following command:
+If you're using macOS or Windows, you might want to enable [Mutagen](https://ddev.readthedocs.io/en/latest/users/install/performance/#mutagen) to improve performance.
+You can do this by running the following command:
 
 ```bash
 ddev config --performance-mode=mutagen
@@ -122,13 +124,14 @@ ddev start
 
 Next, you need to [set up authentication tokens](install_ibexa_dxp.md#set-up-authentication-tokens) by modifying the Composer configuration.
 You must run the following command **after** executing `ddev start`, because the command runs inside the container.
-Replace `<installation-key>` and `<token-password>` with your actual installation key and token password, respectively.
+Replace `<installation-key>` and `<token-password>` with your actual installation key and token password.
 
 ```bash
 ddev composer config --global http-basic.updates.ibexa.co <installation-key> <token-password>
 ```
 
-This authentication doesn't persist if the project is restarted (by `ddev restart` or `ddev composer create`). You can back up the authentication file (`auth.json`) by using the following command:
+This authentication doesn't persist if the project is restarted (by `ddev restart` or `ddev composer create`).
+You can back up the authentication file (`auth.json`) by using the following command:
 
 ```bash
 ddev exec "mkdir -p .ddev/homeadditions/.composer; cp ~/.composer/auth.json .ddev/homeadditions/.composer"
@@ -138,8 +141,8 @@ If you want to reuse an existing `auth.json` file, see [Using `auth.json`](#usin
 
 ### 5. Create project
 
-Once DDEV is running, use Composer to create a new [[= product_name =]] project. 
-Remember to replace `<edition>` and `<version>` with your desired edition and version respectively.
+Once DDEV is running, use Composer to create a new [[= product_name =]] project.
+Remember to replace `<edition>` and `<version>` with your desired edition and version.
 
 ```bash
 ddev composer create ibexa/<edition>-skeleton:<version>
@@ -185,10 +188,10 @@ DDEV offers several ways to get the same result, offering different levels of fl
 !!! tip
 
     Learn more about the [DDEV commands](https://ddev.readthedocs.io/en/latest/users/usage/commands/):
-    
+
     - run [`ddev --help`](https://ddev.readthedocs.io/en/latest/users/usage/cli/#using-the-ddev-command) to list all commands
     - run [`ddev help <command>`](https://ddev.readthedocs.io/en/latest/users/usage/commands/#help) to get usage details about a specific command
-    
+
     Learn more about DDEV configuration from [`ddev config` command documentation](https://ddev.readthedocs.io/en/latest/users/usage/commands/#config) and [advanced configuration files documentation](https://ddev.readthedocs.io/en/latest/users/configuration/config/).
 
 
@@ -196,11 +199,9 @@ DDEV offers several ways to get the same result, offering different levels of fl
 
 An `auth.json` file can be used for one project, or globally for all projects, with the [DDEV `homeaddition` feature](https://ddev.readthedocs.io/en/latest/users/extend/in-container-configuration/).
 
-For example, you can copy an `auth.json` file to a DDEV project:
-`cp <path-to-an>/auth.json .ddev/homeadditions/.composer`
+For example, you can copy an `auth.json` file to a DDEV project: `cp <path-to-an>/auth.json .ddev/homeadditions/.composer`
 
-Alternatively, the Composer global `auth.json` can be the DDEV global `auth.json` with the help of a symbolic link:
-`mkdir -p ~/.ddev/homeadditions/.composer && ln -s ~/.composer/auth.json ~/.ddev/homeadditions/.composer/auth.json`
+Alternatively, the Composer global `auth.json` can be the DDEV global `auth.json` with the help of a symbolic link: `mkdir -p ~/.ddev/homeadditions/.composer && ln -s ~/.composer/auth.json ~/.ddev/homeadditions/.composer/auth.json`
 
 If the DDEV project has already been started, you need to run `ddev restart`.
 
@@ -284,7 +285,7 @@ ddev config --webserver-type=apache-fpm
 
 [[= product_name =]] can't run on Apache without a dedicated Virtual Host.
 
-To set the Apache Virtual Host, override `.ddev/apache/apache-site.conf` with [[= product_name =]]'s config. 
+To set the Apache Virtual Host, override `.ddev/apache/apache-site.conf` with [[= product_name =]]'s config.
 You can do it manually or by using a script.
 
 #### Manual procedure
@@ -414,14 +415,15 @@ If the local project needs to answer to real production domains (for example, to
 
 ### Cluster or [[= product_name_cloud =]]
 
-DDEV can be useful to locally simulate a production cluster.
+You can use DDEV to locally simulate a production cluster.
 
-- See [clustering with DDEV](clustering_with_ddev.md) to add Elasticsearch, Solr, Redis or Memcached to your DDEV installation.
+- See [clustering with DDEV](clustering_with_ddev.md) to add Elasticsearch, Solr, Redis, or Memcached to your DDEV installation.
 - See [DDEV and [[= product_name_cloud =]]](ddev_and_ibexa_cloud.md) to locally run an [[= product_name =]] project by using DDEV.
 
 ## Stop or remove the project
 
-If you need to stop the project to start it again later, use `ddev stop`. Then, use `ddev start` to run the project in the same state.
+If you need to stop the project to start it again later, use `ddev stop`.
+Then, use `ddev start` to run the project in the same state.
 
 If you want to fully remove the project:
 
diff --git a/docs/getting_started/requirements.md b/docs/getting_started/requirements.md
index e443bdc378..f787218e46 100644
--- a/docs/getting_started/requirements.md
+++ b/docs/getting_started/requirements.md
@@ -20,9 +20,12 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
 !!! caution "Recommended versions"
 
-    Review all the recommended versions carefully. If you see a "+" next to the product version, it means that we recommend this version or higher within the same major release. For example, "1.18+" means any 1.x version higher or equal to 1.18, but not 2.x.
+    Review all the recommended versions carefully.
+    If you see a "+" next to the product version, it means that we recommend this version or higher within the same major release.
+    For example, "1.18+" means any 1.x version higher or equal to 1.18, but not 2.x.
 
-    Using the latest listed version of each product or component is recommended. Always use a version that receives security updates, either by the vendor themselves or by a trusted third party, such as the distribution vendor.
+    Using the latest listed version of each product or component is recommended.
+    Always use a version that receives security updates, either by the vendor themselves or by a trusted third party, such as the distribution vendor.
 
 ## Operating system
 
@@ -36,7 +39,8 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     |Ubuntu "Jammy Jellyfish"| 22.04 |
     |RHEL / CentOS | 8.1-8.5+ |
 
-    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release. For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
+    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release.
+    For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
 
 === "[[= product_name =]] v3.3"
 
@@ -48,7 +52,8 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     |Ubuntu "Jammy Jellyfish"| 22.04 |
     |RHEL / CentOS | 8.1-8.5+ |
 
-    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release. For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
+    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release.
+    For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
 
 === "eZ Platform v2.5"
 
@@ -58,7 +63,8 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     |Ubuntu  "Bionic" | 18.04 LTS  |
     |RHEL / CentOS | 8.0-8.5+ |
 
-    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release. For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
+    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release.
+    For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
 
 ## Web server
 
@@ -68,7 +74,8 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     - Apache 2.4 (with required modules `mod_rewrite`, `mod_env` and recommended: `mod_setenvif`, `mod_expires`;
     event MPM is recommended, if you need to use prefork you also need the `mod_php` module)
 
-    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release. For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
+    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release.
+    For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
 
 === "[[= product_name =]] v3.3"
 
@@ -90,7 +97,8 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     - MySQL 8.0
     - PostgreSQL 14
 
-    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release. For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
+    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release.
+    For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
 
 === "[[= product_name =]] v3.3"
 
@@ -98,15 +106,18 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     - MySQL  8.0 (optionally 5.7 - deprecated)
     - PostgreSQL 10+ (PostgreSQL 10 has reached its End of Life. We highly recommend using PostgreSQL 14 for optimal performance and security)
 
-    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release. For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
+    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release.
+    For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
 
 === "eZ Platform v2.5"
 
     - MariaDB  10.3, 10.4 (optionally 10.2 - deprecated)
     - MySQL  8.0 (optionally 5.7 - deprecated)
-    - PostgreSQL 10+ (PostgreSQL 10 has reached its End of Life. We highly recommend using PostgreSQL 14 for optimal performance and security)
+    - PostgreSQL 10+ (PostgreSQL 10 has reached its End of Life.
+    We highly recommend using PostgreSQL 14 for optimal performance and security)
 
-    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release. For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
+    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release.
+    For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
 
 ## PHP
 
@@ -129,10 +140,13 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
 === "eZ Platform v2.5"
 
-    - 7.1 (PHP 7.1 has reached its End of Life. Unless you have extended support from vendors like Debian or Zend, you should upgrade to [[= product_name =]] v3.3 or v4.x)
+    - 7.1 (PHP 7.1 has reached its End of Life.
+    Unless you have extended support from vendors like Debian or Zend, you should upgrade to [[= product_name =]] v3.3 or v4.x)
     - 7.2 (PHP 7.2 has reached its End of Life. Unless you have extended support from vendors like Debian or Zend, you should upgrade to [[= product_name =]]P v3.3 or v4.x)
-    - 7.3 (PHP 7.3 has reached its End of Life. Unless you have extended support from vendors like Debian or Zend, you should upgrade to [[= product_name =]] v3.3 or v4.x)
-    - 7.4 (PHP 7.4 has reached its End of Life. Unless you have extended support from vendors like Debian or Zend, you should upgrade to [[= product_name =]] v3.3 or v4.x)
+    - 7.3 (PHP 7.3 has reached its End of Life.
+    Unless you have extended support from vendors like Debian or Zend, you should upgrade to [[= product_name =]] v3.3 or v4.x)
+    - 7.4 (PHP 7.4 has reached its End of Life.
+    Unless you have extended support from vendors like Debian or Zend, you should upgrade to [[= product_name =]] v3.3 or v4.x)
 
 ### PHP extensions
 
@@ -195,26 +209,32 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
     - `php-redis` 3.1.3+ or `php-memcached` 3.x+*
 
-    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release. For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
+    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release.
+    For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
 
 ## Search
 
 === "[[= product_name =]] v4.6"
 
-    - For content search, Solr 7.7 LTS or Solr 8, recommended 8.11.1 or higher. Alternatively, Elasticsearch 7.16.2 or higher 7.x version.
-    - The above solutions require Oracle Java/Open JDK. The minimum requirement is 8 LTS, recommended 11 LTS. Newer versions aren't supported.
+    - For content search, Solr 7.7 LTS or Solr 8, recommended 8.11.1 or higher.
+    Alternatively, Elasticsearch 7.16.2 or higher 7.x version.
+    - The above solutions require Oracle Java/Open JDK. The minimum requirement is 8 LTS, recommended 11 LTS.
+    Newer versions aren't supported.
 
 === "[[= product_name =]] v3.3"
 
-    - For content search, Solr 7.7 LTS or Solr 8, recommended 8.11.1 or higher. Alternatively, Elasticsearch 7.16.2 or higher 7.x version.
+    - For content search, Solr 7.7 LTS or Solr 8, recommended 8.11.1 or higher.
+    Alternatively, Elasticsearch 7.16.2 or higher 7.x version.
     - For BinaryFile field indexing, Apache Tika 1.20 or higher 1.x version, recommended 1.28.1 or higher.
     - The above solutions require Oracle Java/Open JDK. The minimum requirement is 8 LTS, recommended 11 LTS. Newer versions aren't supported.
 
 === "eZ Platform v2.5"
 
-    - For content search, Solr 7.7 LTS or Solr 8, recommended 8.11.1 or higher. Alternatively, Elasticsearch 7.16.2 or higher 7.x version.
+    - For content search, Solr 7.7 LTS or Solr 8, recommended 8.11.1 or higher.
+    Alternatively, Elasticsearch 7.16.2 or higher 7.x version.
     - For BinaryFile field indexing, Apache Tika 1.20 or higher 1.x version, recommended 1.28.1 or higher.
-    - The above solutions require Oracle Java/Open JDK. The minimum requirement is 8 LTS, recommended 11 LTS. Newer versions aren't supported.
+    - The above solutions require Oracle Java/Open JDK.
+    The minimum requirement is 8 LTS, recommended 11 LTS. Newer versions aren't supported.
 
 ## Graphic Handler
 
@@ -262,7 +282,8 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     - Redis 4.0+, 5.0 or higher (separate instances for session and cache, both using a `volatile-*` [eviction policy](https://redis.io/docs/reference/eviction/), session instance configured for persistence) or [Memcached](https://memcached.org/) 1.5 or higher
     - [Varnish](http://varnish-cache.org/) 6.0LTS or 7.1 with [varnish-modules](https://github.com/varnish/varnish-modules/blob/master/README.md) or [Fastly](https://www.fastly.com/) using [the provided bundle](http_cache.md) (for HTTP Cache)
 
-    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release. For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
+    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release.
+    For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
 
 === "[[= product_name =]] v3.3"
 
@@ -270,7 +291,8 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     - Redis 4.0+, 5.0 or higher (separate instances for session and cache, both using a `volatile-*` [eviction policy](https://redis.io/docs/reference/eviction/), session instance configured for persistence) or [Memcached](https://memcached.org/) 1.5 or higher
     - [Varnish](http://varnish-cache.org/) 6.0LTS with [varnish-modules](https://github.com/varnish/varnish-modules/blob/master/README.md) or [Fastly](https://www.fastly.com/) using [the provided bundle](https://doc.ibexa.co/en/3.3/guide/cache/http_cache/#serving-varnish-through-fastly) (for HTTP Cache)
 
-    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release. For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
+    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release.
+    For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
 
 === "eZ Platform v2.5"
 
@@ -278,7 +300,8 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     - Redis 3.2+ (separate instances for session and cache, both using a `volatile-*` [eviction policy](https://redis.io/docs/reference/eviction/), session instance configured for persistence) or [Memcached](https://memcached.org/) 1.5 or higher
     - [Varnish](http://varnish-cache.org/) 5.1 or 6.0LTS with [varnish-modules](https://github.com/varnish/varnish-modules/blob/master/README.md) or [Fastly](https://www.fastly.com/) using [the provided bundle](https://doc.ibexa.co/en/2.5/guide/cache/http_cache/#serving-varnish-through-fastly) (for HTTP Cache)
 
-    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release. For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
+    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release.
+    For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
 
 ## Filesystem
 
@@ -315,27 +338,32 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     - `Node.js` 18+
     - `yarn` 1.15.2+
 
-    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release. For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
+    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release.
+    For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
 
 === "[[= product_name =]] v3.3"
 
-    - `Node.js` 14+, 16+, 18+ (`Node.js` 14+ has reached its End of Life. We strongly recommend using a newer version to ensure you receive security updates.)
+    - `Node.js` 14+, 16+, 18+ (`Node.js` 14+ has reached its End of Life.
+    We strongly recommend using a newer version to ensure you receive security updates.)
     - `yarn` 1.15.2+
 
-    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release. For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
+    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release.
+    For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
 
 === "eZ Platform v2.5"
 
     - `Node.js` 10, 12 or 14
     - `yarn` 1.15.2+
 
-    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release. For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
+    If you see a "+" next to the product version, it indicates a recommended version or higher within the same major release.
+    For example, "1.18+" means any 1.x version equal to or higher than 1.18, but not 2.x.
 
 ## Browser
 
 === "[[= product_name =]] v4.6"
 
-    [[= product_name =]] is developed to work with *any* web browser that supports modern standards, on *any* screen resolution suitable for web, running on *any* device. However for the Editorial and Administration User Interfaces you need: a minimum of 1366-by-768 screen resolution, a desktop or tablet device, and a recommended/supported browser among the ones found below.
+    [[= product_name =]] is developed to work with *any* web browser that supports modern standards, on *any* screen resolution suitable for web, running on *any* device.
+    However for the Editorial and Administration User Interfaces you need: a minimum of 1366-by-768 screen resolution, a desktop or tablet device, and a recommended/supported browser among the ones found below.
 
     - Mozilla® Firefox® most recent stable version (recommended)
     - Google Chrome™ most recent stable version (recommended)
@@ -344,7 +372,8 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
 === "[[= product_name =]] v3.3"
 
-    [[= product_name =]] is developed to work with *any* web browser that supports modern standards, on *any* screen resolution suitable for web, running on *any* device. However for the Editorial and Administration User Interfaces you need: a minimum of 1366-by-768 screen resolution, a desktop or tablet device, and a recommended/supported browser among the ones found below.
+    [[= product_name =]] is developed to work with *any* web browser that supports modern standards, on *any* screen resolution suitable for web, running on *any* device.
+    However for the Editorial and Administration User Interfaces you need: a minimum of 1366-by-768 screen resolution, a desktop or tablet device, and a recommended/supported browser among the ones found below.
 
     - Mozilla® Firefox® most recent stable version (recommended)
     - Google Chrome™ most recent stable version (recommended)
@@ -353,7 +382,8 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
 === "eZ Platform v2.5"
 
-    eZ Platform is developed to work with *any* web browser that supports modern standards, on *any* screen resolution suitable for web, running on *any* device. However for the Editorial and Administration User Interfaces you need: a minimum of 1366-by-768 screen resolution, a desktop or tablet device, and a recommended/supported browser among the ones found below.
+    eZ Platform is developed to work with *any* web browser that supports modern standards, on *any* screen resolution suitable for web, running on *any* device.
+    However for the Editorial and Administration User Interfaces you need: a minimum of 1366-by-768 screen resolution, a desktop or tablet device, and a recommended/supported browser among the ones found below.
 
     - Mozilla® Firefox® most recent stable version (recommended)
     - Google Chrome™ most recent stable version (recommended)
@@ -370,18 +400,19 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
     For example:
 
-    - Platform.sh provides Redis support for versions 3.2, 4.0 and 5.0. [[= product_name =]] supports Redis version 4.0 or higher, and recommends 5.0. As a result, Redis is supported on [[= product_name_cloud =]] in versions 4.0 and 5.0, but 5.0 is recommended.
+    - Platform.sh provides Redis support for versions 3.2, 4.0 and 5.0. [[= product_name =]] supports Redis version 4.0 or higher, and recommends 5.0.
+    As a result, Redis is supported on [[= product_name_cloud =]] in versions 4.0 and 5.0, but 5.0 is recommended.
 
     Features or services supported by [[= product_name =]] but not covered by Platform.sh may be possible by means of a [custom integration](#custom-integrations).
 
     ### [[= product_name_cloud =]] Setup support matrix
 
-    All [[= product_name =]] features are supported in accordance with the example above. For example: As Legacy Bridge isn't supported with v3, it's not supported on [[= product_name_cloud =]] either.
+    All [[= product_name =]] features are supported in accordance with the example above.
+    For example: As Legacy Bridge isn't supported with v3, it's not supported on [[= product_name_cloud =]] either.
 
     !!! note
 
-        As Platform.sh doesn't support a configuration with multiple PostgreSQL databases,
-        for [[= product_name_cloud =]] / Platform.sh it's impossible to have a DFS table in a separate database.
+        As Platform.sh doesn't support a configuration with multiple PostgreSQL databases, for [[= product_name_cloud =]] / Platform.sh it's impossible to have a DFS table in a separate database.
 
     ### Recommended [[= product_name_cloud =]] setup
 
@@ -406,8 +437,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     Features supported by [[= product_name =]], but not natively by Platform.sh, can in many cases be used by means of custom integrations with external services.
 
     For example, you can create an integration with S3 by means of setting up your own S3 bucket and configuring the relevant parts of [[= product_name =]].
-    We recommend giving the development team working on the project access to the bucket
-    to ensure work is done in a DevOps way without depending on external teams when changes are needed.
+    We recommend giving the development team working on the project access to the bucket to ensure work is done in a DevOps way without depending on external teams when changes are needed.
 
 === "[[= product_name_cloud =]] v3.3"
 
@@ -417,18 +447,19 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
     For example:
 
-    - Platform.sh provides Redis support for versions 3.2, 4.0 and 5.0. [[= product_name =]] supports Redis version 4.0 or higher, and recommends 5.0. As a result, Redis is supported on [[= product_name_cloud =]] in versions 4.0 and 5.0, but 5.0 is recommended.
+    - Platform.sh provides Redis support for versions 3.2, 4.0 and 5.0. [[= product_name =]] supports Redis version 4.0 or higher, and recommends 5.0.
+    As a result, Redis is supported on [[= product_name_cloud =]] in versions 4.0 and 5.0, but 5.0 is recommended.
 
     Features or services supported by [[= product_name =]] but not covered by Platform.sh may be possible by means of a [custom integration](#custom-integrations).
 
     ### [[= product_name_cloud =]] Setup support matrix
 
-    All [[= product_name =]] features are supported in accordance with the example above. For example: As Legacy Bridge isn't supported with v3, it's not supported on [[= product_name_cloud =]] either.
+    All [[= product_name =]] features are supported in accordance with the example above.
+    For example: As Legacy Bridge isn't supported with v3, it's not supported on [[= product_name_cloud =]] either.
 
     !!! note
 
-        As Platform.sh doesn't support a configuration with multiple PostgreSQL databases,
-        for [[= product_name_cloud =]] / Platform.sh it's impossible to have a DFS table in a separate database.
+        As Platform.sh doesn't support a configuration with multiple PostgreSQL databases, for [[= product_name_cloud =]] / Platform.sh it's impossible to have a DFS table in a separate database.
 
     ### Recommended [[= product_name_cloud =]] setup
 
@@ -453,8 +484,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     Features supported by [[= product_name =]], but not natively by Platform.sh, can in many cases be used by means of custom integrations with external services.
 
     For example, you can create an integration with S3 by means of setting up your own S3 bucket and configuring the relevant parts of [[= product_name =]].
-    We recommend giving the development team working on the project access to the bucket
-    to ensure work is done in a DevOps way without depending on external teams when changes are needed.
+    We recommend giving the development team working on the project access to the bucket to ensure work is done in a DevOps way without depending on external teams when changes are needed.
 
 === "eZ Platform Cloud v2.5"
 
@@ -464,8 +494,10 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
     For example:
 
-    - Platform.sh provides Redis support for versions 2.8, 3.0 and 3.2. eZ Platform supports Redis version 3.2 or higher. As a result, Redis is supported by eZ Platform Cloud versions 3.2.
-    - Platform.sh provides Elastic Search service (different versions supported). Elastic Search isn't supported for use as search engine for eZ Platform.
+    - Platform.sh provides Redis support for versions 2.8, 3.0 and 3.2. eZ Platform supports Redis version 3.2 or higher.
+    As a result, Redis is supported by eZ Platform Cloud versions 3.2.
+    - Platform.sh provides Elastic Search service (different versions supported).
+    Elastic Search isn't supported for use as search engine for eZ Platform.
 
     Features or services supported by eZ Platform but not covered by Platform.sh may be possible by means of a [custom integration](#custom-integrations).
 
@@ -489,22 +521,18 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
     ### Experimental/custom Platform.sh setups
 
     Any use of experimental versions or setups isn't eligible for use with eZ Platform Cloud.
-    However, it's possible to use an eZ Enterprise subscription in combination with a Platform.sh contract,
-    where you or a partner take ownership of the configuration to set up the project.
+    However, it's possible to use an eZ Enterprise subscription in combination with a Platform.sh contract, where you or a partner take ownership of the configuration to set up the project.
 
-    Such projects are possible by means of custom integrations/configuration,
-    but they may generate issues that aren't covered by eZ Enterprise subscription bug fix guarantee.
+    Such projects are possible by means of custom integrations/configuration, but they may generate issues that aren't covered by eZ Enterprise subscription bug fix guarantee.
 
     !!! tip "Use a partner with prior experience on legacy and Platform.sh"
 
-        If you're in need of setting up your legacy project on Platform.sh for a transitional period,
-        eZ can put you in contact with a partner experienced in setting up older projects on Platform.sh.
+        If you're in need of setting up your legacy project on Platform.sh for a transitional period, eZ can put you in contact with a partner experienced in setting up older projects on Platform.sh.
         This saves you a lot of time and effort.
         
     !!! note
 
-        As Platform.sh doesn't support a configuration with multiple PostgreSQL databases,
-        for eZ Platform Cloud / Platform.sh it's impossible to have a DFS table in a separate database.
+        As Platform.sh doesn't support a configuration with multiple PostgreSQL databases, for eZ Platform Cloud / Platform.sh it's impossible to have a DFS table in a separate database.
 
     ### Custom integrations
 
diff --git a/docs/getting_started/troubleshooting.md b/docs/getting_started/troubleshooting.md
index baf4d54405..effafa9390 100644
--- a/docs/getting_started/troubleshooting.md
+++ b/docs/getting_started/troubleshooting.md
@@ -8,12 +8,12 @@ This page lists potential problems that you may encounter while installing, conf
 
 ## Encoding database password
 
-The password entered in `DATABASE_URL` during installation must either be URL encoded,
-or not contain any special characters that would require URL encoding.
+The password entered in `DATABASE_URL` during installation must either be URL encoded, or not contain any special characters that would require URL encoding.
 
 ### URL encoding
 
-Using URL encoding involves two steps. First, the password must be URL encoded. This can for instance be done with PHP's `urlencode()` function.
+Using URL encoding involves two steps.
+First, the password must be URL encoded. This can for instance be done with PHP's `urlencode()` function.
 For example, this function converts a password like `(/!=#Ƥ*;%?[` to `%28%2F%21%3D%23%C3%86%C2%A4%2A%3B%25%3F%5B`.
 
 Second, you must remove `resolve:` from `doctrine.dbal.url` in `config/packages/doctrine.yaml`.
@@ -22,10 +22,10 @@ That means changing `%env(resolve:DATABASE_URL)%` to `%env(DATABASE_URL)%`.
 ### Avoid special characters
 
 If your password only contains letters a-z, A-Z, and numbers 0-9, you don't need to do any encoding.
-You can either create your password that way, in which case it's a good idea to make it longer to maintain entropy,
-keeping the password hard to guess for an attacker.
+You can either create your password that way, in which case it's a good idea to make it longer to maintain entropy, keeping the password hard to guess for an attacker.
 Or, you can for instance convert your password with `bin2hex()`, so that, for example, `(/!=#Ƥ*;%?[` becomes `282f213d23c386c2a42a3b253f5b`.
-The output from `bin2hex` is limited to 0-9 and a-f. This more than doubles the length of the password, keeping entropy similar.
+The output from `bin2hex` is limited to 0-9 and a-f.
+This more than doubles the length of the password, keeping entropy similar.
 
 ## Enabling swap with limited RAM
 
@@ -38,9 +38,9 @@ When a system runs out of RAM, you may see `Killed` when trying to clear the cac
 
 ## Upload size limit
 
-To make use of the back office, the defined maximum upload size must be consistent with the maximum file size defined in the content type using a File, Media or Image field.
+To make use of the back office, the defined maximum upload size must be consistent with the maximum file size defined in the content type using a File, Media, or Image field.
 
-This is done by setting `LimitRequestBody` for Apache or `client_max_body_size` for nginx.
+It's done by setting `LimitRequestBody` for Apache or `client_max_body_size` for nginx.
 
 For instance, if one of those fields is configured to accept files up to 10MB, then `client_max_body_size` (in case of nginx) should be set above 10MB, with a safe margin, for example to 15MB.
 
@@ -58,16 +58,13 @@ To avoid the error, check the stability of packages and avoid using `--prefer-s
 
 ### Inconsistent cache/session data
 
-If cache or session data inconsistent across web servers in Redis,
-see [Redis clustering](persistence_cache.md#redis-clustering), and make sure you only read/write to
-one active master instance at a time.
+If cache or session data inconsistent across web servers in Redis, see [Redis clustering](persistence_cache.md#redis-clustering), and make sure you only read/write to one active master instance at a time.
 
 ### Removed or refused sessions
 
 If Redis sessions are removed or new sessions are refused.
-see info on [Cluster setup](sessions.md#cluster-setup).
-Ideally, use a separated instance of Redis for sessions,
-that either never runs out of memory or uses an eviction policy that suits your needs.
+For more information, see [Cluster setup](sessions.md#cluster-setup).
+It's recommended to use a separated instance of Redis for sessions, that either never runs out of memory or uses an eviction policy that suits your needs.
 
 ## Conflict with roave/security-advisories
 
@@ -90,9 +87,7 @@ In such case, require it again when the bug is fixed and the package is updated:
 
 ## Platform.sh HTTP access credentials with Varnish
 
-If you're using Platform.sh with Varnish for HTTP cache
-and you have [HTTP access control by login/password](https://docs.platform.sh/administration/web/configure-environment.html#http-access-control) enabled,
-configure the following variables in your Platform.sh environment:
+If you're using Platform.sh with Varnish for HTTP cache and you have [HTTP access control by login/password](https://docs.platform.sh/administration/web/configure-environment.html#http-access-control) enabled, configure the following variables in your Platform.sh environment:
 
 - `HTTPCACHE_USERNAME`
 - `HTTPCACHE_PASSWORD`

From ae3a32afa273e1e23f49e95e10b3737b1936bec5 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Wed, 16 Oct 2024 14:23:46 +0200
Subject: [PATCH 35/77] Fixes in 'ibexa cloud'

---
 docs/ibexa_cloud/ddev_and_ibexa_cloud.md   | 25 +++++++++++++++-------
 docs/ibexa_cloud/ibexa_cloud_guide.md      | 14 +++++++-----
 docs/ibexa_cloud/install_on_ibexa_cloud.md | 15 +++++--------
 3 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/docs/ibexa_cloud/ddev_and_ibexa_cloud.md b/docs/ibexa_cloud/ddev_and_ibexa_cloud.md
index 03be4210d6..c8ab6ffa2e 100644
--- a/docs/ibexa_cloud/ddev_and_ibexa_cloud.md
+++ b/docs/ibexa_cloud/ddev_and_ibexa_cloud.md
@@ -17,22 +17,29 @@ Two ways are available to run an [[= product_name_cloud =]] project locally with
 
 To configure the [`ddev/ddev-platformsh` add-on](https://github.com/ddev/ddev-platformsh), you need a [Platform.sh API Token](https://docs.platform.sh/administration/cli/api-tokens.html).
 
-The `ddev/ddev-platformsh` add-on configures the document root, the PHP version, the database, and the cache pool according to the [[= product_name_cloud =]] configuration. About the search engine, the add-on can configure Elasticsearch but can't configure Solr. If you use Solr on [[= product_name_cloud =]] and want to add it to your DDEV stack, see [clustering with DDEV and `ibexa/ddev-solr` add-on](clustering_with_ddev.md#solr).
+The `ddev/ddev-platformsh` add-on configures the document root, the PHP version, the database, and the cache pool according to the [[= product_name_cloud =]] configuration.
+About the search engine, the add-on can configure Elasticsearch but can't configure Solr.
+If you use Solr on [[= product_name_cloud =]] and want to add it to your DDEV stack, see [clustering with DDEV and `ibexa/ddev-solr` add-on](clustering_with_ddev.md#solr).
 
 `COMPOSER_AUTH` from Platform.sh can't be used, because JSON commas are incorrectly interpreted by `--web-environment-add`, which sees them as multiple variable separators.
-But the variable must exist for Platform.sh `hooks` scripts to work. To use an `auth.json` file for this purpose, see [Using `auth.json`](install_with_ddev.md#using-authjson).
+But the variable must exist for Platform.sh `hooks` scripts to work.
+To use an `auth.json` file for this purpose, see [Using `auth.json`](install_with_ddev.md#using-authjson).
 
 You must remove Node.js and NVM installations as they're already included in DDEV.
 
 The following sequence of commands:
 
-1. Downloads the [[= product_name_cloud =]] Platform.sh project from the default environment "production" into a new directory using [Platform.sh CLI alias `ibexa_cloud` defined in introduction](#ibexa-cloud-and-ddev). (Replace `<project-ID>` with the hash of your own project. See [`ibexa_cloud help get`](https://docs.platform.sh/administration/cli.html#3-use) for options like selecting another environment).
+1. Downloads the [[= product_name_cloud =]] Platform.sh project from the default environment "production" into a new directory using [Platform.sh CLI alias `ibexa_cloud` defined in introduction](#ibexa-cloud-and-ddev).
+(Replace `<project-ID>` with the hash of your own project.
+See [`ibexa_cloud help get`](https://docs.platform.sh/administration/cli.html#3-use) for options like selecting another environment).
 1. Configures a new DDEV project.
-1. Ignores `.ddev/` directory from Git. (Some DDEV config could be committed like in [this documentation](https://ddev.readthedocs.io/en/latest/users/extend/customization-extendibility/#extending-configyaml-with-custom-configyaml-files).)
+1. Ignores `.ddev/` directory from Git.
+(Some DDEV config could be committed like in [this documentation](https://ddev.readthedocs.io/en/latest/users/extend/customization-extendibility/#extending-configyaml-with-custom-configyaml-files).)
 1. Sets Composer authentication by using an already existing `auth.json` file.
 1. Creates a `public/var` directory if it doesn't exist, to allow the creation of `public/var/.platform.installed` by Platform.sh hook script.
 1. Installs the `ddev/ddev-platformsh` add-on which prompts for the Platform.sh API token, project ID and environment name.
-1. Comments out the Node.js and NVM installations from the hooks copied in `.ddev/config.platformsh.yaml`. (In this file, you may have to discard other specific features like New Relic.)
+1. Comments out the Node.js and NVM installations from the hooks copied in `.ddev/config.platformsh.yaml`.
+(In this file, you may have to discard other specific features like New Relic.)
 1. Changes `maxmemory-policy` from default `allkeys-lfu` to a [value accepted by the `RedisTagAwareAdapter`](https://github.com/symfony/cache/blob/5.4/Adapter/RedisTagAwareAdapter.php#L95).
 1. Starts the project.
 1. Gets the content from Platform.sh, both database and binary files by using `ddev pull platform` feature from the add-on.
@@ -66,9 +73,11 @@ The following example adapts the [manual method to run an already existing proje
 
 The following sequence of commands:
 
-1. Downloads the [[= product_name_cloud =]] Platform.sh project from the default environment "production" into a new directory using [Platform.sh CLI alias `ibexa_cloud` defined in introduction](#ibexa-cloud-and-ddev). (Replace `<project-ID>` with the hash of your own project. See [`ibexa_cloud help get`](https://docs.platform.sh/administration/cli.html#3-use) for options like selecting another environment).
+1. Downloads the [[= product_name_cloud =]] Platform.sh project from the default environment "production" into a new directory using [Platform.sh CLI alias `ibexa_cloud` defined in introduction](#ibexa-cloud-and-ddev).
+(Replace `<project-ID>` with the hash of your own project. See [`ibexa_cloud help get`](https://docs.platform.sh/administration/cli.html#3-use) for options like selecting another environment).
 1. Configures a new DDEV project.
-1. Ignores `.ddev/` directory from Git. (Some DDEV config could be committed like in [this documentation](https://ddev.readthedocs.io/en/latest/users/extend/customization-extendibility/#extending-configyaml-with-custom-configyaml-files).)
+1. Ignores `.ddev/` directory from Git.
+(Some DDEV config could be committed like in [this documentation](https://ddev.readthedocs.io/en/latest/users/extend/customization-extendibility/#extending-configyaml-with-custom-configyaml-files).)
 1. Starts the DDEV project.
 1. Sets Composer authentication.
 1. [Gets the database content from Platform.sh](https://docs.platform.sh/add-services/mysql.html#exporting-data).
@@ -94,4 +103,4 @@ ddev launch
 
 From there, services can be added to get closer to [[= product_name_cloud =]] Platform.sh architecture.
 `.platform/services.yaml` indicates the services used.
-Refer to [clustering with DDEV](clustering_with_ddev.md) for those additions.
+For more information, see [clustering with DDEV](clustering_with_ddev.md).
diff --git a/docs/ibexa_cloud/ibexa_cloud_guide.md b/docs/ibexa_cloud/ibexa_cloud_guide.md
index 709d40eb1f..67876c3ced 100644
--- a/docs/ibexa_cloud/ibexa_cloud_guide.md
+++ b/docs/ibexa_cloud/ibexa_cloud_guide.md
@@ -41,16 +41,18 @@ When you have an account, you can log in to https://console.ibexa.cloud.
 
 ### Platform as a Service
 
-[[= product_name_cloud =]] is a PaaS provider. It's a cloud-based subscription service that you can use for developing, managing, and running applications without infrastructure concerns.
+[[= product_name_cloud =]] is a PaaS provider.
+It's a cloud-based subscription service that you can use for developing, managing, and running applications without infrastructure concerns.
 This cloud computing approach gives users access to a full cloud platform, including hardware, software, and infrastructure.
-PaaS eliminates the requirement to buy and install the necessary hardware and software. All you have to do is access it and you can start deploying resources and developing right away.
+PaaS eliminates the requirement to buy and install the necessary hardware and software.
+All you have to do is access it and you can start deploying resources and developing right away.
 
 ![How PaaS works](how_paas_works.png)
 
 ### Performance management
 
 Make your applications more effective, scalable, and effective by using the [Observability Suite](https://platform.sh/features/observability-suite/).
-This package gives you the the ability to test, profile, and monitor your application before putting it into production.
+This package gives you the ability to test, profile, and monitor your application before putting it into production.
 Observability Suite comes with each [[= product_name_cloud =]] subscription.
 
 ### Automation
@@ -74,7 +76,8 @@ What's more, [[= product_name_cloud =]] as an end-to-end cloud hosting platform,
 
 Comprehensive data security procedures guarantee that you maintain complete ownership of your client's data, defining where it's stored.
 You can be sure that the safety protocols are compliant with all applicable legislation.
-What's more, all updates to your code and infrastructure are fully auditable. Global CDN (Content Delivery Network) is included and fully managed.
+What's more, all updates to your code and infrastructure are fully auditable.
+Global CDN (Content Delivery Network) is included and fully managed.
 [[= product_name_cloud =]], thanks to extensive [[= product_name_base =]] support, enables effortless deployment.
 You can create a clone not only of the code, but also data and the infrastructure.
 As the infrastructure is exactly the same as what's currently in production, you can be sure that everything works well when you conduct your release and push it live.
@@ -82,7 +85,8 @@ As the infrastructure is exactly the same as what's currently in production, you
 ### High availability and compatibility
 
 [[= product_name_cloud =]] is compatible with your choice of public cloud server and supports a variety of hosting platforms.
-It's a Git-native development - compatible with Git Flow. [[= product_name_cloud =]] deployment integrates naturally at the end of your existing production chain, including staging, and work in progress branch preview.
+It's a Git-native development - compatible with Git Flow.
+[[= product_name_cloud =]] deployment integrates naturally at the end of your existing production chain, including staging, and work in progress branch preview.
 You can also integrate with, for example, Bitbucket, GitHub, Gitlab.
 You can instantly clone every branch of both your code and infrastructure configuration.
 Platform.sh (and [[= product_name_cloud =]], by extension) uses the [Infrastracture as Code approach](https://docs.platform.sh/learn/overview.html#infrastructure-as-code).
diff --git a/docs/ibexa_cloud/install_on_ibexa_cloud.md b/docs/ibexa_cloud/install_on_ibexa_cloud.md
index fc842e7bbb..21fa0b9bfc 100644
--- a/docs/ibexa_cloud/install_on_ibexa_cloud.md
+++ b/docs/ibexa_cloud/install_on_ibexa_cloud.md
@@ -22,15 +22,13 @@ You can adapt the configuration in the following places:
 - `.platform/services.yml` - additional services such as search engines or cache
 - `.platform/routes.yml` - routes to additional services, for example Fastly
 
-For details about available configuration settings,
-refer to [Platform.sh documentation](https://docs.platform.sh/create-apps.html).
+For details about available configuration settings, refer to [Platform.sh documentation](https://docs.platform.sh/create-apps.html).
 
 ### Disk space
 
 The total disk space depends on your [[= product_name_cloud =]] subscription level.
 You can assign disk space to the main app container under the `disk` key.
-You can distribute the remaining space between other containers (for example, the database) or search engine
-in `.platform/services.yaml`, under the individual service definitions.
+You can distribute the remaining space between other containers (for example, the database) or search engine in `.platform/services.yaml`, under the individual service definitions.
 
 ### Build and deploy process
 
@@ -44,14 +42,11 @@ Configuration under `hooks` defines the process of building and deploying your p
 
 ### Additional services
 
-`.platform/services.yaml` contains preconfigured setting blocks that you can uncomment
-to enable services such as Solr or Elasticsearch, or persistent Redis session storage.
+`.platform/services.yaml` contains preconfigured setting blocks that you can uncomment to enable services such as Solr or Elasticsearch, or persistent Redis session storage.
 
-For information about available services,
-see [Platform.sh documentation](https://docs.platform.sh/add-services.html#available-services).
+For information about available services, see [Platform.sh documentation](https://docs.platform.sh/add-services.html#available-services).
 
-If you enable any of the services, you must uncomment the relevant relationship
-under the `relationship` key in `.platform.app.yaml` as well.
+If you enable any of the services, you must uncomment the relevant relationship under the `relationship` key in `.platform.app.yaml` as well.
 
 ## 2. Create an account
 

From 8dbc2cb3b3285f64ef4781c126e9fb2ba464c3e1 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Wed, 16 Oct 2024 14:26:03 +0200
Subject: [PATCH 36/77] Fixes in 'ibexa engage' section

---
 docs/ibexa_engage/create_campaign.md         | 17 +++++++++++------
 docs/ibexa_engage/ibexa_engage.md            |  3 ++-
 docs/ibexa_engage/install_ibexa_engage.md    |  3 ++-
 docs/ibexa_engage/integrate_ibexa_connect.md |  3 ++-
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/docs/ibexa_engage/create_campaign.md b/docs/ibexa_engage/create_campaign.md
index afff227235..5cf16b067c 100644
--- a/docs/ibexa_engage/create_campaign.md
+++ b/docs/ibexa_engage/create_campaign.md
@@ -6,7 +6,7 @@ edition: experience
 # Create campaign
 
 [Campaign]([[= user_doc =]]/ibexa_engage/ibexa_engage/#campaign) is a set of concepts, divided into steps, that the user can configure.
-It can contain a welcome screen, an interaction element, a form step, an exit screen, and so on.
+It can contain, for example, a welcome screen, an interaction element, a form step, and an exit screen.
 To create new campaign, you need to use Qualifio Manager.
 You can use Qualifio's existing templates and interactive elements, such as quizzes, pools, and forms, to create visually appealing, customized campaigns.
 Users can configure the backgrounds, themes, or designs, and set up a specific time frame for each campaign.
@@ -24,11 +24,14 @@ For more information about publication channels, see [Publication channel]([[= u
 
 You can add [Campaign block]([[= user_doc =]]/content_management/block_reference/#campaign-block) in Page Builder to display campaign on the landing page.
 
-To select campaign, go to **Properties** tab. From the **Campaign** drop-down, choose campaign.
+To select campaign, go to **Properties** tab.
+From the **Campaign** drop-down, choose campaign.
 This list includes all campaigns available on user's Qualifio account which are active or scheduled to launch in the future.
 
-You can set the dimensions of the field in which the campaign is displayed. To do it, insert width and height values in the proper fields.
-If size fields are blank, the system sets default template values. It's recommended to adjust them for better results.
+You can set the dimensions of the field in which the campaign is displayed.
+To do it, insert width and height values in the proper fields.
+If size fields are blank, the system sets default template values.
+It's recommended to adjust them for better results.
 
 ![Campaign block](campaign_block.png "Campaign block")
 
@@ -38,7 +41,9 @@ You can embed campaign in the Rich text field with Campaign custom tag.
 To do it, insert **Campaign** content item in the Rich Text Field and choose campaign from the drop-down list.
 This list includes all campaigns available on user's Qualifio account which are active or scheduled to launch in the future.
 
-You can set the dimensions of the field in which the campaign is displayed. To do it, select units, and provide width and height values in the proper fields.
-If size fields are blank, the system sets default template values. It's recommended to adjust them for better results.
+You can set the dimensions of the field in which the campaign is displayed.
+To do it, select units, and provide width and height values in the proper fields.
+If size fields are blank, the system sets default template values.
+It's recommended to adjust them for better results.
 
 ![Campaign custom tag](campaign_custom_tag.png "Campaign custom tag")
\ No newline at end of file
diff --git a/docs/ibexa_engage/ibexa_engage.md b/docs/ibexa_engage/ibexa_engage.md
index a48086f36e..89831e20f4 100644
--- a/docs/ibexa_engage/ibexa_engage.md
+++ b/docs/ibexa_engage/ibexa_engage.md
@@ -7,7 +7,8 @@ month_change: false
 # [[= product_name_engage =]]
 
 [[= product_name_engage =]] is a data collection tool.
-It gives you the ability to use the [Qualifio](https://qualifio.com/) tools to engage your audiences. You can use interactive content to build relationships and collect important data, for example, a list of recent orders, or personal information about customers.
+It gives you the ability to use the [Qualifio](https://qualifio.com/) tools to engage your audiences.
+You can use interactive content to build relationships and collect important data, for example, a list of recent orders, or personal information about customers.
 You can also integrate [[= product_name_engage =]] with [[= product_name_connect =]] to create workflows.
 
 [[= cards([
diff --git a/docs/ibexa_engage/install_ibexa_engage.md b/docs/ibexa_engage/install_ibexa_engage.md
index 3a6dd28cd1..d7143215d5 100644
--- a/docs/ibexa_engage/install_ibexa_engage.md
+++ b/docs/ibexa_engage/install_ibexa_engage.md
@@ -13,7 +13,8 @@ For more information, see [Qualifio Developers documentation](https://developers
 ## Enable [[= product_name_engage =]] account
 
 To use [[= product_name_engage =]], you must make arrangements with [[= product_name =]] to define the initial configuration.
-[[= product_name_base =]] team creates and provides user account. An invitation link is sent during the setup process.
+[[= product_name_base =]] team creates and provides user account.
+An invitation link is sent during the setup process.
 
 For more information, see [[[= product_name_engage =]] in User Documentation]([[= user_doc =]]/ibexa_engage/ibexa_engage/#request-access).
 
diff --git a/docs/ibexa_engage/integrate_ibexa_connect.md b/docs/ibexa_engage/integrate_ibexa_connect.md
index c232161571..b0a8e9d49e 100644
--- a/docs/ibexa_engage/integrate_ibexa_connect.md
+++ b/docs/ibexa_engage/integrate_ibexa_connect.md
@@ -54,4 +54,5 @@ To do it, perform the following actions::
 
 ![Configure Ibexa Engage](configure_ibexa_engage.png "Configure Ibexa Engage")
 
-4\. Then, go to **Engage** -> **Integrations** -> **Push rules** to define the default or specific rules for new campaign or website. Select the created webhook.
\ No newline at end of file
+4\. Then, go to **Engage** -> **Integrations** -> **Push rules** to define the default or specific rules for new campaign or website.
+Select the created webhook.
\ No newline at end of file

From 8c5b5ecd284f4b478edc5f7d0584219f8ea8fcd6 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Wed, 16 Oct 2024 14:30:58 +0200
Subject: [PATCH 37/77] Fixes in 'ibexa products' section

---
 docs/ibexa_products/ibexa_commerce.md   |  8 ++++----
 docs/ibexa_products/ibexa_experience.md |  2 +-
 docs/ibexa_products/ibexa_headless.md   | 25 +++++++------------------
 3 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/docs/ibexa_products/ibexa_commerce.md b/docs/ibexa_products/ibexa_commerce.md
index 9970b8efec..7479a4776f 100644
--- a/docs/ibexa_products/ibexa_commerce.md
+++ b/docs/ibexa_products/ibexa_commerce.md
@@ -104,7 +104,7 @@ Recommendations can be used to propose related, alternative, or complimentary pr
 
 #### Use effective merchandising
 
-Merchandising assists in keeping the consistency of the brand and providing customized product recommendations with captivating visuals and powerful search features. 
+Merchandising assists in keeping the consistency of the brand and providing customized product recommendations with captivating visuals and powerful search features.
 You can engage your customers with eye-catching graphics and information.
 The search engine makes it easy to find what they're looking for by providing quick and easy access to the product catalogs.
 
@@ -124,7 +124,7 @@ You can create online store that really fits your needs.
 
 #### Automate business processes
 
-With [[= product_name_com =]], the automation process becomes easier, which is essential if your company wants to do more with less effort. 
-It comes with all capabilities, including order and inventory management, customer data and custom pricing, which are needed to achieve it.
-You can integrate with over 1,300 standard apps, including your CRM, ERP, PIM and DAM systems, and build custom connectors.
+With [[= product_name_com =]], the automation process becomes easier, which is essential if your company wants to do more with less effort.
+It comes with all capabilities, including order and inventory management, customer data, and custom pricing, which are needed to achieve it.
+You can integrate with over 1,300 standard apps, including your CRM, ERP, PIM, and DAM systems, and build custom connectors.
 Also, you can use the ready-to-use pre-designed templates.
\ No newline at end of file
diff --git a/docs/ibexa_products/ibexa_experience.md b/docs/ibexa_products/ibexa_experience.md
index d87d502eb4..856293bd28 100644
--- a/docs/ibexa_products/ibexa_experience.md
+++ b/docs/ibexa_products/ibexa_experience.md
@@ -126,7 +126,7 @@ To promote your campaign, you can add a Campaign block to a page in Page Builder
 ### Use cases
 
 With [[= product_name_exp =]], your customers are the main focus of all that you do.
-It makes it simpler than ever to create the different touchpoints that your customers have with your brand, giving you the ability to guide them through your significant business procedures. 
+It makes it simpler than ever to create the different touchpoints that your customers have with your brand, giving you the ability to guide them through your significant business procedures.
 
 #### Build new pages and integrated forms
 
diff --git a/docs/ibexa_products/ibexa_headless.md b/docs/ibexa_products/ibexa_headless.md
index 5878661789..e4e29b433c 100644
--- a/docs/ibexa_products/ibexa_headless.md
+++ b/docs/ibexa_products/ibexa_headless.md
@@ -36,8 +36,7 @@ Then, content is available to end users through REST, GraphQL, or every output y
 
 ### Technical backstage
 
-When you have a license, you install [[= product_name_headless =]] through Composer
-on an architecture including at least a web server with PHP and a relational database server.
+When you have a license, you install [[= product_name_headless =]] through Composer on an architecture including at least a web server with PHP and a relational database server.
 For performance, several bricks can be added to your stack such as a reverse proxy or a search engine.
 
 [[= product_name_headless =]] is based on Symfony. Any Symfony developer, or even PHP developer, can quickly learn how to extend it with the help of an online documentation.
@@ -54,8 +53,7 @@ APIs summary:
 - The OAuth 2 [Client](oauth_client.md) and [Server](oauth_server.md) allow to connect to an SSO or be the SSO.
 - The design engine and its theme templates mechanism allows to serve the content in several shapes.
 - The PHP API opens [[= product_name_headless =]] to extendability to fit your needs.
-  For example, content can be computed, edited or served in specific ways such as
-  scheduled/live imports/exports, automated edition tasks, or specific controllers to communicate with other applications.
+  For example, content can be computed, edited, or served in specific ways such as scheduled/live imports/exports, automated edition tasks, or specific controllers to communicate with other applications.
 
 ## Capabilities and benefits
 
@@ -63,8 +61,7 @@ APIs summary:
 It comes without a default front office.
 You don't lose time to develop a theme for a provided front office before discovering it doesn't fit your needs.
 No distraction.
-[[= product_name_headless =]] helps you focus on the content, create and organize with its straightforward user interface (UI),
-imagine its inputs/outputs, and implement them with its various layers' APIs.
+[[= product_name_headless =]] helps you focus on the content, create and organize with its straightforward user interface (UI), imagine its inputs/outputs, and implement them with its various layers' APIs.
 
 ### Core features
 
@@ -173,22 +170,14 @@ Several features help end users collaborate on the content, such as:
 
 ## Use cases
 
-As a content repository with an omnipotent back office,
-many APIs to absorb, compute and distribute content,
-even a recommendation engine to deliver the right content to various readers,
-[[= product_name_headless =]] can be used in several cases.
+As a content repository with an omnipotent back office, many APIs to absorb, compute and distribute content, even a recommendation engine to deliver the right content to various readers, [[= product_name_headless =]] can be used in several cases.
 Here are few examples.
 
 ### Brick and mortar, but with an online showcase
 
-If you prefer the human warmth of a retail store,
-if your products' numerous complex options should be discussed,
-or if you're simply not ready yet to sell online,
-[[= product_name_headless =]] helps to build an exposition of your product catalog and your philosophy,
-an online presence to keep earlier customers interested and gather new ones.
-It can be a structuring first step to test customer's adoption of your website,
-before increasing user experience with [[= product_name_exp =]],
-and finally becoming an online store with [[= product_name_com =]].
+If you prefer the human warmth of a retail store, if your products' numerous complex options should be discussed,
+or if you're not ready yet to sell online, [[= product_name_headless =]] helps to build an exposition of your product catalog and your philosophy, an online presence to keep earlier customers interested and gather new ones.
+It can be a structuring first step to test customer's adoption of your website, before increasing user experience with [[= product_name_exp =]], and finally becoming an online store with [[= product_name_com =]].
 
 ### Large network with multiple inputs and outputs
 

From abe6688a7515c75428abea912c4b7c52ef6ed310 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Wed, 16 Oct 2024 15:00:23 +0200
Subject: [PATCH 38/77] Fixes in 'cache' section

---
 .../cache/http_cache/content_aware_cache.md   | 135 +++++++++---------
 .../cache/http_cache/context_aware_cache.md   |  45 ++----
 .../cache/http_cache/fastly.md                |  34 +++--
 .../cache/http_cache/http_cache.md            |   7 +-
 .../http_cache/http_cache_configuration.md    |  21 ++-
 .../cache/http_cache/reverse_proxy.md         |  65 ++++-----
 .../cache/persistence_cache.md                |  44 +++---
 7 files changed, 154 insertions(+), 197 deletions(-)

diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
index 28813143ec..9dbcead81d 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
@@ -9,8 +9,7 @@ This awareness is accomplished by means of cache tagging. All supported reverse
 
 !!! note "Tag header is stripped in production for security reasons"
 
-    For security reasons this header, and other internal cache headers,
-    are stripped from output in production by the reverse proxy (in VCL for Varnish and Fastly).
+    For security reasons this header, and other internal cache headers, are stripped from output in production by the reverse proxy (in VCL for Varnish and Fastly).
 
 ## Cache tags
 
@@ -20,9 +19,7 @@ Tags form a secondary set of keys assigned to every cache item, on top of the "p
 Like an index in a database, a tag is typically used for anything relevant that represents the given cache item.
 Tags are used for cache invalidation.
 
-For example, the system tags every article response, and when the article content type is updated,
-it tells Varnish that all articles should be considered stale
-and updated in the background when someone requests them.
+For example, the system tags every article response, and when the article content type is updated, it tells Varnish that all articles should be considered stale and updated in the background when someone requests them.
 
 Current content tags (and when the system purges on them):
 
@@ -37,16 +34,14 @@ Current content tags (and when the system purges on them):
 
 !!! note "Automatic repository prefixing of cache tags"
 
-    As [[= product_name =]] supports multi-repository (multi-database) setups that can have overlapping IDs,
-    the shared HTTP cache systems need to distinguish tags relevant to the different content repositories.
+    As [[= product_name =]] supports multi-repository (multi-database) setups that can have overlapping IDs, the shared HTTP cache systems need to distinguish tags relevant to the different content repositories.
 
     This is why in multi-repository setup you can see cache tags such as `1p2`.
     In this example `1` represents the index among configured repositories, meaning the second repository in the system.
 
     Tags aren't prefixed for default repository (index "0").
 
-The content tags are returned in a header in the responses from [[= product_name =]]. The header name is dependent on
-which HTTP Cache [[= product_name =]] is configured with:
+The content tags are returned in a header in the responses from [[= product_name =]]. The header name is dependent on which HTTP Cache [[= product_name =]] is configured with:
 
 - Symfony reverse proxy: `X-Cache-Tags`
 - Varnish: `xkey`
@@ -132,14 +127,15 @@ If the given content has several Locations, you can see several `l<location-id>`
 
 ### ResponseConfigurator
 
-A `ReponseCacheConfigurator` configures an HTTP Response object, makes the response public, adds tags, and sets the shared max age. 
+A `ReponseCacheConfigurator` configures an HTTP Response object, makes the response public, adds tags, and sets the shared max age.
 It's provided to `ReponseTaggers` that use it to add the tags to the response.
 
 The `ConfigurableResponseCacheConfigurator` (`Ibexa\HttpCache\ResponseConfigurator\ConfigurableResponseCacheConfigurator`) follows the `view_cache` configuration and only enables cache if it's enabled in the configuration.
 
 ### Delegator and Value taggers
 
-- Delegator taggers - extract another value or several from the given value and pass it on to another tagger. For example, a `ContentView` is covered both by the `ContentValueViewTagger` and `LocationValueViewTagger`, where the first extracts the Content from the `ContentView` and passes it to the `ContentInfoTagger`.
+- Delegator taggers - extract another value or several from the given value and pass it on to another tagger.
+For example, a `ContentView` is covered both by the `ContentValueViewTagger` and `LocationValueViewTagger`, where the first extracts the content from the `ContentView` and passes it to the `ContentInfoTagger`.
 - Value taggers - extract the `Location` and pass it on to the `LocationViewTagger`.
 
 ## DispatcherTagger
@@ -187,8 +183,7 @@ $tagHandler->addRelationTags([33, 44]);
 
 In PHP, FOSHttpCache exposes the `fos_http_cache.http.symfony_response_tagger` service which enables you to add tags to a response.
 
-The following example adds minimal tags when ID 33 and 34 are rendered in ESI,
-but parent response needs these tags to get refreshed if they're deleted:
+The following example adds minimal tags when ID 33 and 34 are rendered in ESI, but parent response needs these tags to get refreshed if they're deleted:
 
 ``` php
 /** @var \FOS\HttpCacheBundle\Http\SymfonyResponseTagger $responseTagger */
@@ -199,8 +194,8 @@ See [Tagging from code](https://foshttpcachebundle.readthedocs.io/en/latest/feat
 
 4\. Use deprecated `X-Location-Id` header.
 
-For custom or built-in controllers (for example, REST) still using `X-Location-Id`, `XLocationIdResponseSubscriber` handles translating
-this header to tags. It supports singular and comma-separated Location ID value(s):
+For custom or built-in controllers (for example, REST) still using `X-Location-Id`, `XLocationIdResponseSubscriber` handles translating this header to tags.
+It supports singular and comma-separated Location ID value(s):
 
 ```php
 /** @var \Symfony\Component\HttpFoundation\Response $response */
@@ -213,8 +208,7 @@ $response->headers->set('X-Location-Id', '123,212,42');
 !!! caution "X-Location-Id use is deprecated"
 
     `X-Location-Id` is deprecated and removed in future.
-    For rendering content it's advised to refactor to use Content View,
-    if not applicable `ContentTagInterface` or lastly manually output tags.
+    For rendering content it's advised to refactor to use content view, if not applicable `ContentTagInterface` or lastly manually output tags.
 
 ## Response tagging in templates
 
@@ -254,14 +248,13 @@ See [Tagging from Twig Templates](https://foshttpcachebundle.readthedocs.io/en/l
 
 ### Default tag purging
 
-`ibexa/http-cache` uses repository API event subscribers to listen to events emitted on repository operations,
-and depending on the operation triggers expiry on a specific tag or set of tags.
+`ibexa/http-cache` uses repository API event subscribers to listen to events emitted on repository operations, and depending on the operation triggers expiry on a specific tag or set of tags.
 All event subscribers can be found in `http-cache/src/lib/EventSubscriber/CachePurge`.
 
 ### Tags purged on publish event
 
-Below is an example of a Content structure. The tags which the content view controller adds to each location are
-also listed
+Below is an example of a content structure.
+The tags which the content view controller adds to each location are also listed:
 
 ```
    - [Home] (content-id=52, location-id=2)
@@ -292,9 +285,10 @@ Effectively, in this example HTTP cache for `[Parent1]` and `[Child]` is cleared
 
 ### Tags purged on move event
 
-With the same Content structure as above, the `[Child]` location is moved below `[Parent2]`.
+With the same content structure as above, the `[Child]` location is moved below `[Parent2]`.
 
 The new structure is then:
+
 ```
    - [Home] (content-id=52, location-id=2)
      ez-all c52 ct42 l2 pl1 p1 p2
@@ -316,8 +310,7 @@ The following keys are purged during the move:
 - `pl21`, because cache for all children of new parent (`[Parent2]`) should be purged
 - `p22`, because cache for any element below `[Child]` should be purged (because path has changed)
 
-In other words, HTTP Cache for `[Parent1]`, children of `[Parent1]` ( if any ), `[Parent2]`, children of `[Parent2]` ( if any ),
-`[Child]` and any subtree below `[Child]`.
+In other words, HTTP Cache for `[Parent1]`, children of `[Parent1]` ( if any ), `[Parent2]`, children of `[Parent2]` ( if any ), `[Child]` and any subtree below `[Child]`.
 
 ### Custom purging from code
 
@@ -336,7 +329,7 @@ $purgeClient->purgeAll();
 
 ### Purging from command line
 
-Example for purging by Location and by Content ID:
+Example for purging by Location and by content ID:
 
 ```bash
 bin/console fos:httpcache:invalidate:tag l44 c33
@@ -350,22 +343,21 @@ bin/console fos:httpcache:invalidate:tag ez-all
 
 !!! tip "Purge is done on the current repository"
 
-    Similarly to purging from code, the tags you purge on, are prefixed to match the currently configured SiteAccess. 
+    Similarly to purging from code, the tags you purge on, are prefixed to match the currently configured SiteAccess.
     When you use this command in combination with multi-repository setup, make sure to specify SiteAccess argument.
 
 ## Testing and debugging HTTP cache
 
-It's important to test your code in an environment which is as similar as your production environment as possible. That
-means that if only are testing locally using the default Symfony Reverse proxy when your are going to use Varnish or
-Fastly in production, you're likely ending up some (bad) surprises. Due to the symfony reverse proxy's lack of support for ESIs, it behaves
-quite different from Varnish and Fastly in some aspects.
+It's important to test your code in an environment which is as similar as your production environment as possible.
+That means that if only are testing locally using the default Symfony Reverse proxy when your are going to use Varnish or Fastly in production, you're likely ending up some (bad) surprises.
+Due to the symfony reverse proxy's lack of support for ESIs, it behaves quite different from Varnish and Fastly in some aspects.
 If you're going to use Varnish in production, make sure you also test your code with Varnish.
-If you're going to use Fastly in production, testing with Fastly in your developer install is likely not feasible
-(you're local development environment must then be accessible for Fastly). Testing with Varnish instead in most
-cases does the job. But if you need to change the varnish configuration to make your site work, be aware that Varnish and Fastly uses different dialects, and
-that .vcl code for Varnish V6.x doesn't likely work as-is on Fastly.
+If you're going to use Fastly in production, testing with Fastly in your developer install is likely not feasible (you're local development environment must then be accessible for Fastly).
+Testing with Varnish instead in most cases does the job.
+But if you need to change the varnish configuration to make your site work, be aware that Varnish and Fastly uses different dialects, and that .vcl code for Varnish V6.x doesn't likely work as-is on Fastly.
+
+This section describes to how to debug problems related to HTTP cache.
 
-This section describes to how to debug problems related to HTTP cache. 
 	You must be able to look both at responses and headers [[= product_name =]] sends to HTTP cache, and not so much at responses and headers
 	the HTTP cache sends to the client (web browser).
 	It means you must be able to send requests to your origin (web server) that don't go through Varnish or Fastly.
@@ -373,7 +365,7 @@ This section describes to how to debug problems related to HTTP cache.
   If you perform tests on Fastly enabled environment on [[= product_name_cloud =]] provided by Platform.sh, you need to use the Platform.sh
 	dashboard to obtain the endpoint for Nginx.
 
-The following example shows how to debug and check why Fastly doesn't cache the front page properly. 
+The following example shows how to debug and check why Fastly doesn't cache the front page properly.
 If you run the command multiple times:
 
 `curl -IXGET https://www.staging.foobar.com.us-2.platformsh.site`
@@ -390,12 +382,13 @@ x-cache: MISS
 
 #### Finding Nginx endpoint for environments located on the grid
 
-To find the Nginx point, first, you need to know in which region your project is located. To do that, go to the Platform.sh dashboard.
+To find the Nginx point, first, you need to know in which region your project is located.
+To do that, go to the Platform.sh dashboard.
 To find a valid route, click an element in the **URLs** drop-down for the specified environment and select the route.
 A route may look like this:
 `https://www.staging.foobar.com.us-2.platformsh.site/`
 
-In this case the region is `us-2` and you can find the public IP list on [Platform.sh documentation page](https://docs.platform.sh/development/regions.html#public-ip-addresses)
+In this case the region is `us-2` and you can find the public IP list on [Platform.sh documentation page](https://docs.platform.sh/development/regions.html#public-ip-addresses).
 Typically, you can add a `gw` to the hostname and use nslookup to find it.
 
 ```bash
@@ -416,7 +409,7 @@ You can also use the [[[= product_name_cloud =]] CLI](https://cli.ibexa.co/) (wh
 If you have a dedicated 3-node cluster on Platform.sh, the procedure for getting the endpoint to environments that are located on that cluster (`production` and sometimes also `staging`) is slightly different.
 In the **URLs** drop-down in the Platform.sh dashboard, find the route that has the format `somecontent.[clusterid].ent.platform.sh/`, for example, `myenvironment.abcdfg2323.ent.platform.sh/`
 
-The endpoint in case has the format `c.[clusterid].ent.platform.sh`, for example, `c.asddfs2323.ent.platform.sh/`
+The endpoint in case has the format `c.[clusterid].ent.platform.sh`, for example, `c.asddfs2323.ent.platform.sh/`.
 Next, use nslookup to find the IP:
 
 ```bash
@@ -428,9 +421,8 @@ Next, use nslookup to find the IP:
 
 ### Fetching user context hash
 
-As explained in [User Context Hash caching](context_aware_cache.md#user-context-hash-caching), the HTTP cache indexes the cache based on the
-user-context-hash. Users with the same user-context-hash here the same cache (as long as [[= product_name =]]
-responds with `Vary: X-Context-User-Hash`).
+As explained in [User Context Hash caching](context_aware_cache.md#user-context-hash-caching), the HTTP cache indexes the cache based on the user-context-hash.
+Users with the same user-context-hash here the same cache (as long as [[= product_name =]] responds with `Vary: X-Context-User-Hash`).
 
 To simulate the requests the HTTP cache sends to [[= product_name =]], you need this user-context-hash.
 To obtain it, use `curl`.
@@ -443,8 +435,8 @@ Some notes about each of these parameters:
 
 - `-IXGET`, one of many ways to tell curl that we want to send a GET request, but we are only interested in outputting the headers
 - `--resolve www.staging.foobar.com.us-2.platformsh.site:443:1.2.3.4`
-    - We tell curl not to do a DNS lookup for `www.staging.foobar.com.us-2.platformsh.site`. We do that because in our case
-    that resolves to the Fastly endpoint, not our origin (nginx)
+    - We tell curl not to do a DNS lookup for `www.staging.foobar.com.us-2.platformsh.site`.
+    We do that because in our case that resolves to the Fastly endpoint, not our origin (nginx)
     - We specify `443` because we are using `https`
     - We provide the IP of the nginx endpoint at platform.sh (`1.2.3.4` in this example)
 - `--header "Surrogate-Capability: abc=ESI/1.0"`, strictly speaking not needed when fetching the user-context-hash, but this tells [[= product_name =]] that client understands ESI tags.
@@ -452,12 +444,11 @@ Some notes about each of these parameters:
 - `--header "accept: application/vnd.fos.user-context-hash"` tells [[= product_name =]] that the client wants to receive the user-context-hash
 - `--header "x-fos-original-url: /"` is required by the fos-http-cache bundle to deliver the user-context-hash
 - `https://www.staging.foobar.com.us-2.platformsh.site/_fos_user_context_hash` : here we use the hostname we earlier told
-  curl how to resolve using `---resolve`. `/_fos_user_context_hash` is the route to the controller that are able to
-  deliver the user-context-hash.
-- You may also provide the session cookie (`--cookie ".....=....") for a logged-in-user if you're interested in
-  the x-user-context-hash for a different user but anonymous
+  curl how to resolve using `---resolve`. `/_fos_user_context_hash` is the route to the controller that are able to deliver the user-context-hash.
+- You may also provide the session cookie (`--cookie ".....=....") for a logged-in-user if you're interested in the x-user-context-hash for a different user but anonymous
 
 The output for this command should look similar to this:
+
 ```
     HTTP/1.1 200 OK
     Server: nginx/1.20.0
@@ -474,8 +465,7 @@ The output for this command should look similar to this:
     Surrogate-Key: ez-user-context-hash ez-all fos_http_cache_hashlookup-
 ```
 
-The header `X-User-Context-Hash` is the one of the interest here, but you may also note the `Surrogate-Key` which
-holds the [cache tags](#cache-tags).
+The header `X-User-Context-Hash` is the one of the interest here, but you may also note the `Surrogate-Key` which holds the [cache tags](#cache-tags).
 
 ### Fetching HTML response
 
@@ -486,6 +476,7 @@ Now you have the user-context-hash, and you can ask origin for the actual resour
 ```
 
 The output :
+
 ```
 HTTP/1.1 200 OK
 Server: nginx/1.20.0
@@ -502,16 +493,16 @@ Surrogate-Key: ez-all c52 ct42 l2 pl1 p1 p2 r56 r57
 ```
 
 The `Cache-Control` header tells the HTTP cache to store the result in the cache for 1 day (86400 seconds)
-The `Vary: X-User-Content-Hash` header tells the HTTP cache that this cache element may be used for all users which has
-the given `x-user-hash` (`daea248406c0043e62997b37292bf93a8c91434e8661484983408897acd93814`).
+The `Vary: X-User-Content-Hash` header tells the HTTP cache that this cache element may be used for all users which has the given `x-user-hash` (`daea248406c0043e62997b37292bf93a8c91434e8661484983408897acd93814`).
 The document might also be removed from the cache by purging any of the keys provided in the `Surrogate-Key` header.
 
-So back to the original problem here. This resource is for some reason not cached by Fastly ( remember the
-`x-cache: MISS` we started with). But origin says this page can be cached for 1 day. How can that be?
+So back to the original problem here.
+This resource is for some reason not cached by Fastly (remember the `x-cache: MISS` we started with).
+But origin says this page can be cached for 1 day. How can that be?
 The likely reason is that this page also contains some ESI fragments and that one or more of these aren't cachable.
 
-So, first let's see if there are any ESIs here. We remove the `-IXGET` options (to see content of the response,
-not only headers) to curl and search for esi:
+So, first let's see if there are any ESIs here.
+We remove the `-IXGET` options (to see content of the response, not only headers) to curl and search for esi:
 
 ```bash
     $ curl --resolve www.staging.foobar.com.us-2.platformsh.site:443:1.2.3.4 --header "Surrogate-Capability: abc=ESI/1.0" --header "x-user-context-hash: daea248406c0043e62997b37292bf93a8c91434e8661484983408897acd93814" https://www.staging.foobar.com.us-2.platformsh.site/ | grep esi
@@ -525,9 +516,8 @@ The output is:
     <esi:include src="/_fragment?_hash=lnKTnmv6bb1XpaMPWRjV3sNazbn9rDXskhjGae1BDw8%3D&_path=locationId%3D2%26contentId%3D52%26blockId%3D13%26versionNo%3D3%26languageCode%3Deng-GB%26serialized_siteaccess%3D%257B%2522name%2522%253A%2522site%2522%252C%2522matchingType%2522%253A%2522default%2522%252C%2522matcher%2522%253Anull%252C%2522provider%2522%253Anull%257D%26serialized_siteaccess_matcher%3Dnull%26_format%3Dhtml%26_locale%3Den_GB%26_controller%3DEzSystems%255CCustomBundle%255CController%255CFooController%253A%253AcustomAction" />
 ```
 
-Now, investigate the response of each of these ESI fragments to understand what is going on. it's important to
-put that URL in single quotes as the URLS to the ESIs include special characters that can be interpreted by the
-shell.
+Now, investigate the response of each of these ESI fragments to understand what is going on.
+It's important to put that URL in single quotes as the URLS to the ESIs include special characters that can be interpreted by the shell.
 
 #### 1st ESI
 
@@ -554,7 +544,7 @@ X-Cache-Debug: 1
 Surrogate-Key: ez-all c52 l2
 ```
 
-The headers here look correct and don't indicate that this ESI isn't cached by the HTTP cache
+The headers here look correct and don't indicate that this ESI isn't cached by the HTTP cache.
 The second ESI has a similar response.
 
 #### 3rd ESI
@@ -583,20 +573,27 @@ X-Cache-Debug: 1
 Surrogate-Key: ez-all
 ```
 
-The `Cache-Control` and `Vary` headers look correct. The request is handled by a custom controller and the `Surrogate-Key` only contains the default `ez-all` value.
-This isn't a problem as long as the controller doesn't return values from any Content in the [[= product_name =]] repository. If it does, the controller should also add the corresponding IDs to such objects in that header.
+The `Cache-Control` and `Vary` headers look correct.
+The request is handled by a custom controller and the `Surrogate-Key` only contains the default `ez-all` value.
+This isn't a problem as long as the controller doesn't return values from any content in the [[= product_name =]] repository.
+If it does, the controller should also add the corresponding IDs to such objects in that header.
+
+The `Set-Cookie` here may cause the problem.
+A ESI fragment should never set a cookie because:
 
-The `Set-Cookie` here may cause the problem. A ESI fragment should never set a cookie because:
 - Clients only receive the headers set in the "mother" document (the headers in the "/" response in this case).
 
-- Only the content of ESIs responses is returned to the client. **No headers set in the ESI response ever reach the client**. ESI headers are only seen by the HTTP cache.
+- Only the content of ESIs responses is returned to the client.
+**No headers set in the ESI response ever reach the client**.
+ESI headers are only seen by the HTTP cache.
 
-- Symfony reverse proxy doesn't support ESIs at all, and any ESI calls (`render_esi()`) are implicitly replaced by
-  sub-requests (`render()`). So any `Set-Cookie` **is** sent to the client when using Symfony reverse proxy.
+- Symfony reverse proxy doesn't support ESIs at all, and any ESI calls (`render_esi()`) are implicitly replaced by sub-requests (`render()`).
+So any `Set-Cookie` **is** sent to the client when using Symfony reverse proxy.
 
-- Fastly flags it resource as "not cachable" because it set a cookie at least once. Even though that endpoint.
-  stops setting cookies, Fastly still doesn't cache that fragment. Any document referring to that ESI is a `MISS`.
-  Fastly cache needs to be purged (`Purge-all` request) to remove this flag.
+- Fastly flags it resource as "not cachable" because it set a cookie at least once.
+Even though that endpoint stops setting cookies, Fastly still doesn't cache that fragment.
+Any document referring to that ESI is a `MISS`.
+Fastly cache needs to be purged (`Purge-all` request) to remove this flag.
 
 - It means that it's not recommended to always initiate a session when loading the front page.
 
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
index 90c286b8a8..9ba1f297ae 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
@@ -7,10 +7,8 @@ description: Context-aware HTTP cache caches requests depending on the logged-in
 [[= product_name =]] allows caching requests made by logged-in users.
 This is called (user) context-aware cache.
 
-It means that HTTP cache is unique per set of user permissions (roles and limitations), 
-and there are variations of cache shared only among users that have the exact same permissions. 
-So if a user browses a list of children Locations, they only see children Locations 
-they have access to, even if their rendering is served from HTTP cache.
+It means that HTTP cache is unique per set of user permissions (roles and limitations), and there are variations of cache shared only among users that have the exact same permissions.
+So if a user browses a list of children locations, they only see children locations they have access to, even if their rendering is served from HTTP cache.
 
 This is accomplished by varying on a header called `X-Context-User-Hash`, which the system populates on the request.
 The [logic for this](#request-lifecycle) is accomplished in the provided VCL for Varnish and Fastly.
@@ -27,8 +25,7 @@ This expands steps covered in [FOSHttpCacheBundle documentation on user context
 1. The caching proxy receives the hash response, copies the hash header to the client's original request for `/foo` and restarts the modified original request.
 1. If the response to `/foo` should differ per user context, the application sets a `Vary: X-Context-User-Hash` header, which makes Proxy store the variations of this cache varying on the hash value.
 
-The next time a request comes in from the same user, application lookup for the hash (step 3) doesn't take place,
-as the hash lookup itself is cached by the cache proxy as described below.
+The next time a request comes in from the same user, application lookup for the hash (step 3) doesn't take place, as the hash lookup itself is cached by the cache proxy as described below.
 
 ### User context hash caching
 
@@ -50,21 +47,14 @@ It also varies on `Authorization` to cover any possible basic authorization head
 
 !!! note "Problems with stale user hash"
 
-    If you notice issues with stale hash usage, before you disable this cache, make sure login or logout always 
-    generates new session IDs and performs a full redirect to make sure no requests are being made using stale 
-    user context hashes.
+    If you notice issues with stale hash usage, before you disable this cache, make sure login or logout always generates new session IDs and performs a full redirect to make sure no requests are being made using stale user context hashes.
 
 !!! caution "Limitations of the user context hash"
 
-    If you use URI-based SiteAccess matching on a multi-repository installation (multiple databases), 
-    the default SiteAccess on the domain needs to point to the same repository (database), 
-    because `/_fos_user_context_hash` isn't SiteAccess-aware by default (see 
-    `ibexa.rest.default_router.non_siteaccess_aware_routes` parameter).
-    This occurs because reverse proxy doesn't have knowledge about SiteAccesses 
-    and it doesn't pass the whole URL to be able to cache the user context hash response.
+    If you use URI-based SiteAccess matching on a multi-repository installation (multiple databases), the default SiteAccess on the domain needs to point to the same repository (database), because `/_fos_user_context_hash` isn't SiteAccess-aware by default (see `ibexa.rest.default_router.non_siteaccess_aware_routes` parameter).
+    This occurs because reverse proxy doesn't have knowledge about SiteAccesses and it doesn't pass the whole URL to be able to cache the user context hash response.
 
-    The only known workaround is to make it SiteAccess aware, and have custom VCL logic tied to your SiteAccess
-    matching with Varnish/Fastly, to send the SiteAccess prefix as URI.
+    The only known workaround is to make it SiteAccess aware, and have custom VCL logic tied to your SiteAccess matching with Varnish/Fastly, to send the SiteAccess prefix as URI.
 
 !!! caution "Default options for FOSHttpCacheBundle"
 
@@ -97,8 +87,7 @@ Here are some generic recommendations on how to approach personalized content wi
 Default VCL strips everything except session cookie, so this is effectively "per user".
 If you're on single-server setup without Varnish or Fastly, you can use the same cookie logic on the web server instead.
 
-This a low effort solution, and can be enough for one fragment that is reused across the whole site, 
-for example, in header to show user name:
+This a low effort solution, and can be enough for one fragment that is reused across the whole site, for example, in header to show user name:
 
 Example:
 
@@ -109,8 +98,8 @@ Example:
 
 2\. Ajax/JS lookup to "uncached" custom Symfony controllers:
 
-This method doesn't consume memory in Varnish. 
-It can optionally be cached with custom logic: Symfony Cache on server side and/or with client side caching techniques. 
+This method doesn't consume memory in Varnish.
+It can optionally be cached with custom logic: Symfony Cache on server side and/or with client side caching techniques.
 This should be done as Ajax/JS lookup to avoid the uncached request that slows down the whole delivery of Vanish if it's done as ESI.
 
 This solution requires more effort depending on project requirements (traffic load, etc.).
@@ -123,8 +112,7 @@ This solution requires more effort (controller, VCL logic and adapting your own
 
 !!! tip "Dealing with paywall use cases"
 
-    If you need to handle a paywall on a per-item basis, or example, do a
-    lookup to backend for each URL where this is relevant.
+    If you need to handle a paywall on a per-item basis, or example, do a lookup to backend for each URL where this is relevant.
 
     You can find an example for paywall authorization in [FOSHTTPCache documentation](https://foshttpcache.readthedocs.io/en/latest/user-context.html#alternative-for-paywalls-authorization-request).
 
@@ -136,19 +124,16 @@ For information on how user context hashes are generated, see [FOSHttpCacheBundl
 This is needed given [[= product_name =]]'s more complex permission model compared to Symfony's.
 
 You can technically extend the user context hash by [implementing your own custom context provider(s)](https://foshttpcachebundle.readthedocs.io/en/latest/reference/configuration/user-context.html#custom-context-providers).
-However, **this is strongly discouraged** as it means increasing the amount of cache variations
-stored in proxy for every single cache item, lowering cache hit ratio and increasing memory use.
+However, **this is strongly discouraged** as it means increasing the amount of cache variations stored in proxy for every single cache item, lowering cache hit ratio and increasing memory use.
 
-Instead, you can create your own hash header for use cases where you need it. 
+Instead, you can create your own hash header for use cases where you need it.
 This way only controllers and views that really vary by your custom logic varies on it.
 
-You can do it using several methods, ranging from completely custom VCL logic and dedicated controller to respond with hash 
-to trusted proxy lookups, but this means additional lookups.
+You can do it using several methods, ranging from completely custom VCL logic and dedicated controller to respond with hash to trusted proxy lookups, but this means additional lookups.
 
 ### Example for custom vary by logic
 
-You can extend `/_fos_user_context_hash` lookup to add another HTTP header with custom hash for your
-needs, and adapt the user context hash VCL logic to use the additional header.
+You can extend `/_fos_user_context_hash` lookup to add another HTTP header with custom hash for your needs, and adapt the user context hash VCL logic to use the additional header.
 
 To avoid overloading any application code, take advantage of Symfony's event system:
 
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md b/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md
index fbd1bcd7c1..6792fa9314 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md
@@ -4,16 +4,15 @@ description: Configure Fastly for use with Ibexa DXP.
 
 # Configure and customize Fastly
 
-You can configure Fastly by using API calls or through the Fastly Web Interface. 
+You can configure Fastly by using API calls or through the Fastly Web Interface.
 Fastly provides a [Fastly CLI](https://developer.fastly.com/reference/cli/) for configuring Fastly through its API.
 
-[[= product_name_cloud =]] is delivered with Fastly preconfigured. 
-It means that you don't have to do any changes to the Fastly configuration to make your site work. 
-The information provided here is only applicable if you want to change the default Fastly configuration on [[= product_name_cloud =]], 
-or if you're not using [[= product_name_cloud =]] and want to configure Fastly to work with [[= product_name =]] on premise.
+[[= product_name_cloud =]] is delivered with Fastly preconfigured.
+It means that you don't have to do any changes to the Fastly configuration to make your site work.
+The information provided here is only applicable if you want to change the default Fastly configuration on [[= product_name_cloud =]], or if you're not using [[= product_name_cloud =]] and want to configure Fastly to work with [[= product_name =]] on premise.
 
 !!! note "The Fastly Web Interface isn't available for [[= product_name_cloud =]]"
-    It's recommend for [[= product_name_cloud =]] customers to use the Fastly CLI instead of using the Fastly API directly with `curl`, and so on.
+    It's recommend for [[= product_name_cloud =]] customers to use the Fastly CLI instead of using the Fastly API directly with `curl`, and more.
 
 !!! note "Disable Varnish when you use Fastly"
     Varnish is automatically provisioned on [[= product_name_cloud =]]. Varnish needs to be disabled on all environments that use
@@ -34,7 +33,7 @@ FASTLY_KEY=...
 FASTLY_SERVICE_ID=...
 ```
 
-These credentials are different for your production and staging environments. 
+These credentials are different for your production and staging environments.
 When you configure the Fastly CLI, use the credentials for the environment that you want to change.
 
 !!! note "Different environment variable names between products"
@@ -56,7 +55,7 @@ fastly service-version activate --version=latest
 ## Quick introduction to Fastly CLI
 
 Fastly configuration is versioned, which means that when you alter the configuration, you create a new version
-and activate it. 
+and activate it.
 If needed, you can revert the configuration to one of previous versions at any point.
 
 ### List configuration versions
@@ -99,10 +98,10 @@ fastly service-version clone --version=latest
 ```
 
 !!! note "Command parameters"
-    Most Fastly CLI commands have the `--version` parameter. 
+    Most Fastly CLI commands have the `--version` parameter.
     In addition to a specific version number, the `--version` parameter always supports aliases like `active` and `latest`.
 
-    Most Fastly CLI commands that alter the config also support the `--autoclone` parameter. 
+    Most Fastly CLI commands that alter the config also support the `--autoclone` parameter.
     With such commands, when you use the `--autoclone` parameter, calling `fastly service-version clone` is no longer needed.
 
 ### Activate version
@@ -115,7 +114,7 @@ fastly service-version activate --version=latest
 
 ## View and modify VCL configuration
 
-Fastly configuration is stored in Varnish Configuration Language (VCL) files. 
+Fastly configuration is stored in Varnish Configuration Language (VCL) files.
 You can change the behaviour of Fastly by [uploading custom VCL files](https://docs.fastly.com/en/guides/uploading-custom-vcl).
 [[= product_name =]] ships with two VCL files that need to be enabled for Fastly to work correctly with the platform; `ez_main.vcl` and `ez_user_hash.vcl` (located in `vendor/ibexa/fastly/fastly/`)
 
@@ -193,7 +192,7 @@ Versions: 8
 
 ### Modify Fastly configuration
 
-You can modify the existing Fastly configuration, for example, by uploading a modified `.vcl` file. 
+You can modify the existing Fastly configuration, for example, by uploading a modified `.vcl` file.
 
 Create a new version based on the one that is currently active, and upload the file:
 
@@ -215,7 +214,7 @@ fastly service-version activate --version=latest
 
 ## Snippets
 
-You can also add VCL code to the Fastly configuration without modifying the custom `.vcl` files directly. 
+You can also add VCL code to the Fastly configuration without modifying the custom `.vcl` files directly.
 You do it by creating [snippets](https://docs.fastly.com/en/guides/about-vcl-snippets).
 it's recommended that you use snippets instead of changing the VCL files provided by [[= product_name =]] as much as possible, which makes it easier to upgrade the [[= product_name =]] VCL configuration later.
 
@@ -303,7 +302,7 @@ fastly service-version activate --version=latest
 
 ### Get diff between two versions
 
-You can easily view the diff between two different versions by using the Fastly web interface.
+You can view the diff between two different versions by using the Fastly web interface.
 Unfortunately, Fastly CLI doesn't support this functionality.
 However, Fastly API and GNU diff can help you get an identical result.
 
@@ -346,7 +345,7 @@ Usernames and passwords can be stored inside the VCL file, but in this case cred
 
 ### Create and activate dictionary
 
-Fastly configuration includes a dictionary named `basicauth`. 
+Fastly configuration includes a dictionary named `basicauth`.
 Using a dictionary instead of storing usernames directly in a `.vcl` file is beneficial, because you can add or remove records without having to create and activate new configuration versions.
 
 ``` bash
@@ -390,8 +389,8 @@ fastly dictionary-entry list --dictionary-id=ltC6Rg4pqw4qaNKF5tEW33
 ```
 
 Now your dictionary stores new username and password. The next thing to do is to alter the Fastly VCL configuration
-and add the basic-auth support. 
-This example uses [snippets](https://docs.fastly.com/en/guides/about-vcl-snippets), so that no changes are needed in the `.vcl` files that are shipped with [[= product_name =]]. 
+and add the basic-auth support.
+This example uses [snippets](https://docs.fastly.com/en/guides/about-vcl-snippets), so that no changes are needed in the `.vcl` files that are shipped with [[= product_name =]].
 You need two snippets, store these as files in your system:
 
 In `snippet_basic_auth_error.vcl`:
@@ -480,4 +479,3 @@ fastly vcl snippet create --name="BasicAuth error" --version=latest --priority 1
 fastly service-version activate --version=latest
 ```
 
- 
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/http_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/http_cache.md
index 10661012d0..3ef834ec29 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/http_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/http_cache.md
@@ -4,13 +4,10 @@ description: Ibexa DXP's HTTP cache functionalities enable using reverse proxies
 
 # HTTP cache
 
-[[= product_name =]] provides advanced caching features needed for its own content views,
-to make Varnish and Fastly act as the view cache for the system.
+[[= product_name =]] provides advanced caching features needed for its own content views, to make Varnish and Fastly act as the view cache for the system.
 This and other features allow [[= product_name =]] to be scaled up to serve high traffic websites and applications.
 
-HTTP cache is handled by the [ibexa/http-cache](https://github.com/ibexa/http-cache) bundle,
-which extends [friendsofsymfony/http-cache-bundle](https://foshttpcachebundle.readthedocs.io/en/latest/),
-a Symfony community bundle that in turn extends [Symfony HTTP cache]([[= symfony_doc =]]/http_cache.html).
+HTTP cache is handled by the [ibexa/http-cache](https://github.com/ibexa/http-cache) bundle, which extends [friendsofsymfony/http-cache-bundle](https://foshttpcachebundle.readthedocs.io/en/latest/), a Symfony community bundle that in turn extends [Symfony HTTP cache]([[= symfony_doc =]]/http_cache.html).
 
 For content view responses coming from [[= product_name =]] itself, this means that:
 
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/http_cache_configuration.md b/docs/infrastructure_and_maintenance/cache/http_cache/http_cache_configuration.md
index bea19428b5..e087d374b9 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/http_cache_configuration.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/http_cache_configuration.md
@@ -26,7 +26,8 @@ As the system takes care of purges, the cache should not become stale with the e
 
 ## Cache header rules
 
-A few redirect and error pages are served through the content view system. If you set a high `default_ttl`, they can also be served from cache.
+A few redirect and error pages are served through the content view system.
+If you set a high `default_ttl`, they can also be served from cache.
 
 To avoid this, the installation ships with configuration to match these specific situations and set a much lower TTL.
 [FOSHttpCacheBundle matching rules](https://foshttpcachebundle.readthedocs.io/en/latest/reference/configuration/headers.html) enables you to specify a different TTL:
@@ -68,11 +69,9 @@ fos_http_cache:
 ## Time-to-live value for Page blocks
 
 For the Page Builder, block cache by default respects `$content.ttl_cache$` and `$content.default_ttl$` settings.
-However, if the given block value has a since or till date, 
-it's taken into account for the TTL calculation for both the block and the whole page.
+However, if the given block value has a since or till date, it's taken into account for the TTL calculation for both the block and the whole page.
 
-To overload this behavior, listen to [`BlockResponseEvents::BLOCK_RESPONSE`](page_events.md),
-and set priority to `-200` to adapt what Page field type does by default.
+To overload this behavior, listen to [`BlockResponseEvents::BLOCK_RESPONSE`](page_events.md), and set priority to `-200` to adapt what Page field type does by default.
 
 For example, to disable cache for the block, use `$event->getResponse()->setPrivate()`.
 
@@ -80,19 +79,17 @@ For example, to disable cache for the block, use `$event->getResponse()->setPriv
 
 [Edge Side Includes](https://symfony.com/doc/current/http_cache/esi.html) (ESI) can be used to split out the different parts of a web page into separate fragments that can be freely reused as pieces by reverse proxy.
 
-In practice, with ESI, every sub-request is regenerated from application perspective. And while you can tune your system to reduce this, it always causes additional overhead in the following situations:
+In practice, with ESI, every sub-request is regenerated from application perspective.
+And while you can tune your system to reduce this, it always causes additional overhead in the following situations:
 
 - When cache is cold on all or some of the sub-requests
 - With Symfony Proxy (AppCache) there is always some overhead, even on warm cache (hits)
 - In development environment
 
-This may differ depending on your system, however, it's recommended to stay below 5 ESI 
-requests per page and only using them for parts that are the same across the whole site or larger parts of it.
+This may differ depending on your system, however, it's recommended to stay below 5 ESI requests per page and only using them for parts that are the same across the whole site or larger parts of it.
 
-You should not use ESI for parts that are effectively uncached, 
-because your reverse proxy has to wait for the back end and cannot deliver cached pages directly.
+You should not use ESI for parts that are effectively uncached, because your reverse proxy has to wait for the back end and cannot deliver cached pages directly.
 
 !!! note "ESI limitations with the URIElement SiteAccess matcher"
 
-    Is isn't possible to share ESIs across the SiteAccesses when using URI matching 
-    as URI contains the SiteAccess name encoded in its path information.
+    Is isn't possible to share ESIs across the SiteAccesses when using URI matching as URI contains the SiteAccess name encoded in its path information.
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md b/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
index 59fa7cb26a..f16231a4b6 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
@@ -44,8 +44,7 @@ Using a different proxy is highly recommended as they provide better performance
 
 ## VCL base files
 
-For reverse proxies to work properly with your installation, you need to add the corresponding VCL files for your
-HTTP Cache.
+For reverse proxies to work properly with your installation, you need to add the corresponding VCL files for your HTTP Cache.
 
 - [Varnish VCL xkey example](https://github.com/ibexa/http-cache/blob/main/docs/varnish/vcl/varnish5.vcl)
 - Fastly can be found in `vendor/ibexa/fastly/fastly`. You must install the following to use Fastly:
@@ -57,12 +56,9 @@ The provided `.vcl` files work both with [Fastly Shielding](https://docs.fastly.
 If you decide to use Fastly VCL, consider using [Fastly CLI](https://developer.fastly.com/learning/tools/cli/#installing) with it to manage VCL files from the command line.
 To learn more, see [Prepare to use Fastly locally](fastly.md#prepare-for-using-fastly-locally) and [Introduction to Fastly CLI](fastly.md#quick-introduction-to-fastly-cli).
 
-!!! tip
-    Support for Fastly Shielding was added in [[= product_name =]] v3.3.24 and v4.1.6
+!!! tip "Support for Fastly Shielding was added in [[= product_name =]] v3.3.24 and v4.1.6"
 
-    When you extend [FOSHttpCacheBundle](https://foshttpcachebundle.readthedocs.io/en/latest/),
-    you can also adapt your VCL further with [FOSHttpCache documentation](https://foshttpcache.readthedocs.io/en/latest/varnish-configuration.html)
-    to use additional features.
+    When you extend [FOSHttpCacheBundle](https://foshttpcachebundle.readthedocs.io/en/latest/), you can also adapt your VCL further with [FOSHttpCache documentation](https://foshttpcache.readthedocs.io/en/latest/varnish-configuration.html) to use additional features.
 
 ## Configure Varnish and Fastly
 
@@ -78,8 +74,7 @@ Failing to configure reverse proxies correctly may introduce several problems, i
 
 You need to consider your `TrustedProxy` configuration when you use Symfony [behind a load balancer or a reverse proxy](https://symfony.com/doc/5.1/deployment/proxies.html).
 
-To configure trusted proxies, use [Symfony semantic configuration]([[= symfony_doc =]]/deployment/proxies.html#solution-settrustedproxies) under
-the `framework.trusted_proxies` [configuration key](configuration.md#configuration-files), for example:
+To configure trusted proxies, use [Symfony semantic configuration]([[= symfony_doc =]]/deployment/proxies.html#solution-settrustedproxies) under the `framework.trusted_proxies` [configuration key](configuration.md#configuration-files), for example:
 
 ``` yaml
 framework:
@@ -90,31 +85,28 @@ framework:
 
     On Platform.sh, Varnish doesn't have a static IP, like with [AWS LB](https://symfony.com/doc/5.1/deployment/proxies.html#but-what-if-the-ip-of-my-reverse-proxy-changes-constantly).
     For this reason, the `TRUSTED_PROXIES` env variable supports being set to value `REMOTE_ADDR`, which is equal to:
-  
+
     ```php
     Request::setTrustedProxies([$request->server->get('REMOTE_ADDR')], Request::HEADER_X_FORWARDED_ALL);
     ```
 
-    When trusting remote IP like this, make sure your application is only accessible through Varnish. 
+    When trusting remote IP like this, make sure your application is only accessible through Varnish.
     If it's accessible in other ways, this may result in trusting, for example, the IP of client browser instead, which would be a serious security issue.
 
-    Make sure that **all** traffic always comes from the trusted proxy/load balancer,
-    and that there is no other way to configure it.
+    Make sure that **all** traffic always comes from the trusted proxy/load balancer, and that there is no other way to configure it.
 
 When using Fastly, you need to set `trusted_proxies` according to the [IP ranges used by Fastly](https://api.fastly.com/public-ip-list).
 
 !!! tip
 
     You don't have to set `trusted_proxies` when using Fastly on Platform.sh.
-    The Platform.sh router automatically changes the source IP of requests coming from Fastly,
-    replacing the source IP with the actual client IP and removing any `X-FORWARD-...` header in the request before it reaches [[= product_name =]].
+    The Platform.sh router automatically changes the source IP of requests coming from Fastly, replacing the source IP with the actual client IP and removing any `X-FORWARD-...` header in the request before it reaches [[= product_name =]].
 
 For more information about setting these variables, see [Configuration examples](#configuration-examples).
 
 ### Update YML configuration
 
-Next, you need to tell [[= product_name =]] to use an HTTP-based purge client (specifically the FosHttpCache Varnish purge client),
-and specify the URL that Varnish can be reached on:
+Next, you need to tell [[= product_name =]] to use an HTTP-based purge client (specifically the FosHttpCache Varnish purge client), and specify the URL that Varnish can be reached on:
 
 | Configuration | Parameter| Environment variable| Possible values|
 |---------|--------|--------|----------|
@@ -124,8 +116,7 @@ and specify the URL that Varnish can be reached on:
 | `ibexa.system.<scope>.http_cache.fastly.service_id` | `fastly_service_id` | `FASTLY_SERVICE_ID` | Service ID to authenticate with Fastly. |
 | `ibexa.system.<scope>.http_cache.fastly.key` | `fastly_key` | `FASTLY_KEY` | Service key/token to authenticate with Fastly. |
 
-If you need to set multiple purge servers, configure them in the YAML configuration, 
-instead of parameter or environment variable, as they only take single string value.
+If you need to set multiple purge servers, configure them in the YAML configuration, instead of parameter or environment variable, as they only take single string value.
 
 Example configuration for Varnish as reverse proxy, providing that [front controller has been configured](#configure-symfony-front-controller):
 
@@ -144,15 +135,13 @@ ibexa:
 
 !!! note "Invalidating Varnish cache using tokens"
 
-    In setups where the Varnish server IP can change (for example, on [[= product_name_cloud =]]),
-    you can use token-based cache invalidation through [`ez_purge_acl`](https://github.com/ibexa/http-cache/blob/main/docs/varnish/vcl/varnish5.vcl#L174).
- 
+    In setups where the Varnish server IP can change (for example, on [[= product_name_cloud =]]), you can use token-based cache invalidation through [`ez_purge_acl`](https://github.com/ibexa/http-cache/blob/main/docs/varnish/vcl/varnish5.vcl#L174).
+
     In such situation, use strong, secure hash and make sure to keep the token secret.
 
 ### Ensure proper Captcha behavior [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
-If your installation uses Varnish and you want users to be able to configure and use Captcha in their forms, 
-you must enable sending Captcha data as a response to an Ajax request. 
+If your installation uses Varnish and you want users to be able to configure and use Captcha in their forms, you must enable sending Captcha data as a response to an Ajax request.
 Otherwise, Varnish doesn't allow for the transfer of Captcha data to the form, and as a result, users see an empty image.
 
 To enable sending Captcha over Ajax, add the following configuration:
@@ -168,8 +157,7 @@ ibexa:
 
 ### Update custom Captcha block [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
-If you created a custom Captcha block for your site by overriding the default file (`vendor/gregwar/captcha-bundle/Resources/views/captcha.html.twig`),
-you must make the following changes to the custom block template file:
+If you created a custom Captcha block for your site by overriding the default file (`vendor/gregwar/captcha-bundle/Resources/views/captcha.html.twig`), you must make the following changes to the custom block template file:
 
 - change the name of the block to `ajax_captcha_widget`
 - include the JavaScript file:
@@ -228,12 +216,12 @@ FASTLY_KEY="token"
 #### Configure Fastly on Platform.sh
 
 If you use Platform.sh, it's recommended to configure all environment variables through [Platform.sh variables](https://docs.platform.sh/guides/ibexa/fastly.html).
-In [[= product_name =]], Varnish is enabled by default. To use Fastly, first you must 
-[disable Varnish](https://docs.platform.sh/guides/ibexa/fastly.html#remove-varnish-configuration) 
+In [[= product_name =]], Varnish is enabled by default. To use Fastly, first you must [disable Varnish](https://docs.platform.sh/guides/ibexa/fastly.html#remove-varnish-configuration).
 
 #### Get Fastly service ID and API token
 
-To get the service ID, log in to https://www.fastly.com/. In the upper menu, click the **CONFIGURE** tab.
+To get the service ID, log in to https://www.fastly.com/.
+In the upper menu, click the **CONFIGURE** tab.
 The service ID is displayed next to the name of your service on any page.
 
 For instructions on how to generate a Fastly API token, see [the Fastly guide](https://docs.fastly.com/en/guides/using-api-tokens).
@@ -270,8 +258,7 @@ You can configure environment variables through [Platform.sh variables](https://
 
 !!! tip
 
-    For HTTP cache, you most likely only use this for configuring Fastly for production and optionally staging,
-    allowing `variables:env:` in `.platform.app.yaml` to, for example, specify Varnish or Symfony proxy as default for dev environment.
+    For HTTP cache, you most likely only use this for configuring Fastly for production and optionally staging, allowing `variables:env:` in `.platform.app.yaml` to, for example, specify Varnish or Symfony proxy as default for dev environment.
 
 #### Apache with Varnish
 
@@ -308,29 +295,25 @@ Stale cache, or grace mode in Varnish, occurs when:
 - Cache is served some time after the TTL expired.
 - When the back-end server doesn't respond.
 
-This has several benefits for high traffic installations to reduce load to the back end. 
-Instead of creating several concurrent requests for the same page to the back end, 
-the following happens when a page has been soft purged:
+This has several benefits for high traffic installations to reduce load to the back end.
+Instead of creating several concurrent requests for the same page to the back end, the following happens when a page has been soft purged:
 
 - Next request hitting the cache triggers an asynchronous lookup to the back end.
-- If cache is still within grace period, first and subsequent requests for the content are served from cache,
-and don't wait for the asynchronous lookup to finish.
+- If cache is still within grace period, first and subsequent requests for the content are served from cache, and don't wait for the asynchronous lookup to finish.
 - The back-end lookup finishes and refreshes the cache so any subsequent requests get a fresh cache.
 
-By default, [[= product_name =]] always soft purges content on reverse proxies that support it (Varnish and Fastly),
-with the following logic in the out-of-the-box VCL:
+By default, [[= product_name =]] always soft purges content on reverse proxies that support it (Varnish and Fastly), with the following logic in the out-of-the-box VCL:
 
 - Cache is within grace period.
 - Either the server isn't responding, or the request comes without a session cookie (anonymous user).
 
 Serving grace isn't always allowed by default because:
 
-- It's a safe default. Even if just for anonymous users, stale cache can easily be confusing during acceptance testing.
+- It's a safe default. Even if for anonymous users, stale cache can be confusing during acceptance testing.
 - It means REST API, which is used by the back office, would serve stale data, breaking the UI.
 
 !!! tip "Customizing stale cache handling"
 
-    If you want to use grace handling for logged-in users as well, you can adapt the provided VCL to add a condition
-    for opting out if the request has a cookie and the path contains REST API prefix to make sure the back office isn't negatively affected.
+    If you want to use grace handling for logged-in users as well, you can adapt the provided VCL to add a condition for opting out if the request has a cookie and the path contains REST API prefix to make sure the back office isn't negatively affected.
 
     If you want to disable grace mode, you can adapt the VCL to do hard instead of soft purges, or set grace/stale time to `0s`.
diff --git a/docs/infrastructure_and_maintenance/cache/persistence_cache.md b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
index cc47ce2d0b..bfd06f53d9 100644
--- a/docs/infrastructure_and_maintenance/cache/persistence_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
@@ -10,18 +10,17 @@ description: Persistence cache caches SPI\Persistence calls used in common page
 
 Persistence cache can best be described as an implementation of `SPI\Persistence` that decorates the main backend implementation, aka Storage Engine *(currently: "Legacy Storage Engine")*.
 
-As shown in the illustration, this is done in the exact same way as the Event layer is a custom implementation of `API\Repository` decorating the main repository.
+As shown in the illustration, this is done in the exact same way as the event layer is a custom implementation of `API\Repository` decorating the main repository.
 In the case of Persistence Cache, instead of sending events on calls passed on to the decorated implementation, most of the load calls are cached, and calls that perform changes purge the affected caches.
 Cache handlers *(Memcached, Redis, Filesystem, etc.)* can be configured using Symfony configuration.
 For details on how to reuse this Cache service in your own custom code, see below.
 
 ## Transparent cache
 
-With the persistence cache, just like with the HTTP cache, [[= product_name =]] tries to follow principles of transparent caching.
-This can shortly be described as a cache which is invisible to the end user (admin/editors) of [[= product_name =]] where content
-is always returned *fresh*. In other words, there should be no need to manually clear the cache like it was frequently
-the case with eZ Publish 4.x. This is possible thanks to an interface that follows CRUD (Create Read Update Delete)
-operations per domain.
+With the persistence cache, like with the HTTP cache, [[= product_name =]] tries to follow principles of transparent caching.
+This can shortly be described as a cache which is invisible to the end user (admin/editors) of [[= product_name =]] where content is always returned *fresh*.
+In other words, there should be no need to manually clear the cache like it was frequently the case with eZ Publish 4.x.
+This is possible thanks to an interface that follows CRUD (Create Read Update Delete) operations per domain.
 
 ## What is cached?
 
@@ -36,8 +35,7 @@ Notes:
 - Search isn't defined as persistence and the queries themselves aren't planned to be cached as they're too complex by design (for example, full text).
   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:
+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:
 
 - Symfony Cache tab: for Symfony Cache itself, the tab shows cache lookups to cache backends
 - [[= product_name_base =]] tab: shows calls made to database back end, and if they're cached or not
@@ -48,8 +46,8 @@ To see where and how to contribute additional caches, refer to the [source code]
 
 !!! note
 
-    Current implementation uses Symfony cache. It technically supports the following cache backends:
-    [APCu, Array, Chain, Doctrine, Filesystem, Memcached, PDO & Doctrine DBAL, Php Array, Proxy, Redis]([[= symfony_doc =]]/components/cache/cache_pools.html#creating-cache-pools).
+    Current implementation uses Symfony cache.
+    It technically supports the following cache backends: [APCu, Array, Chain, Doctrine, Filesystem, Memcached, PDO & Doctrine DBAL, Php Array, Proxy, Redis]([[= symfony_doc =]]/components/cache/cache_pools.html#creating-cache-pools).
     [[= product_name =]] officially supports only using Filesystem for single server and Redis or Memcached for clustered setups.
 
 Use of Memcached or Redis as shared cache back end is a requirement for use in clustering setup.
@@ -61,8 +59,7 @@ Filesystem adapters, for example, are **not** intended to be used over a shared
 The underlying cache system is exposed as an `ibexa.cache_pool` service, and can be reused by any other service as described in the [Using Cache service](#using-cache-service) section.
 
 By default, configuration uses the `cache.tagaware.filesystem` service to store cache files.
-The service is defined in `config/packages/cache_pool/cache.tagaware.filesystem.yaml`
-to use [FilesystemTagAwareAdapter](https://github.com/ibexa/recipes/blob/master/ibexa/oss/4.0/config/packages/cache_pool/cache.tagaware.filesystem.yaml#L8).
+The service is defined in `config/packages/cache_pool/cache.tagaware.filesystem.yaml` to use [FilesystemTagAwareAdapter](https://github.com/ibexa/recipes/blob/master/ibexa/oss/4.0/config/packages/cache_pool/cache.tagaware.filesystem.yaml#L8).
 
 You can select a different cache backend and configure its parameters in the relevant file in the `cache_pool` folder.
 
@@ -85,7 +82,7 @@ ibexa:
 
 !!! note "One cache pool for each repository"
 
-    If your installation has several Repositories *(databases)*, make sure every group of sites using different Repositories also uses a different cache pool.
+    If your installation has several repositories *(databases)*, make sure every group of sites using different Repositories also uses a different cache pool.
 
 ### In-Memory cache configuration
 
@@ -129,8 +126,7 @@ parameters:
 [Redis](https://redis.io/), an in-memory data structure store, is one of the supported cache solutions for clustering.
 Redis is used via [Redis pecl extension](https://pecl.php.net/package/redis).
 
-See [Redis Cache Adapter in Symfony documentation]([[= symfony_doc =]]/components/cache/adapters/redis_adapter.html#configure-the-connection)
-for information on how to connect to Redis.
+See [Redis Cache Adapter in Symfony documentation]([[= symfony_doc =]]/components/cache/adapters/redis_adapter.html#configure-the-connection for information on how to connect to Redis.
 
 #### Supported Adapters
 
@@ -186,7 +182,7 @@ See `.env`, `config/packages/ibexa.yaml` and `config/packages/cache_pool/cache.r
     The regular `php bin/console cache:clear` command doesn't clear Redis persistence cache.
     Use a dedicated Symfony command to clear the pool you have configured: `php bin/console cache:pool:clear cache.redis`.
 
-##### Redis Clustering
+##### Redis clustering
 
 Persistence cache depends on all involved web servers, each of them seeing the same view of the cache because it's shared among them.
 With that in mind, the following configurations of Redis are possible:
@@ -218,8 +214,7 @@ Several cloud providers have managed services that are easier to set up, handle
 
 [Memcached, a distributed caching solution](http://memcached.org/) is a cache solution that is supported for clustering use, as an alternative to Redis.
 
-See [Memcached Cache Adapter in Symfony documentation]([[= symfony_doc =]]/components/cache/adapters/memcached_adapter.html#configure-the-connection)
-for information on how to configure Memcached.
+See [Memcached Cache Adapter in Symfony documentation]([[= symfony_doc =]]/components/cache/adapters/memcached_adapter.html#configure-the-connection) for information on how to configure Memcached.
 
 
 #### Supported Adapters
@@ -230,7 +225,8 @@ There is one Memcached adapter available out of the box.
 
 **Pros**: Memcached is able to handle much more concurrent load by design (multi threaded), and typically uses far less memory than Redis in general due to a simpler data structure.
 
-**Cons**: 1.5-2x more lookups to the back-end cache server then `RedisTagAwareAdapter`. Depending on the number of lookups and latency to cache server this might affect page load time.
+**Cons**: 1.5-2x more lookups to the back-end cache server then `RedisTagAwareAdapter`.
+Depending on the number of lookups and latency to cache server this might affect page load time.
 
 #### Adjusting configuration
 
@@ -278,12 +274,16 @@ See `config/default_parameters.yaml` and `config/cache_pool/cache.memcached.yaml
 
     > -l &lt;addr&gt;
 
-    > Listen on &lt;addr&gt;; default to INADDR\_ANY. &lt;addr&gt; may be specified as host:port. If you don't specify a port number, the value you specified with -p or -U is used. You may specify multiple addresses separated by comma or by using -l multiple times. This is an important option to consider as there is no other way to secure the installation. Binding to an internal or firewalled network interface is suggested.
+    > Listen on &lt;addr&gt;; default to INADDR\_ANY. &lt;addr&gt; may be specified as host:port.
+    If you don't specify a port number, the value you specified with -p or -U is used.
+    You may specify multiple addresses separated by comma or by using -l multiple times.
+    This is an important option to consider as there is no other way to secure the installation.
+    Binding to an internal or firewalled network interface is suggested.
 
 ## Using cache service
 
 Using the internal cache service allows you to use an interface and without caring whether the system is configured to place the cache in Memcached or on File system.
-And as [[= product_name =]] requires that instances use a cluster-aware cache in Cluster setup, you can safely assume your cache is shared *(and invalidated)* across all web servers.
+And as [[= product_name =]] requires that instances use a cluster-aware cache in cluster setup, you can safely assume your cache is shared *(and invalidated)* across all web servers.
 
 !!! note
 
@@ -300,7 +300,7 @@ And as [[= product_name =]] requires that instances use a cluster-aware cache in
 
 ##### With dependency injection
 
-In your Symfony services configuration you can simply define that you require the cache service in your configuration like so:
+In your Symfony services configuration you can define that you require the cache service in your configuration like so:
 
 ``` yaml
 # yml configuration

From eda8f7609128b8e3e4fd908e998711467a9ef87c Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Wed, 16 Oct 2024 15:03:45 +0200
Subject: [PATCH 39/77] Fixes in 'clustering'

---
 .../clustering/clustering.md                  | 29 +++++++++----------
 .../clustering/clustering_with_aws_s3.md      |  8 ++---
 .../clustering/clustering_with_ddev.md        |  4 +--
 3 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/docs/infrastructure_and_maintenance/clustering/clustering.md b/docs/infrastructure_and_maintenance/clustering/clustering.md
index 3760d7fb36..20ec49db58 100644
--- a/docs/infrastructure_and_maintenance/clustering/clustering.md
+++ b/docs/infrastructure_and_maintenance/clustering/clustering.md
@@ -34,7 +34,8 @@ It's also recommended to use:
 
 ### Shared persistence cache
 
-Redis is the recommended cache solution for clustering. An alternative solution is using Memcached.
+Redis is the recommended cache solution for clustering.
+An alternative solution is using Memcached.
 
 See [persistence cache documentation](persistence_cache.md#persistence-cache-configuration) on information on how to configure them.
 
@@ -66,10 +67,8 @@ It uses a database to manipulate metadata, making up for the potential inconsist
 
 You need to configure both metadata and binarydata handlers.
 
-[[= product_name =]] ships with a custom local adapter (`ibexa.io.nfs.adapter.site_access_aware`), 
-which decorates the Flysystem v2 local adapter to enable support for SiteAccess-aware settings.
-If an NFS path relies on SiteAccess-aware dynamic parameters, you must use the custom local adapter 
-instead of the Flysystem v2 local adapter.
+[[= product_name =]] ships with a custom local adapter (`ibexa.io.nfs.adapter.site_access_aware`), which decorates the Flysystem v2 local adapter to enable support for SiteAccess-aware settings.
+If an NFS path relies on SiteAccess-aware dynamic parameters, you must use the custom local adapter instead of the Flysystem v2 local adapter.
 Configure the custom local adapter to read/write to the NFS mount point on each local server.
 As metadata handler, create a DFS one, configured with a Doctrine connection.
 
@@ -90,10 +89,9 @@ or
 
 `DATABASE_URL=postgresql://root:rootpassword@127.0.0.1:3306/ibexa_dfs?serverVersion=8.0`
 
-For production, it's recommended to create the DFS table in its own database,
-manually importing its schema definition:
+For production, it's recommended to create the DFS table in its own database, manually importing its schema definition:
 
-??? note "dfs_schema.sql (MySQL)"
+!!! note "dfs_schema.sql (MySQL)"
 
     ``` sql
         CREATE TABLE ezdfsfile (
@@ -114,7 +112,7 @@ manually importing its schema definition:
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
     ```
 
-??? note "dfs_schema.sql (PostgreSQL)"
+!!! note "dfs_schema.sql (PostgreSQL)"
 
     ``` sql
     CREATE TABLE ezdfsfile (
@@ -198,13 +196,13 @@ ibexa:
 
 !!! tip
 
-    If you're looking to [set up S3](clustering_with_aws_s3.md) or other [Flysystem](https://flysystem.thephpleague.com/docs/)/third-party adapters like Google Cloud Storage, this needs to be configured as binary handler. The rest here still stays the same, the DFS metadata handler takes care of caching the lookups to avoid slow IO lookups.
+    If you're looking to [set up S3](clustering_with_aws_s3.md) or other [Flysystem](https://flysystem.thephpleague.com/docs/)/third-party adapters like Google Cloud Storage, this needs to be configured as binary handler.
+    The rest here still stays the same, the DFS metadata handler takes care of caching the lookups to avoid slow IO lookups.
 
 #### Customizing the storage directory
 
 Earlier versions required the NFS adapter directory to be set to `$var_dir$/$storage_dir$` part for the NFS path.
-This is no longer required,
-but the default prefix used to serve binary files still matches this expectation.
+It's no longer required, but the default prefix used to serve binary files still matches this expectation.
 
 If you decide to change this setting, make sure you also set `io.url_prefix` to a matching value.
 If you set the NFS adapter's directory to `/path/to/nfs/storage`, use this configuration so that the files can be served by Symfony:
@@ -218,8 +216,7 @@ ibexa:
 ```
 
 As an alternative, you may serve images from NFS using a dedicated web server.
-If in the example above, this server listens on `http://static.example.com/`
-and uses `/path/to/nfs/storage` as the document root, configure `io.url_prefix` as follows:
+If in the example above, this server listens on `http://static.example.com/` and uses `/path/to/nfs/storage` as the document root, configure `io.url_prefix` as follows:
 
 ``` yaml
 ibexa:
@@ -236,7 +233,7 @@ You can read more about that on [Binary files URL handling](file_url_handling.md
 The default [[= product_name =]] rewrite rules let image requests be served directly from disk.
 In a cluster setup, files matching `^/var/([^/]+/)?storage/images(-versioned)?/.*` have to be passed through `/public/index.php` instead.
 
-In any case, this specific rewrite rule must be placed before the ones that "ignore" image files and just let the web server serve the files directly.
+In any case, this specific rewrite rule must be placed before the ones that "ignore" image files and let the web server serve the files directly.
 
 #### Apache
 
@@ -285,4 +282,4 @@ If `--to` is omitted, the first non-default IO configuration is used.
 While the command is running, the files should not be modified.
 To avoid surprises you should create a [backup](backup.md) and/or execute a dry run before doing the actual update, using the `--dry-run` switch.
 
-Since this command can run for a very long time, to avoid memory exhaustion run it in the production environment using the `--env=prod` switch.
+Since this command can run for a long time, to avoid memory exhaustion run it in the production environment using the `--env=prod` switch.
diff --git a/docs/infrastructure_and_maintenance/clustering/clustering_with_aws_s3.md b/docs/infrastructure_and_maintenance/clustering/clustering_with_aws_s3.md
index 8ca764d9b6..a3492b251f 100644
--- a/docs/infrastructure_and_maintenance/clustering/clustering_with_aws_s3.md
+++ b/docs/infrastructure_and_maintenance/clustering/clustering_with_aws_s3.md
@@ -30,7 +30,7 @@ The secret key cannot be retrieved again after the key has been created, so don'
 !!! note
 
     Make sure that your bucket is [configured as Public](https://docs.aws.amazon.com/AmazonS3/latest/userguide/configuring-block-public-access-bucket.html) to avoid facing 403 errors, as the current S3 handler is meant to store files publicly so they can be served directly from S3.
-    
+
 ## Set up [[= product_name =]] for AWS S3
 
 In your [[= product_name =]] root directory, run `php composer require league/flysystem-aws-s3-v3:^2.0`.
@@ -75,8 +75,7 @@ ibexa_io:
     `aws_s3` is an arbitrary handler identifier that is used in the config block below.
     You can configure multiple handlers.
 
-    For example, you could configure one called `gcloud_storage` for a
-    [Google Cloud Storage adapter](https://github.com/thephpleague/flysystem#officially-supported-adapters).
+    For example, you could configure one called `gcloud_storage` for a [Google Cloud Storage adapter](https://github.com/thephpleague/flysystem#officially-supported-adapters).
 
 Under the `ibexa.system.<scope>.io` [configuration key](configuration.md#configuration-files), enable the binary data handler:
 
@@ -94,5 +93,4 @@ Clear all caches and reload, and that's it.
 
 ## Migrate your existing binary data to S3
 
-You can [migrate existing binary data](clustering.md#migrating-to-a-cluster-setup) to S3 using the `php bin/console ibexa:io:migrate-files` command
-which was added in [EZP-25946](https://issues.ibexa.co/browse/EZP-25946).
+You can [migrate existing binary data](clustering.md#migrating-to-a-cluster-setup) to S3 using the `php bin/console ibexa:io:migrate-files` command which was added in [EZP-25946](https://issues.ibexa.co/browse/EZP-25946).
diff --git a/docs/infrastructure_and_maintenance/clustering/clustering_with_ddev.md b/docs/infrastructure_and_maintenance/clustering/clustering_with_ddev.md
index a5386e78e0..0582a20d22 100644
--- a/docs/infrastructure_and_maintenance/clustering/clustering_with_ddev.md
+++ b/docs/infrastructure_and_maintenance/clustering/clustering_with_ddev.md
@@ -18,7 +18,7 @@ But the data sharing needed by a cluster of several servers can still be emulate
 The `ddev config --php-version` option should set the same PHP version as the production servers.
 
 !!! tip
- 
+
     - [`ddev describe`](https://ddev.readthedocs.io/en/latest/users/usage/commands/#describe) displays a cluster summary that include accesses from inside and outside DDEV services
     - [`ddev ssh`](https://ddev.readthedocs.io/en/latest/users/usage/commands/#ssh) opens a terminal inside a service
     - [`ddev exec`](https://ddev.readthedocs.io/en/latest/users/usage/commands/#exec) executes a command inside a service
@@ -79,7 +79,7 @@ You can now check whether Solr works.
 
 For example, the `ddev exec curl -s http://solr:8983/api/cores/` command:
 
- - checks whether the `web` server can access the `solr` server, 
+ - checks whether the `web` server can access the `solr` server
  - checks whether `collection1` exists and its status
  - displays `collection1`'s `numDocs` that shouldn't be zero if indexing worked correctly
 

From 9011431f1fac48c34ffd28b99ec5dcb3eaf16f3d Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Wed, 16 Oct 2024 15:11:07 +0200
Subject: [PATCH 40/77] Fixes in 'security'

---
 .../security/development_security.md          |  15 ++-
 .../security/reporting_issues.md              |   8 +-
 .../security/security_checklist.md            | 127 +++++++++---------
 3 files changed, 77 insertions(+), 73 deletions(-)

diff --git a/docs/infrastructure_and_maintenance/security/development_security.md b/docs/infrastructure_and_maintenance/security/development_security.md
index 92969ba847..9300660e2b 100644
--- a/docs/infrastructure_and_maintenance/security/development_security.md
+++ b/docs/infrastructure_and_maintenance/security/development_security.md
@@ -10,8 +10,7 @@ description: Ensure the security of your Ibexa DXP installation by using one of
 
 !!! note "Security checklist"
 
-    See the [Security checklist](security_checklist.md) for a list of security-related issues
-    you should take care of before going live with a project.
+    See the [Security checklist](security_checklist.md) for a list of security-related issues you should take care of before going live with a project.
 
 ## Symfony authentication
 
@@ -52,11 +51,13 @@ logout:
 
 Authentication is provided using the Symfony Security component.
 
-[Native and universal `form_login`]([[= symfony_doc =]]/security/form_login_setup.html) is used, in conjunction with an extended `DaoAuthenticationProvider` (DAO stands for *Data Access Object*), the `RepositoryAuthenticationProvider`. Native behavior of `DaoAuthenticationProvider` has been preserved, making it possible to still use it for pure Symfony applications.
+[Native and universal `form_login`]([[= symfony_doc =]]/security/form_login_setup.html) is used, in conjunction with an extended `DaoAuthenticationProvider` (DAO stands for *Data Access Object*), the `RepositoryAuthenticationProvider`.
+Native behavior of `DaoAuthenticationProvider` has been preserved, making it possible to still use it for pure Symfony applications.
 
 #### Security controller
 
-A `SecurityController` is used to manage all security-related actions and is thus used to display the login form. It follows all standards explained in [Symfony security documentation]([[= symfony_doc =]]/security/form_login_setup.html).
+A `SecurityController` is used to manage all security-related actions and is thus used to display the login form.
+It follows all standards explained in [Symfony security documentation]([[= symfony_doc =]]/security/form_login_setup.html).
 
 The base template used is [`Security/login.html.twig`](https://github.com/ibexa/core/blob/main/src/bundle/Core/Resources/views/Security/login.html.twig).
 
@@ -94,14 +95,14 @@ If you want to use this feature, you must at least extend the login template to
 
 #### Login handlers / SSO
 
-Symfony provides native support for [multiple user providers]([[= symfony_doc =]]/security/multiple_user_providers.html). This makes it easy to integrate any kind of login handlers, including SSO and existing third-party bundles (for example, [FR3DLdapBundle](https://github.com/Maks3w/FR3DLdapBundle), [HWIOauthBundle](https://github.com/hwi/HWIOAuthBundle), [FOSUserBundle](https://github.com/FriendsOfSymfony/FOSUserBundle), [BeSimpleSsoAuthBundle](https://github.com/BeSimple/BeSimpleSsoAuthBundle), etc.).
+Symfony provides native support for [multiple user providers]([[= symfony_doc =]]/security/multiple_user_providers.html).
+This makes it easy to integrate any kind of login handlers, including SSO and existing third-party bundles (for example, [FR3DLdapBundle](https://github.com/Maks3w/FR3DLdapBundle), [HWIOauthBundle](https://github.com/hwi/HWIOAuthBundle), [FOSUserBundle](https://github.com/FriendsOfSymfony/FOSUserBundle), [BeSimpleSsoAuthBundle](https://github.com/BeSimple/BeSimpleSsoAuthBundle), and more).
 
 See [Authenticating a user with multiple user provider](user_authentication.md#authenticate-user-with-multiple-user-providers) for more information.
 
 ## JWT authentication
 
-To use [JWT authentication](https://jwt.io/) with [[= product_name =]], in the provided `config/packages/lexik_jwt_authentication.yaml` file,
-modify the existing configuration by setting `authorization_header` to `enabled`:
+To use [JWT authentication](https://jwt.io/) with [[= product_name =]], in the provided `config/packages/lexik_jwt_authentication.yaml` file, modify the existing configuration by setting `authorization_header` to `enabled`:
 
 ``` yaml hl_lines="8"
 lexik_jwt_authentication:
diff --git a/docs/infrastructure_and_maintenance/security/reporting_issues.md b/docs/infrastructure_and_maintenance/security/reporting_issues.md
index e20407e329..09adeeab46 100644
--- a/docs/infrastructure_and_maintenance/security/reporting_issues.md
+++ b/docs/infrastructure_and_maintenance/security/reporting_issues.md
@@ -4,7 +4,7 @@ description: Learn how to report security issues in Ibexa DXP.
 
 # Reporting security issues in Ibexa products
 
-The security of [[= product_name_base =]] software is a primary concern and we take it seriously.
+The security of [[= product_name_base =]] software is a primary concern and is taken seriously.
 
 For more information on security in [[= product_name_base =]] products, see [Ibexa Security Policy](https://www.ibexa.co/software-information/security).
 
@@ -26,7 +26,8 @@ Please be verbose when reporting issues. The issue is solved faster if you inclu
 
 ## Dialogue
 
-The engineering team may need your help to clarify certain specifics, so please respond to such inquiries. We keep you updated about the progress on our end.
+The engineering team may need your help to clarify certain specifics, so please respond to such inquiries.
+We keep you updated about the progress on our end.
 
 ## Responsible disclosure
 
@@ -34,4 +35,5 @@ Please give the engineering team time to produce and distribute a solution befor
 
 ## Attribution
 
-If you want, we can include your name and/or the name of your organisation, a link, and short description about you in the security notification we send out with the fix. Thank you!
+If you want, we can include your name and/or the name of your organisation, a link, and short description about you in the security notification we send out with the fix.
+Thank you!
diff --git a/docs/infrastructure_and_maintenance/security/security_checklist.md b/docs/infrastructure_and_maintenance/security/security_checklist.md
index 21d1f8a7b1..ca5c95c569 100644
--- a/docs/infrastructure_and_maintenance/security/security_checklist.md
+++ b/docs/infrastructure_and_maintenance/security/security_checklist.md
@@ -4,15 +4,12 @@ description: Ensure that your Ibexa DXP installation is secure by following our
 
 # Security checklist
 
-When getting ready to go live with your project for the first time, or when re-launching it,
-make sure that your setup is secure.
+When getting ready to go live with your project for the first time, or when re-launching it, make sure that your setup is secure.
 
 !!! caution
 
-    Security is an ongoing process. After going live, you should pay attention to security advisories
-    released via [your service portal](https://support.ibexa.co/),
-    or via [Security advisories](https://developers.ibexa.co/security-advisories) if you're not a subscriber.
-    
+    Security is an ongoing process. After going live, you should pay attention to security advisories released via [your service portal](https://support.ibexa.co/), or via [Security advisories](https://developers.ibexa.co/security-advisories) if you're not a subscriber.
+
 ## Symfony
 
 ### `APP_SECRET`
@@ -24,11 +21,11 @@ make sure that your setup is secure.
 - The secret must be long enough. 32 characters is minimum, longer is better.
 
 !!! tip
-    
+
     The following command generates a 64-character-long secure random value:
-    
+
     `php -r "print bin2hex(random_bytes(32));"`
-    
+
 !!! note
 
     On [[= product_name_cloud =]], if `APP_SECRET` isn't set, the system sets it to [`PLATFORM_PROJECT_ENTROPY`](https://docs.platform.sh/guides/symfony/environment-variables.html#symfony-environment-variables)
@@ -37,7 +34,7 @@ make sure that your setup is secure.
 
 Only expose Symfony production mode openly on the internet.
 Don't expose the dev mode on the internet, otherwise you may disclose things like `phpinfo` and environment variables.
-Exposing the dev mode exposes things like `phpinfo`, environment variables and so on.
+Exposing the dev mode exposes things like `phpinfo`, environment variables, and more.
 
 For more information about securing Symfony-based systems, see [Authentication and authorisation]([[= symfony_doc =]]/security.html), [more on this subject]([[= symfony_doc =]]/security.html#learn-more), and Symfony's [secrets management system]([[= symfony_doc =]]/configuration/secrets.html).
 
@@ -49,8 +46,7 @@ PHP 7.4 introduced the `zend.exception_ignore_args` setting in `php.ini`.
 The default value is 0 (disabled) for backwards compatibility.
 On production sites this should be set to 1 (enabled), to ensure stack traces don't include arguments passed to functions.
 Such arguments could include passwords or other sensitive information.
-You should also make sure no stack trace is ever visible to end users of production sites,
-though visible arguments are unsafe even if the stack traces only show up in log files.
+You should also make sure no stack trace is ever visible to end users of production sites, though visible arguments are unsafe even if the stack traces only show up in log files.
 
 ### Disable error output from PHP
 
@@ -68,23 +64,21 @@ display_startup_errors  = Off
 ### Other PHP settings
 
 Consider what other security related settings are relevant for your needs.
-The [OWASP PHP Configuration Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/PHP_Configuration_Cheat_Sheet.html)
-contains several recommendations, but be aware that they may be out of date as they don't mention PHP 8.
-See also [PHP's own security manual](https://www.php.net/manual/en/security.php).
+The [OWASP PHP Configuration Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/PHP_Configuration_Cheat_Sheet.html) contains several recommendations, but be aware that they may be out of date as they don't mention PHP 8.
+
+For more information, see [PHP's own security manual](https://www.php.net/manual/en/security.php).
 
 ## [[= product_name =]]
 
 ### Fully-vetted admin users
 
-Make sure Admin users and other privileged users who have access to System Information and setup in the back end
-are vetted and fully trustworthy.
+Make sure Admin users and other privileged users who have access to System Information and setup in the back end are vetted and fully trustworthy.
 
-As administrator you have access to full information about the system through the `setup/system_info` policy,
-and also to user data, Role editing, and many other critical aspects.
+As administrator you have access to full information about the system through the `setup/system_info` policy, and also to user data, role editing, and many other critical aspects.
 
 ### Strong passwords
 
-Enforce strong passwords for all users. 
+Enforce strong passwords for all users.
 This is specially important for admin accounts and other privileged users.
 
 - Never go online with admin password set to `publish` or any other default value.
@@ -98,25 +92,28 @@ This is specially important for admin accounts and other privileged users.
 
 ### Secure secrets
 
-Ensure all other secrets are similarly secured: Varnish invalidate token, JWT passphrase (if in use),
-and any other application-specific secrets.
+Ensure all other secrets are similarly secured: Varnish invalidate token, JWT passphrase (if in use), and any other application-specific secrets.
 
 ### Protect against brute force attacks
 
-Consider introducing a measure against brute force login attacks, like CAPTCHA. Adjust timeout limits to your needs:
+Consider introducing a measure against brute force login attacks, like CAPTCHA.
+Adjust timeout limits to your needs:
 
-When using the "forgot password" feature, a token is created which expires if the user doesn't click the password reset
-link that gets mailed to them in time. The time before it expires is set in the parameter
-`ibexa.site_access.config.default.security.token_interval_spec`. By nature this feature must be available to users
-before they have logged in, including would-be attackers. If an attacker uses this feature with someone else's email
-address, the attacker doesn't receive the email. But they could still try to guess the password reset link. That's why
-this interval should be as short as possible. 5 minutes is often enough.
+When using the "forgot password" feature, a token is created which expires if the user doesn't click the password reset link that gets mailed to them in time.
+The time before it expires is set in the parameter `ibexa.site_access.config.default.security.token_interval_spec`.
+By nature this feature must be available to users before they have logged in, including would-be attackers.
+If an attacker uses this feature with someone else's email address, the attacker doesn't receive the email.
+But they could still try to guess the password reset link.
+That's why this interval should be as short as possible.
+5 minutes is often enough.
 
 [[= product_name =]] allows you to create and send invitations to create an account in the frontend as a customer, the back office
-as an employee, or the Corporate Portal as a business partner. You can send invitations to individual users or in
-bulk. These invitations time out according to the parameter
-`ibexa.site_access.config.default.user_invitation.hash_expiration_time`. This can safely be longer than the "forgot password" time,
-since attackers cannot generate invitations. Don't leave it longer than it needs to be, though.
+as an employee, or the Corporate Portal as a business partner.
+You can send invitations to individual users or in bulk.
+These invitations time out according to the parameter
+`ibexa.site_access.config.default.user_invitation.hash_expiration_time`.
+This can safely be longer than the "forgot password" time, since attackers cannot generate invitations.
+Don't leave it longer than it needs to be, though.
 
 These timeouts are both entered as [PHP DateInterval duration strings](https://www.php.net/manual/en/dateinterval.construct.php).
 The forgot password feature defaults to "PT1H" (one hour).
@@ -130,7 +127,8 @@ See [Security advisory: EZSA-2020-002](https://developers.ibexa.co/security-advi
 ### Block upload of unwanted file types
 
 The `ibexa.site_access.config.default.io.file_storage.file_type_blacklist` setting is defined in the config file `src/bundle/Core/Resources/config/default_settings.yml` in the Core bundle.
-It prevents uploading files that might be executed on the server, a Remote Code Execution (RCE) vulnerability. The setting lists filename extensions for files that shouldn't be uploaded.
+It prevents uploading files that might be executed on the server, a Remote Code Execution (RCE) vulnerability.
+The setting lists filename extensions for files that shouldn't be uploaded.
 Attempting to upload files from the list results in an error message.
 There are also other safety measures in place, like using the web server configuration to block execution of uploaded scripts, see the next point.
 
@@ -147,7 +145,8 @@ See the line below `# Disable .php(3) and other executable extensions in the var
 
 ### Use secure password hashing
 
-Use the most secure supported password hashing method. This is currently `bcrypt`, and it's enabled by default.
+Use the most secure supported password hashing method.
+This is currently `bcrypt`, and it's enabled by default.
 
 ### Use UTF8MB4 with MySQL/MariaDB
 
@@ -171,18 +170,19 @@ Use the following checklist to ensure the roles and policies are secure:
 ### Don't use "hide" for read access restriction
 
 The [visibility switcher](https://doc.ibexa.co/en/latest/content_management/locations/#location-visibility) is a convenient feature for withdrawing content from the frontend.
-It acts as a filter in the frontend by default. You can choose to respect it or ignore it in your code.
-It'sn't permission-based, and doesn't restrict read access to content. Hidden content can be read through other means, like the REST API or GraphQL.
+It acts as a filter in the frontend by default.
+You can choose to respect it or ignore it in your code.
+It'sn't permission-based, and doesn't restrict read access to content.
+Hidden content can be read through other means, like the REST API or GraphQL.
 
-If you need to restrict read access to a given content item, you could create a role that grants read access for a given
-[**Section**](https://doc.ibexa.co/en/latest/administration/content_organization/sections/)
-or [**Object State**](https://doc.ibexa.co/en/latest/administration/content_organization/object_states/),
-and set a different Section or Object State for the given Content.
+If you need to restrict read access to a given content item, you could create a role that grants read access for a given [**Section**](https://doc.ibexa.co/en/latest/administration/content_organization/sections/) or [**Object State**](https://doc.ibexa.co/en/latest/administration/content_organization/object_states/), and set a different section or Object State for the given content.
 Or use other permission-based [**Limitations**](https://doc.ibexa.co/en/latest/permissions/limitations/).
 
 ### Minimize exposure
 
-Security should be a multi-layered exercise. It's wise to minimize what features you make available to the world, even if there are no known or suspected vulnerabilities in those features, and even if your content is properly protected by roles and policies. Reduce your attack surface by exposing only what you must.
+Security should be a multi-layered exercise.
+It's wise to minimize what features you make available to the world, even if there are no known or suspected vulnerabilities in those features, and even if your content is properly protected by roles and policies.
+Reduce your attack surface by exposing only what you must.
 
 - If possible, make the back office unavailable on the open internet.
 - [Symfony FOSJsRoutingBundle](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle) is required in those releases where it's included, to expose routes to JavaScript. It exposes only the required routes, nothing more. It's only required in the back office SiteAccess though, so you can consider blocking it in other SiteAccesses. You should also go through your own custom routes, and decide for each if you need to expose them or not. See the documentation on [YAML route definitions for exposure](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle/blob/master/Resources/doc/usage.rst#generating-uris).
@@ -193,7 +193,8 @@ Security should be a multi-layered exercise. It's wise to minimize what features
 
 !!! tip "Access control"
 
-    One way to lock down an endpoint that should not be openly available is to restrict access to logged-in users, by using the [`access_control`]([[= symfony_doc =]]/security/access_control.html) feature. In your YAML configuration, under the `security` key, add an entry similar to the following one, which redirects requests to a login page:
+    One way to lock down an endpoint that should not be openly available is to restrict access to logged-in users, by using the [`access_control`]([[= symfony_doc =]]/security/access_control.html) feature.
+    In your YAML configuration, under the `security` key, add an entry similar to the following one, which redirects requests to a login page:
 
     ```yaml
     security:
@@ -217,34 +218,34 @@ Those steps aren't needed when using [[= product_name_cloud =]], where the provi
 
 ### Security headers
 
-There are a number of security related HTTP response headers that you can use to improve your security. 
-Headers must be adapted to the site in question, and in most cases it's site owner's responsibility. 
-The headers can be set either by the web server, or by a proxy like Varnish. 
+There are a number of security related HTTP response headers that you can use to improve your security.
+Headers must be adapted to the site in question, and in most cases it's site owner's responsibility.
+The headers can be set either by the web server, or by a proxy like Varnish.
 You can also set headers in PHP code by making a Symfony `RequestListener` for the `kernel.response` event and adding the header to the response object headers list.
 
 You most likely need to vary the security headers based on the SiteAccess in question and site implementation details, such as frontend code and libraries used.
 
-- `Strict-Transport-Security` - ensures that all requests are sent over HTTPS, with no fallback to HTTP. 
-All production sites should use HTTPS and this header unless they have very particular needs. 
-This header is less important during development provided that the site is on an internal, protected network. 
-- `X-Frame-Options` - ensures that the site isn't embedded in a frame by a compliant browser. 
-Set the header to `SAMEORIGIN` to allow embedding by your own site, or `DENY` to block framing completely. 
-- `X-Content-Type-Options` - prevents the browser from second-guessing the mime-type of delivered content. 
-This header is less important if users cannot upload content and/or you trust your editors. However, it's safer to use it at all times. 
-Make sure that the `Content-Type` header is also correctly set, including for the top-level document, to avoid issues with HTML documents being downloaded while they should be rendered. 
-- `Content-Security-Policy` - blocks cross site scripting (XSS) attacks by setting an allowlist (whitelist) of resources to be loaded for a given page. 
-You can set separate lists for scripts, images, fonts, and so on. 
-For experimentation and testing, you can use `Content-Security-Policy-Report-Only` before activating the actual policy. 
-- `Referrer-Policy` - limits what information is sent from the previous page or site when navigating to a new page or site. 
-This header has several directives for fine-tuning the referrer information. 
-- `Permissions-Policy` - limits what features the browser can use, such as fullscreen, notifications, location, camera, or microphone. 
-For example, if someone succeeds in injecting their JavaScript into your site, this header prevents them from using those features to attack your users. 
+- `Strict-Transport-Security` - ensures that all requests are sent over HTTPS, with no fallback to HTTP.
+All production sites should use HTTPS and this header unless they have particular needs.
+This header is less important during development provided that the site is on an internal, protected network.
+- `X-Frame-Options` - ensures that the site isn't embedded in a frame by a compliant browser.
+Set the header to `SAMEORIGIN` to allow embedding by your own site, or `DENY` to block framing completely.
+- `X-Content-Type-Options` - prevents the browser from second-guessing the mime-type of delivered content.
+This header is less important if users cannot upload content and/or you trust your editors. However, it's safer to use it at all times.
+Make sure that the `Content-Type` header is also correctly set, including for the top-level document, to avoid issues with HTML documents being downloaded while they should be rendered.
+- `Content-Security-Policy` - blocks cross site scripting (XSS) attacks by setting an allowlist (whitelist) of resources to be loaded for a given page.
+You can set separate lists for scripts, images, fonts, and more.
+For experimentation and testing, you can use `Content-Security-Policy-Report-Only` before activating the actual policy.
+- `Referrer-Policy` - limits what information is sent from the previous page or site when navigating to a new page or site.
+This header has several directives for fine-tuning the referrer information.
+- `Permissions-Policy` - limits what features the browser can use, such as fullscreen, notifications, location, camera, or microphone.
+For example, if someone succeeds in injecting their JavaScript into your site, this header prevents them from using those features to attack your users.
 
 ### Track dependencies
 
 - Run servers on a recent operating system and install security patches for dependencies.
 - Configure servers to alert you about security updates from vendors. Pay special attention to dependencies used by your project directly, or by PHP. The provider of the operating system usually has a service for this.
 - Enable [GitHub Dependabot](https://docs.github.com/en/code-security/dependabot/dependabot-security-updates/about-dependabot-security-updates)
-to receive notifications when a security fix is released in a Github-hosted dependency.
-- If you're not using Github for your project, you can create a dummy project on Github with the same dependencies as your real project, and enable Dependabot notifications for that.
+to receive notifications when a security fix is released in a GitHub-hosted dependency.
+- If you're not using GitHub for your project, you can create a dummy project on GitHub with the same dependencies as your real project, and enable Dependabot notifications for that.
 - Ensure you get notifications about security fixes in JavaScript dependencies.

From e49efef52ea7ec174c67a6ff880ab6061244fcc0 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Wed, 16 Oct 2024 15:18:41 +0200
Subject: [PATCH 41/77] Fixes in 'infrastructure' section

---
 docs/infrastructure_and_maintenance/backup.md | 12 ++++---
 docs/infrastructure_and_maintenance/devops.md | 20 +++++++-----
 .../environments.md                           | 11 ++++---
 .../performance.md                            | 12 +++----
 .../request_lifecycle.md                      | 31 ++++++++++---------
 .../sessions.md                               | 20 +++++-------
 .../support_and_maintenance_faq.md            | 15 +++------
 7 files changed, 62 insertions(+), 59 deletions(-)

diff --git a/docs/infrastructure_and_maintenance/backup.md b/docs/infrastructure_and_maintenance/backup.md
index 79e0f16e5a..d28854d9b9 100644
--- a/docs/infrastructure_and_maintenance/backup.md
+++ b/docs/infrastructure_and_maintenance/backup.md
@@ -2,20 +2,22 @@
 description: Periodically back up your Repository information by making a database backup.
 ---
 
-# Backup 
+# Backup
 
-You should always make sure that your solution is properly backed up. The following example shows you how to do this on a Linux-UNIX-based system. You should shut down the DXP if it's running before making a backup.
+You should always make sure that your solution is properly backed up.
+The following example shows you how to do this on a Linux-UNIX-based system.
+You should shut down the DXP if it's running before making a backup.
 
 !!! note "Externally stored assets"
 
     If you store assets in any external service or localization, you should back them up before proceeding.
 
 1\. Navigate into the [[= product_name =]] directory:
- 
+
 ```
 cd /path/to/ibexa
 ```
- 
+
 2\. Clear all caches:
 
 ```
@@ -24,7 +26,7 @@ var/logs/*
 ```
 
 3\. Create a dump of the database:
- 
+
 ```
 # MySQL
 mysqldump -u <database_user> --add-drop-table <database_name> > db_backup.sql
diff --git a/docs/infrastructure_and_maintenance/devops.md b/docs/infrastructure_and_maintenance/devops.md
index 1dc63ea399..ef851697dc 100644
--- a/docs/infrastructure_and_maintenance/devops.md
+++ b/docs/infrastructure_and_maintenance/devops.md
@@ -8,7 +8,9 @@ description: See various tools that can help you debug your Ibexa DXP installati
 
 ### Clearing file cache using the Symfony cache:clear command
 
-Symfony provides a command for clearing cache. It deletes all file-based caches, which mainly consist of a Twig template, a [service container](php_api.md#service-container), and the Symfony route cache, but also everything else stored in the cache folder. Out of the box on a single-server setup this includes Content cache. 
+Symfony provides a command for clearing cache.
+It deletes all file-based caches, which mainly consist of a Twig template, a [service container](php_api.md#service-container), and the Symfony route cache, but also everything else stored in the cache folder.
+Out of the box on a single-server setup this includes Content cache. 
 
 For further information on the command's use, see its help text:
 
@@ -18,7 +20,8 @@ php bin/console --env=prod cache:clear -h
 
 !!! note
 
-    If you don't specify an environment, by default `cache:clear` clears the cache for the `dev` environment. If you want to clear it for `prod` you need to use the `--env=prod` option.
+    If you don't specify an environment, by default `cache:clear` clears the cache for the `dev` environment.
+    If you want to clear it for `prod` you need to use the `--env=prod` option.
 
 !!! caution "Clustering"
 
@@ -41,17 +44,20 @@ To install it, run the following command:
 composer require symfony/debug-pack
 ```
 
-After you have installed Symfony Web Debug Toolbar, it's available when running [[= product_name =]] in the `dev` environment. it's extended with some [[= product_name =]]-specific information:
+After you have installed Symfony Web Debug Toolbar, it's available when running [[= product_name =]] in the `dev` environment.
+It's extended with some [[= product_name =]]-specific information:
 
 ![Ibexa DXP info in Web Debug Toolbar](web_debug_toolbar.png "Ibexa DXP info in Web Debug Toolbar")
 
 #### SPI (persistence)
 
-This section provides the number of non-cached SPI calls and handlers. You can see details of these calls in the [Symfony Profiler]([[= symfony_doc =]]/profiler.html) page.
+This section provides the number of non-cached SPI calls and handlers.
+You can see details of these calls in the [Symfony Profiler]([[= symfony_doc =]]/profiler.html) page.
 
 #### SiteAccess
 
-Here you can see the name of the current SiteAccess and how it was matched. For reference see the [list of possible SiteAccess matchers](siteaccess_matching.md#available-siteaccess-matchers).
+Here you can see the name of the current SiteAccess and how it was matched.
+For reference see the [list of possible SiteAccess matchers](siteaccess_matching.md#available-siteaccess-matchers).
 
 ## Logging and debug configuration
 
@@ -61,8 +67,8 @@ The other is the standard [PSR-3](https://github.com/php-fig/fig-standards/blob
 
 ### Debugging in dev environment
 
-When using the Symfony `dev` [environment](environments.md), the system tracks additional metrics for you to be able to debug issues. They
-include Symfony cache use, and a [persistence cache](persistence_cache.md#persistence-cache-configuration) use.
+When using the Symfony `dev` [environment](environments.md), the system tracks additional metrics for you to be able to debug issues.
+They include Symfony cache use, and a [persistence cache](persistence_cache.md#persistence-cache-configuration) use.
 
 #### Reducing memory use
 
diff --git a/docs/infrastructure_and_maintenance/environments.md b/docs/infrastructure_and_maintenance/environments.md
index 7753ee0d8f..17bb607dd7 100644
--- a/docs/infrastructure_and_maintenance/environments.md
+++ b/docs/infrastructure_and_maintenance/environments.md
@@ -4,16 +4,19 @@ description: In Ibexa DXP you can use environment provided by Symfony in virtual
 
 # Environments
 
-Environment configuration is provided by Symfony. [[= product_name =]] additionally enables you to specify environments in virtual host configuration.
-You can configure several environments, such as production, development, or staging. You can have different configuration sets for each of them.
+Environment configuration is provided by Symfony.
+[[= product_name =]] additionally enables you to specify environments in virtual host configuration.
+You can configure several environments, such as production, development, or staging.
+You can have different configuration sets for each of them.
 
 !!! tip
 
     See also [Environments in Symfony doc]([[= symfony_doc =]]/configuration.html#configuration-environments).
-    
+
 ## Web server configuration
 
-For example, using Apache, in the [`VirtualHost` example](https://raw.githubusercontent.com/ibexa/post-install/main/resources/templates/apache2/vhost.template) in your installation, the required `VirtualHost` configurations have been already included. You can switch to the desired environment by setting the `ENVIRONMENT` variable to `prod`, `dev` or another custom value, like in the following example:
+For example, using Apache, in the [`VirtualHost` example](https://raw.githubusercontent.com/ibexa/post-install/main/resources/templates/apache2/vhost.template) in your installation, the required `VirtualHost` configurations have been already included.
+You can switch to the desired environment by setting the `ENVIRONMENT` variable to `prod`, `dev` or another custom value, like in the following example:
 
 ```
 # Environment.
diff --git a/docs/infrastructure_and_maintenance/performance.md b/docs/infrastructure_and_maintenance/performance.md
index 0300ce4909..40bf170dc4 100644
--- a/docs/infrastructure_and_maintenance/performance.md
+++ b/docs/infrastructure_and_maintenance/performance.md
@@ -15,7 +15,7 @@ If you're 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.
+- Avoid shared filesystems for code (Docker for Mac/Win, VirtualBox/*, Vagrant, and more), 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_overview.md).
 
 ## Client
@@ -44,7 +44,7 @@ In production setups:
 
 ### Web server
 
-- Use Nginx/Apache even for development, as PHP's built-in web server (as exposed via Symfony's `server:*` commands) is only able to handle one request at a time (including JS/CSS/* asset loading, etc.).
+- Use Nginx/Apache even for development, as PHP's built-in web server (as exposed via Symfony's `server:*` commands) is only able to handle one request at a time (including JS/CSS/* asset loading, and more).
 - Use a recent version of nginx, set up https, and enable http/2 to reduce connection latency on parallel requests.
 
 ### PHP
@@ -116,9 +116,9 @@ To avoid quickly running out of memory while executing such commands you should
 
 !!! note "Memory still grows"
 
-    Even when everything is configured like described above, memory grows for each iteration
-    of indexing/inserting a content item with at least *1kb* per iteration after the initial first 100 rounds.
-    This is expected behavior; to be able to handle more iterations you have to do one or several of the following:
+    Even when everything is configured like described above, memory grows for each iteration of indexing/inserting a content item with at least *1kb* per iteration after the initial first 100 rounds.
+    This is expected behavior.
+    To be able to handle more iterations you have to do one or several of the following:
 
     - Change the import/index script in question to [use process forking](#process-forking-with-symfony) to avoid the issue.
     - Upgrade PHP: *newer versions of PHP are typically more memory-efficient.*
@@ -127,7 +127,7 @@ To avoid quickly running out of memory while executing such commands you should
 ### Process forking with Symfony
 
 The recommended way to completely avoid "memory leaks" in PHP in the first place is to use processes.
-For console scripts this is typically done using process forking which is quite easily achievable with Symfony.
+For console scripts this is typically done using process forking which is achievable with Symfony.
 
 The things you need to do:
 
diff --git a/docs/infrastructure_and_maintenance/request_lifecycle.md b/docs/infrastructure_and_maintenance/request_lifecycle.md
index 1787425b2f..fffdce2bf3 100644
--- a/docs/infrastructure_and_maintenance/request_lifecycle.md
+++ b/docs/infrastructure_and_maintenance/request_lifecycle.md
@@ -11,7 +11,8 @@ When entering the server infrastructure, the HTTP request can be handled by seve
 
 For an overview of what happens on a reverse proxy like Varnish or Fastly, see [Context-aware HTTP cache / Request lifecycle](context_aware_cache.md#request-lifecycle).
 
-When arriving at a web server, the request is filtered by Apache Virtual Host, Nginx Server Blocks or equivalent. There, requests of static resources are separated from requests to PHP interpreter.
+When arriving at a web server, the request is filtered by Apache Virtual Host, Nginx Server Blocks, or equivalent.
+There, requests of static resources are separated from requests to PHP interpreter.
 
 As [[= product_name =]] is a Symfony application, the handling of requests starts like in Symfony (see [Symfony and HTTP Fundamentals](https://symfony.com/doc/current/introduction/http_fundamentals.html)).
 
@@ -19,7 +20,8 @@ If the HTTP request is to be treated by [[= product_name =]], it goes to the `pu
 
 The front controller transforms the HTTP request into a PHP [`Request` object](https://symfony.com/doc/current/introduction/http_fundamentals.html#symfony-request-object) and passes it to Symfony's Kernel to get a [`Response` object](https://symfony.com/doc/current/introduction/http_fundamentals.html#symfony-response-object) that is transformed and sent back as an HTTP response.
 
-The schemas start with a regular `Request` object from a browser that enters Symfony and [[= product_name =]]. There is no ESI, no REST, and no GraphQL request performed.
+The schemas start with a regular `Request` object from a browser that enters Symfony and [[= product_name =]].
+There is no ESI, no REST, and no GraphQL request performed.
 
 
 ## Lifecycle flowcharts
@@ -41,19 +43,19 @@ This schema is described below event by event.
 !!! tip
 
     To list all listeners that listen to an event, run `php bin/console debug:event-dispatcher <event.name>`, for example:
-    
+
     ```bash
     php bin/console debug:event-dispatcher kernel.request
     ```
-    
+
     To view details of a service (including class, arguments and tags), run `php bin/console debug:container --show-arguments <service.name>`, for example:
-    
+
     ```bash
     php bin/console debug:container --show-arguments ibexa.siteaccess_match_listener`
     ```
-    
+
     To list all services with a specific tag, run `php bin/console debug:container --tag=<tag>`, for example:
-    
+
     ```bash
     php bin/console debug:container --tag=router
     ```
@@ -79,13 +81,11 @@ The `ibexa.siteaccess_match_listener` service:
 - then dispatches the `Ibexa\Core\MVC\Symfony\SiteAccess` event (`MVCEvents::SITEACCESS`).
 
 The `SiteAccessListener` (`Ibexa\Bundle\Core\EventListener\SiteAccessListener`) subscribes to this `Ibexa\Core\MVC\Symfony\SiteAccess` event with top priority (priority 255).
-The `SiteAccessListener` adds the **`semanticPathinfo`** attribute, the path without SiteAccess indications ([`URIElement`](siteaccess_matching.md#urielement), [`URIText`](siteaccess_matching.md#uritext),
-or [`Map\URI`](siteaccess_matching.md#mapuri) implementing the `URILexer` interface) to the request.
+The `SiteAccessListener` adds the **`semanticPathinfo`** attribute, the path without SiteAccess indications ([`URIElement`](siteaccess_matching.md#urielement), [`URIText`](siteaccess_matching.md#uritext), or [`Map\URI`](siteaccess_matching.md#mapuri) implementing the `URILexer` interface) to the request.
 
 ### Routing
 
-Finally, the `Symfony\Component\HttpKernel\EventListener\RouterListener` (`router_listener`) (priority 32), which also listens to the `kernel.request` event,
-calls `Ibexa\Core\MVC\Symfony\Routing\ChainRouter::matchRequest` and adds its returned parameters to the request.
+Finally, the `Symfony\Component\HttpKernel\EventListener\RouterListener` (`router_listener`) (priority 32), which also listens to the `kernel.request` event, calls `Ibexa\Core\MVC\Symfony\Routing\ChainRouter::matchRequest` and adds its returned parameters to the request.
 
 #### `ChainRouter`
 
@@ -109,7 +109,7 @@ If a wildcard matches, the request's `semanticPathinfo` is updated and the route
 ### `UrlAliasRouter`
 
 `UrlAliasRouter` (`Ibexa\Bundle\Core\Routing\UrlAliasRouter`):
-This router uses the `UrlAliasService` to associate the `semanticPathinfo` to a Location.
+This router uses the `UrlAliasService` to associate the `semanticPathinfo` to a location.
 If it finds a Location, the request receives the attributes **`locationId`** and **`contentId`**, **`viewType`** is set to `full`, and the **`_controller`** is set to `ibexa_content:viewAction` for now.
 
 The `locale_listener` (priority 16) sets the request's **`_locale`** attribute.
@@ -153,7 +153,8 @@ The `HttpKernel` then dispatches a `kernel.controller_arguments` (`KernelEvents:
 
 ## Controller execution
 
-The `HttpKernel` extracts from the request the controller and the arguments to pass to the controller. [Argument resolvers](https://symfony.com/doc/5.4/controller/argument_value_resolver.html) work in a way similar to autowiring.
+The `HttpKernel` extracts from the request the controller and the arguments to pass to the controller.
+[Argument resolvers](https://symfony.com/doc/5.4/controller/argument_value_resolver.html) work in a way similar to autowiring.
 The `HttpKernel` executes the controller with those arguments.
 
 As a reminder, the controller and its argument can be:
@@ -233,4 +234,6 @@ The `HttpKernel` retrieves the response attached to the event and continues.
 
 ## End of HTTP response
 
-The web server outputs the HTTP response. Depending on the architecture, few things may still occur. For example, Varnish or Fastly can take specific headers into account when setting the cache or serving it.
+The web server outputs the HTTP response.
+Depending on the architecture, few things may still occur.
+For example, Varnish or Fastly can take specific headers into account when setting the cache or serving it.
diff --git a/docs/infrastructure_and_maintenance/sessions.md b/docs/infrastructure_and_maintenance/sessions.md
index df25a9d677..31285cd5d6 100644
--- a/docs/infrastructure_and_maintenance/sessions.md
+++ b/docs/infrastructure_and_maintenance/sessions.md
@@ -9,13 +9,11 @@ It's further enhanced in [[= product_name =]] with support for SiteAccess-aware
 
 !!! note
 
-    Use of Memcached, Redis (or experimentally PDO) as session handler is a requirement in a cluster setup,
-    for details [see below](#cluster-setup). For an overview of the clustering feature see [Clustering](clustering.md).
+    Use of Memcached, Redis (or experimentally PDO) as session handler is a requirement in a cluster setup, for details [see below](#cluster-setup). For an overview of the clustering feature see [Clustering](clustering.md).
 
 ## Configuration
 
-Symfony offers the possibility to change many session options at application level
-(for example, in Symfony [`framework` configuration]([[= symfony_doc =]]/reference/configuration/framework.html#session)).
+Symfony offers the possibility to change many session options at application level (for example, in Symfony [`framework` configuration]([[= symfony_doc =]]/reference/configuration/framework.html#session)).
 These options include:
 
 - `cookie_domain`
@@ -24,13 +22,11 @@ These options include:
 - `cookie_secure`
 - `cookie_httponly`
 
-However, in [[= product_name =]] you can set up several sites within one Symfony application,
-so you can also define session configuration per SiteAccess and SiteAccess group level.
+However, in [[= product_name =]] you can set up several sites within one Symfony application, so you can also define session configuration per SiteAccess and SiteAccess group level.
 
 ### Session options per SiteAccess
 
-All site-related session configuration can be defined per SiteAccess and SiteAccess group
-under the `ibexa.system.<scope>.session` [configuration key](configuration.md#configuration-files):
+All site-related session configuration can be defined per SiteAccess and SiteAccess group under the `ibexa.system.<scope>.session` [configuration key](configuration.md#configuration-files):
 
 ``` yaml
 ibexa:
@@ -53,7 +49,7 @@ ibexa:
 ## Session handlers
 
 In Symfony, a session handler is configured using `framework.session.handler_id`.
-Symfony can be configured to use custom handlers, or just fall back to what is configured in PHP by setting it to null (`~`).
+Symfony can be configured to use custom handlers, or fall back to what is configured in PHP by setting it to null (`~`).
 
 ### Default configuration
 
@@ -102,8 +98,7 @@ Alternatively if you need to configure Memcached servers dynamically:
 - Set `%ibexa.session.handler_id%` (or `SESSION_HANDLER_ID` env var) to `app.session.handler.native_memcached`
 - Set `%ibexa.session.save_path%` (or `SESSION_SAVE_PATH` env var) to [`save_path` config for Memcached](https://www.php.net/manual/en/memcached.sessions.php)
 
-Optionally tweak [`php-memcached` session settings](https://www.php.net/manual/en/memcached.configuration.php) for things like
-session locking.
+Optionally tweak [`php-memcached` session settings](https://www.php.net/manual/en/memcached.configuration.php) for things like session locking.
 
 ##### Handling sessions with Redis
 
@@ -133,8 +128,7 @@ If you want to make sure sessions survive Redis or server restarts, consider usi
 
 ##### Alternative storing sessions in database using PDO
 
-For setups where database is preferred for storing sessions, you may use Symfony's PdoSessionHandler,
-although it's not currently recommended from performance perspective.
+For setups where database is preferred for storing sessions, you may use Symfony's PdoSessionHandler, although it's not currently recommended from performance perspective.
 
 Below is a configuration example for [[= product_name =]]. Refer to the [Symfony Cookbook]([[= symfony_doc =]]/doctrine/pdo_session_storage.html) for full documentation.
 
diff --git a/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md b/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md
index e1f3bce162..c64b158e55 100644
--- a/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md
+++ b/docs/infrastructure_and_maintenance/support_and_maintenance_faq.md
@@ -17,13 +17,11 @@ composer show ibexa/*
 
 Besides that, all the configuration from the `config` directory may be helpful.
 
-You should also list the steps to reproduce the issue,
-or at least provide a clear description of the circumstances under which the problem occurred.
+You should also list the steps to reproduce the issue, or at least provide a clear description of the circumstances under which the problem occurred.
 
 If you stumble upon a database-related problem, providing corresponding logs is also an important step.
 
-Additionally, mention recent changes, performed migrations or external scripts/code customizations
-related to the code which generates the problem.
+Additionally, mention recent changes, performed migrations or external scripts/code customizations related to the code which generates the problem.
 
 #### What are the recommended ways to increase my project's performance?
 
@@ -33,7 +31,7 @@ The most important clues around increasing overall performance of your [[= produ
 
 The language of the back office is based on the browser language.
 To change it you should install the proper package for your language (see [language packages list](https://github.com/ezplatform-i18n)).
-Once you have language packages installed, you can switch the language of the back office in the User Settings menu.
+Once you have language packages installed, you can switch the language of the back office in the **User Settings** menu.
 
 If you don't have a language defined in the browser, it's selected based on the `parameters.locale_fallback` parameter located in `config/packages/ibexa.yaml`.
 
@@ -51,12 +49,9 @@ As an alternative to manually applying the patch, you can use [composer-patches]
 You can apply patches received from the Support, community or the others by using your `composer.json` file.
 For checking the versions you're on, refer to your `composer.lock`.
 All you need is to specify which package receives patches and give the path/URL to the actual file.
-This should be done inside the `extra` section. Packages which should receive patches
-are removed during `composer update` or `composer require` so they can be re-installed and re-patched.
+This should be done inside the `extra` section. Packages which should receive patches are removed during `composer update` or `composer require` so they can be re-installed and re-patched.
 
-When updating to the release that already contains specified patches,
-Composer throws an error alongside a message that they cannot be applied and are skipped
-([this is configurable with 1.x](https://github.com/cweagans/composer-patches/tree/1.x#error-handling)).
+When updating to the release that already contains specified patches, Composer throws an error alongside a message that they cannot be applied and are skipped ([this is configurable with 1.x](https://github.com/cweagans/composer-patches/tree/1.x#error-handling)).
 They can be manually removed from `composer.json` now.
 
 #### How to clear the cache properly?

From d7460c907069e9c64ef617151f66ec05f825a9ef Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Wed, 16 Oct 2024 15:22:22 +0200
Subject: [PATCH 42/77] Fixes in 'languages'

---
 .../languages/back_office_translations.md     | 17 +++---
 docs/multisite/languages/language_api.md      |  3 +-
 docs/multisite/languages/languages.md         | 55 +++++++++++++------
 3 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/docs/multisite/languages/back_office_translations.md b/docs/multisite/languages/back_office_translations.md
index 4f6072d1a9..8b1597f874 100644
--- a/docs/multisite/languages/back_office_translations.md
+++ b/docs/multisite/languages/back_office_translations.md
@@ -6,7 +6,8 @@ description: The language of the back office is selected automatically based on
 
 ## Enabling back office languages
 
-All translations are available as a part of [[= product_name =]]. To enable back office translations, use the following configuration:
+All translations are available as a part of [[= product_name =]].
+To enable back office translations, use the following configuration:
 
 ``` yaml
 ibexa:
@@ -25,7 +26,7 @@ If your browser language is set to French, the back office is displayed in Frenc
 !!! tip
 
     You can also manually add the necessary .xliff files to an existing project.
-    
+
     Add the language to an array under `ibexa.system.<siteaccess>.user_preferences.additional_translations`, for example:
 
     `ibexa.system.<siteaccess>.user_preferences.additional_translations: ['pl_PL', 'fr_FR']`
@@ -38,21 +39,17 @@ To learn how to contribute to a translation, see [Contributing translations](con
 
 ### Selecting back office language
 
-Once you have language packages enabled, you can switch the language of the back office
-in the User Settings menu.
+Once you have language packages enabled, you can switch the language of the back office in the **User Settings** menu.
 
 Otherwise, the language is selected based on the browser language.
-If you don't have a language defined in the browser, the language is selected
-based on `parameters.locale_fallback` in `config/packages/ibexa.yaml`.
+If you don't have a language defined in the browser, the language is selected based on `parameters.locale_fallback` in `config/packages/ibexa.yaml`.
 
 ## Custom string translations
 
 When you extend the back office you often need to provide labels for new elements.
-It's good practice to provide your labels in translations files, instead of literally,
-so they can be reused and translated into other languages.
+It's good practice to provide your labels in translations files, instead of literally, so they can be reused and translated into other languages.
 
-To provide label strings, make use of the `Symfony\Component\Translation\TranslatorInterface`
-and its `trans()` method.
+To provide label strings, make use of the `Symfony\Component\Translation\TranslatorInterface` and its `trans()` method.
 
 The method takes as arguments:
 
diff --git a/docs/multisite/languages/language_api.md b/docs/multisite/languages/language_api.md
index 2e3d783b2d..bd596cacfd 100644
--- a/docs/multisite/languages/language_api.md
+++ b/docs/multisite/languages/language_api.md
@@ -16,8 +16,7 @@ To get a list of all languages in the system use [`LanguageService::loadLanguage
 
 ## Creating a language
 
-To create a new language, you need to create a [`LanguageCreateStruct`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-LanguageCreateStruct.html)
-and provide it with the language code and language name.
+To create a new language, you need to create a [`LanguageCreateStruct`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-LanguageCreateStruct.html) and provide it with the language code and language name.
 Then, use [`LanguageService::createLanguage`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-LanguageService.html#method_createLanguage) and pass the `LanguageCreateStruct` to it:
 
 ``` php
diff --git a/docs/multisite/languages/languages.md b/docs/multisite/languages/languages.md
index d97340a193..ea55e57af1 100644
--- a/docs/multisite/languages/languages.md
+++ b/docs/multisite/languages/languages.md
@@ -9,47 +9,62 @@ description: You can create multiple language versions (translations) of content
 [[= product_name =]] offers the ability to create multiple language versions (translations) of a content item.
 Translations are created per version of the item, so each version of the content can have a different set of translations.
 
-A version always has at least one translation which by default is the *initial/main* translation. Further versions can be added, but only for languages that have previously been [added to the global translation list](#adding-available-languages), that is a list of all languages available in the system. The maximum number of languages in the system is 62.
+A version always has at least one translation which by default is the *initial/main* translation.
+Further versions can be added, but only for languages that have previously been [added to the global translation list](#adding-available-languages), that is a list of all languages available in the system.
+The maximum number of languages in the system is 62.
 
-Different translations of the same content item can be edited separately. This means that different users can work on translations into different languages at the same time.
+Different translations of the same content item can be edited separately.
+This means that different users can work on translations into different languages at the same time.
 
 Each version, including a draft, contains all the existing translations.
-However, even if work on a draft takes time and other translations are updated in the meantime,
-publishing the draft doesn't overwrite later modifications.
+However, even if work on a draft takes time and other translations are updated in the meantime, publishing the draft doesn't overwrite later modifications.
 
 ### Adding available languages
 
-The multilanguage system operates based on a global translation list that contains all languages available in the installation. Languages can be [added to this list from the **Admin** panel](https://doc.ibexa.co/projects/userguide/en/latest/content_management/translate_content/) in the back office. After adding a language be sure to dump all assets to the file system:
+The multilanguage system operates based on a global translation list that contains all languages available in the installation.
+Languages can be [added to this list from the **Admin** panel](https://doc.ibexa.co/projects/userguide/en/latest/content_management/translate_content/) in the back office.
+After adding a language be sure to dump all assets to the file system:
 
 ```
 yarn encore <environment>
 # OR php bin/console ibexa:encore:compile
 ```
 
-**The new language must then be added to the [SiteAccess](multisite.md) configuration**. Once this is done, any user with proper permissions can create content item versions in these languages in the user interface.
+**The new language must then be added to the [SiteAccess](multisite.md) configuration**.
+Once this is done, any user with proper permissions can create content item versions in these languages in the user interface.
 
 ### Translatable and untranslatable fields
 
-Language versions consist of translated values of the content item's fields. In the content type definition every field is set to be Translatable or not.
+Language versions consist of translated values of the content item's fields.
+In the content type definition every field is set to be Translatable or not.
 
-[[= product_name =]] doesn't decide by itself which fields can be translated and which cannot. For some field values the need for a translation can be obvious, for example for the body of an article. In other cases, for instance images without text, integer numbers or e-mail addresses, translation is usually unnecessary. Despite that, [[= product_name =]] gives you the possibility to mark any field as translatable regardless of its field type. It's only your decision to exclude the translation possibility for those fields where it makes no sense.
+[[= product_name =]] doesn't decide by itself which fields can be translated and which cannot.
+For some field values the need for a translation can be obvious, for example for the body of an article.
+In other cases, for instance images without text, integer numbers, or email addresses, translation is usually unnecessary.
+Despite that, [[= product_name =]] gives you the possibility to mark any field as translatable regardless of its field type.
+It's only your decision to exclude the translation possibility for those fields where it makes no sense.
 
 When a field isn't flagged as Translatable, its value is copied from the initial/main translation when a new language version is created. This copied value cannot be modified. When a field is Translatable, you have to enter its value in a new language version manually.
 
-For example, let's say that you need to store information about marathon contestants and their results. You build a "contestant" content type using the following fields: name, photo, age, nationality, finish time. Allowing the translation of anything other than nationality would be pointless, since the values stored by the other fields are the same regardless of the language used to describe the contestant. In other words, the name, photo, age and finish time would be the same in, for example, both English and Norwegian.
+For example, let's say that you need to store information about marathon contestants and their results.
+You build a "contestant" content type using the following fields: name, photo, age, nationality, finish time.
+Allowing the translation of anything other than nationality would be pointless, since the values stored by the other fields are the same regardless of the language used to describe the contestant.
+In other words, the name, photo, age and finish time would be the same in, for example, both English and Norwegian.
 
 ### Access control
 
-You can control whether a user or user group is able to translate content or not. You do this by adding a [Language limitation](limitation_reference.md#language-limitation) to policies that allow creating or editing content. This limitation enables you to define which role can work with which languages in the system.
+You can control whether a user or user group is able to translate content or not.
+You do this by adding a [Language limitation](limitation_reference.md#language-limitation) to policies that allow creating or editing content.
+This limitation enables you to define which role can work with which languages in the system.
 
 For more information of the permissions system, see [Permissions](permissions.md).
 
-In addition, you can also control the access to the global translation list by using the Content/Translations policy. This policy allows users to add and remove languages from the global translation list.
+In addition, you can also control the access to the global translation list by using the `Content/Translations` policy.
+This policy allows users to add and remove languages from the global translation list.
 
 ## Using SiteAccesses for handling translations
 
-If you want to have completely separate versions of the website, each with content in its own language,
-you can [use SiteAccesses](#using-siteaccesses-for-handling-translations).
+If you want to have completely separate versions of the website, each with content in its own language, you can [use SiteAccesses](#using-siteaccesses-for-handling-translations).
 Depending on the URI used to access the website, a different site opens, with a language set in configuration settings.
 All content items are then displayed in this language.
 
@@ -111,7 +126,8 @@ A locale *conversion map* example [can be found in `ibexa/core`, in `locale.yaml
 
 ### More complex translation setup
 
-There are some cases where your SiteAccesses share settings (Repository, content settings, etc.), but you don't want all of them to share the same `translation_siteaccesses` setting. This can be for example the case when you use separate SiteAccesses for mobile versions of a website.
+There are some cases where your SiteAccesses share settings (repository, content settings, etc.), but you don't want all of them to share the same `translation_siteaccesses` setting.
+This can be for example the case when you use separate SiteAccesses for mobile versions of a website.
 
 The solution is defining new groups:
 
@@ -171,15 +187,20 @@ ibexa:
 
 ### Using implicit *related SiteAccesses*
 
-If the `translation_siteaccesses` setting isn't provided, implicit *related SiteAccesses* is used instead. SiteAccesses are considered *related* if they share:
+If the `translation_siteaccesses` setting isn't provided, implicit *related SiteAccesses* is used instead.
+SiteAccesses are considered *related* if they share:
 
 - The same repository
 - The same root `location_id` (see [Multisite](multisite.md))
 
 ### Fallback languages and missing translations
 
-When setting up SiteAccesses with different language versions, you can specify a list of preset languages for each SiteAccess. When this SiteAccess is used, the system goes through this list. If a content item is unavailable in the first (prioritized) language, it attempts to use the next language in the list, and so on. Thanks to this you can have a fallback in case of a lacking translation.
+When setting up SiteAccesses with different language versions, you can specify a list of preset languages for each SiteAccess.
+When this SiteAccess is used, the system goes through this list.
+If a content item is unavailable in the first (prioritized) language, it attempts to use the next language in the list, and more.
+Thanks to this you can have a fallback in case of a lacking translation.
 
-You can also assign a Default content availability flag to content types (available in the **Admin** panel). When this flag is assigned, content items of this type are available even when they don't have a language version in any of the languages configured for the current SiteAccess.
+You can also assign a Default content availability flag to content types (available in the **Admin** panel).
+When this flag is assigned, content items of this type are available even when they don't have a language version in any of the languages configured for the current SiteAccess.
 
 If a language isn't provided in the list of prioritized languages and it's not the content item's first language, the URL alias for this content in this language isn't generated.

From 806aff1f2eea0a188917ec8b21fc6897ba41452c Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Wed, 16 Oct 2024 15:28:08 +0200
Subject: [PATCH 43/77] Fixes in 'site factory and siteaccess' sections

---
 docs/multisite/site_factory/site_factory.md   | 20 +++++------
 .../site_factory_configuration.md             | 35 +++++++++----------
 .../siteaccess_aware_configuration.md         | 35 +++++++------------
 .../siteaccess/siteaccess_matching.md         | 16 ++++-----
 4 files changed, 44 insertions(+), 62 deletions(-)

diff --git a/docs/multisite/site_factory/site_factory.md b/docs/multisite/site_factory/site_factory.md
index 470b586786..84fe97184b 100644
--- a/docs/multisite/site_factory/site_factory.md
+++ b/docs/multisite/site_factory/site_factory.md
@@ -10,15 +10,13 @@ It enables you to configure new sites without editing [YAML-based SiteAccess con
 
 !!! note
 
-    A SiteAccess that you define for a site by following the [configuration](multisite_configuration.md) 
-    is always treated with higher priority than a SiteAccess created by using the Site Factory. 
-    For example, if you define a French site within a YAML file,
-    and then create a site that uses the `fr` path in Site Factory, matchers ignore the second site.
+    A SiteAccess that you define for a site by following the [configuration](multisite_configuration.md) is always treated with higher priority than a SiteAccess created by using the Site Factory.
+    For example, if you define a French site within a YAML file, and then create a site that uses the `fr` path in Site Factory, matchers ignore the second site.
 
 Site Factory is disabled by default after installation.
 
 If you plan to use Site Factory, you need to enable and configure it.
-To enable or disable Site Factory, follow respectively:
+To enable or disable Site Factory, follow:
 
 - [Enable Site Factory section](#enable-site-factory)
 - [Disable Site Factory section](#disable-site-factory)
@@ -29,11 +27,11 @@ To enable Site Factory, set the `ibexa_site_factory.enabled` [configuration key]
 
 ### Configure designs
 
-Next, configure Site Factory by adding empty SiteAccess groups. At least one empty group is required.
+Next, configure Site Factory by adding empty SiteAccess groups.
+At least one empty group is required.
 The number of empty SiteAccess groups must be equal to the number of templates that you want to have when you create the new site.
 
-In this example, you add two SiteAccess groups (`example_site_factory_group_1` and `example_site_factory_group_2`)
-that correspond to the two templates (`site1` and `site2`) that you add in the next step.
+In this example, you add two SiteAccess groups (`example_site_factory_group_1` and `example_site_factory_group_2`) that correspond to the two templates (`site1` and `site2`) that you add in the next step.
 
 Add the groups under the `ibexa.siteaccess` [configuration key](configuration.md#configuration-files):
 
@@ -144,7 +142,7 @@ Then, run `docker-compose up`:
 ```bash
 export COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/multihost.yml"
 docker-compose up
-```       
+```
 
 Your sites should be now visible under:
 
@@ -157,7 +155,7 @@ Your sites should be now visible under:
 
 ### Define site directory
 
-You can adjust the place where the directory of the new site is created (Location with ID 2 by default).
+You can adjust the place where the directory of the new site is created (location with ID 2 by default).
 To do it, go to configuration files and under the `ibexa.system.<scope>.site_factory` [configuration key](configuration.md#configuration-files) add the following parameter:
 
 ``` yaml
@@ -172,7 +170,7 @@ Now, all new directories are created under "[[= product_name =]]".
 
 ### Provide access
 
-The Site Factory is set up, now you can provide sufficient permissions to the Users.
+The Site Factory is set up, now you can provide sufficient permissions to the users.
 
 Set the below policies to allow users to:
 
diff --git a/docs/multisite/site_factory/site_factory_configuration.md b/docs/multisite/site_factory/site_factory_configuration.md
index 1784fbabf6..0000cb3733 100644
--- a/docs/multisite/site_factory/site_factory_configuration.md
+++ b/docs/multisite/site_factory/site_factory_configuration.md
@@ -5,15 +5,14 @@ edition: experience
 
 # Site Factory configuration
 
-## Parent Location
+## Parent location
 
-When working with the [Site Factory](site_factory.md), you can define the parent 
-Location for a new site in the configuration.
-Each new site is created in the designated Location.
+When working with the [Site Factory](site_factory.md), you can define the parent location for a new site in the configuration.
+Each new site is created in the designated location.
 
-To define a parent Location, add a new configuration key to the site template definition.
-Each template is assigned to its own Location.
-This can be either a Location ID (for example, `62`), or a recommended remote Location ID (for example, `1548b8cd8dd4c6b5082e566615d45e91`).
+To define a parent location, add a new configuration key to the site template definition.
+Each template is assigned to its own location.
+This can be either a location ID (for example, `62`), or a recommended remote location ID (for example, `1548b8cd8dd4c6b5082e566615d45e91`).
 
 Add the configuration key to your template under the `ibexa_site_factory` [configuration key](configuration.md#configuration-files):
 
@@ -32,13 +31,13 @@ ibexa_site_factory:
             parent_location_remote_id: 1548b8cd8dd4c6b5082e566615d45e91
 ```
 
-Now, you can see the path to the new site's parent Location under design selection.
-If you have sufficient permissions, you can change the defined Location during site creation.
-If the parent Location isn't defined, you have to choose it from Universal Discovery Widget.
+Now, you can see the path to the new site's parent location under design selection.
+If you have sufficient permissions, you can change the defined Llcation during site creation.
+If the parent location isn't defined, you have to choose it from Universal Discovery Widget.
 
 ## Site skeletons
 
-The Site skeleton enables you to copy an entire content structure of the site design to the defined Location.
+The Site skeleton enables you to copy an entire content structure of the site design to the defined location.
 
 Site skeleton copying is a one-off operation, it only happens during the site creation process.
 After that, you cannot copy the Site skeleton again, for example in the edit view.
@@ -49,7 +48,7 @@ Remember that one template can only have one Site skeleton.
 If the design doesn't have a defined Site skeleton, a directory of the new site is created in a standard Site Factory process.
 
 To define a Site skeleton, add the `site_skeleton_id` or `site_skeleton_remote_id` key to the site template definition.
-This can be either a Location ID (for example, `5966`), or a remote Location ID (for example, `3bed95afb1f8126f06a3c464e461e1ae66`).
+This can be either a location ID (for example, `5966`), or a remote location ID (for example, `3bed95afb1f8126f06a3c464e461e1ae66`).
 
 ``` yaml hl_lines="7 12"
 ibexa_site_factory:
@@ -76,8 +75,7 @@ You can create many user group skeletons and associate them with many templates.
 One template can have many user group skeletons assigned.
 
 To create a user group skeleton, first go to **Admin** -> **Site skeletons** and add a user group to the list of available skeletons.
-Then, review the detailed information of the newly created user group skeleton,
-copy the Location ID or the Location remote ID, and add a configuration key to the site template definition:
+Then, review the detailed information of the newly created user group skeleton, copy the location ID or the Location remote ID, and add a configuration key to the site template definition:
 
 ``` yaml
 ibexa_site_factory:
@@ -89,19 +87,18 @@ ibexa_site_factory:
 ```
 
 Manage the permissions associated to the user group skeleton by [assigning roles](https://doc.ibexa.co/projects/userguide/en/latest/site_organization/organizing_the_site/#managing-permissions).
-Make sure that the roles that you assign to the user group skeleton don't contain Location-based limitations. 
+Make sure that the roles that you assign to the user group skeleton don't contain location-based limitations.
 User group skeletons cannot contain individual user content items either.
 
 User group skeletons are retained after deleting the site.
 
 ## Automatic update of roles
 
-Role definitions can contain user/login policies with limitations that limit user access to certain sites. 
+Role definitions can contain user/login policies with limitations that limit user access to certain sites.
 To avoid the need to add the new SiteAccess to limitations for all roles,
-you can decide that the roles you select are automatically updated when the site is created, updated or deleted.
+you can decide that the roles you select are automatically updated when the site is created, updated, or deleted.
 
-Under the `ibexa_site_factory` [configuration key](configuration.md#configuration-files), add a list of roles which should have access to the frontend
-when a site is created in Site Factory, for example:
+Under the `ibexa_site_factory` [configuration key](configuration.md#configuration-files), add a list of roles which should have access to the frontend when a site is created in Site Factory, for example:
 
 ``` yaml
 ibexa_site_factory:
diff --git a/docs/multisite/siteaccess/siteaccess_aware_configuration.md b/docs/multisite/siteaccess/siteaccess_aware_configuration.md
index bedf93ff5a..a49f721544 100644
--- a/docs/multisite/siteaccess/siteaccess_aware_configuration.md
+++ b/docs/multisite/siteaccess/siteaccess_aware_configuration.md
@@ -5,14 +5,13 @@ description: Make sure your custom development's configuration can be used with
 # SiteAccess-aware configuration
 
 The [Symfony Config component]([[= symfony_doc =]]/components/config.html) makes it possible to define semantic configuration, exposed to the end developer.
-This configuration is validated by rules you define, for example, validating type (string, array, integer, boolean and so on).
+This configuration is validated by rules you define, for example, validating type (string, array, integer, boolean, and more).
 Usually, after it's validated and processed, this semantic configuration is then mapped to internal *key/value* parameters stored in the service container.
 
 [[= product_name =]] uses this for its core configuration, but adds another configuration level, the SiteAccess.
 For each defined SiteAccess, you need to be able to use the same configuration tree to define SiteAccess-specific config.
 
-These settings then need to be mapped to SiteAccess-aware internal parameters 
-that you can retrieve with the [ConfigResolver](dynamic_configuration.md#configresolver).
+These settings then need to be mapped to SiteAccess-aware internal parameters that you can retrieve with the [ConfigResolver](dynamic_configuration.md#configresolver).
 For this, internal keys need to follow the format `<namespace>.<scope>.<parameter_name>`. where:
 
 - `namespace` is specific to your app or bundle
@@ -23,8 +22,7 @@ For more information about the ConfigResolver, namespaces and scopes, see [confi
 
 !!! tip "Repository-aware configuration"
 
-    If you need to use different settings per Repository, not per SiteAccess,
-    see [Repository-aware configuration](repository_configuration.md#repository-aware-configuration).
+    If you need to use different settings per Repository, not per SiteAccess, see [Repository-aware configuration](repository_configuration.md#repository-aware-configuration).
 
 The example below assumes you're using an `Acme\ExampleBundle`.
 Remember to register the bundle by adding it to `config/bundles.php`:
@@ -35,9 +33,7 @@ Acme\ExampleBundle\AcmeExampleBundle::class => ['all' => true],
 
 ### Parsing semantic configuration
 
-To parse semantic configuration, create a `Configuration` class which extends
-`Ibexa\Bundle\Core\DependencyInjection\Configuration\SiteAccessAware\Configuration`
-and then extend its `generateScopeBaseNode()` method:
+To parse semantic configuration, create a `Configuration` class which extends `Ibexa\Bundle\Core\DependencyInjection\Configuration\SiteAccessAware\Configuration` and then extend its `generateScopeBaseNode()` method:
 
 ``` php hl_lines="17"
 <?php
@@ -171,8 +167,8 @@ parameters:
 #### Merging hash values between scopes
 
 When you define a hash as semantic config, you sometimes don't want the SiteAccess settings to replace the default or group values,
-but enrich them by appending new entries. This is possible by using `$processor->mapConfigArray()`,
-which you must call outside the closure (before or after), so that it's called only once.
+but enrich them by appending new entries.
+This is possible by using `$processor->mapConfigArray()`, which you must call outside the closure (before or after), so that it's called only once.
 
 ``` php
 $processor->mapConfigArray('custom_setting', $config);
@@ -209,8 +205,7 @@ acme_example:
                 language: javascript
 ```
 
-By calling `mapConfigArray()` you can get the following end configuration, 
-where keys defined for `custom_setting` in default/group/SiteAccess scopes are merged:
+By calling `mapConfigArray()` you can get the following end configuration, where keys defined for `custom_setting` in default/group/SiteAccess scopes are merged:
 
 ``` yaml
 parameters:
@@ -225,11 +220,9 @@ parameters:
 ##### Merging from second level
 
 In the example above, entries were merged in respect to the scope order of precedence.
-However, because you defined the `os_types` key for `siteaccess1`, it completely overrode the default value,
-because the merge process is done only at the first level.
+However, because you defined the `os_types` key for `siteaccess1`, it completely overrode the default value, because the merge process is done only at the first level.
 
-You can add another level by passing `ContextualizerInterface::MERGE_FROM_SECOND_LEVEL`
-as the third argument to `$contextualizer->mapConfigArray()`:
+You can add another level by passing `ContextualizerInterface::MERGE_FROM_SECOND_LEVEL` as the third argument to `$contextualizer->mapConfigArray()`:
 
 ``` php
 $contextualizer->mapConfigArray('custom_setting', $config, ContextualizerInterface::MERGE_FROM_SECOND_LEVEL);
@@ -247,8 +240,8 @@ parameters:
         language: javascript
 ```
 
-There is also another option, `ContextualizerInterface::UNIQUE`,
-that ensures the array setting has unique values. It only works on normal arrays, not hashes.
+There is also another option, `ContextualizerInterface::UNIQUE`, that ensures the array setting has unique values.
+It only works on normal arrays, not hashes.
 
 !!! note
 
@@ -259,12 +252,10 @@ that ensures the array setting has unique values. It only works on normal arrays
 Instead of passing a callable to `$processor->mapConfig()`, you can pass an instance of
 `Ibexa\Bundle\Core\DependencyInjection\Configuration\SiteAccessAware\ConfigurationMapperInterface`.
 
-This can be useful if you have a lot of configuration to map and don't want to pollute 
-your service container extension class (it's better for maintenance).
+This can be useful if you have a lot of configuration to map and don't want to pollute your service container extension class (it's better for maintenance).
 
 #### Merging hash values between scopes
 
 You should not use `$contextualizer->mapConfigArray()` within the scope loop, like for simple values.
 When using a closure/callable, you usually call it before or after `$processor->mapConfig()`.
-For mapper objects, you can use a dedicated interface: `HookableConfigurationMapperInterface`,
-which defines two methods: `preMap()` and `postMap()`.
+For mapper objects, you can use a dedicated interface: `HookableConfigurationMapperInterface`, which defines two methods: `preMap()` and `postMap()`.
diff --git a/docs/multisite/siteaccess/siteaccess_matching.md b/docs/multisite/siteaccess/siteaccess_matching.md
index 42d1019ae0..a6c32c2f2c 100644
--- a/docs/multisite/siteaccess/siteaccess_matching.md
+++ b/docs/multisite/siteaccess/siteaccess_matching.md
@@ -25,7 +25,8 @@ ibexa:
 
 `ibexa.siteaccess.match` can contain multiple matchers.
 
-The first matcher succeeding always wins, so be careful when using catch-all matchers like `URIElement`. In the following example, `Compound\LogicalAnd` is placed before the `Map\Host` for `my.site/corporate` to be reachable:
+The first matcher succeeding always wins, so be careful when using catch-all matchers like `URIElement`.
+In the following example, `Compound\LogicalAnd` is placed before the `Map\Host` for `my.site/corporate` to be reachable:
 
 ```yaml
 ibexa:
@@ -43,11 +44,9 @@ ibexa:
                 my.site: mysite
 ```
 
-If the matcher class doesn't start with a backslash (`\`), it's relative to `Ibexa\Core\MVC\Symfony\SiteAccess\Matcher`
-(for example, `Map\URI` refers to `Ibexa\Core\MVC\Symfony\SiteAccess\Matcher\Map\URI`)
+If the matcher class doesn't start with a backslash (`\`), it's relative to `Ibexa\Core\MVC\Symfony\SiteAccess\Matcher` (for example, `Map\URI` refers to `Ibexa\Core\MVC\Symfony\SiteAccess\Matcher\Map\URI`)
 
-You can specify [custom matchers](#custom-matchers) by using a fully qualified class name (for example, `\My\SiteAccess\Matcher`)
-or a service identifier (for example, `@my_matcher_service`).
+You can specify [custom matchers](#custom-matchers) by using a fully qualified class name (for example, `\My\SiteAccess\Matcher`) or a service identifier (for example, `@my_matcher_service`).
 In the case of a fully qualified class name, the matching configuration is passed in the constructor.
 In the case of a service, it must implement `Ibexa\Bundle\Core\SiteAccess\Matcher`.
 The matching configuration is passed to `setMatchingConfiguration()`.
@@ -150,8 +149,7 @@ Example host name `www.page.com` matches SiteAccess `event`.
 
 !!! note
 
-    If you encounter problems with the `Map\Host` matcher, make sure that your installation is
-    [properly configured to use token-based authentication](ez_platform_v2.4.md#update-ez-enterprise-v24-to-v242).
+    If you encounter problems with the `Map\Host` matcher, make sure that your installation is [properly configured to use token-based authentication](ez_platform_v2.4.md#update-ez-enterprise-v24-to-v242).
 
 ### `Map\URI`
 
@@ -214,9 +212,7 @@ ibexa:
             '@App\Matcher\MySiteaccessMatcher': ~
 ```
 
-The service must be tagged with `ibexa.site_access.matcher`
-and must implement `Ibexa\Bundle\Core\SiteAccess\Matcher`
-(and `Ibexa\Core\MVC\Symfony\SiteAccess\VersatileMatcher` if you want to use compound logical matchers).
+The service must be tagged with `ibexa.site_access.matcher` and must implement `Ibexa\Bundle\Core\SiteAccess\Matcher` (and `Ibexa\Core\MVC\Symfony\SiteAccess\VersatileMatcher` if you want to use compound logical matchers).
 
 ## Combining SiteAccess matchers
 

From 8c106c486f8c479391db1fa1f7c3237071670e91 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 08:18:33 +0200
Subject: [PATCH 44/77] Fixes in 'multisite'

---
 docs/multisite/multisite_configuration.md     | 26 +++++++------------
 docs/multisite/set_up_campaign_siteaccess.md  | 15 ++++-------
 .../set_up_translation_siteaccess.md          |  8 +++---
 3 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/docs/multisite/multisite_configuration.md b/docs/multisite/multisite_configuration.md
index 24c16f7359..addae360f4 100644
--- a/docs/multisite/multisite_configuration.md
+++ b/docs/multisite/multisite_configuration.md
@@ -32,7 +32,7 @@ ibexa:
             event_group: [event]
 ```
 
-Groups are useful when you want to use common settings for several SiteAccesses and avoid duplicating configuration.
+You can use groups when you want to use common settings for several SiteAccesses and avoid duplicating configuration.
 SiteAccess groups act like regular SiteAccesses as far as configuration is concerned.
 A SiteAccess can be part of several groups. SiteAccess configuration has always precedence over group configuration.
 
@@ -42,9 +42,7 @@ The predefined `admin` SiteAccess in `admin_group` (configured in `config/packag
 Don't remove this group.
 If you need a multisite setup with multiple back offices, add any additional administration SiteAccesses to `admin_group`.
 
-In cases where the sites are on separate databases, each needs its own [repository](repository_configuration.md)
-(including their own storage and search connection), var dir, [cache pool](persistence_cache.md#persistence-cache-configuration),
-and ideally also separate Varnish/Fastly configuration.
+In cases where the sites are on separate databases, each needs its own [repository](repository_configuration.md) (including their own storage and search connection), var dir, [cache pool](persistence_cache.md#persistence-cache-configuration), and ideally also separate Varnish/Fastly configuration.
 
 !!! caution
 
@@ -76,13 +74,11 @@ ibexa:
 
 ### SiteAccess name
 
-To create a better editorial experience, you can replace the SiteAccess code in the back office
-with a human-readable name of the website, for example `Company site` or `Summer Sale`.
+To create a better editorial experience, you can replace the SiteAccess code in the back office with a human-readable name of the website, for example `Company site` or `Summer Sale`.
 
 You can also translate SiteAccess names. Displayed names depend on the current back office language.
 
-To define translations or SiteAccess names, place them in YAML file with correct language code,
-for example `translations/ibexa_siteaccess.en.yaml`:
+To define translations or SiteAccess names, place them in YAML file with correct language code, for example `translations/ibexa_siteaccess.en.yaml`:
 
 ``` yaml
 en: Company site
@@ -121,8 +117,7 @@ ibexa:
 ```
 
 `global` and `default` scopes include the `admin` SiteAccess, which is responsible for the back office.
-For example, the following configuration defines both the front template for articles
-and the template used in the back office, unless you configure other templates for a specific SiteAccess or SiteAccess group:
+For example, the following configuration defines both the front template for articles and the template used in the back office, unless you configure other templates for a specific SiteAccess or SiteAccess group:
 
 ``` yaml
 ibexa:
@@ -166,14 +161,14 @@ ibexa:
 
 !!! caution "SiteAccess with separate admin domain"
 
-    If an admin SiteAccess in your installation uses a different domain than the front SiteAccesses,
-    be sure to use SSL (https protocol).
+    If an admin SiteAccess in your installation uses a different domain than the front SiteAccesses, be sure to use SSL (https protocol).
     Otherwise, you cannot preview content in Page Builder from the back office.
 
 #### SiteAccess switching in Page Builder
 
 If you need to change between SiteAccesses in Site mode, don't use any functions in the page itself (for example, a language switcher).
-This may cause unexpected errors. Instead, switch between SiteAccesses using the SiteAccess bar above the page.
+This may cause unexpected errors.
+Instead, switch between SiteAccesses using the SiteAccess bar above the page.
 
 ## Location tree
 
@@ -195,12 +190,11 @@ ibexa:
 
 - `location_id` defines the Location ID of the content root for the SiteAccess.
 - `excluded_uri_prefixes` defines which URIs ignore the root limit set using `location_id`.
-In the example above, the Media and Images folders are accessible using their own URI,
-even though they're outside the Location provided in `content.tree_root.location_id`.
+In the example above, the Media and Images folders are accessible using their own URI, even though they're outside the Location provided in `content.tree_root.location_id`.
 - `index_page` is the page shown when you access the root index `/`.
 
 !!! note
-    
+
     Prefixes aren't case sensitive.
     Leading slashes (`/`) are automatically trimmed internally, so they can be ignored.
 
diff --git a/docs/multisite/set_up_campaign_siteaccess.md b/docs/multisite/set_up_campaign_siteaccess.md
index 049f9ff175..e75a00d5ed 100644
--- a/docs/multisite/set_up_campaign_siteaccess.md
+++ b/docs/multisite/set_up_campaign_siteaccess.md
@@ -11,8 +11,7 @@ The `campaign` site uses a different part of the content tree than the main site
 
 ## Configure SiteAccesses
 
-First, in SiteAccess configuration, add the `campaign` SiteAccess
-to the list under the `ibexa.siteaccess` [configuration key](configuration.md#configuration-files):
+First, in SiteAccess configuration, add the `campaign` SiteAccess to the list under the `ibexa.siteaccess` [configuration key](configuration.md#configuration-files):
 
 ``` yaml
 ibexa:
@@ -27,8 +26,7 @@ ibexa:
                 site: site
 ```
 
-The `match` setting ensures that when a visitor accesses the `<yourdomain>/summer-sale` URI,
-they see the `campaign` SiteAccess.
+The `match` setting ensures that when a visitor accesses the `<yourdomain>/summer-sale` URI, they see the `campaign` SiteAccess.
 
 ## Set root folder
 
@@ -48,8 +46,7 @@ ibexa:
                     location_id: 57
 ```
 
-Thanks to this configuration, you can access `<your site>/campaign/Articles/Article2`,
-but not `<your site>/campaign/General/Articles/Article1`.
+Thanks to this configuration, you can access `<your site>/campaign/Articles/Article2`, but not `<your site>/campaign/General/Articles/Article1`.
 
 ## Reuse content
 
@@ -66,8 +63,6 @@ ibexa:
                     excluded_uri_prefixes: [ /media/images/logos ]
 ```
 
-Now, when you use the `campaign` SiteAccess, you can reach `<your site>/campaign/Media/Images/Logos`,
-despite the fact that it's not a sub-item of the "Campaign" Location.
+Now, when you use the `campaign` SiteAccess, you can reach `<your site>/campaign/Media/Images/Logos`, despite the fact that it's not a sub-item of the "Campaign" Location.
 
-As a next step, you can configure different [designs](design_engine.md)
-for the two SiteAccesses.
+As a next step, you can configure different [designs](design_engine.md) for the two SiteAccesses.
diff --git a/docs/multisite/set_up_translation_siteaccess.md b/docs/multisite/set_up_translation_siteaccess.md
index e4a4931c72..ef471c792c 100644
--- a/docs/multisite/set_up_translation_siteaccess.md
+++ b/docs/multisite/set_up_translation_siteaccess.md
@@ -28,8 +28,7 @@ yarn encore <prod|dev>
 
 Next, configure a new SiteAccess to match the newly-configured language.
 
-The most typical setup for a site with translated content is to map the base of the domain to one language
-and use the first segment of the URI to match to translations.
+The most typical setup for a site with translated content is to map the base of the domain to one language and use the first segment of the URI to match to translations.
 
 For example:
 
@@ -38,7 +37,7 @@ For example:
 
 To achieve this you need to create a new SiteAccess in configuration under the `ibexa.siteaccesses` [configuration key](configuration.md#configuration-files).
 Add the `fr` SiteAccess to list of all SiteAccesses and it to the common `site_group`.
-This group is used for sharing settings such as API keys, cache locations and so on.
+This group is used for sharing settings such as API keys, cache locations, and more.
 
 ``` yaml
 ibexa:
@@ -79,5 +78,4 @@ As a next step, allow Anonymous users to read content on the new SiteAccesses:
 1. Clear the cache by running: `php bin/console cache:clear`.
 
 You can now start translating content.
-When you reload the site, access a translated content item through both SiteAccesses to see the difference,
-for example: `<yourdomain>/<article-name>` and `<yourdomain>/fr/<article-name>`.
+When you reload the site, access a translated content item through both SiteAccesses to see the difference, for example: `<yourdomain>/<article-name>` and `<yourdomain>/fr/<article-name>`.

From 6baff1aa963a762ea2a88c50bc116f63499f38cd Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 08:37:43 +0200
Subject: [PATCH 45/77] Fixes in 'permissions' section

---
 docs/permissions/custom_policies.md      |  44 +++---
 docs/permissions/limitation_reference.md |  97 +++++--------
 docs/permissions/limitations.md          |  12 +-
 docs/permissions/permission_overview.md  |  17 ++-
 docs/permissions/permission_use_cases.md | 170 ++++++++++-------------
 docs/permissions/policies.md             |  21 ++-
 6 files changed, 151 insertions(+), 210 deletions(-)

diff --git a/docs/permissions/custom_policies.md b/docs/permissions/custom_policies.md
index 6f5b505413..fe98afe1e7 100644
--- a/docs/permissions/custom_policies.md
+++ b/docs/permissions/custom_policies.md
@@ -4,21 +4,21 @@ description: Create a custom policy to cover non-standard permission needs.
 
 # Custom policies
 
-The content Repository uses [roles and policies](permissions.md) to give users access to different functions of the system.
+The content repository uses [roles and policies](permissions.md) to give users access to different functions of the system.
 
-Any bundle can expose available Policies via a `PolicyProvider` which can be added to IbexaCoreBundle's [service container](php_api.md#service-container) extension.
+Any bundle can expose available policies via a `PolicyProvider` which can be added to IbexaCoreBundle's [service container](php_api.md#service-container) extension.
 
 ## PolicyProvider
 
-A `PolicyProvider` object provides a hash containing declared modules, functions and Limitations.
+A `PolicyProvider` object provides a hash containing declared modules, functions and limitations.
 
 - Each policy provider provides a collection of permission *modules*.
 - Each module can provide *functions* (for example, in `content/read`, "content" is the module, and "read" is the function)
-- Each function can provide a collection of Limitations.
+- Each function can provide a collection of limitations.
 
-First level key is the module name which is limited to characters within the set `A-Za-z0-9_`, value is a hash of
-available functions, with function name as key. Function value is an array of available Limitations, identified
-by the alias declared in `LimitationType` service tag. If no Limitation is provided, value can be `null` or an empty array.
+First level key is the module name which is limited to characters within the set `A-Za-z0-9_`, value is a hash of available functions, with function name as key.
+Function value is an array of available limitations, identified by the alias declared in `LimitationType` service tag.
+If no limitation is provided, value can be `null` or an empty array.
 
 ``` php
 [
@@ -34,7 +34,7 @@ by the alias declared in `LimitationType` service tag. If no Limitation is provi
 ```
 
 Limitations need to be implemented as *Limitation types* and declared as services identified with `ibexa.permissions.limitation_type` tag.
-Name provided in the hash for each Limitation is the same value set in the `alias` attribute in the service tag.
+Name provided in the hash for each limitation is the same value set in the `alias` attribute in the service tag.
 
 For example:
 
@@ -62,9 +62,7 @@ class MyPolicyProvider implements PolicyProviderInterface
 
 !!! note "Extend existing policies"
 
-    While a `PolicyProvider` may provide new functions to an existing policy module,
-    or additional Limitations to an existing function,
-    it's however strongly recommended to create your own modules.
+    While a `PolicyProvider` may provide new functions to an existing policy module, or additional limitations to an existing function, it's however strongly recommended to create your own modules.
 
     It's impossible to remove an existing module, function or limitation from a policy.
 
@@ -143,7 +141,7 @@ For a `PolicyProvider` to be active, you have to register it in the `src/Kernel.
 [[= include_file('code_samples/back_office/limitation/src/Kernel.php') =]]
 ```
 
-## Custom Limitation type
+## Custom limitation type
 
 For a custom module function, you can use existing limitation types or create custom ones.
 
@@ -172,7 +170,7 @@ services:
 [[= include_file('code_samples/back_office/limitation/config/append_to_services.yaml', 1, 4) =]]
 ```
 
-### Custom Limitation type form
+### Custom limitation type form
 
 #### Form mapper
 
@@ -192,7 +190,7 @@ Provide a template corresponding to `getFormTemplate`.
 [[= include_file('code_samples/back_office/limitation/templates/themes/admin/limitation/custom_limitation_form.html.twig') =]]
 ```
 
-Next, register the service with the `ibexa.admin_ui.limitation.mapper.form` tag and set the `limitationType` attribute to the Limitation type's identifier:
+Next, register the service with the `ibexa.admin_ui.limitation.mapper.form` tag and set the `limitationType` attribute to the limitation type's identifier:
 
 ``` yaml
 [[= include_file('code_samples/back_office/limitation/config/append_to_services.yaml', 5, 8) =]]
@@ -200,32 +198,32 @@ Next, register the service with the `ibexa.admin_ui.limitation.mapper.form` tag
 
 #### Notable form mappers to extend
 
-Some abstract Limitation type form mapper classes are provided to help implementing common complex Limitations.
+Some abstract limitation type form mapper classes are provided to help implementing common complex limitations.
 
-- `MultipleSelectionBasedMapper` is a mapper used to build forms for Limitations based on a checkbox list, where multiple items can be chosen. For example, it's used to build forms for [Content Type Limitation](limitation_reference.md#content-type-limitation), [Language Limitation](limitation_reference.md#language-limitation) or [Section Limitation](limitation_reference.md#section-limitation).
-- `UDWBasedMapper` is used to build a Limitation form where a Content/Location must be selected. For example, it's used by the [Subtree Limitation](limitation_reference.md#subtree-limitation) form.
+- `MultipleSelectionBasedMapper` is a mapper used to build forms for limitations based on a checkbox list, where multiple items can be chosen. For example, it's used to build forms for [Content Type Limitation](limitation_reference.md#content-type-limitation), [Language Limitation](limitation_reference.md#language-limitation) or [Section Limitation](limitation_reference.md#section-limitation).
+- `UDWBasedMapper` is used to build a limitation form where a Content/Location must be selected. For example, it's used by the [Subtree Limitation](limitation_reference.md#subtree-limitation) form.
 
 #### Value mapper
 
-By default, without a value mapper, the Limitation value is rendered by using the block `ez_limitation_value_fallback` of the template [`vendor/ibexa/admin-ui/src/bundle/Resources/views/themes/admin/limitation/limitation_values.html.twig`](https://github.com/ibexa/admin-ui/blob/4.5/src/bundle/Resources/views/themes/admin/limitation/limitation_values.html.twig#L1-L6).
+By default, without a value mapper, the limitation value is rendered by using the block `ez_limitation_value_fallback` of the template [`vendor/ibexa/admin-ui/src/bundle/Resources/views/themes/admin/limitation/limitation_values.html.twig`](https://github.com/ibexa/admin-ui/blob/4.5/src/bundle/Resources/views/themes/admin/limitation/limitation_values.html.twig#L1-L6).
 
-To customize the rendering, a value mapper eventually transforms the Limitation value and sends it to a custom template.
+To customize the rendering, a value mapper eventually transforms the limitation value and sends it to a custom template.
 
 The value mapper implements [`Ibexa\AdminUi\Limitation\LimitationValueMapperInterface`](https://github.com/ibexa/admin-ui/blob/4.5/src/lib/Limitation/LimitationValueMapperInterface.php).
 
-Its `mapLimitationValue` function returns the Limitation value transformed for the needs of the template.
+Its `mapLimitationValue` function returns the limitation value transformed for the needs of the template.
 
 ``` php
 [[= include_file('code_samples/back_office/limitation/src/Security/Limitation/Mapper/CustomLimitationValueMapper.php') =]]
 ```
 
-Then register the service with the `ibexa.admin_ui.limitation.mapper.value` tag and set the `limitationType` attribute to Limitation type's identifier:
+Then register the service with the `ibexa.admin_ui.limitation.mapper.value` tag and set the `limitationType` attribute to limitation type's identifier:
 
 ``` yaml
 [[= include_file('code_samples/back_office/limitation/config/append_to_services.yaml', 9, 12) =]]
 ```
 
-When a value mapper exists for a Limitation, the rendering uses a Twig block named `ez_limitation_<lower_case_identifier>_value` where `<lower_case_identifier>` is the Limitation identifier in lower case.
+When a value mapper exists for a limitation, the rendering uses a Twig block named `ez_limitation_<lower_case_identifier>_value` where `<lower_case_identifier>` is the limitation identifier in lower case.
 In this example, block name is `ez_limitation_customlimitation_value` as the identifier is `CustomLimitation`.
 
 This template receives a `values` variable which is the return of the `mapLimitationValue` function from the corresponding value mapper.
@@ -248,7 +246,7 @@ For example, `translations/ibexa_content_forms_policies.en.yaml`:
 [[= include_file('code_samples/back_office/limitation/translations/ibexa_content_forms_policies.en.yaml') =]]
 ```
 
-### Custom Limitation check
+### Custom limitation check
 
 Check if current user has this custom limitation set to true from a custom controller:
 
diff --git a/docs/permissions/limitation_reference.md b/docs/permissions/limitation_reference.md
index 7f1a1718a9..c731bebd58 100644
--- a/docs/permissions/limitation_reference.md
+++ b/docs/permissions/limitation_reference.md
@@ -8,11 +8,9 @@ page_type: reference
 ## Blocking limitation
 
 A generic limitation type to use when no other limitation has been implemented.
-Without any Limitation assigned, a `LimitationNotFoundException` is thrown.
+Without any limitation assigned, a `LimitationNotFoundException` is thrown.
 
-It's called "blocking" because it always informs the permissions system that 
-the user doesn't have access to any policy the limitation is assigned to, making 
-the permissions system move on to the next policy.
+It's called "blocking" because it always informs the permissions system that the user doesn't have access to any policy the limitation is assigned to, making the permissions system move on to the next policy.
 
 ### Possible values
 
@@ -37,7 +35,7 @@ Out of the box FunctionList uses it in the following way:
 
 ## ActivityLogOwner limitation
 
-The `ActivityLogOwner` limitation specifies if a user can see only their own [recent activity](recent_activity.md) log entries, and not entries from other users. 
+The `ActivityLogOwner` limitation specifies if a user can see only their own [recent activity](recent_activity.md) log entries, and not entries from other users.
 
 | Value | UI value        | Description                                                  |
 |-------|-----------------|--------------------------------------------------------------|
@@ -66,8 +64,7 @@ The Change Owner (`ChangeOwner`) limitation specifies whether the user can chang
 
 ## Content type Group limitation
 
-The content type Group (`UserGroup`) limitation specifies that only users with at least one common *direct* user 
-Group with the owner of content get the selected access right.
+The Content Type Group (`UserGroup`) limitation specifies that only users with at least one common *direct* user Group with the owner of content get the selected access right.
 
 ### Possible values
 
@@ -77,9 +74,7 @@ Group with the owner of content get the selected access right.
 
 ## Content type Group of Parent limitation
 
-The content type Group of Parent (`ParentUserGroupLimitation`) limitation specifies that only Users with at least one common *direct* user group 
-with the owner of the parent Location of a content item get a certain access right, 
-used by `content/create` permission.
+The Content Type Group of Parent (`ParentUserGroupLimitation`) limitation specifies that only Users with at least one common *direct* user group with the owner of the parent Location of a content item get a certain access right, used by `content/create` permission.
 
 ### Possible values
 
@@ -89,8 +84,7 @@ used by `content/create` permission.
 
 ## Content type limitation
 
-The Content Typ (`ContentType`) limitation specifies whether the user has access to content with a specific 
-content type.
+The Content Type (`ContentType`) limitation specifies whether the user has access to content with a specific content type.
 
 ### Possible values
 
@@ -100,13 +94,10 @@ content type.
 
 ## Content type of Parent limitation
 
-The content type of Parent (`ParentContentType`) limitation specifies whether the user has access to content whose parent Location 
-contains a specific content type, used by `content/create`.
+The Content Type of Parent (`ParentContentType`) limitation specifies whether the user has access to content whose parent location contains a specific content type, used by `content/create`.
 
-This limitation combined with `ContentType` limitation allows you to define business 
-rules like allowing users to create "Blog Post" within a "Blog." 
-If you also combine it with `Owner of Parent` limitation, you effectively limit 
-access to create Blog Posts in the users' own Blogs.
+This limitation combined with `ContentType` limitation allows you to define business rules like allowing users to create "Blog Post" within a "Blog."
+If you also combine it with `Owner of Parent` limitation, you effectively limit access to create Blog Posts in the users' own Blogs.
 
 ### Possible values
 
@@ -116,16 +107,15 @@ access to create Blog Posts in the users' own Blogs.
 
 ## Field Group limitation [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
-A Field Group (`FieldGroup`) limitation specifies whether the user can work with content Fields belonging 
-to a specific group.
-A user with this limitation is allowed to edit Fields belonging to the indicated group.
-Otherwise, the Fields are inactive and filled with the default value (if set).
+A Field Group (`FieldGroup`) limitation specifies whether the user can work with content fields belonging to a specific group.
+A user with this limitation is allowed to edit fields belonging to the indicated group.
+Otherwise, the fields are inactive and filled with the default value (if set).
 
 ### Possible values
 
 |Value|UI value|Description|
 |------|------|------|
-|`<FieldGroup_identifier>`|`<FieldGroup_identifier>`|All valid Field group identifiers can be set as value(s)|
+|`<FieldGroup_identifier>`|`<FieldGroup_identifier>`|All valid field group identifiers can be set as value(s)|
 
 ## Language limitation
 
@@ -133,8 +123,7 @@ A Language (`Language`) limitation specifies whether the user has access to work
 
 A user with this limitation is allowed to:
 
- - Create new content with the given translation(s) only.
-This only applies to creating the first version of a content item.
+- Create new content with the given translation(s) only. This only applies to creating the first version of a content item.
 - Edit content by adding a new translation or modifying an existing translation.
 - Publish content only when it results in adding or modifying an allowed translation.
 - Delete content only when it contains a translation into the specified language.
@@ -147,21 +136,19 @@ This only applies to creating the first version of a content item.
 
 ## Location limitation
 
-A Location (`Location`) limitation specifies whether the user has access to content with a specific 
-Location, in case of `content/create` the parent Location is evaluated.
+A Location (`Location`) limitation specifies whether the user has access to content with a specific location, in case of `content/create` the parent location is evaluated.
 
 ### Possible values
 
 |Value|UI value|Description|
 |------|------|------|
-|`<Location_id>`|`<Location_name>`|All valid Location IDs can be set as value(s)|
+|`<Location_id>`|`<Location_name>`|All valid location IDs can be set as value(s)|
 
 ## New Section limitation
 
-A New Section (`NewSection`) limitation specifies whether the user has access to assigning content to a given Section.
+A New Section (`NewSection`) limitation specifies whether the user has access to assigning content to a given section.
 
-In the `section/assign` policy you can combine this with Section limitation to 
-limit both from and to values.
+In the `section/assign` policy you can combine this with section limitation to limit both from and to values.
 
 ### Possible values
 
@@ -171,11 +158,9 @@ limit both from and to values.
 
 ## New State limitation
 
-A New State (`NewObjectState`) limitation specifies whether the user has access to (assigning) a given Object 
-state to content.
+A New State (`NewObjectState`) limitation specifies whether the user has access to (assigning) a given Object state to content.
 
-In the `state/assign` policy you can combine this with State limitation to limit 
-both from and to values.
+In the `state/assign` policy you can combine this with State limitation to limit both from and to values.
 
 ### Possible values
 
@@ -185,8 +170,7 @@ both from and to values.
 
 ## Object State limitation
 
-The Object State (`ObjectState`) limitation specifies whether the user has access to content with a specific 
-Object state.
+The Object State (`ObjectState`) limitation specifies whether the user has access to content with a specific Object state.
 
 ### Possible values
 
@@ -206,8 +190,7 @@ The Order Owner (`OrderOwner`) limitation specifies whether the user can modify
 
 ## Owner limitation
 
-The Owner (`Owner`) limitation specifies that only the owner of the content item gets the selected 
-access right.
+The Owner (`Owner`) limitation specifies that only the owner of the content item gets the selected access right.
 
 ### Possible values
 
@@ -218,21 +201,18 @@ access right.
 
 ## Owner of Parent limitation
 
-The Owner of Parent (`ParentOwner`) limitation specifies that only the users who own all parent Locations of 
-a content item get a certain access right, used for `content/create` permission.
+The Owner of Parent (`ParentOwner`) limitation specifies that only the users who own all parent locations of a content item get a certain access right, used for `content/create` permission.
 
 ### Possible values
 
 |Value|UI value|Description|
 |------|------|------|
-|`1`|"self"|Only the user who is the owner of all parent Locations gets access|
+|`1`|"self"|Only the user who is the owner of all parent locations gets access|
 |`2`|"session"|Deprecated and works exactly like "self" in public PHP API since it has no knowledge of user Sessions|
 
 ## Parent Depth limitation
 
-The Parent Depth (`ParentDepth`) limitation specifies whether the user has access to creating content under 
-a parent Location within a specific depth of the tree, used for `content/create` 
-permission.
+The Parent Depth (`ParentDepth`) limitation specifies whether the user has access to creating content under a parent location within a specific depth of the tree, used for `content/create` permission.
 
 ### Possible values
 
@@ -253,12 +233,11 @@ The Payment Owner (`PaymentOwner`) limitation specifies whether the user can mod
 
 ## Personalization access limitation
 
-The Personalization limitation specifies the SiteAccesses for which the user can view or modify 
-the scenario configuration.
+The Personalization limitation specifies the SiteAccesses for which the user can view or modify the scenario configuration.
 
 ## Product Type limitation
 
-The Product Type (`ProductType`) limitation specifies whether the user has access to products belonging to a specific Product Type.
+The Product Type (`ProductType`) limitation specifies whether the user has access to products belonging to a specific product type.
 
 ### Possible values
 
@@ -268,8 +247,7 @@ The Product Type (`ProductType`) limitation specifies whether the user has acces
 
 ## Section limitation
 
-The Section (`Section`) limitation specifies whether the user has access to content within a specific 
-Section.
+The Section (`Section`) limitation specifies whether the user has access to content within a specific section.
 
 This limitation can be used as a role limitation.
 
@@ -281,8 +259,7 @@ This limitation can be used as a role limitation.
 
 ## Segment group limitation [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
-The segment group (`SegmentGroup`) limitation specifies whether the user has access segments within a specific 
-segment group.
+The segment group (`SegmentGroup`) limitation specifies whether the user has access segments within a specific segment group.
 
 This limitation can be used as a role limitation.
 
@@ -294,8 +271,7 @@ This limitation can be used as a role limitation.
 
 ## SiteAccess limitation
 
-The SiteAccess (`SiteAccess`) limitation specifies to which SiteAccesses a certain permission applies, used 
-by `user/login`.
+The SiteAccess (`SiteAccess`) limitation specifies to which SiteAccesses a certain permission applies, used by `user/login`.
 
 ### Possible values
 
@@ -305,8 +281,7 @@ by `user/login`.
 
 ### Legacy compatibility notes
 
-`SiteAccess` limitation is deprecated and isn't used actively in public PHP API, 
-but is allowed for being able to read / create limitations for legacy.
+`SiteAccess` limitation is deprecated and isn't used actively in public PHP API, but is allowed for being able to read / create limitations for legacy.
 
 ## Shipment Owner limitation
 
@@ -320,9 +295,7 @@ The Shipment Owner (`ShipmentOwner`) limitation specifies whether the user can m
 
 ## Subtree limitation
 
-The Subtree (`Subtree`) limitation specifies whether the user has access to content within a specific 
-Subtree of Location, in case of `content/create` the parent Subtree of Location 
-is evaluated.
+The Subtree (`Subtree`) limitation specifies whether the user has access to content within a specific Subtree of location, in case of `content/create` the parent Subtree of location is evaluated.
 
 This limitation can be used as a role limitation.
 
@@ -351,8 +324,7 @@ This limitation can be used as a role limitation.
 
 ## Workflow Stage limitation
 
-The Workflow Stage (`WorkflowStage`) limitation specifies whether the user can edit content in a specific workflow 
-stage.
+The Workflow Stage (`WorkflowStage`) limitation specifies whether the user can edit content in a specific workflow stage.
 
 ### Possible values
 
@@ -360,8 +332,7 @@ The limitation takes as values stages configured for the workflow.
 
 ## Workflow Transition limitation
 
-The Workflow Transition (`WorkflowTransition`) limitation specifies whether the user can move the content in a workflow through 
-a specific transition.
+The Workflow Transition (`WorkflowTransition`) limitation specifies whether the user can move the content in a workflow through a specific transition.
 
 ### Possible values
 
diff --git a/docs/permissions/limitations.md b/docs/permissions/limitations.md
index a961883cc1..80ec9c0c92 100644
--- a/docs/permissions/limitations.md
+++ b/docs/permissions/limitations.md
@@ -7,24 +7,24 @@ page_type: reference
 
 Limitations are part of the permissions system.
 They limit the access granted to users by [Policies](permission_overview.md).
-While a Policy grants the user access to a function, Limitations narrow it down by different criteria.
+While a policy grants the user access to a function, Limitations narrow it down by different criteria.
 
 Limitations consist of two parts:
 
 - `Limitation` (Value)
 - `LimitationType`
 
-Certain Limitations also serve as Role Limitations, which means they can be used to limit the rights of a Role assignment.
-Currently, this covers [Subtree of Location](limitation_reference.md#subtree-limitation), [Section](limitation_reference.md#section-limitation) and [Personalization access](limitation_reference.md#personalization-access-limitation) Limitations.
+Certain limitations also serve as role limitations, which means they can be used to limit the rights of a role assignment.
+Currently, this covers [Subtree of Location](limitation_reference.md#subtree-limitation), [Section](limitation_reference.md#section-limitation) and [Personalization access](limitation_reference.md#personalization-access-limitation) limitations.
 
 `Limitation` represents the value, while `LimitationType` deals with the business logic surrounding how it actually works and is enforced.
 `LimitationTypes` have two modes of operation in regard to permission logic (see [`Ibexa\Contracts\Core\Limitation`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Limitation-Type.html) interface for more info):
 
 | Method | Use |
 |--------|-----|
-| `evaluate` | Evaluates if the User has access to a given object in a certain context (for instance the context can be Locations when the object is `Content`), under the condition of the `Limitation` value(s). |
-| `getCriterion` | Generates a `Criterion` using `Limitation` value and current User which `SearchService` by default applies to search criteria for filtering search based on permissions. |
+| `evaluate` | Evaluates if the User has access to a given object in a certain context (for instance the context can be locations when the object is `Content`), under the condition of the `Limitation` value(s). |
+| `getCriterion` | Generates a `Criterion` using `Limitation` value and current User which `SearchService` by default applies to Search Criteria for filtering search based on permissions. |
 
 ## Limitation reference
 
-See [Limitation reference](limitation_reference.md) for detailed information about individual Limitations.
+See [Limitation reference](limitation_reference.md) for detailed information about individual limitations.
diff --git a/docs/permissions/permission_overview.md b/docs/permissions/permission_overview.md
index 86ea5e003f..8149907b24 100644
--- a/docs/permissions/permission_overview.md
+++ b/docs/permissions/permission_overview.md
@@ -7,26 +7,29 @@ description: The permission system is based on policies that you assign to users
 A new user doesn't have permissions for any part of the system, unless they're explicitly given access.
 To get access they need to inherit roles, typically assigned to the user group they belong to.
 
-Each role can contain one or more **Policies**. A policy is a rule that gives access to a single **function** in a **module**.
-For example, a `section/assign` Policy allows the user to assign content to Sections.
+Each role can contain one or more **Policies**.
+A policy is a rule that gives access to a single **function** in a **module**.
+For example, a `section/assign` policy allows the user to assign content to sections.
 
 When you add a policy to a role, you can also restrict it using one or more **Limitations**.
 A policy with a limitation only applies when the condition in the limitation is fulfilled.
 For example, a `content/publish` policy with a `ContentType` limitation on the "Blog Post" content type allows the user to publish only Blog Posts, and not other content.
 
 A limitation, like a policy, specifies what a user *can* do, not what they *can't do*.
-A `Section` limitation, for example, *gives* the user access to the selected Section, not *prohibits* it.
+A `Section` limitation, for example, *gives* the user access to the selected section, not *prohibits* it.
 
 For more information, see [Limitation reference](limitation_reference.md) and [Permission use cases](permission_use_cases.md).
 
 ## Assigning roles to users
 
-Every user or user group can have many roles. A user can also belong to many groups, for example, Administrators, Editors, Subscribers.
+Every user or user group can have many roles.
+A user can also belong to many groups, for example, Administrators, Editors, Subscribers.
 
-it's best practice to avoid assigning roles to users directly.
+It's best practice to avoid assigning roles to users directly.
 Instead, try to organize your content so that it can be covered with general roles assigned to user groups.
 
-Using Groups is easier to manage and more secure. It also improves system performance.
+Using groups is easier to manage and more secure.
+It also improves system performance.
 The more role assignments and complex policies you add for a given user, the more complex the search/load queries are, because they always take permissions into account.
 
 ## Permissions for custom controllers
@@ -53,7 +56,7 @@ public function performAccessCheck(): void
     - `valueObject` is the object you want to check for, for example `ContentInfo`.
     - `targets` are a table of value objects that are the target of the operation.
     For example, to check if content can be assigned to a Section, provide the Section as `targets`.
-    `targets` accept Location, Object state and Section objects.
+    `targets` accept location, Object state and section objects.
 
 ### Checking user access
 
diff --git a/docs/permissions/permission_use_cases.md b/docs/permissions/permission_use_cases.md
index 3db1d2d3df..e826007f0f 100644
--- a/docs/permissions/permission_use_cases.md
+++ b/docs/permissions/permission_use_cases.md
@@ -8,7 +8,7 @@ Here are a few examples of sets of policies that you can use to get some common
 
 ## Enter back office
 
-To allow the User to enter the back office interface and view all content, set the following policies:
+To allow the user to enter the back office interface and view all content, set the following policies:
 
 - `user/login`
 - `content/read`
@@ -22,14 +22,12 @@ These policies are necessary for all other cases below that require access to th
 
 You can use this option together with [[= product_name_exp =]]'s content review options.
 Users assigned with these policies can create content, but cannot publish it.
-To publish, they must send the content for review to another User with proper permissions 
-(for example, senior editor, proofreader, etc.).
+To publish, they must send the content for review to another User with proper permissions (for example, senior editor, proofreader, etc.).
 
 - `content/create`
 - `content/edit`
 
-Use this setup with [[= product_name_exp =]] or [[= product_name_com =]] only,
-as [[= product_name_headless =]] doesn't allow the User to continue working with their content.
+Use this setup with [[= product_name_exp =]] or [[= product_name_com =]] only, as [[= product_name_headless =]] doesn't allow the User to continue working with their content.
 
 ## Create and publish content
 
@@ -39,29 +37,28 @@ To create and publish content, users must additionally have the following polici
 - `content/edit`
 - `content/publish`
 
-This also lets the user copy and move content, and add new Locations to a content item (but not remove them).
+This also lets the user copy and move content, and add new locations to a content item (but not remove them).
 
 ## Move content
 
-To move a content item or a Subtree to another Location, the user must have the following policies:
+To move a content item or a subtree to another location, the user must have the following policies:
 
 - `content/read` - on the source Location
 - `content/create` - on the target Location
 
 ## Remove content
 
-To send content to Trash, the User needs to have the `content/remove` policy.
-If content has more than one language, the User must have access to all the languages.
+To send content to Trash, the user needs to have the `content/remove` policy.
+If content has more than one language, the user must have access to all the languages.
 That is, the `content/remove` policy must have either no limitation, or a limitation for all languages of the content item.
 
-To remove an archived version of content, the User must have the `content/versionremove` policy.
+To remove an archived version of content, the user must have the `content/versionremove` policy.
 
 Further manipulation of Trash requires the `content/restore` policy to restore items from Trash, and `content/cleantrash` to completely delete all content from the Trash.
 
 !!! caution
 
-    With the `content/cleantrash` policy, the User can empty the Trash even if they don't have access to the trashed content,
-    for example, because it belonged to a Section that the user doesn't have permissions for.
+    With the `content/cleantrash` policy, the user can empty the Trash even if they don't have access to the trashed content, for example, because it belonged to a Section that the user doesn't have permissions for.
 
 ## Restrict editing to part of the tree
 
@@ -71,39 +68,35 @@ Three limitations that you could use here are `Section` limitation, `Location` l
 ### Section limitation
 
 Let's assume you have two Folders under your Home: Blog and Articles.
-You can let a User create content for the blogs, but not in Articles, by adding a `Section` limitation to 
-the Blog content item.
-This allows the User to publish content anywhere under this Location in the structure.
-Section doesn't have to belong to the same Subtree of Location in the content structure, any Locations can be assigned to it.
+You can let a user create content for the blogs, but not in Articles, by adding a `Section` limitation to the Blog content item.
+This allows the User to publish content anywhere under this location in the structure.
+Section doesn't have to belong to the same subtree of location in the content structure, any locations can be assigned to it.
 
 ### Location limitation
 
-If you add a `Location` limitation and point to the same Location, the User is able to publish content directly 
-under the selected Location, but not anywhere deeper in its Subtree of Location.
+If you add a `Location` limitation and point to the same location, the user is able to publish content directly under the selected Location, but not anywhere deeper in its subtree of location.
 
-### Subtree of Location limitation
+### Subtree of location limitation
 
-To limit the User's access to a subtree, use the `Subtree of Location` limitation.
+To limit the user's access to a subtree, use the `Subtree of Location` limitation.
 You do it by creating two new roles for a user group:
- 
+
  1. Role with a `Subtree` limitation for the User
  1. Role with a `Location` limitation for the Subtree
 
 Follow the example below to learn how to do that.
 
-**Cookbook**, **Dinner recipes** and **Dessert recipes** containers aren't accessible in the frontend. 
-Edit access to them in the **Admin** panel. 
+**Cookbook**, **Dinner recipes** and **Dessert recipes** containers aren't accessible in the frontend.
+Edit access to them in the **Admin** panel.
 
 ![Subtree file structure](subtree_usability_notes_1.png)
 
-To give the vegetarian editors access only to the **Vegetarian** dinner recipes section,
- create a new role, for example, *EditorVeg*.
+To give the vegetarian editors access only to the **Vegetarian** dinner recipes section, create a new role, for example, *EditorVeg*.
 Next, add to it a `content/read` policy with the `Subtree` limitation for `Cookbook/Dinner recipes/Vegetarian`.
 Assign the role to the vegetarian editors user group.
 It allows users from that group to access the **Vegetarian** container but not **Cookbook** and **Dinner recipes**.
 
-To give users access to **Cookbook** and **Dinner recipes** containers, 
-create a new role, for example, *EditorVegAccess*.
+To give users access to **Cookbook** and **Dinner recipes** containers, create a new role, for example, *EditorVegAccess*.
 Next, add to it a `content/read` policy with the `Location` limitations **Cookbook** and **Dinner recipes**.
 Assign the new role to the vegetarian editors user group as well.
 Only then the limitations are combined with `AND`, resulting in an empty set.
@@ -113,15 +106,13 @@ The vegetarian editors should now see the following content tree:
 ![Limited subtree file structure](subtree_usability_notes_2.png)
 
 When a policy has more than one limitation, all of them have to apply, or the policy doesn't work.
-For example, a `Location` limitation on Location `1/2` and `Subtree of Location` limitation on `1/2/55` cannot work together,
-because no Location can satisfy both those requirements at the same time.
-To combine more than one limitation with the *or* relation, not *and*,
-you can split your policy in two, each with one of these limitations.
+For example, a `Location` limitation on Location `1/2` and `Subtree of Location` limitation on `1/2/55` cannot work together, because no location can satisfy both those requirements at the same time.
+To combine more than one limitation with the *or* relation, not *and*, you can split your policy in two, each with one of these limitations.
 
-## Manage Locations
+## Manage locations
 
-To add a new Location to a content item, the policies required for publishing content are enough.
-To allow the User to remove a Location, grant them the following policies:
+To add a new location to a content item, the policies required for publishing content are enough.
+To allow the user to remove a location, grant them the following policies:
 
 - `content/remove`
 - `content/manage_locations`
@@ -137,8 +128,7 @@ Do this by adding the `WorkflowStageLimitation` to `content` policies such as `c
 You can also control which transitions the user can pass content through.
 Do this by using the `workflow/change_stage` policy together with the `WorkflowTransitionLimitation`.
 
-For example, to enable the user to edit only content in the "Design" stage
-and to pass it after creating design to the "Proofread stage", use following permissions:
+For example, to enable the user to edit only content in the "Design" stage and to pass it after creating design to the "Proofread stage", use following permissions:
 
 - `content/edit` with `WorkflowStageLimitation` set to "Design".
 - `workflow/change_stage` with `WorkflowTransitionLimitation` set to `to_proofreading`
@@ -152,28 +142,25 @@ To enable upload, you need you set the following permissions:
 - `content/read`
 - `content/publish`
 
-You can control what content items can be uploaded and where by using imitations
-on the `content/create` and `content/publish` policies.
+You can control what content items can be uploaded and where by using imitations on the `content/create` and `content/publish` policies.
 
-A Location limitation limits the uploading to a specific Location in the tree. 
+A Location limitation limits the uploading to a specific location in the tree.
 A content type limitation controls the content types that are allowed.
-For example, you can set the Location limitation on a **Pictures** Folder, and add a content type limitation
-that only allows content items of type **Image**. 
-This ensures that only files of type `image` can be uploaded,
-and only to the **Pictures** Folder.
+For example, you can set the location limitation on a **Pictures** Folder, and add a content type limitation that only allows content items of type **Image**.
+This ensures that only files of type `image` can be uploaded, and only to the **Pictures** Folder.
 
 ## Taxonomies
 
-You can control which users or user groups can work with taxonomies. 
+You can control which users or user groups can work with taxonomies.
 To let users create and assign taxonomy entries, set the following permissions:
 
 - `taxonomy/assign` to allow user to tag and untag content
 - `taxonomy/read` to see the Taxonomy interface
 - `taxonomy/manage` to create, edit and delete tags
 
-With limitations, you can configure whether permissions apply to Tags, product categories or both.
+With limitations, you can configure whether permissions apply to Tags, product categories, or both.
 
-## Register Users
+## Register users
 
 To allow anonymous users to register through the `/register` route, grant the `user/register` policy to the Anonymous user group.
 
@@ -190,9 +177,9 @@ Additional policies are needed for each section of the Admin.
 
 ### Sections
 
-- `section/view` to see and access the Section list
-- `section/edit` to add and edit Sections
-- `section/assign` to assign Sections to content
+- `section/view` to see and access the section list
+- `section/edit` to add and edit sections
+- `section/assign` to assign sections to content
 
 ### Languages
 
@@ -205,7 +192,7 @@ Additional policies are needed for each section of the Admin.
 ### Object states
 
 - `state/administrate` to view a list of Object states, add and edit them
-- `state/assign` to assign Objects states to Content
+- `state/assign` to assign Objects states to content
 
 ### Roles
 
@@ -214,9 +201,9 @@ Additional policies are needed for each section of the Admin.
 
 ### Users
 
-- `content/view` to view the list of Users
+- `content/view` to view the list of users
 
-Users are treated like other content, so to create and modify them, the User needs to have the same permissions as for managing other content items.
+Users are treated like other content, so to create and modify them, the user needs to have the same permissions as for managing other content items.
 
 ## Product catalog
 
@@ -224,7 +211,7 @@ You can control to what extend users can access the product catalog and all its
 
 ### Product type
 
-To create or edit product types, a user needs to have access to attributes and attribute groups. 
+To create or edit product types, a user needs to have access to attributes and attribute groups.
 Set the following permissions to allow such access:
 
 - `product_type/create`
@@ -233,9 +220,8 @@ Set the following permissions to allow such access:
 
 ### Product item
 
-When a product is created, a product item and a content item are also generated. 
-Permissions for the product catalog override permissions for content, therefore, 
-users without permissions for content can still manage products.
+When a product is created, a product item and a content item are also generated.
+Permissions for the product catalog override permissions for content, therefore, users without permissions for content can still manage products.
 
 - `product/create`
 - `product/view`
@@ -243,48 +229,40 @@ users without permissions for content can still manage products.
 
 ## Commerce [[% include 'snippets/commerce_badge.md' %]]
 
-To control which commerce functionalities are available to store users, you can grant 
-or prevent them access to individual components.
+To control which commerce functionalities are available to store users, you can grant or prevent them access to individual components.
 
-Out of the box, [[= product_name_com =]] comes with the *Storefront User* Role that is assigned to anonymous users and grants them the following permissions:
+Out of the box, [[= product_name_com =]] comes with the *Storefront User* role that is assigned to anonymous users and grants them the following permissions:
 
-- `product/view`, `product_type/view` and `catalog/view`, to allow them to view a product 
-list and product details
+- `product/view`, `product_type/view` and `catalog/view`, to allow them to view a product list and product details
 - `cart/view`, `cart/create` and `cart/edit` with the `CartOwner` limitation set to `self`, to allow them to add items to their own shopping cart, modify their cart, and delete it
-- `checkout/view`, `checkout/create`, `checkout/update` and `checkout/delete`, to allow 
-them to proceed to checkout and interact with the checkout process
+- `checkout/view`, `checkout/create`, `checkout/update` and `checkout/delete`, to allow them to proceed to checkout and interact with the checkout process
 
-You can modify the default roles by preventing anonymous users from being able to proceed with the checkout process,
-and creating the *Registered Buyer* role that enables logged-in users to purchase products. 
+You can modify the default roles by preventing anonymous users from being able to proceed with the checkout process, and creating the *Registered Buyer* role that enables logged-in users to purchase products.
 
-You could do this by moving permissions that relate to checkout from the *Storefront User* role to the *Registered Buyer* role,
-and granting *Registered Buyer* with the `user/register` and `user/login` permissions which control access to registration and login.
+You could do this by moving permissions that relate to checkout from the *Storefront User* role to the *Registered Buyer* role, and granting *Registered Buyer* with the `user/register` and `user/login` permissions which control access to registration and login.
 
 See below for a detailed listing of permissions that apply to Commerce, together with their meaning.
 
 !!! note "Owner limitation"
 
-    For anonymous users, orders, shipments, and/or payments are saved with a 'null' user reference. 
+    For anonymous users, orders, shipments, and/or payments are saved with a 'null' user reference.
     Therefore, when you apply the `Owner/self` imitation to any of the permissions below, anonymous users aren't allowed to interact with any of these entities.
 
-### Cart 
+### Cart
 
-Set the following permissions to decide what actions are available when users 
-interact with carts: 
+Set the following permissions to decide what actions are available when users interact with carts:
 
-- `cart/view` - to allow user to view their cart 
+- `cart/view` - to allow user to view their cart
 - `cart/delete` - to delete cart, for example, after successful checkout
 - `cart/create` - to create a new cart
 - `cart/edit` - to allow user to add products to their cart
 
-To further control access to a cart, you can use the `CartOwner` limitation 
-and set its value to `self`. 
+To further control access to a cart, you can use the `CartOwner` limitation and set its value to `self`
 This way users can only interact with their own carts.
 
-### Checkout 
+### Checkout
 
-Set the following permissions to decide what actions are available when users 
-interact with checkout: 
+Set the following permissions to decide what actions are available when users interact with checkout:
 
 - `checkout/view` - to control user access to checkout
 - `checkout/create` - to allow starting the checkout process, by proceeding from cart
@@ -293,60 +271,54 @@ interact with checkout:
 
 ### Order management
 
-Set the following permissions to decide what actions are available when users 
-interact with orders:
+Set the following permissions to decide what actions are available when users interact with orders:
 
 - `order/create` - to allow the user to create a new order
 - `order/view` - to allow the user to view orders
-- `order/update` - to allow the user to change status of an existing order 
-- `order/cancel` - to allow the user to cancel an existing order 
+- `order/update` - to allow the user to change status of an existing order
+- `order/cancel` - to allow the user to cancel an existing order
 
-To further control access to an order, you can use the `OrderOwner` limitation 
-and set its value to `self`. 
+To further control access to an order, you can use the `OrderOwner` limitation and set its value to `self`.
 This way users can only interact with their own orders.
 
 ### Shipping management
 
-Set the following permissions to decide what actions are available when users 
-interact with shipping methods and shipments.
+Set the following permissions to decide what actions are available when users interact with shipping methods and shipments.
 
 #### Shipping methods
 
 - `shipping_method/create` - to allow the user to create a new shipping method
 - `shipping_method/view` - to allow the user to view shipping methods
-- `shipping_method/edit` - to allow the user to modify an existing shipping method 
-- `shipping_method/delete` - to allow the user to delete an existing shipping method 
+- `shipping_method/edit` - to allow the user to modify an existing shipping method
+- `shipping_method/delete` - to allow the user to delete an existing shipping method
 
 #### Shipments
 
 - `shipment/create` - to allow the user to create a new shipment
 - `shipment/view` - to allow the user to view shipments
-- `shipment/update` - to allow the user to change status of an existing shipment 
-- `shipment/delete` - to allow the user to cancel an existing shipment 
+- `shipment/update` - to allow the user to change status of an existing shipment
+- `shipment/delete` - to allow the user to cancel an existing shipment
 
-To further control access to a shipment, you can use the `ShipmentOwner` limitation 
-and set its value to `self`. 
+To further control access to a shipment, you can use the `ShipmentOwner` limitation and set its value to `self`.
 This way users can only interact with their own shipments.
 
 ### Payment management
 
-Set the following permissions to decide what actions are available when users 
-interact with payment methods and payments.
+Set the following permissions to decide what actions are available when users interact with payment methods and payments.
 
 #### Payment methods
 
 - `payment_method/create` - to allow the user to create a new payment method
 - `payment_method/view` - to allow the user to view payment methods
-- `payment_method/edit` - to allow the user to modify an existing payment method 
-- `payment_method/delete` - to allow the user to delete an existing payment method 
+- `payment_method/edit` - to allow the user to modify an existing payment method
+- `payment_method/delete` - to allow the user to delete an existing payment method
 
 #### Payments
 
 - `payment/create` - to allow the user to create a new payment
 - `payment/view` - to allow the user to view payments
-- `payment/edit` - to allow the user to modify an existing payment 
-- `payment/delete` - to allow the user to delete an existing payment 
+- `payment/edit` - to allow the user to modify an existing payment
+- `payment/delete` - to allow the user to delete an existing payment
 
-To further control access to a payment, you can use the `PaymentOwner` limitation 
-and set its value to `self`. 
+To further control access to a payment, you can use the `PaymentOwner` limitation and set its value to `self`.
 This way users can only interact with their own payments.
diff --git a/docs/permissions/policies.md b/docs/permissions/policies.md
index 863def3208..c1ae558086 100644
--- a/docs/permissions/policies.md
+++ b/docs/permissions/policies.md
@@ -6,8 +6,7 @@ page_type: reference
 # Policies
 
 Policies are the main building block of the permissions system.
-Each role you assign to user or user group consists of policies
-which define, which parts of the application or website the user has access to.
+Each role you assign to user or user group consists of policies which define, which parts of the application or website the user has access to.
 
 ## Available policies
 
@@ -67,7 +66,7 @@ which define, which parts of the application or website the user has access to.
 
 #### Sites [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
-| Module              | Function                     | Effect                                                                                                | Possible Limitations |
+| Module              | Function                     | Effect                                                                                                | Possible limitations |
 |---------------------|------------------------------|-------------------------------------------------------------------------------------------------------|----------------------|
 | <nobr>`site`</nobr> | <nobr>`change_status`</nobr> | change status of the public accesses of sites to <nobr>`Live` or `Offline`</nobr> in the Site Factory |
 |                     | <nobr>`create`</nobr>        | create sites in the Site Factory                                                                      |
@@ -78,7 +77,7 @@ which define, which parts of the application or website the user has access to.
 
 #### Users
 
-| Module              | Function                   | Effect                                            | Possible Limitations |
+| Module              | Function                   | Effect                                            | Possible limitations |
 |---------------------|----------------------------|---------------------------------------------------|----------------------|
 | <nobr>`user`</nobr> | <nobr>`activation`</nobr>  | unused                                            |
 |                     | <nobr>`invite`</nobr>      | create and send invitations to create an account  |
@@ -92,7 +91,7 @@ which define, which parts of the application or website the user has access to.
 
 #### Cart [[% include 'snippets/commerce_badge.md' %]]
 
-| Module              | Function              | Effect                                                              | Possible Limitations                                      |
+| Module              | Function              | Effect                                                              | Possible limitations                                      |
 |---------------------|-----------------------|---------------------------------------------------------------------|-----------------------------------------------------------|
 | <nobr>`cart`</nobr> | <nobr>`create`</nobr> | create a cart                                                       | [CartOwner](limitation_reference.md#cartowner-limitation) |
 |                     | <nobr>`delete`</nobr> | delete cart, for example, after successful checkout                 | [CartOwner](limitation_reference.md#cartowner-limitation) |
@@ -186,7 +185,7 @@ which define, which parts of the application or website the user has access to.
 | Module                 | Function                          | Effect                                                                                                                                  | Possible limitations                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
 |------------------------|-----------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | <nobr>`content`</nobr> | <nobr>`cleantrash`</nobr>         | empty the Trash (even when the User doesn't have access to individual content items)                                                   |
-|                        | <nobr>`create`</nobr>             | create new content. Note: even without this Policy the User is able to enter edit mode, but cannot finalize work with the content item. | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Language](limitation_reference.md#language-limitation)</br>[Owner of Parent](limitation_reference.md#owner-of-parent-limitation)</br>[Content type Group of Parent](limitation_reference.md#content-type-group-of-parent-limitation)</br>[Content type of Parent](limitation_reference.md#content-type-of-parent-limitation)</br>[Parent Depth](limitation_reference.md#parent-depth-limitation)</br>[Field Group](limitation_reference.md#field-group-limitation)</br>[Change Owner](limitation_reference.md#change-owner-limitation)             |
+|                        | <nobr>`create`</nobr>             | create new content. Note: even without this policy the user is able to enter edit mode, but cannot finalize work with the content item. | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Language](limitation_reference.md#language-limitation)</br>[Owner of Parent](limitation_reference.md#owner-of-parent-limitation)</br>[Content type Group of Parent](limitation_reference.md#content-type-group-of-parent-limitation)</br>[Content type of Parent](limitation_reference.md#content-type-of-parent-limitation)</br>[Parent Depth](limitation_reference.md#parent-depth-limitation)</br>[Field Group](limitation_reference.md#field-group-limitation)</br>[Change Owner](limitation_reference.md#change-owner-limitation)             |
 |                        | <nobr>`diff`</nobr>               | unused                                                                                                                                  |
 |                        | <nobr>`edit`</nobr>               | edit existing content                                                                                                                   | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Content type Group](limitation_reference.md#content-type-group-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Language](limitation_reference.md#language-limitation)</br>[Object State](limitation_reference.md#object-state-limitation)</br>[Workflow Stage](limitation_reference.md#workflow-stage-limitation)</br>[Field Group](limitation_reference.md#field-group-limitation)</br>[Version Lock](limitation_reference.md#version-lock-limitation)</br>[Change Owner](limitation_reference.md#change-owner-limitation) |
 |                        | <nobr>`hide`</nobr>               | hide and reveal content Locations                                                                                                       | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Content type Group](limitation_reference.md#content-type-group-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Language](limitation_reference.md#language-limitation)                                                                                                                                                                                                                                                                                                                                                       |
@@ -219,7 +218,7 @@ which define, which parts of the application or website the user has access to.
 |------------------------|-----------------------|----------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | <nobr>`section`</nobr> | <nobr>`assign`</nobr> | assign Sections to content                                                       | [content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[New Section](limitation_reference.md#new-section-limitation) |
 |                        | <nobr>`edit`</nobr>   | edit existing Sections and create new ones                                       |
-|                        | <nobr>`view`</nobr>   | view the Sections list in Admin. Required for all other section-related Policies |
+|                        | <nobr>`view`</nobr>   | view the Sections list in Admin. Required for all other section-related policies |
 
 #### Object States
 
@@ -267,15 +266,13 @@ which define, which parts of the application or website the user has access to.
 
 | Module                      | Function              | Effect                                                                                                          | Possible limitations |
 |-----------------------------|-----------------------|-----------------------------------------------------------------------------------------------------------------|----------------------|
-| <nobr>`product_type`</nobr> | <nobr>`create`</nobr> | create a product type, a new attribute, a new attribute group and add translation to product type and attribute |
+| <nobr>`product_type`</nobr> | <nobr>`create`</nobr> | create a product type, a new attribute, a new attribute group, and add translation to product type and attribute |
 |                             | <nobr>`delete`</nobr> | delete a product type, attribute, attribute group                                                               |
 |                             | <nobr>`edit`</nobr>   | edit a product type, attribute, attribute group                                                                 |
 |                             | <nobr>`view`</nobr>   | view product types, attributes and attribute groups                                                             |
 
 ## Combining policies
 
-Policies on one role are connected with the *and* relation, not *or*,
-so when policy has more than one limitation, all of them have to apply.
+Policies on one role are connected with the *and* relation, not *or*, so when policy has more than one limitation, all of them have to apply.
 
-If you want to combine more than one limitation with the *or* relation, not *and*,
-you can split your policy in two, each with one of these limitations.
+If you want to combine more than one limitation with the *or* relation, not *and*, you can split your policy in two, each with one of these limitations.

From 2c62c4adf3e7ac800cf08be893c47165e471ff91 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 09:07:33 +0200
Subject: [PATCH 46/77] Fixes in 'personalization'

---
 .../api_reference/content_api.md              |  68 ++---
 .../api_reference/recommendation_api.md       |  80 +++---
 .../api_reference/tracking_api.md             | 236 ++++++------------
 .../personalization/api_reference/user_api.md |  32 +--
 .../attribute_search_in_elasticsearch.md      |   7 +-
 .../personalization/enable_personalization.md | 113 +++------
 ...importing_historical_user_tracking_data.md |  24 +-
 .../integrate_recommendation_service.md       |  16 +-
 .../legacy_recommendation_api.md              |  45 ++--
 docs/personalization/personalization.md       |   5 +-
 docs/personalization/personalization_guide.md |  35 ++-
 .../recommendation_integration.md             |  60 ++---
 docs/personalization/tracking_integration.md  |  54 ++--
 .../tracking_with_ibexa-tracker.md            |  65 ++---
 14 files changed, 304 insertions(+), 536 deletions(-)

diff --git a/docs/personalization/api_reference/content_api.md b/docs/personalization/api_reference/content_api.md
index 5e61f89e60..22d0aa5f85 100644
--- a/docs/personalization/api_reference/content_api.md
+++ b/docs/personalization/api_reference/content_api.md
@@ -4,10 +4,8 @@ description: Personalization server can use external information about the items
 
 # Content API
 
-Apart from the [events]([[= user_doc =]]/personalization/event_types) collected by the Personalization client, 
-the Personalization server can use external information about the products.
-This information must be uploaded to the Personalization server by the administrator 
-of the website.
+Apart from the [events]([[= user_doc =]]/personalization/event_types) collected by the Personalization client, the Personalization server can use external information about the products.
+This information must be uploaded to the Personalization server by the administrator of the website.
 
 The following information can be loaded to the recommendation solution:
 
@@ -18,22 +16,19 @@ The following information can be loaded to the recommendation solution:
 For more information about personalization, see [Introduction](personalization.md) and [Best practices](recommendation_integration.md).
 
 The Personalization client provides a REST interface that accepts items in XML format.
-You can use the interface to post item information within the request's body into the store, 
-and to display or update the items directly.
+You can use the interface to post item information within the request's body into the store, and to display or update the items directly.
 
 You can use HTTP methods to create, update or retrieve items that are in the data store.
 
 !!! note "Authentication"
 
     For getting or posting content data, basic authentication is enabled by default.
-    Use your customer ID and license key as username and password. 
-    If authentication is enabled for recommendation requests and you want to change 
-    this, contact support@ibexa.co.
+    Use your customer ID and license key as username and password.
+    If authentication is enabled for recommendation requests and you want to change this, contact support@ibexa.co.
 
 ## GET requests
 
-Use the GET method to retrieve all information that is stored in the database 
-for the given item ID:
+Use the GET method to retrieve all information that is stored in the database for the given item ID:
 
 `GET: https://admin.perso.ibexa.co/api/[customerid]/item/[itemtypeid]/[itemid]`
 
@@ -48,7 +43,7 @@ Once uploaded, the item is scheduled to be inserted in the database, and isn't d
 
 ## DELETE requests
 
-Use the DELETE method to delete all information that is related to the given item ID. 
+Use the DELETE method to delete all information that is related to the given item ID.
 
 `DELETE: https://admin.perso.ibexa.co/api/[customerid]/item/[itemtypeid]/[itemid]?lang=<language_code>`
 
@@ -67,7 +62,7 @@ The following call attributes are available:
 
 ### Request object format
 
-An XML representation of the data object used for item import can look like this: 
+An XML representation of the data object used for item import can look like this:
 
 ``` xml
 <items version="1">
@@ -103,8 +98,7 @@ An XML representation of the data object used for item import can look like this
 
 !!! note "XML schema definition"
 
-    The current schema that is used for interpreting the XML objects 
-    can be seen [here](https://admin.perso.ibexa.co/api/00000/item/schema.xsd).
+    The current schema that is used for interpreting the XML objects can be seen [here](https://admin.perso.ibexa.co/api/00000/item/schema.xsd).
 
 The following keys and attributes used in the XML object are available:
 
@@ -137,62 +131,53 @@ To check how many digits the fractional unit of a currency has, see the [ISO 421
 
 ##### Validity
 
-Items with defined validity are recommended only in the specified timeframe. 
-Values in the `validto` and `validfrom` attributes must follow the [XSD format](https://www.w3.org/TR/xmlschema-2/#dateTime) 
-and don't include the time zone. 
+Items with defined validity are recommended only in the specified timeframe.
+Values in the `validto` and `validfrom` attributes must follow the [XSD format](https://www.w3.org/TR/xmlschema-2/#dateTime) and don't include the time zone.
 Time zone is always your time zone.
 
 ##### Category path
 
-With the data import interface, you can upload information about the paths 
-to categories in which the product is located.
+With the data import interface, you can upload information about the paths to categories in which the product is located.
 However, the category path can be also updated as a result of the "Click" events.
-If you regularly upload product data, the "Click" event cannot contain the category 
-path information.
+If you regularly upload product data, the "Click" event cannot contain the category path information.
 Otherwise, the following negative side effects occur:
 
 - Every new category path attached to the "Click" event is appended to a list of the categories of the product
 - Imported product data overwrites the collected category paths
 
-For example, when a product that is originally located under `Garden` is clicked 
-in the "Hot Sellers" section, the category path `TopSeller` is sent.
+For example, when a product that is originally located under `Garden` is clicked in the "Hot Sellers" section, the category path `TopSeller` is sent.
 
 #### Content items/products with no attributes
 
 All the elements and attributes except the `type` and `id` are optional.
 You can therefore upload a product without any additional information.
-You do it, for example, when a random recommendation model is used 
-or you want to want to apply ad-hoc boosting and filtering of recommendations.
+You do it, for example, when a random recommendation model is used or you want to want to apply ad-hoc boosting and filtering of recommendations.
 As a result, the Personalization server randomly recommends the imported items/products.
-This can prove useful for a news agency, where new items are published very often.
+This can prove useful for a news agency, where new items are published often.
 
 #### Custom attributes
 
 You can also define custom attributes under the `<attributes>` key.
 This section can only contain values that are distinct and used to build pre-filtered models.
 
-By default, it's assumed that every attribute is of type "NOMINAL", which means that 
-there is a limited set of values, and values of an attribute are treated as distinct 
-when calculating the results of a content-based model.
+By default, it's assumed that every attribute is of type "NOMINAL", which means that there is a limited set of values, and values of an attribute are treated as distinct when calculating the results of a content-based model.
 
-If you have an attribute that is of type "NUMERIC", and you add another attribute 
-of the same type, the Personalization server treats the two values as a range.
+If you have an attribute that is of type "NUMERIC", and you add another attribute of the same type, the Personalization server treats the two values as a range.
 
 ``` xml
 <attribute key="size" value="4" type="NUMERIC" />
 ```
 
-However, if the other attribute is of type "NOMINAL", they're both treated 
-as different and have no "distance-based similarity".
+However, if the other attribute is of type "NOMINAL", they're both treated as different and have no "distance-based similarity".
 
-Another typical example of a custom attribute is the color of an item. 
+Another typical example of a custom attribute is the color of an item.
 To upload the value to the data store, add the following line under the `<attributes>` key.
 
 ``` xml
 <attribute key="color" value="green" />
 ```
 
-You can have multiple attributes with the same name and different type. 
+You can have multiple attributes with the same name and different type.
 For example, `size` can be expressed as a number (40.5) or as a code ("L").
 
 ## Responses
@@ -210,11 +195,8 @@ The following HTTP response codes are used by the recommendation controller:
 
 ## Transferring item identifiers
 
-You could use the data import interface to help migrate the database, 
-when it involves changing item IDs of items that are supported by the 
-Personalization server.
-If you transfer items from one ID to another, you can use the events recorded 
-for "old" item IDs to calculate model results that present "new" IDs.
+You could use the data import interface to help migrate the database, when it involves changing item IDs of items that are supported by the Personalization server.
+If you transfer items from one ID to another, you can use the events recorded for "old" item IDs to calculate model results that present "new" IDs.
 
 Use the following method to pass the XML object:
 
@@ -235,6 +217,4 @@ The old item is wiped, including all attributes.
 
 !!! note
 
-    The attributes of the "old" item ID aren't moved or merged, and if you 
-    rely on attributes, for example, for filtering based on prices, 
-    you must reimport the new item.
+    The attributes of the "old" item ID aren't moved or merged, and if you rely on attributes, for example, for filtering based on prices, you must reimport the new item.
diff --git a/docs/personalization/api_reference/recommendation_api.md b/docs/personalization/api_reference/recommendation_api.md
index 809cfc1c61..80719869f1 100644
--- a/docs/personalization/api_reference/recommendation_api.md
+++ b/docs/personalization/api_reference/recommendation_api.md
@@ -4,19 +4,15 @@ description: Use HTTP GET request method to render recommendations.
 
 # Recommendation API
 
-Recommendations are retrieved from the Personalization server with RESTful requests 
-that rely on the HTTP GET method. 
-The result can a list of item IDs that can then be used to call the underlying 
-CMS or shop system and postload the necessary information for the rendering process.
+Recommendations are retrieved from the Personalization server with RESTful requests that rely on the HTTP GET method.
+The result can a list of item IDs that can then be used to call the underlying CMS or shop system and postload the necessary information for the rendering process.
 
 For more information about Personalization, see [Introduction](personalization.md) and [Basic integration](recommendation_integration.md).
 
 !!! note "Authentication"
 
-    For fetching recommendations, authentication is disabled by default, and 
-    it must be disabled when you use [JSONP](https://en.wikipedia.org/wiki/JSONP) for response handling. 
-    If authentication is enabled for recommendation requests and you want to change 
-    this, contact support@ibexa.co.
+    For fetching recommendations, authentication is disabled by default, and it must be disabled when you use [JSONP](https://en.wikipedia.org/wiki/JSONP) for response handling.
+    If authentication is enabled for recommendation requests and you want to change this, contact support@ibexa.co.
 
 ## GET requests
 
@@ -31,33 +27,30 @@ For the request to return recommendations, you must provide the following parame
 |Parameter|Description|Value|
 |---|---|---|
 |`customerid`|A customer ID (for example "00000"), as defined when [enabling Personalization](enable_personalization.md#set-up-customer-credentials). Can be used to identify a website in installations that [hosts multiple SiteAccesses]([[= user_doc =]]/personalization/use_cases/#multiple-website-hosting).|alphanumeric|
-|`userid`|An ID of the tracked user in the website (for example, an internal customer code, a session code or a cookie for anonymous users.|alphanumeric|
+|`userid`|An ID of the tracked user in the website (for example, an internal customer code, a session code, or a cookie for anonymous users.|alphanumeric|
 |`scenarioid`|An ID of the scenario used for providing recommendations, as defined in the back office.|alphanumeric|
 |`extension`|A format of the response (either JSON or JSONP).|`json` or `jsonp`|
 
 !!! caution "Parameter encoding limitations"
 
-    All parameters must be URL-encoded (see RFC 3986) and cannot contain a backslash 
-    (`%5C`) character.
+    All parameters must be URL-encoded (see RFC 3986) and cannot contain a backslash (`%5C`) character.
 
 ### Customizing the recommendation request
 
-You can customize the recommendation request by using additional query string parameters. 
+You can customize the recommendation request by using additional query string parameters.
 For example, you can send the following request to the Personalization server: 
 
 `GET https://reco.perso.ibexa.co/api/v2/00000/john.doe/landing_page.json ?contextitems=123&categorypath=%2FCamera%2FCompact&attribute=title&attribute=deeplink,description&numrecs=8`
 
-The request fetches 8 recommendations for user ID `john.doe`, who is viewing item 123 
-and the category `/Camera/Compact`, based on the scenario with the identifier `landing_page`. 
-The recommendation response uses the JSON format and should include values of 
-`title`, `deeplink` and `description` attributes.
+The request fetches 8 recommendations for user ID `john.doe`, who is viewing item 123 and the category `/Camera/Compact`, based on the scenario with the identifier `landing_page`.
+The recommendation response uses the JSON format and should include values of `title`, `deeplink` and `description` attributes.
 
 You can use the following parameters to customize a request:
 
 |Parameter|Example|Description|Value|
 |---|---|---|---|
 |`numrecs`|20|Defines a number of recommendations to be delivered. The lower this value, the shorter the response time. The default value is 10. |1 to 50|
-|`contextitems`|10,13,14 or "CLICKED"|A comma-separated list of items that the user is viewing on the web page. The list is required by [context-based recommendations]([[= user_doc =]]/personalization/recommendation_models). All items must be of the same type. The type is defined in the scenario configuration. If history code is used ("CLICKED","CONSUMED", "OWNS", "RATED" or "BASKET"), context items are pulled from the user profile (for example, the most recent clicks or purchases). This parameter is optional. |1 to 2147483647 (or alphanumeric if enabled)|
+|`contextitems`|10,13,14, or "CLICKED"|A comma-separated list of items that the user is viewing on the web page. The list is required by [context-based recommendations]([[= user_doc =]]/personalization/recommendation_models). All items must be of the same type. The type is defined in the scenario configuration. If history code is used ("CLICKED","CONSUMED", "OWNS", "RATED" or "BASKET"), context items are pulled from the user profile (for example, the most recent clicks or purchases). This parameter is optional. |1 to 2147483647 (or alphanumeric if enabled)|
 |`outputtypeid`|1|Required for scenarios that are defined with multiple output item types, otherwise optional. By default it's the first/lowest output type enabled in the scenario config.|numeric|
 |`crosscontenttype`| |Used instead of `outputtypeid`, if set to true, displays recommendations for all output types defined in the scenario. | boolean|
 |`jsonpCallback`|"myCallback"|Function or method name (used for JSONP request only). It can be a function ("callme"), or a method ("obj.callme"). The default value is "jsonpCallback".|legal JavaScript function call|
@@ -80,15 +73,14 @@ For more information, see [Submodels]([[= user_doc =]]/personalization/recommend
 !!! note "Multiple submodels in recommendations"
 
     If you send a request with two attribute keys, the response contains an intersection of two recommendation sets that originate from submodels calculated for these attributes.
-    
+
     For example, to get recommendations for items of certain type that are limited by submodels based on both a nominal and numeric attribute, you can send the following request:
-    
+
     `GET https://reco.perso.ibexa.co/api/v2/00000/john.doe/landing_page.json?numrecs=50&outputtypeid=1&width-range=10:30&color=green`
 
 ##### Segment parameters
 
-If you have configured segments, you can use them in the recommendation model. Pass the following parameter
-to request recommendations for a specific segment or segment group.
+If you have configured segments, you can use them in the recommendation model. Pass the following parameter to request recommendations for a specific segment or segment group.
 
 Parameter|Example|Description|Value|
 |---|---|---|---|
@@ -98,20 +90,17 @@ For more information, see [Segments]([[= user_doc =]]/personalization/segment_ma
 
 ## Responses
 
-The recommendation request returns information about the currently used context 
-items and an array of recommendation objects in JSON or JSONP format. 
-The result can be integrated into any webpage on the client side by using script code. 
-To track user actions like "clickrecommended" and "rendered", use the links 
-delivered in the response.
+The recommendation request returns information about the currently used context items and an array of recommendation objects in JSON or JSONP format.
+The result can be integrated into any webpage on the client side by using script code.
+To track user actions like "clickrecommended" and "rendered", use the links delivered in the response.
 
 For more information, see inline comments below.
 
 !!! note "Previewing recommendations"
 
-    You can preview the actual responses that come from the Personalization server 
-    and how they're rendered in the user interface.
+    You can preview the actual responses that come from the Personalization server and how they're rendered in the user interface.
     For more information, see [Previewing scenario results]([[= user_doc =]]/personalization/previewing_scenario).
-    
+
 For more information about integrating recommendations in the web page, see [Best practices](recommendation_integration.md).
 
 ### Response object format
@@ -251,18 +240,13 @@ Error messages can change, don't use them for automated processing.
 
 !!! note "Rendering data"
 
-    If data import with the [Content API](content_api.md) was successful, you 
-    can also fetch data used for rendering (for example "title", "description" 
-    or "deeplink") from the recommendation response.
+    If data import with the [Content API](content_api.md) was successful, you can also fetch data used for rendering (for example "title", "description" or "deeplink") from the recommendation response.
 
 ## Cache recommendations
 
-The Personalization server's response can be cached. 
-Depending on the recommendation model and context, it can drastically reduce 
-the number of recommendation requests. 
-The recommendation service supports the following HTTP headers to enable cache 
-control on the client side (all date values must follow the "HTTP-date" format 
-as defined by [RFC 2616](https://datatracker.ietf.org/doc/html/rfc2616)):
+The Personalization server's response can be cached.
+Depending on the recommendation model and context, it can drastically reduce the number of recommendation requests.
+The recommendation service supports the following HTTP headers to enable cache control on the client side (all date values must follow the "HTTP-date" format as defined by [RFC 2616](https://datatracker.ietf.org/doc/html/rfc2616)):
 
 |Scope|Header|Description|Example|
 |---|---|---|---|
@@ -270,22 +254,16 @@ as defined by [RFC 2616](https://datatracker.ietf.org/doc/html/rfc2616)):
 |Response|`Last-Modified`|The last modification date of the recommendations.|`Last-Modified: Tue, 15 Nov 2013 12:45:26 GMT`|
 |Response|`Expires`|Gives the date/time after which the response is outdated|`Expires: Thu, 01 Dec 2013 16:00:00 GMT`|
 
-The last modification timestamp indicates a change that could influence the 
-recommendation response. 
-It depends on an updated recommendation calculation, an update of an item or 
-certain scenario configuration changes. 
+The last modification timestamp indicates a change that could influence the recommendation response.
+It depends on an updated recommendation calculation, an update of an item or certain scenario configuration changes. 
 
-The expiration timestamp is a best-effort prediction based on the model configuration 
-and provided context. 
-The shortest expiration period is 5 minutes from the request time, the longest 
-is 24 hours. 
+The expiration timestamp is a best-effort prediction based on the model configuration and provided context.
+The shortest expiration period is 5 minutes from the request time, the longest is 24 hours.
 
-You don't usually have to calculate the expiration time manually. 
-Instead, make sure that the `Expires` header is used in the configuration 
-of your caching system and not a static value out of your configuration.
+You don't usually have to calculate the expiration time manually.
+Instead, make sure that the `Expires` header is used in the configuration of your caching system and not a static value out of your configuration.
 
-To learn how Personalization server calculates the `Expires` header that's provided 
-to your caching system, see the following table with caching strategy examples:
+To learn how Personalization server calculates the `Expires` header that's provided to your caching system, see the following table with caching strategy examples:
 
 | Model | Context | Expiration time | Description |
 |------|------|-----|-----|
diff --git a/docs/personalization/api_reference/tracking_api.md b/docs/personalization/api_reference/tracking_api.md
index d00c4a90af..7dcf9b9ec5 100644
--- a/docs/personalization/api_reference/tracking_api.md
+++ b/docs/personalization/api_reference/tracking_api.md
@@ -4,8 +4,7 @@ description: Allows to track items using it ID. It covers many content types wit
 
 # Tracking API
 
-To provide recommendations, a tracking process needs to collect user behavior
-on the customer's site.
+To provide recommendations, a tracking process needs to collect user behavior on the customer's site.
 The most popular user events are:
 
 - Click - When a user opens a detail page.
@@ -15,35 +14,29 @@ The most popular user events are:
 - Clickrecommended - When a user clicks a recommendation
 
 For a complete list of events, see [Event types]([[= user_doc =]]/personalization/event_types) in User Documentation. 
-Depending on the event type, some additional parameters, such as item price
-or user rating, must be provided.
+Depending on the event type, some additional parameters, such as item price or user rating, must be provided.
 
-Importing historical user data can help you reduce the delay in delivery of high
-quality recommendations.
+Importing historical user data can help you reduce the delay in delivery of high quality recommendations.
 
 For more information, see [Importing historical user tracking data](importing_historical_user_tracking_data.md).
 
-Apart from the tracking API, you can add tracking to the website by integrating
-a JavaScript library.
+Apart from the tracking API, you can add tracking to the website by integrating a JavaScript library.
 
 For more information, see [Tracking with ibexa-tracker.js](tracking_with_ibexa-tracker.md).
 
 ## Definitions
 
 You can use the tracking API both in eCommerce and content publishing scenarios.
-eCommerce mostly uses the term "product", whereas the Publisher domain widely
-uses the terms "content", "article", "images" or "videos".
+eCommerce mostly uses the term "product", whereas the Publisher domain widely uses the terms "content", "article", "images" or "videos".
 Therefore, a generic term "item" is used instead to cover all the mentioned types.
-For further segmentation the term "item type" is used, which, in combination
-with the item ID itself, defines a domain specific object.
+For further segmentation the term "item type" is used, which, in combination with the item ID itself, defines a domain specific object.
 
 For example, an electronic product can be defined by item type "1" and item id "3298",
 while a textile product can be defined by item type "2" and item id "3298".
 
 !!! note
 
-    Usually only one item type is sufficient in the eCommerce business as each
-    product available in an eCommerce shop has a unique identifier.
+    Usually only one item type is sufficient in the eCommerce business as each product available in an eCommerce shop has a unique identifier.
 
 |Domain|Item ID|Item Type|
 |---|---|---|
@@ -51,12 +44,9 @@ while a textile product can be defined by item type "2" and item id "3298".
 |Content publishing|Video|ID of a video|
 |Content publishing|Photo Gallery|ID of a photo gallery|
 
-Assuming the numbering of content is independent and the same item ID is used
-for two items of different item types, it's impossible to tell the difference
-if there is no segmentation by item types.
+Assuming the numbering of content is independent and the same item ID is used for two items of different item types, it's impossible to tell the difference if there is no segmentation by item types.
 
-If an article, a video and a photo gallery have the same item ID, use different
-item types to separate the items that are tracked.
+If an article, a video and a photo gallery have the same item ID, use different item types to separate the items that are tracked.
 For example:
 
 - item type "1" and itemid "29712" -> article
@@ -65,50 +55,37 @@ For example:
 
 !!! note
 
-    Even if item IDs cannot overlap in a customer's system, [[= product_name_base =]] recommends using
-    different item types to provide independent tracking and cross-item type recommendations,
-    such as, for example, "Users who read this article also watched these videos"
-    or "Users who liked this gallery also read these articles".
+    Even if item IDs cannot overlap in a customer's system, [[= product_name_base =]] recommends using different item types to provide independent tracking and cross-item type recommendations, such as, for example, "Users who read this article also watched these videos" or "Users who liked this gallery also read these articles".
 
 ## Identifiers
 
 ### User identifier
 
-High quality recommendations can only be delivered if the underlying data
-is correct and consistent. 
+High quality recommendations can only be delivered if the underlying data is correct and consistent. 
 For consistent tracking it's crucial to choose and use a consistent identifier for a user.
 A user usually visits a website anonymously.
-Therefore, their identifier is either a first-party cookie or a session ID
-provided by the website. 
-If there is no existing user ID handling that can be re-used, it's recommended that
-you use your own cookie and set the expiry date to at least 90 days from the last usage.
-If there is a login mechanism, the user is usually tracked with a temporary
-identifier before the login.
+Therefore, their identifier is either a first-party cookie or a session ID provided by the website. 
+If there is no existing user ID handling that can be re-used, it's recommended that you use your own cookie and set the expiry date to at least 90 days from the last usage.
+If there is a login mechanism, the user is usually tracked with a temporary identifier before the login.
 Immediately after a successful login process a Login event must be sent.
-At this point a [pseudonymous](https://eur-lex.europa.eu/legal-content/EN/TXT/HTML/?uri=CELEX:32016R0679&from=EN#d1e1489-1-1) user ID,
-for example, a system's internal registration id, must be used. 
+At this point a [pseudonymous](https://eur-lex.europa.eu/legal-content/EN/TXT/HTML/?uri=CELEX:32016R0679&from=EN#d1e1489-1-1) user ID, for example, a system's internal registration id, must be used. 
 After logout, the anonymous user ID can be used again.
 
 !!! note
 
-    The user identifier is required in tracking requests, otherwise it's discarded
-    from the tracking servers.
+    The user identifier is required in tracking requests, otherwise it's discarded from the tracking servers.
 
-    If a browser has JavaScript or cookies disabled, make sure that you put some
-    "dummy" value as identifier in the tracking request to avoid losing tracking
-    information.
+    If a browser has JavaScript or cookies disabled, make sure that you put some "dummy" value as identifier in the tracking request to avoid losing tracking information.
     Even if the event isn't user-specific, it's still useful for [popularity models]([[= user_doc =]]/personalization/recommendation_models/).
 
 The Personalization server internally creates a hash of every user ID.
 The original ID isn't saved.
-it's still possible that the original ID appears in the log files for the debugging
-purposes but log files are purged regularly.
+it's still possible that the original ID appears in the log files for the debugging purposes but log files are purged regularly.
 The user ID is case sensitive.
 
 ### Item identifiers
 
-Persons responsible for the sales policy in place in your organization must decide
-what should be presented as recommendations on the website.
+Persons responsible for the sales policy in place in your organization must decide what should be presented as recommendations on the website.
 In the eCommerce business you mostly have the possibility to track items based on:
 
 - Stock Keeping Unit (SKU) or
@@ -118,35 +95,24 @@ The exact identifiers that are tracked are also recommended ("what-you-track-is-
 By default, it's not possible to track SKUs but recommend UPCs.
 The following use case is typical for eCommerce business:
 
-Customer A implements the Personalization server and decides to use the SKU
-as item identifiers and recommendable items.
-End users who browse through the shop probably get recommendations of
-the same item that is currently displayed but in a different size and/or color,
-a so-called "variant".
-The Personalization server doesn't recognize relations between items, therefore,
-every single SKU is used to calculate similarities between them.
-In the case of bestsellers, this could lead to the appearance of a shirt
-in size L on position 2 and the same shirt in size M on position 4.
+Customer A implements the Personalization server and decides to use the SKU as item identifiers and recommendable items.
+End users who browse through the shop probably get recommendations of the same item that is currently displayed but in a different size and/or color, a so-called "variant".
+The Personalization server doesn't recognize relations between items, therefore, every single SKU is used to calculate similarities between them.
+In the case of bestsellers, this could lead to the appearance of a shirt in size L on position 2 and the same shirt in size M on position 4.
 
 Customer B decides to use the UPC as item identifiers.
 This results in recommendations that don't contain variations of the currently shown item.
-Therefore, the detail page of shirt X doesn't contain a recommendation
-for the same shirt in a different size.
+Therefore, the detail page of shirt X doesn't contain a recommendation for the same shirt in a different size.
 And the same shirt doesn't show up twice on a list of bestseller recommendations.
 
-If the size of an item or the color is selectable on a detail page of an item,
-you may prefer to use the UPC.
-If recommendations of the same item in different sizes or colors are desired,
-you should use the SKU as item identifiers.
+If the size of an item or the color is selectable on a detail page of an item, you may prefer to use the UPC.
+If recommendations of the same item in different sizes or colors are desired, you should use the SKU as item identifiers.
 
-Remember to use the same identifier in all interactions between your website
-and the Personalization server, for example, when a user buys an item,
-clicks a recommendation or displays a product page.
+Remember to use the same identifier in all interactions between your website and the Personalization server, for example, when a user buys an item, clicks a recommendation, or displays a product page.
 
 ## Request parameter categorypath
 
-Category paths are logical tree structures that lead to items and are used for
-recommendation filtering.
+Category paths are logical tree structures that lead to items and are used for recommendation filtering.
 For example, "recommend only items from the same category".
 
 During recommendation requests, the category path must always be provided.
@@ -154,27 +120,21 @@ The category path is a forward slash-separated list of categories from the root,
 The initial slash (if present) is ignored.
 Like all other parameters, the category path must be URL-encoded and cannot contain backslashes.
 
-The "categorypath" parameter offers the possibility to provide category-based
-recommendations without an explicit export of the structure of a customer's website.
+The "categorypath" parameter offers the possibility to provide category-based recommendations without an explicit export of the structure of a customer's website.
 If enabled by [[= product_name_base =]], it's used for on-the-fly updating of item categories.
-If an item is moved to another category, it's handled as present in both
-categories until the old category ages out or is forcibly deleted.
+If an item is moved to another category, it's handled as present in both categories until the old category ages out or is forcibly deleted.
 Multiple category locations of an item (multi-homing) are therefore possible.
 
 !!! note "Category paths"
 
-    When you import your own item metadata by using the Personalization server
-    import interface, you might choose to not provide the category path
-    in the Click event.
-    Category path is required by default, contact [[= product_name_base =]] to change the default
-    configuration.
+    When you import your own item metadata by using the Personalization server import interface, you might choose to not provide the category path in the Click event.
+    Category path is required by default, contact [[= product_name_base =]] to change the default configuration.
 
 ## Track events
 
 !!! note
 
-    Events are forwarded to the Personalization server with HTTP or HTTPS requests
-    (or [RESTful-Requests](https://en.wikipedia.org/wiki/Representational_state_transfer)).
+    Events are forwarded to the Personalization server with HTTP or HTTPS requests (or [RESTful-Requests](https://en.wikipedia.org/wiki/Representational_state_transfer)).
     Both GET and POST methods are allowed for the event tracking.
     Make sure that all embedded and query string parameters are URL encoded and don't use a backslash, encoded as %5C\.
 
@@ -194,16 +154,11 @@ For a list of embedded parameters that each of the events may use, see the follo
 ### Basket event
 
 The Basket event can be used to add products to a user's shopping cart.
-This event is especially valuable if anonymized checkout is allowed or no recurring
-user identification is possible.
-By using the shopping cart products as input for getting recommendations, problems
-with an empty profile or no buy history for the user can be solved.
-The more valuable Basket events instead of recent user clicks can be used to provide
-personalized recommendations.
-It also happens quite often that users "store" products on their shopping [wishlist](#wishlist-event)
-and plan to buy them later.
-With the help of this information, personalized shopping cart-based recommendations
-can be provided in the whole shop.
+This event is especially valuable if anonymized checkout is allowed or no recurring user identification is possible.
+By using the shopping cart products as input for getting recommendations, problems with an empty profile or no buy history for the user can be solved.
+The more valuable Basket events instead of recent user clicks can be used to provide personalized recommendations.
+It also happens quite often that users "store" products on their shopping [wishlist](#wishlist-event) and plan to buy them later.
+With the help of this information, personalized shopping cart-based recommendations can be provided in the whole shop.
 
 `GET https://event.perso.ibexa.co/api/[customerid]/basket/[userid]/[itemtypeid]/[itemid]`
 
@@ -212,9 +167,7 @@ This event has no query string parameters.
 
 ### Blacklist event
 
-If a website offers a link or button that allows feedback similar to "don't
-recommend this product to me anymore", a user could express that they have bought
-it already in another shop.
+If a website offers a link or button that allows feedback similar to "don't recommend this product to me anymore", a user could express that they have bought it already in another shop.
 
 The format of the URL is:
 
@@ -226,59 +179,48 @@ This event has no query string parameters. 
 ### Buy event
 
 As the name suggests, this event is used when an end user buys an item.
-It must be sent to the event tracker at the end of a successful check-out process
-to ensure that no further action of the user can result in an abort.
+It must be sent to the event tracker at the end of a successful check-out process to ensure that no further action of the user can result in an abort.
 
 The URL has the following format: 
 
 `GET https://event.perso.ibexa.co/api/[customerid]/buy/[userid]/[itemtypeid]/[itemid]?fullprice=2.50EUR&quantity=4`
 
 For a detailed description of embedded parameters, see [event parameters](#event-parameters).
-In addition to the fact that an item is bought, this event should provide information
-about the product price and quantity.
+In addition to the fact that an item is bought, this event should provide information about the product price and quantity.
 
 |Name|Description|Values|
 |---|---|---|
 |`quantity`|The number of products a user has bought. Default value is "1". You can send n events instead of setting this parameter to n. This parameter is optional.|integer (default is "1")|
 |`fullprice`|A price for a single product. It contains the price in decimal format plus the currency ISO 4217 code. If the price has a decimal part, the point must be used. There can be no space between price and currency. This parameter is optional.|currency, for example "12.45EUR" or "456JPY"|
 
-For example, if a user bought 4 pens for 10 Euros, `fullprice` can be set to "2.50EUR"
-and `quantity` can be set to 4.
+For example, if a user bought 4 pens for 10 Euros, `fullprice` can be set to "2.50EUR" and `quantity` can be set to 4.
 
 The Buy event is only relevant if the user is charged per product, like in a classic shop.
-If products are sold on a subscription basis, or the web presence is ad-sponsored,
-this event type isn't applicable.
+If products are sold on a subscription basis, or the web presence is ad-sponsored, this event type isn't applicable.
 
 #### Prices in a Buy event
 
 Every Buy event can contain a price.
-If the price is set, it's stored with the event and used for calculating the
-revenue for statistics.
+If the price is set, it's stored with the event and used for calculating the revenue for statistics.
 The price must be a price the user paid for the item, including all taxes and discounts. 
 
-If product price filtering is activated, the information provided over the product
-import is used.
+If product price filtering is activated, the information provided over the product import is used.
 
 For more information, see [Content API](content_api.md).
 
-The currency is stored with the price and normalized only when statistic information
-is requested.
-it's often a good choice to select a base currency and convert prices before
-sending the buy event.
-The price attached to a buy event never overwrites the price which was defined
-in an item import.
+The currency is stored with the price and normalized only when statistic information is requested.
+it's often a good choice to select a base currency and convert prices before sending the buy event.
+The price attached to a buy event never overwrites the price which was defined in an item import.
 
 ### Click event
 
 When the end user opens an item/article detail, a Click events is sent.
-The Click event often provides additional information about the category
-structure of the website.
+The Click event often provides additional information about the category structure of the website.
 
 !!! note
 
     User IDs aren't stored in the database.
-    they're irreversibly anonymized before saving to disk or building the
-    recommendation model.
+    they're irreversibly anonymized before saving to disk or building the recommendation model.
 
 The URL to track user clicks has the following format:
 
@@ -302,7 +244,7 @@ Some optional request parameters can be set over query string parameters (GET pa
     For eCommerce stores, this event isn't required but can be used in custom implementations.
 
 The event is sent when the end user stays on the page for a predefined period of time.
-it's then assumed that the user consumed the item (read an article or watched a video).
+It's then assumed that the user consumed the item (read an article or watched a video).
 
 The URL has the following format:
 
@@ -316,24 +258,17 @@ The following table lists the request parameters:
 |`percentage`|Informs how much of an item was consumed, for example, that an article was read only in 20%, a movie was watched in 90% or someone finished 3/4 of all levels of a game.|0-100|
 
 The logic for calculating the percentage is defined by the implementation.
-For articles, this could be by scrolling down, for a movie/video based on the
-consumption part. 
+For articles, this could be by scrolling down, for a movie/video based on the consumption part. 
 You must decide what 100% consumption means.
 For example, a movie contains end titles that are almost never consumed.
 Therefore, they should not be part of the percentage calculation.
 
-The simplest implementation for articles is a JavaScript timer, which sends this
-event after a predefined time has elapsed (and the user did not leave the page).
-The timespan after that the event is triggered should be dependent on the content,
-for example, it could be 30 seconds for a small newspaper article or a timespan
-calculated by the amount of words.
+The simplest implementation for articles is a JavaScript timer, which sends this event after a predefined time has elapsed (and the user did not leave the page).
+The timespan after that the event is triggered should be dependent on the content, for example, it could be 30 seconds for a small newspaper article or a timespan calculated by the amount of words.
 
 !!! note "Incremental tracking of consume events"
 
-    Consume events for a user can be sent incrementally as the recommender uses
-    only the highest percentage rate. For example, if a user watches a movie,
-    the website could send Consume events in 10% steps to avoid losing tracking
-    information when the browser window is forcibly closed.
+    Consume events for a user can be sent incrementally as the recommender uses only the highest percentage rate. For example, if a user watches a movie, the website could send Consume events in 10% steps to avoid losing tracking information when the browser window is forcibly closed.
 
 ### Deletefrombasket event
 
@@ -359,19 +294,13 @@ This event has no query string parameters. 
 
 ### Login event
 
-Recommendations rely on the fact that user actions can be correlated over a longer
-period of time.
-Moreover, recommendations similar to "users who viewed this product ultimately
-bought it" require correlating Click events with subsequent Buy events.
-In general, users tend to browse a website anonymously and add products to their
-shopping cart.
-Up to this point, a user is identified by a visit-scoped variable (for example,
-a session ID or a first party cookie).
+Recommendations rely on the fact that user actions can be correlated over a longer period of time.
+Moreover, recommendations similar to "users who viewed this product ultimately bought it" require correlating Click events with subsequent Buy events.
+In general, users tend to browse a website anonymously and add products to their shopping cart.
+Up to this point, a user is identified by a visit-scoped variable (for example, a session ID or a first party cookie).
 During the check-out of the shopping cart, a user probably logs in to an existing account.
-As a result, the user identifier changes from an anonymous visit-scoped ID
-(sourceuserid) to a pseudonymous, persistent account ID (targetuserid).
-You should correlate both IDs to correlate the Buy events (account ID) with
-the preceding Click events (visit-scoped ID).
+As a result, the user identifier changes from an anonymous visit-scoped ID (sourceuserid) to a pseudonymous, persistent account ID (targetuserid).
+You should correlate both IDs to correlate the Buy events (account ID) with the preceding Click events (visit-scoped ID).
 The Login event serves exactly this purpose.
 
 The format of the URL is: 
@@ -383,8 +312,7 @@ For a detailed description of embedded parameters, see [event parameters](#event
 ### Rate event
 
 Publishers, media or shops often allow commenting/rating products, articles or movies.
-If a user comments on an item, it indicates a special interest in this topic that has
-to be treated separately.
+If a user comments on an item, it indicates a special interest in this topic that has to be treated separately.
 
 The format of the URL is:
 
@@ -409,8 +337,7 @@ It can also be used as a basis for the price drop trigger.
 `GET https://event.perso.ibexa.co/api/[customerid]/wishlist/[userid]/[itemtypeid]/[itemid]?price=2.50EUR`
 
 For a detailed description of embedded parameters, see [event parameters](#event-parameters).
-In addition to the fact that an item is placed on the shopping list, this event can provide information
-about the product price at the time it was saved.
+In addition to the fact that an item is placed on the shopping list, this event can provide information about the product price at the time it was saved.
 
 |Name|Description|
 |---|---|
@@ -418,20 +345,15 @@ about the product price at the time it was saved.
 
 ## Tracking events based on recommendations
 
-Tracking events based on integrated recommendations are the only way to measure the accuracy
-and effectiveness of recommendations.
+Tracking events based on integrated recommendations are the only way to measure the accuracy and effectiveness of recommendations.
 Both recommendation response and trigger message include requests to generate these events.
-Events of this type inform the Personalization server about the recommendations that
-were shown to the user and which of those recommendations were clicked.
-Otherwise, it would be impossible to calculate reliable statistics that could be checked
-against the customer's KPIs.
+Events of this type inform the Personalization server about the recommendations that were shown to the user and which of those recommendations were clicked.
+Otherwise, it would be impossible to calculate reliable statistics that could be checked against the customer's KPIs.
 
 A recommendation response includes requests to generate a Rendered and Clickrecommended event.
 The first one is executed when a recommendation is shown to the user.
 The second is called when a recommendation is clicked or otherwise accepted.
-Sending Rendered events causes as many requests as recommendations to be displayed,
-a Clickrecommended event is usually sent only once (when a user clicks on
-a specific recommendation item).
+Sending Rendered events causes as many requests as recommendations to be displayed, a Clickrecommended event is usually sent only once (when a user clicks on a specific recommendation item).
 
 Example of a recommendation response:
 
@@ -493,11 +415,8 @@ For more information, see [Send messages with recommendations](../integrate_reco
 
 ### Rendered event
 
-This event is sent when the website uses the recommendation provided by the recommendation
-engine and renders it on the webpage.
-In combination with a predefined threshold, it allows the recommender engine to
-exclude this item from future results and avoid recommending the same item to the
-same user multiple times during a session.
+This event is sent when the website uses the recommendation provided by the recommendation engine and renders it on the webpage.
+In combination with a predefined threshold, it allows the recommender engine to exclude this item from future results and avoid recommending the same item to the same user multiple times during a session.
 
 The URL for a Rendered event has the following format:
 
@@ -505,14 +424,13 @@ The URL for a Rendered event has the following format:
 
 For a detailed description of embedded parameters, see [event parameters](#event-parameters).
 
-it's common that recommendations are rendered as a block with multiple items.
+It's common that recommendations are rendered as a block with multiple items.
 To save traffic and speed up the process, you can bundle multiple recommendations in one request.
 Several item IDs must be comma-separated.
 
 ### Clickrecommended event
 
-When the end users clicks a recommendation, the following event is sent
-to gather statistics related to the acceptance of recommendations.
+When the end users clicks a recommendation, the following event is sent to gather statistics related to the acceptance of recommendations.
 
 The URL has the following format:
 
@@ -525,12 +443,10 @@ The request parameters are:
 |---|---|---|
 |`scenario`|Name of the scenario, where recommendations originated from. This parameter is required.|URL-encoded alphanumeric|
 
-The scenario parameter identifies the originating scenario to gain detailed statistics
-about the scenario that motivated the user to click on a recommendation.
+The scenario parameter identifies the originating scenario to gain detailed statistics about the scenario that motivated the user to click on a recommendation.
 This information comes with the recommendation from the recommendation controller. 
 
-The event is used for providing statistics about how often users accepted the recommendations of
-the configured recommendation scenario or considered them as valuable.
+The event is used for providing statistics about how often users accepted the recommendations of the configured recommendation scenario or considered them as valuable.
 
 ### Triggeropened event
 
@@ -597,13 +513,11 @@ User "Js79009234YU7" puts products 128 and 129 into the cart.
 
 `GET https://event.perso.ibexa.co/api/00000/basket/Js79009234YU7/1/129`
 
-To buy selected products, user "Js79009234YU7" logs in and obtains an internal
-identifier (for example, the registration ID) "johndoe" from the site.
+To buy selected products, user "Js79009234YU7" logs in and obtains an internal identifier (for example, the registration ID) "johndoe" from the site.
 
 `GET https://event.perso.ibexa.co/api/00000/login/Js79009234YU7/johndoe`
 
-The user buys two products from the cart: product 128 (one piece for the price
-  of EUR 19.99) and product 129 (2 pieces for the price of EUR 4.44 each).
+The user buys two products from the cart: product 128 (one piece for the price of EUR 19.99) and product 129 (2 pieces for the price of EUR 4.44 each).
 
 `GET https://event.perso.ibexa.co/api/00000/buy/johndoe/1/128?quantity=1&fullprice=19.99EUR`
 `GET https://event.perso.ibexa.co/api/00000/buy/johndoe/1/129?quantity=2&fullprice=4.44EUR`
diff --git a/docs/personalization/api_reference/user_api.md b/docs/personalization/api_reference/user_api.md
index 991d46ec42..710baa385a 100644
--- a/docs/personalization/api_reference/user_api.md
+++ b/docs/personalization/api_reference/user_api.md
@@ -4,19 +4,18 @@ description: Use HTTP methods to correlate metadata with user data and combine u
 
 # User API
 
-When generating recommendations, it's useful to have the ability to correlate metadata 
-with user data and combine users into clusters of certain type.
-Such metadata can be gender, ZIP code, discount rate, etc. 
-You can use the following user metadata import format to enrich the tracked data with information that cannot be calculated and must be provided by the end-user. 
+When generating recommendations, it's useful to have the ability to correlate metadata with user data and combine users into clusters of certain type.
+Such metadata can be gender, ZIP code, discount rate, and more. 
+You can use the following user metadata import format to enrich the tracked data with information that cannot be calculated and must be provided by the end-user.
 
 If you plan to import user metadata, contact support@ibexa.co to ensure that you're compliant with privacy regulations.
 
 !!! note "Authentication"
 
     For importing metadata, basic authentication is enabled by default.
-    Use your customer ID and license key as username and password. 
+    Use your customer ID and license key as username and password.
     If authentication is enabled for recommendation requests and you want change this, contact support@ibexa.co.
-    
+
 ## GET requests
 
 Use the following request to fetch user attributes for the specified users:
@@ -40,21 +39,16 @@ For the requests to function, you must provide the following parameters:
 |---|---|---|
 |`customerid`|A customer ID (for example "00000"), as defined when [enabling Personalization](enable_personalization.md#set-up-customer-credentials). Can be used to identify a website in installations that [hosts multiple SiteAccesses]([[= user_doc =]]/personalization/use_cases/#multiple-website-hosting).|alphanumeric|
 |`source`|An ID of the source of the specified user's metadata.|alphanumeric|
-|`userid`|An ID of the tracked user in the website (for example, an internal customer code, a session code or a cookie for anonymous users.|alphanumeric|
-  
+|`userid`|An ID of the tracked user in the website (for example, an internal customer code, a session code, or a cookie for anonymous users.|alphanumeric|
+
 !!! caution "Parameter encoding limitations"
 
-      All parameters must be URL-encoded (see RFC 3986) and cannot contain slash, backslash or space 
-      characters.
-      
+      All parameters must be URL-encoded (see RFC 3986) and cannot contain slash, backslash or space characters.
+
 ##### Source
 
-The `source` parameter defines the system that stores the specified user's metadata. 
-If you have multiple source systems for updating user attributes, 
-for example, a registration service, where users define their gender and age, 
-or an application that integrates with Facebook to source the brands the user "liked" in your shop, 
-every new upload of attributes replaces the attribute set that already exists 
-for the same user/source pair.
+The `source` parameter defines the system that stores the specified user's metadata.
+If you have multiple source systems for updating user attributes, for example, a registration service, where users define their gender and age, or an application that integrates with Facebook to source the brands the user "liked" in your shop, every new upload of attributes replaces the attribute set that already exists for the same user/source pair.
 
 If you need to get all the available attributes for all sources, apply the `allSources` query string parameter, for example:
 
@@ -78,14 +72,14 @@ For example:
 ## DELETE request
 
 Use the following request to run an opt-out option to delete the user and all data related to this user. After this request, the user is deleted from the database.
- 
+
 `DELETE: https://admin.perso.ibexa.co/api/[customerid]/user/[userid[,userid[...]]]`
 
 ## Responses
 
 ### Response object format
 
-For an example of user metadata, see the following XML code. 
+For an example of user metadata, see the following XML code.
 The attribute keys and values are chosen at random.
 
 ``` xml
diff --git a/docs/personalization/attribute_search_in_elasticsearch.md b/docs/personalization/attribute_search_in_elasticsearch.md
index f3ab56b7c7..01c2b6a710 100644
--- a/docs/personalization/attribute_search_in_elasticsearch.md
+++ b/docs/personalization/attribute_search_in_elasticsearch.md
@@ -4,7 +4,8 @@ description: Attribute search uses Elasticsearch database to display dynamically
 
 # Attribute search in Elasticsearch database
 
-If you use external data source for personalization data, it's not possible to display external content in the Universal Discovery Widget as it's deprecated. Attribute search is used in scenario preview and editorials models instead.
+If you use external data source for personalization data, it's not possible to display external content in the Universal Discovery Widget as it's deprecated.
+Attribute search is used in scenario preview and editorials models instead.
 Attribute search works like an autocomplete feature, but values are dynamically taken from the Elasticsearch database.
 
 ## Configure attribute search
@@ -18,7 +19,7 @@ ibexa:
             personalization:
                 output_type_attributes:
                     <item_type_id>:
-                        title: <item_name>                        
+                        title: <item_name>
 ```
 
 
@@ -41,7 +42,7 @@ ibexa:
                         title: short_name
                         description: body
                         image: image
-                        
+
 ```
 
 ![Attributes search](perso_attributes_search.png)
diff --git a/docs/personalization/enable_personalization.md b/docs/personalization/enable_personalization.md
index 5af31b397f..4ff3d08e14 100644
--- a/docs/personalization/enable_personalization.md
+++ b/docs/personalization/enable_personalization.md
@@ -8,14 +8,12 @@ To enable it, you must set up authentication parameters that you receive from [[
 
 ## Get authentication parameters
 
-First, either you or another [[= product_name_base =]] user responsible for managing the [[= product_name =]]  
-instance must [request access to the service]([[= user_doc =]]/personalization/enabling_personalization/#request-access-to-the-server).
+First, either you or another [[= product_name_base =]] user responsible for managing the [[= product_name =]] instance must [request access to the service]([[= user_doc =]]/personalization/enabling_personalization/#request-access-to-the-server).
 
 ## Set up customer credentials
 
 When you receive the credentials, add them to your configuration.
-In the root folder of your project, edit either the `.env` or `.env.local` file 
-by adding the following lines with your customer ID and license key: 
+In the root folder of your project, edit either the `.env` or `.env.local` file by adding the following lines with your customer ID and license key:
 
 ```
 PERSONALIZATION_CUSTOMER_ID=12345
@@ -25,17 +23,15 @@ PERSONALIZATION_HOST_URI=https://server_uri
 
 !!! note "Configuring user credentials for different customers"
 
-    If your installation [hosts multiple sites]([[= user_doc =]]/personalization/use_cases/#multiple-website-hosting) with different 
-    customer IDs, for example, to provide separate recommendations for different 
-    language versions of the store, you can store all credentials in the same file:
-    
+    If your installation [hosts multiple sites]([[= user_doc =]]/personalization/use_cases/#multiple-website-hosting) with different customer IDs, for example, to provide separate recommendations for different language versions of the store, you can store all credentials in the same file:
+
     ```
     # Main credentials - ENU store
     PERSONALIZATION_CUSTOMER_ID=12345
     PERSONALIZATION_LICENSE_KEY=67890-1234-5678-90123-4567
     PERSONALIZATION_HOST_URI=https://server_uri
 
-    # Additional credentials - FRA store 
+    # Additional credentials - FRA store
     FRA_CUSTOMER_ID=54321
     FRA_LICENSE_KEY=09876-5432-1098-7654-3210
     FRA_HOST_URI=https://FRA_server_uri
@@ -45,29 +41,22 @@ PERSONALIZATION_HOST_URI=https://server_uri
 
 ## Configure Personalization
 
-The [Personalization package](https://github.com/ibexa/personalization-client) 
-adds a personalization solution to [[= product_name =]] and communicates with 
-the Personalization server.
+The [Personalization package](https://github.com/ibexa/personalization-client) adds a personalization solution to [[= product_name =]] and communicates with the Personalization server.
 
-Its job is to track the way visitors use the website and recommend content 
-based on their behavior.
+Its job is to track the way visitors use the website and recommend content based on their behavior.
 
 For more information about integrating the Personalization service, see [Developer guide](tracking_api.md) and [Best practices](tracking_integration.md).
 
 ### Set up item type tracking
 
-For the recommendations to be calculated, apart from visitor events (CLICK, BUY, etc.), 
-the Personalization server must receive a list of item types that are tracked.
+For the recommendations to be calculated, apart from visitor events (CLICK, BUY, etc.), the Personalization server must receive a list of item types that are tracked.
 
 You define item types to be tracked in [configuration files](configuration.md#configuration-files).
 The content is then initially exported by a script.
-After this, it's synchronized with the Personalization service every time a change 
-occurs (using any method that triggers the event).
+After this, it's synchronized with the Personalization service every time a change occurs (using any method that triggers the event).
 
 The Personalization configuration is SiteAccess-aware.
-If your installation hosts multiple sites with different customer IDs, 
-for example, to provide separate recommendations for different language versions 
-of the site, provide the credentials that correspond to each of the sites.
+If your installation hosts multiple sites with different customer IDs, for example, to provide separate recommendations for different language versions of the site, provide the credentials that correspond to each of the sites.
 
 The configuration can resemble the following example:
 
@@ -87,7 +76,7 @@ ibexa:
                         title: 'title'
                         image: 'image_legend'
                         description: 'sub_title'
-                    456: 
+                    456:
                         title: 'short_title'
                         image: 'primary_image'
                         description: 'sub_title'
@@ -105,7 +94,7 @@ ibexa:
                         title: 'title'
                         image: 'image_legend'
                         description: 'sub_title'
-                    456: 
+                    456:
                         title: 'short_title'
                         image: 'primary_image'
                         description: 'sub_title'
@@ -113,10 +102,9 @@ ibexa:
 
 !!! note "Authentication"
 
-    For data exchange purposes, basic authentication is enabled by default. 
+    For data exchange purposes, basic authentication is enabled by default.
     To change this, contact support@ibexa.co.
-    For security reasons, [store the authentication credentials in the ENV file](#set-up-customer-credentials), 
-    and don't commit them to the Version Control System.
+    For security reasons, [store the authentication credentials in the ENV file](#set-up-customer-credentials), and don't commit them to the Version Control System.
     Then, use environment variables to pull them into the YAML file.
 
 | Parameter                            | Description                                               |
@@ -142,8 +130,7 @@ ibexa:
 
 #### Enable tracking
 
-The Personalization client bundle delivers a Twig extension
-which helps integrate the user tracking functionality into your site.
+The Personalization client bundle delivers a Twig extension which helps integrate the user tracking functionality into your site.
 Place the following code snippet in the `<head>` section of your header template:
 
 ``` html+twig
@@ -163,8 +150,7 @@ As the API uses token based authorization you first need a valid bearer token.
 
 When you publish a content item a bearer token is created and saved to the `ibexa_token` db table.
 
-Additionally a POST request is send to the Personalization Engine,  containing the token
-and the Rest URL where the Personalization Engine can fetch the changed Content.
+Additionally a POST request is send to the Personalization Engine,  containing the token and the Rest URL where the Personalization Engine can fetch the changed Content.
 
 The `BEARER_TOKEN` is the newest one in `ibexa_token` table having `type=1` and `identifier=update`. The token has a default lifetime of one day.
 
@@ -231,8 +217,7 @@ The `content` endpoint returns one item and the `contentlist` endpoint returns m
 
 To get recommendations you must first export the item information to the Personalization server.
 
-After you [define item types to be tracked and recommended](#set-up-item-type-tracking),
-start the full export.
+After you [define item types to be tracked and recommended](#set-up-item-type-tracking), start the full export.
 
 You need to run the `ibexa:personalization:run-export command per SiteAccesses that you want to use together with Personalization. You need different customer IDs for different SiteAccesses.
 
@@ -245,12 +230,9 @@ php bin/console ibexa:personalization:run-export
     --languages=<language>,<language>
 ```
 
-The bundle exporter collects all content related to the `<site_access_name>`/`<customer_id>` 
-pair and stores it in files to the folder `public/var/export/yyyy/mm/dd/hh/mm` of your project.
-After finishing, the system sends a POST request to the endpoint and informs the 
-Personalization server to fetch new content.
-An internal workflow is then triggered, so that the generated files are downloaded 
-and imported in the Personalization server's content store.
+The bundle exporter collects all content related to the `<site_access_name>`/`<customer_id>` pair and stores it in files to the folder `public/var/export/yyyy/mm/dd/hh/mm` of your project.
+After finishing, the system sends a POST request to the endpoint and informs the Personalization server to fetch new content.
+An internal workflow is then triggered, so that the generated files are downloaded and imported in the Personalization server's content store.
 
 The export process can take several minutes.
 
@@ -258,8 +240,7 @@ The export process can take several minutes.
 
 !!! caution "Re-exporting modified item types"
 
-    If the item types to be recommended change, you must perform a new full export
-    by running the `php bin/console ibexa:personalization:run-export` command again.
+    If the item types to be recommended change, you must perform a new full export by running the `php bin/console ibexa:personalization:run-export` command again.
 
 #### Check export results
 
@@ -277,7 +258,7 @@ To get the data of an imported item you can request the following REST resource:
 
 `GET https://admin.perso.ibexa.co/api/<your_customer_id>/item/<your_item_type_id>/<your_item_id>`
 
-This way uses basic authentication. 
+This way uses basic authentication.
 The username is the customer ID and the password is the license key.
 
 ??? note "Example response"
@@ -331,10 +312,8 @@ In the back office, go to **Personalization** > **Import** and review the list o
 
 The Personalization server is automatically kept in sync with the content in [[= product_name =]].
 
-Every time an editor creates, updates or deletes content in the back office,
-a notification is sent to https://admin.perso.ibexa.co/.
-The personalization service also notifies other components of the Personalization server
-and it eventually fetches the affected content and updates it internally.
+Every time an editor creates, updates or deletes content in the back office, a notification is sent to https://admin.perso.ibexa.co/.
+The personalization service also notifies other components of the Personalization server and it eventually fetches the affected content and updates it internally.
 
 ![Subsequent content exports](incremental_content_export.png)
 
@@ -342,14 +321,10 @@ and it eventually fetches the affected content and updates it internally.
 
 !!! note "Client-based recommendations"
 
-    Recommendations are fetched and rendered asynchronously, so there 
-    is no additional load on the server.
-    Therefore, it's crucial that you check whether the content export was successful, 
-    because certain references, for example, deeplinks and image references, are 
-    included.
+    Recommendations are fetched and rendered asynchronously, so there is no additional load on the server.
+    Therefore, it's crucial that you check whether the content export was successful, because certain references, for example, deeplinks and image references, are included.
     If the export fails, the Personalization server doesn't have full content information.
-    As a result, even if the recommendations are displayed, they might miss images, 
-    titles or deeplinks.
+    As a result, even if the recommendations are displayed, they might miss images, titles or deeplinks.
 
 To display recommendations on your site, you must include the asset in the template using the following code:
 
@@ -374,8 +349,7 @@ render(controller('ibexa_personalization::showRecommendationsAction', {
 
 !!! tip
 
-    To check whether tracking is enabled on the front end, use the 
-    `ibexa_recommendation_enabled()` Twig function.
+    To check whether tracking is enabled on the front end, use the `ibexa_recommendation_enabled()` Twig function.
     You can wrap the call to the `RecommendationController` with:
 
     ``` html+twig
@@ -402,21 +376,18 @@ You can also bypass named arguments with standard value passing as arguments.
 
 !!! note "Custom templates"
 
-    To use a custom template for displaying recommendations,
-    ensure that it includes `event_tracking.html.twig`:
+    To use a custom template for displaying recommendations, ensure that it includes `event_tracking.html.twig`:
 
     `{% include '@IbexaPersonalization/event_tracking.html.twig' %}`.
 
-Recommendation responses contain all content data that is requested as attribute 
-in the recommendation call.
+Recommendation responses contain all content data that is requested as attribute in the recommendation call.
 This response data can be used in templates to render and style recommendations.
 
-For example, the following GET request should deliver the response below
-if the content fields were previously exported by the export script.
+For example, the following GET request should deliver the response below if the content fields were previously exported by the export script.
 
 `GET https://reco.perso.ibexa.co/api/v2/<your_customer_id>/someuser/popular.json?contextitems=71&numrecs=5&categorypath=/&outputtypeid=<your_item_type>&attribute=name,author,uri,image`
 
-??? note "Example response"
+!!! note "Example response"
 
     ``` json
     {
@@ -507,8 +478,7 @@ if the content fields were previously exported by the export script.
 
 #### Modify recommendation data
 
-You can retrieve data returned from the Personalization server and modify it 
-before it's shown to the user.
+You can retrieve data returned from the Personalization server and modify it before it's shown to the user.
 
 To modify recommendation data, subscribe to `RecommendationResponseEvent`.
 See [`Event/Subscriber/RecommendationEventSubscriber.php`](https://github.com/ibexa/personalization-client/blob/main/src/lib/Event/Subscriber/RecommendationEventSubscriber.php) for an example:
@@ -522,18 +492,15 @@ public static function getSubscribedEvents(): array
 }
 ```
 
-The `-10` refers to priority, which must be negative so this action is performed 
-before the main subscriber is run.
+The `-10` refers to priority, which must be negative so this action is performed before the main subscriber is run.
 
 ### Image variations
 
 Displaying image variations isn't supported out of the box.
 
-You can work around this limitation by creating a template
-(based on [recommendations.html.twig](https://github.com/ibexa/personalization-client/blob/main/src/bundle/Resources/views/recommendations.html.twig)).
+You can work around this limitation by creating a template (based on [recommendations.html.twig](https://github.com/ibexa/personalization-client/blob/main/src/bundle/Resources/views/recommendations.html.twig)).
 
-To access a specific image variation through API, add the `image` parameter to the 
-request URL with the name of the variation as its value.
+To access a specific image variation through API, add the `image` parameter to the request URL with the name of the variation as its value.
 For example, to retrieve the `rss` variation of the image, use:
 
 `/api/ezp/v2/ibexa_recommendation/v1/contenttypes/16?lang=eng-GB&fields=title,description,image,intro,name&page=1&page_size=20&image=rss`
@@ -559,12 +526,8 @@ You can replace `info` with `debug` to increase verbosity.
 
 ## Set up user roles and permissions
 
-Depending on your requirements, you may need to set up `edit` and `view` [permissions](permissions.md) 
-to grant users access to recommendation settings that relate to different SiteAccesses 
-and results that come from these websites.
+Depending on your requirements, you may need to set up `edit` and `view` [permissions](permissions.md) to grant users access to recommendation settings that relate to different SiteAccesses and results that come from these websites.
 
 ## Configure recommendation logic
 
-When you enable the Personalization, you can go back to the back office, 
-refresh the Personalization dashboard and proceed with [configuring the logic]([[= user_doc =]]/personalization/perso_configuration) 
-used to calculate the recommendation results.
+When you enable the Personalization, you can go back to the back office, refresh the Personalization dashboard and proceed with [configuring the logic]([[= user_doc =]]/personalization/perso_configuration) used to calculate the recommendation results.
diff --git a/docs/personalization/importing_historical_user_tracking_data.md b/docs/personalization/importing_historical_user_tracking_data.md
index 987732cef6..2617bdc13a 100644
--- a/docs/personalization/importing_historical_user_tracking_data.md
+++ b/docs/personalization/importing_historical_user_tracking_data.md
@@ -5,20 +5,15 @@ description: Use historical user tracking data to build user profiles and genera
 # Importing historical user tracking data
 
 The recommendation engine supports replaying historical user events by adding a special parameter *overridetimestamp* on the buy event to simulate the event date.
-This is then used as the datetime of an event instead of the current timestamp 
-of the request.
+This is then used as the datetime of an event instead of the current timestamp of the request.
 
-To give an example: it's often requested to import the buy history of users 
-to avoid the cold start problem and being able to start with good recommendations.
-Instead of waiting till the user profile is built by collecting events from the day,
-you implemented the tracking.
-Usually a curl input file is generated which creates buy requests that are sent 
-to the tracking endpoint.
+To give an example: it's often requested to import the buy history of users to avoid the cold start problem and being able to start with good recommendations.
+Instead of waiting till the user profile is built by collecting events from the day, you implemented the tracking.
+Usually a curl input file is generated which creates buy requests that are sent to the tracking endpoint.
 
 !!! note "User identifiers"
 
-    Ensure that user identifiers used in an import file are the same that 
-    are used in the live tracking, for example, the user login identifiers.
+    Ensure that user identifiers used in an import file are the same that are used in the live tracking, for example, the user login identifiers.
 
 There must be some validation to avoid importing buy events by any user.
 Therefore a signature parameter needs to be added, which is calculated like the following:
@@ -28,12 +23,10 @@ Therefore a signature parameter needs to be added, which is calculated like the
 !!! caution "Parameters without a value"
 
     The order of the parameters to be signed is crucial.
-    They must be sent in alphabetical order based on the parameter names to create 
-    a signature.
+    They must be sent in alphabetical order based on the parameter names to create a signature.
     Encodings must always contain capital letters (for example, %3A and not %3a).
 
-    If a parameter value is "" or "null" or "undefined" it needs to be excluded from 
-    the signing and must not be sent in the query string.
+    If a parameter value is "" or "null" or "undefined" it needs to be excluded from the signing and must not be sent in the query string.
 
     **valid**: `https://event.perso.ibexa.co/api/00000/buy/johndoe/1/11?fullprice=19.99EUR&overridetimestamp=2012-01-01T11%3A00%3A00&quantity=1&signature=d0026f017ae823f19530d93318c5a2f6`
 
@@ -41,8 +34,7 @@ Therefore a signature parameter needs to be added, which is calculated like the
 
 ## Example
 
-With a license key of "8695-1828-92810-5535-4239" and a purchase of certain 
-products, there can be the following signature values:
+With a license key of "8695-1828-92810-5535-4239" and a purchase of certain products, there can be the following signature values:
 
 ```
 https://event.perso.ibexa.co/api/00000/buy/johndoe/1/11?fullprice=19.99EUR&overridetimestamp=2012-01-01T11%3A00%3A00&quantity=1&signature=d0026f017ae823f19530d93318c5a2f6
diff --git a/docs/personalization/integrate_recommendation_service.md b/docs/personalization/integrate_recommendation_service.md
index 4b9613ffcb..9c38003577 100644
--- a/docs/personalization/integrate_recommendation_service.md
+++ b/docs/personalization/integrate_recommendation_service.md
@@ -5,8 +5,7 @@ description: Integrate recommendation service into your website.
 # Integrate recommendation service
 
 To return recommendations, you must first [enable the Personalization service](enable_personalization.md).
-Next, integrate the service with [[= product_name =]] by activating
-event tracking and embedding recommendation results into the website.
+Next, integrate the service with [[= product_name =]] by activating event tracking and embedding recommendation results into the website.
 
 !!! note
 
@@ -16,18 +15,15 @@ event tracking and embedding recommendation results into the website.
 ## Track events
 
 The service primarily relies on event tracking.
-For the events to be registered, every content item or product page must call
-a special tracking URL.
-The easiest way of embedding the tracking URL is placing a one pixel image on every page,
-like in the case of analytical tools or visitor counters.
+For the events to be registered, every content item or product page must call a special tracking URL.
+The easiest way of embedding the tracking URL is placing a one pixel image on every page, like in the case of analytical tools or visitor counters.
 A code that includes an image looks like this:
 
 `<img href="https://event.perso.ibexa.co/ebl/00000/click/<user_ID>/<content_type_ID>/<content_ID>" width="1" height="1">`
 
 where:
 
-- `<user_ID>` stands either for the user ID or session ID of the user who is currently
-logged into your website (any URL-encoded string is allowed).
+- `<user_ID>` stands either for the user ID or session ID of the user who is currently logged into your website (any URL-encoded string is allowed).
 
 - `<content_type_ID>` stands for the [contentTypeId](content_model.md#content-information) of the content item or product that you want to track and recommend.
 
@@ -214,9 +210,7 @@ The object contains links to the recommended items (`triggerOpenedLink`, `clickR
 
 ## Advanced integration
 
-You can configure integration at a more advanced level to track more events,
-use additional parameters, apply custom scenario configurations, filters,
-and enable additional features.
+You can configure integration at a more advanced level to track more events, use additional parameters, apply custom scenario configurations, filters, and enable additional features.
 
 For more information about available functionalities, see [User Documentation]([[= user_doc =]]/personalization/personalization).
 
diff --git a/docs/personalization/legacy_recommendation_api.md b/docs/personalization/legacy_recommendation_api.md
index 7afe65f3d1..9625bd28ca 100644
--- a/docs/personalization/legacy_recommendation_api.md
+++ b/docs/personalization/legacy_recommendation_api.md
@@ -6,34 +6,27 @@ description: An old method of fetching recommendations from the system using rec
 
 !!! caution
 
-    This is a page describing the old version of the recommendation API. 
+    This is a page describing the old version of the recommendation API.
     It's available for reference purposes only.
 
     Use the new [Recommendation API](recommendation_api.md) instead.
 
-This page describes how to fetch recommendations from the Recommender System through
-recommendation requests.
-Before recommendation can be fetched from the recommendation controller, a sufficient 
-number of events must be collected and the model build must finish successfully.
+This page describes how to fetch recommendations from the Recommender System through recommendation requests.
+Before recommendation can be fetched from the recommendation controller, a sufficient number of events must be collected and the model build must finish successfully.
 
 !!! note
 
-    **BASIC Authentication** for fetching recommendations is enabled for some 
-    configurations (for example for Gambio Plugin) by default.
+    **BASIC Authentication** for fetching recommendations is enabled for some configurations (for example for Gambio Plugin) by default.
     Use the `customerid` as username and the license key as password.
-    The license key is displayed in the upper right in the [Admin GUI](https://admin.yoochoose.net/)) 
-    after you log in with your registration credentials.
+    The license key is displayed in the upper right in the [Admin GUI](https://admin.yoochoose.net/)) after you log in with your registration credentials.
 
-    If you plan to use [JSONP](https://www.w3schools.com/js/js_json_jsonp.asp), authentication 
-    must be disabled.
+    If you plan to use [JSONP](https://www.w3schools.com/js/js_json_jsonp.asp), authentication must be disabled.
     If it's enabled in your solution (can be easily tested with a recommendation request in a browser), please contact the eZ Recommender support (<support@yoochoose.com>) for further information and disabling.
 
 ## Getting recommendations
 
-Recommendations are retrieved from the Personalization server with RESTful requests 
-by using the GET method.
-The result is a list of item IDs that can be used to call the underlying CMS 
-or shop system, to retrieve the necessary information for the rendering process.
+Recommendations are retrieved from the Personalization server with RESTful requests by using the GET method.
+The result is a list of item IDs that can be used to call the underlying CMS or shop system, to retrieve the necessary information for the rendering process.
 
 To allow the customer to retrieve different types of recommendations based on different methods (for example, Collaborative Filtering, Content Based, Stereotype, etc.) the Recommendation System uses scenario IDs relating to a predefined set of configurations inside the system.
 These configurations are a combination of methods and filters that should be applied including possible fallbacks if the requested methods don't deliver a result.
@@ -77,7 +70,7 @@ It fetches 8 recommendations for user Smith, who is watching the item 123 and th
 ## Response handling
 
 The recommendation request returns a list of item IDs that are JSON, JSONP or XML-formatted.
-The result can be easily integrated into any webpage by using some lines of script code. 
+The result can be integrated into any webpage by using some lines of script code. 
 
 !!! tips
 
@@ -156,11 +149,11 @@ The format of error messages can be changed and should not be used for automated
 
 ## Advanced Request Parameter
 
-There are some additional very special request parameters.
+There are some additional special request parameters.
 
 ###### any attribute name (used only if submodels are configured)
 
-Item's attribute, for example, color, price, etc.
+Item's attribute, for example, color, price, and more.
 These are customer specific and can only be understood by the recommender system if the item attributes are imported by using the YOOCHOOSE content import APIs.
 There can be multiple attributename and attributevalue pairs.
 
@@ -212,16 +205,22 @@ Recommendation service support following HTTP headers to allow cache control on
 |Response|`Last-Modified`|The last modification date of the recommendations.|`Last-Modified: Tue, 15 Nov 2013 12:45:26 GMT`|-|
 ||`Expires`|Gives the date/time after which the response is considered to be outdated|`Expires: Thu, 01 Dec 2013 16:00:00 GMT`|-|
 
-The last modification timestamp indicates a change that could influence the recommendation response. It depends on an updated recommendation calculation, an update of an item or some scenario configuration changes. The expiration timestamp is a best-effort prediction based on the model building configuration and provided context. The shortest expiration period is 5 minutes from the request time. The longest is 24 hours. In the table below several examples are illustrated:
+The last modification timestamp indicates a change that could influence the recommendation response.
+It depends on an updated recommendation calculation, an update of an item or some scenario configuration changes.
+The expiration timestamp is a best-effort prediction based on the model building configuration and provided context.
+The shortest expiration period is 5 minutes from the request time. The longest is 24 hours.
+In the table below several examples are illustrated:
 
 | Model | Context | Expiration time | Description |
 |------|------|-----|-----|
-| Bestselling products last 7 days | no context | 24 hours | The model with the 7 days scope is usually built once a day. It can be easily cached for 24 hours. It has no context and can therefore be cached globally for all the users of a customer. |
+| Bestselling products last 7 days | no context | 24 hours | The model with the 7 days scope is usually built once a day. It can be cached for 24 hours. It has no context and can therefore be cached globally for all the users of a customer. |
 | Also bought products in the last month | current product | 24 hours | The model with the 30 days scope is usually built once a day. The context is always the same. It can be cached for every product. The same result can be used for all users of a customer. |
 | Also consumed read articles in the last hour | current article | 30 minutes | Models with a short scope are usually built several times a day or even per hour. In this case the expiration time is set to the half of the model build frequency/period. |
 | Personalized recommendation based on the user's statistic | customers click history | now | Although the statistic model isn't updated within minutes, it's very likely that the context is changed shortly (customer clicks another product and therefore the click is added to his history). The expiration time should not be much longer than the user activity on the web page. |
 
-In most cases you don't need to calculate the expiration time manually. The table above is provided for the orientation, how the Expires header of the HTTP response is calculated by the recommendation engine and already provided to your caching system. You just need to make sure that the Expires header is used in the configuration of your caching system instead of a static value out of your configuration.
+In most cases you don't need to calculate the expiration time manually.
+The table above is provided for the orientation, how the Expires header of the HTTP response is calculated by the recommendation engine and already provided to your caching system.
+You just need to make sure that the Expires header is used in the configuration of your caching system instead of a static value out of your configuration.
 
 ## Integration best Practices
 
@@ -254,7 +253,7 @@ One of the possible technique to work around this limitation is [JSONP](https://
 
 A better solution in comparison with JSONP is to provide the proxy on the server side, which forwards script requests to the Recommender system.
 It can be implemented as a very simple proxy using the [mod\_proxy module](https://httpd.apache.org/docs/2.2/mod/mod_proxy.html) of Apache Webserver.
-It just transfers the data and the JavaScript renders the response into HTML itself.
+It transfers the data and the JavaScript renders the response into HTML itself.
 
 An alternative approach is creating the HTML code on the server side for every target page in a sense to simplify the script on the client side.
 
@@ -267,7 +266,7 @@ An overview of pros and cons for each of the above techniques:
 |Problem|Simple Way|Bottom loading|Background loading|JSONP|XMLHttpRequest + Proxy|
 |---|---|---|---|---|---|
 |Isn't blocked by ad blockers or no-track plug-ins|Yes|Yes|Yes|-|Yes|
-|Works if JavaScript is disabled|Yes|depends|-|-|-|	 	 
+|Works if JavaScript is disabled|Yes|depends|-|-|-|
 |Works for server without multithreading functionality|Yes|Yes|-|Yes|Yes|
 |Compatible with frontend caching on the server|-|-|-|Yes|Yes|
 |Doesn't delay page rendering|-|depends|depends|Yes|Yes|
diff --git a/docs/personalization/personalization.md b/docs/personalization/personalization.md
index f5e3be3e88..809d8ca769 100644
--- a/docs/personalization/personalization.md
+++ b/docs/personalization/personalization.md
@@ -5,10 +5,9 @@ page_type: landing_page
 
 # Personalization
 
-Ibexa Personalization is a service that allows you to track the visitors of your website and offers personalized recommendations or serves targeted content, based on their preferences and behavior.
+[[= product_name_base =]] Personalization is a service that allows you to track the visitors of your website and offers personalized recommendations or serves targeted content, based on their preferences and behavior.
 
-Personalization can be used both by publishers, for example, to track content consumption 
-and promote content, and in e-commerce, to drive purchases.
+Personalization can be used both by publishers, for example, to track content consumption and promote content, and in e-commerce, to drive purchases.
 
 To provide online recommendations, the service must at least:
 
diff --git a/docs/personalization/personalization_guide.md b/docs/personalization/personalization_guide.md
index 5ac6746336..44070c6156 100644
--- a/docs/personalization/personalization_guide.md
+++ b/docs/personalization/personalization_guide.md
@@ -30,7 +30,7 @@ Now, you can start collecting data and boost your business.
 
 Personalization with tracking scripts, monitors  individual sessions from user’s behavior and interest data through events (clicks, viewed articles, pages, purchases) and demographic data (location, industry, occupation).
 
-Next, collects data and computes models thanks to complex algorithms. 
+Next, collects data and computes models thanks to complex algorithms.
 
 Personalization is SiteAcces-aware, it means it can serve on multiple sites with different customer IDs and deliver recommendations for each site (for example, if you host multi language site).
 
@@ -42,13 +42,13 @@ Use Twig extension to add a tracking script and implement it into your site conf
 
 Models are statistics-based and perform calculations based on data from content, users and events.
 
-They work in the background and update on regular time intervals to ensure best and accurate recommendations. Personalization service includes a few predefined models according to your needs and agreements between your organization and Ibexa.
+They work in the background and update on regular time intervals to ensure best and accurate recommendations. Personalization service includes a few predefined models according to your needs and agreements between your organization and [[= product_name_base =]].
 
 If you need more customized models, contact customer support.
 
 Personalization service includes the following model types:
 
-- popularity models - based on trends, Top clicked, Top purchased, algorithm recommends trending content 
+- popularity models - based on trends, Top clicked, Top purchased, algorithm recommends trending content
 
 - collaborative models - generate predictions by analyzing user behavior and their interactions with target items, compares to other users behavior with similar browsing behavior
 
@@ -61,11 +61,14 @@ Personalization service includes the following model types:
 
 ### Scenarios
 
-Scenarios are sequences of events. You can use scenarios to determine how and when render particular content to your customers. Each scenario can include also subscenarios used for granular personalized rendering of content.
+Scenarios are sequences of events.
+You can use scenarios to determine how and when render particular content to your customers.
+Each scenario can include also subscenarios used for granular personalized rendering of content.
 
 ### Segments
 
-Use segments to get content targeted at particular user groups. Segments calculate models based on the segment attribute factor. Assign users to different recommendation groups and create advanced logic with operators to get best segmentation for your audience.
+Use segments to get content targeted at particular user groups.
+Segments calculate models based on the segment attribute factor. Assign users to different recommendation groups and create advanced logic with operators to get best segmentation for your audience.
 
 ![Segments](perso_segment_group_or.png)
 
@@ -87,35 +90,43 @@ For more information, see documentation for API operations available for Persona
 
 ### Web design and content development
 
-Create websites with content targeted at your customers. Deliver your visitors relevant content and build trust in your brand.
+Create websites with content targeted at your customers.
+Deliver your visitors relevant content and build trust in your brand.
 
 ### Reduce clutter and improve customer retention
 
 Help users find content of their interest quicker, use words to appeal to individual customers and segments.
 Enrich customer data by integrating [[= product_name_base =]] Personalization with other systems such as ERP, CRMs.
 Track user’s scenarios and develop strategies that match your strategies and improve engagement.
+
 ### Satisfy customer expectations
 
 Personalization engine shows customers products relevant to their interests, builds a feeling of connection and understanding.
 
 ### Increase customer engagement
 
-Targeted and customized content considerably improves engagement by delivering content that fits your visitors interests and anticipates their needs. This creates a bound between your brand and users who spend more time on your website, and are more likely to come back to your services. A kind of loyalty is created.
+Targeted and customized content considerably improves engagement by delivering content that fits your visitors interests and anticipates their needs.
+This creates a bound between your brand and users who spend more time on your website, and are more likely to come back to your services.
+A kind of loyalty is created.
 
 ### Improve customer experience
 
-Stand out from other companies by provided well-suited content and make a space for your customers where they feel known and valued and treated exceptional. Build trust and a bond with visitors, who are more likely to come back.
+Stand out from other companies by provided well-suited content and make a space for your customers where they feel known and valued and treated exceptional.
+Build trust and a bond with visitors, who are more likely to come back.
 
-### Increase average order value 
+### Increase average order value
 
-Apply collaborative models with predictive analysis and find out what motivates users to put extra items into their carts. Start building predictions of their behaviors and suggest items, products your visitors are willing to buy.
+Apply collaborative models with predictive analysis and find out what motivates users to put extra items into their carts.
+Start building predictions of their behaviors and suggest items, products your visitors are willing to buy.
 
 ![Dashboard](perso_dashboard_revenue.png)
 
 
-### Measure your return and boost conversion rates 
+### Measure your return and boost conversion rates
 
-Connect Personalization engine with your eCommerce shop, focus on the revenue generated by recommendations. Track what recommendations are shown to your visitors and analyze conversion rates. Effectively evaluate quality of recommendations and compare with your KPIs.
+Connect Personalization engine with your eCommerce shop, focus on the revenue generated by recommendations.
+Track what recommendations are shown to your visitors and analyze conversion rates.
+Effectively evaluate quality of recommendations and compare with your KPIs.
 
 ## Use cases
 
diff --git a/docs/personalization/recommendation_integration.md b/docs/personalization/recommendation_integration.md
index 16b1e861e4..e2d0265b1e 100644
--- a/docs/personalization/recommendation_integration.md
+++ b/docs/personalization/recommendation_integration.md
@@ -4,68 +4,46 @@ description: Methods for REST call with Personalization server.
 
 # Recommendation integration
 
-There are several ways to integrate the REST calls with the Personalization server 
-and to avoid blocking webpage rendering, if the communication with the Recommender 
-is distrusted or interrupted.
+There are several ways to integrate the REST calls with the Personalization server and to avoid blocking webpage rendering, if the communication with the Recommender is distrusted or interrupted.
 
 ## Use page blocks
 
-[[= product_name =]] ships with a number of page blocks that editors can place on
-landing pages and configure to present scenario results.
-To work, these blocks require that Personalization and scenarios are properly 
-configured.
-For a list of all page blocks that are available out-of-the-box, 
-see [Page block reference]([[= user_doc =]]/content_management/block_reference/).
+[[= product_name =]] ships with a number of page blocks that editors can place on landing pages and configure to present scenario results.
+To work, these blocks require that Personalization and scenarios are properly configured.
+For a list of all page blocks that are available out-of-the-box, see [Page block reference]([[= user_doc =]]/content_management/block_reference/).
 
 ## Request recommendations synchronously
 
-The simplest way to load recommendations is to synchronously request the Personalization 
-server for recommendations as they're needed. This way is sufficient in most cases. 
-The most important drawback is that the request time increases by the time 
-of the recommendation request. 
-If the network is overloaded or the Personalization server isn't available, 
-it can lock the request.
+The simplest way to load recommendations is to synchronously request the Personalization server for recommendations as they're needed. This way is sufficient in most cases.
+The most important drawback is that the request time increases by the time of the recommendation request.
+If the network is overloaded or the Personalization server isn't available, it can lock the request.
 
 ## Load in the bottom
 
-You can place the code that loads the data from the eZ Recommender at the bottom 
-of the generated document and flush the output buffer to the client 
-before requesting recommendations. 
-The browser gets a whole page to render and can display it even if the very end 
-of the page is still loading. 
-Then the JavaScript code with the recommendation information loaded at the bottom 
-of the page must fill the gaps on the page with recommendations as soon as 
-it's completely loaded.
+You can place the code that loads the data from the eZ Recommender at the bottom of the generated document and flush the output buffer to the client before requesting recommendations.
+The browser gets a whole page to render and can display it even if the very end of the page is still loading.
+Then the JavaScript code with the recommendation information loaded at the bottom of the page must fill the gaps on the page with recommendations as soon as it's completely loaded.
 
 ## Non-blocking load in the background
 
-If the website is implemented in a language that supports multithreading or 
-non-blocking I/O, the recommendation request can start right after the browser 
-request is received. 
-The page generation and the recommendation requests are accomplished in parallel. 
-By combining this idea with the previous solution and placing the recommendation 
-results at the bottom of the page you can avoid any interruption in the processing.
+If the website is implemented in a language that supports multithreading or non-blocking I/O, the recommendation request can start right after the browser request is received.
+The page generation and the recommendation requests are accomplished in parallel.
+By combining this idea with the previous solution and placing the recommendation results at the bottom of the page you can avoid any interruption in the processing.
 
 ## Load from JavaScript using JSONP
 
-You cannot request the recommendation controller server directly from the JavaScript 
-(over AJAX library or directly over XMLHttpRequest) because of the cross-domain 
-restriction in most browsers. 
+You cannot request the recommendation controller server directly from the JavaScript (over AJAX library or directly over XMLHttpRequest) because of the cross-domain restriction in most browsers.
 One of the possible ways to work around this limitation is JSONP.
 
 ## Load over proxy
 
-A better solution than JSONP is to provide the proxy on the server side, which 
-forwards script requests to the Personalization service. 
-It can be implemented as a basic proxy using the `mod_proxy` module of 
-the Apache Webserver. 
+A better solution than JSONP is to provide the proxy on the server side, which forwards script requests to the Personalization service.
+It can be implemented as a basic proxy using the `mod_proxy` module of the Apache Webserver.
 It transfers the data and the JavaScript renders the response into HTML itself.
 
-An alternative approach is to create the HTML code on the server side for every 
-target page, to simplify the script on the client side.
+An alternative approach is to create the HTML code on the server side for every target page, to simplify the script on the client side.
 
-You can use the following tools as an implementation of such a proxy: 
-the Apache proxy module, an independent daemon like “netcat” or a PHP script.
+You can use the following tools as an implementation of such a proxy: the Apache proxy module, an independent daemon like “netcat” or a PHP script.
 
 ## Comparison
 
@@ -74,7 +52,7 @@ An overview of pros and cons for each of the presented techniques:
 |Feature|Synchronous loading|Bottom loading|Background loading|JSONP|XMLHttpRequest + Proxy|
 |---|---|---|---|---|---|
 |Isn't blocked by ad blockers or no-track plug-ins|&#10004;|&#10004;|&#10004;|-|&#10004;|
-|Works if JavaScript is disabled|Yes|depends|-|-|-|	 	 
+|Works if JavaScript is disabled|Yes|depends|-|-|-|
 |Works for server without multithreading functionality|&#10004;|&#10004;|-|&#10004;|&#10004;|
 |Compatible with frontend caching on the server|-|-|-|&#10004;|&#10004;|
 |Doesn't delay page rendering|-|depends|depends|&#10004;|&#10004;|
diff --git a/docs/personalization/tracking_integration.md b/docs/personalization/tracking_integration.md
index 89dfb423f1..f526e90639 100644
--- a/docs/personalization/tracking_integration.md
+++ b/docs/personalization/tracking_integration.md
@@ -4,9 +4,8 @@ description: See the methods of event tracking integration using tracking from s
 
 # Tracking integration
 
-There are several ways to integrate event reporting into the webpage. 
-The simplest way is to generate code of a tiny image and put it on the webpage 
-where the event must be sent [pixel tracking](integrate_recommendation_service.md#track-events).
+There are several ways to integrate event reporting into the webpage.
+The simplest way is to generate code of a tiny image and put it on the webpage where the event must be sent [pixel tracking](integrate_recommendation_service.md#track-events).
 
 For example, with HTML: 
 
@@ -25,49 +24,38 @@ img.src = "https://event.perso.ibexa.co/ebl/00000/click/johndoe/1/100?categorypa
 
 <!-- doubled information from integrate recommendation service-->
 
-The drawback of this option is that such calls can be blocked by ad blockers 
-or do-not-track plugins on the client side.
+The drawback of this option is that such calls can be blocked by ad blockers or do-not-track plugins on the client side.
 
 ## Server-side tracking
 
-Another option is to call the tracker from the server. 
-The most important drawback is that the event request increases the general request time. 
-If the network is overloaded or the Personalization server isn't available, 
-the number of requests can grow and lead to a stalled and finally crashing HTTP service. 
+Another option is to call the tracker from the server.
+The most important drawback is that the event request increases the general request time.
+If the network is overloaded or the Personalization server isn't available, the number of requests can grow and lead to a stalled and finally crashing HTTP service.
 See below the techniques that help avoid these problems.
 
 ### Tracking at the bottom
 
-You can place the code at the very end of the generating script 
-and flush the output buffer to the client before sending the events. 
-The connection to the browser can remain open for the time of processing, 
-but it's transparent for the end user.
+You can place the code at the very end of the generating script and flush the output buffer to the client before sending the events.
+The connection to the browser can remain open for the time of processing, but it's transparent for the end user.
 
 ### Tracking asynchronously
 
-If the website is implemented in a language that supports multithreading, non-blocking 
-I/O or messaging infrastructure, you can start the event request right after 
-the browser request is received instead of waiting for this process to finish.
+If the website is implemented in a language that supports multithreading, non-blocking I/O or messaging infrastructure, you can start the event request right after the browser request is received instead of waiting for this process to finish.
 
 ## Client-side tracking
 
 ### Using JSONP
 
-Another solution is to provide a proxy on the server side, which forwards 
-script requests to the Personalization server. 
-In this model, the requests are triggered from the client, when the page is already 
-loaded and rendered. 
-It's impossible to request the recommendation controller server directly from JavaScript 
-(either through the AJAX library or directly over XMLHttpRequest) because of the 
-cross-domain restriction in most browsers. 
+Another solution is to provide a proxy on the server side, which forwards script requests to the Personalization server.
+In this model, the requests are triggered from the client, when the page is already loaded and rendered.
+It's impossible to request the recommendation controller server directly from JavaScript (either through the AJAX library or directly over XMLHttpRequest) because of the cross-domain restriction in most browsers.
 One possible work around this limitation is [JSONP](https://www.w3schools.com/js/js_json_jsonp.asp).
 
 ### Using server proxy
 
-Another option is to tunnel the JavaScript request through the proxy on the same server. 
-The server only forwards requests to the Personalization server. 
-It can be an implemented Apache proxy module, an independent daemon 
-(for example, "netcat"), or a PHP script.
+Another option is to tunnel the JavaScript request through the proxy on the same server.
+The server only forwards requests to the Personalization server.
+It can be an implemented Apache proxy module, an independent daemon (for example, "netcat"), or a PHP script.
 
 ## Comparison
 
@@ -83,14 +71,8 @@ An overview of pros and cons for every technique:
 
 !!! tip "The recommended approach"
 
-    An Ibexa-recommended solution is to use pixel tracking for non-complex events,
-    or where every page is generated on the server side without any caching logic.
-    For hints about preloading image URLs with JavaScript elements 
-    (`var img = new Image(); img.src="uri"`)
-    or without them (`&lt;img src="uri"... /&gt;`), see [How to Preload Images](https://www.mediacollege.com/internet/javascript/image/preload.html).
+    An Ibexa-recommended solution is to use pixel tracking for non-complex events, or where every page is generated on the server side without any caching logic.
+    For hints about preloading image URLs with JavaScript elements (`var img = new Image(); img.src="uri"`) or without them (`&lt;img src="uri"... /&gt;`), see [How to Preload Images](https://www.mediacollege.com/internet/javascript/image/preload.html).
 
-    If you plan to implement caching mechanisms and more complex events like 
-    Consume (depending on the viewing time of the page), Basket (which is usually 
-    an in-page event) or custom in-page events that take place on the client side, 
-    a JavaScript implementation is strongly encouraged.
+    If you plan to implement caching mechanisms and more complex events like Consume (depending on the viewing time of the page), Basket (which is usually an in-page event) or custom in-page events that take place on the client side, a JavaScript implementation is strongly encouraged.
     For a sample script and instructions, see [Track with ibexa-tracker.js](tracking_with_ibexa-tracker.md).
diff --git a/docs/personalization/tracking_with_ibexa-tracker.md b/docs/personalization/tracking_with_ibexa-tracker.md
index 33807e9df9..a213ce8d85 100644
--- a/docs/personalization/tracking_with_ibexa-tracker.md
+++ b/docs/personalization/tracking_with_ibexa-tracker.md
@@ -4,29 +4,21 @@ description: Integrate tracking with a Google-style JavaScript.
 
 # Track events with ibexa-tracker.js
 
-This is another example of how you can integrate the tracking with a Google-style 
-JavaScript in your site.
-The approach is very generic and evaluate it if it meets your
-**requirements and security policy**.
-
-If you want the `userid` to be generated automatically, leave out the user 
-params in the `_ycq.push` calls.
-If a predefined cookie already exists, it's used. 
+This is another example of how you can integrate the tracking with a Google-style JavaScript in your site.
+The approach is very generic and evaluate it if it meets your **requirements and security policy**.
+
+If you want the `userid` to be generated automatically, leave out the user params in the `_ycq.push` calls.
+If a predefined cookie already exists, it's used.
 Otherwise a new one is created.
 
 ## Tracking code quickstart
 
-The Personalization JavaScript is a Google-like tracking API (ga.js) that you can paste 
-into your pages. 
-It activates the tracking by inserting <https://cdn.perso.ibexa.co/ibexa-tracker.js> 
-into the page.
+The Personalization JavaScript is a Google-like tracking API (ga.js) that you can paste into your pages.
+It activates the tracking by inserting <https://cdn.perso.ibexa.co/ibexa-tracker.js> into the page.
 
-To use this mechanism on your pages, copy the code snippet below, and replace 
-`<YOUR_MANDATOR_ID>` with the customer ID, `<PAGE_ID>` with the page/item identifier 
-and `<USER_ID>` with the one generated by your user identifier. 
-All identifiers can be any form of string. 
-Paste this snippet into your website template page so that it appears before 
-the closing `</head>` tag.
+To use this mechanism on your pages, copy the code snippet below, and replace `<YOUR_MANDATOR_ID>` with the customer ID, `<PAGE_ID>` with the page/item identifier and `<USER_ID>` with the one generated by your user identifier.
+All identifiers can be any form of string.
+Paste this snippet into your website template page so that it appears before the closing `</head>` tag.
 
 ``` js
 <script type="text/javascript">
@@ -35,8 +27,8 @@ the closing `</head>` tag.
   _ycq.push(['_trackEvent', '1', 'click', '<PAGE_ID>', '<USER_ID>']);
 
   (function() {
-    var yc = document.createElement('script'); 
-    yc.type = 'text/javascript'; 
+    var yc = document.createElement('script');
+    yc.type = 'text/javascript';
     yc.async = true;
     yc.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'cdn.perso.ibexa.co/ibexa-tracker.js';
     var ycs = document.getElementsByTagName('script')[0];
@@ -48,24 +40,19 @@ the closing `</head>` tag.
 
 ## Asynchronous syntax
 
-The `_ycq` object is what makes the asynchronous syntax possible. 
-It acts as a queue, which is a "first-in, first-out" (FIFO) data structure that 
-collects API calls until `ibexa-tracker.js` is ready to run them. 
+The `_ycq` object is what makes the asynchronous syntax possible.
+It acts as a queue, which is a "first-in, first-out" (FIFO) data structure that collects API calls until `ibexa-tracker.js` is ready to run them.
 To add to the queue, use the `_ycq.push` method.
 
-To push an API call into the queue, you must convert it from the traditional 
-JavaScript syntax to a command array. 
-Command arrays are JavaScript arrays that conform to a certain format. 
-The first element in a command array is the name of the tracker object method 
-that you want to call. 
-It must be a string. The remaining elements are the arguments you want to pass 
-to the tracker object method. 
+To push an API call into the queue, you must convert it from the traditional JavaScript syntax to a command array.
+Command arrays are JavaScript arrays that conform to a certain format.
+The first element in a command array is the name of the tracker object method that you want to call.
+It must be a string. The remaining elements are the arguments you want to pass to the tracker object method.
 These can be any JavaScript value.
 
 ## Tracking code
 
-The `_ycq` global object can be used directly for asynchronous page tracking 
-with the `push(...)` method. 
+The `_ycq` global object can be used directly for asynchronous page tracking with the `push(...)` method. 
 
 ### `_ycq` object methods
 
@@ -73,12 +60,9 @@ with the `push(...)` method. 
 
 `push(commandArray)`
 
-Executes the command array, which is a JavaScript array that conforms 
-to the following format. 
-The first element of the array must be the name of a tracker object method passed 
-as a string. 
-The rest of the array elements are the values to be passed in as arguments to 
-the function. 
+Executes the command array, which is a JavaScript array that conforms to the following format. 
+The first element of the array must be the name of a tracker object method passed as a string. 
+The rest of the array elements are the values to be passed in as arguments to the function. 
 
 Here is an example of typical usage of the method:
 
@@ -100,12 +84,11 @@ _ycq.push(['_trackEvent', '1', 'click', 'https://mydoc.pdf', 'user1234']);
 
 ## Tracking with HTML event handlers
 
-The asynchronous tracking syntax should also be used from within DOM event handlers. 
+The asynchronous tracking syntax should also be used from within DOM event handlers.
 For example, the following button generates an event when it's clicked:
 
 ``` js
 <button onclick = "_ycq.push(['_trackEvent', '2', 'click', 'itemId1', 'user1234x'])"/><button>
 ```
 
-Even if this button is clicked before the browser has finished loading `ibexa-tracker.js`, 
-the event is captured and eventually executed.
+Even if this button is clicked before the browser has finished loading `ibexa-tracker.js`, the event is captured and eventually executed.

From 1d6e23dfb5f4f679cd9461b0e565fc29c8202f55 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 09:22:06 +0200
Subject: [PATCH 47/77] Fixes in 'pim'

---
 docs/pim/catalog_api.md                       |  5 +-
 docs/pim/catalogs.md                          |  2 +-
 docs/pim/create_custom_catalog_filter.md      |  5 +-
 .../pim/create_custom_name_schema_strategy.md |  4 +-
 docs/pim/create_product_code_generator.md     |  6 +-
 docs/pim/enable_purchasing_products.md        |  7 +-
 docs/pim/pim_configuration.md                 |  2 +-
 docs/pim/pim_guide.md                         | 96 +++++++++----------
 docs/pim/price_api.md                         |  3 +-
 docs/pim/prices.md                            | 10 +-
 docs/pim/product_api.md                       | 20 ++--
 docs/pim/products.md                          | 19 ++--
 12 files changed, 77 insertions(+), 102 deletions(-)

diff --git a/docs/pim/catalog_api.md b/docs/pim/catalog_api.md
index f6b1df2ee3..973610403f 100644
--- a/docs/pim/catalog_api.md
+++ b/docs/pim/catalog_api.md
@@ -16,8 +16,7 @@ To get a single catalog, use `Ibexa\Contracts\ProductCatalog\CatalogServiceInter
 
 ## Get products in catalog
 
-To get products from a catalog, request the product query from the catalog object
-with `Ibexa\Contracts\ProductCatalog\Values\CatalogInterface::getQuery()`.
+To get products from a catalog, request the product query from the catalog object with `Ibexa\Contracts\ProductCatalog\Values\CatalogInterface::getQuery()`.
 Then, create a new `ProductQuery` based on it and run a product search with `ProductServiceInterface::findProduct()`:
 
 ``` php
@@ -26,7 +25,7 @@ Then, create a new `ProductQuery` based on it and run a product search with `Pro
 
 ## Create catalog
 
-To create a catalog, you need to prepare a `CatalogCreateStruct` that contains: identifier, name, description and Criteria for filtering products.
+To create a catalog, you need to prepare a `CatalogCreateStruct` that contains: identifier, name, description, and Criteria for filtering products.
 Then, pass this struct to `CatalogServiceInterface::createCatalog()`:
 
 ``` php
diff --git a/docs/pim/catalogs.md b/docs/pim/catalogs.md
index 1eed22b86e..032c6ed4ba 100644
--- a/docs/pim/catalogs.md
+++ b/docs/pim/catalogs.md
@@ -6,7 +6,7 @@ description: Catalogs enable filtering our a selection of products from the PIM.
 
 You can create multiple catalogs containing subsets of the whole product list.
 
-Use them, for example, to build special catalogs for B2B and B2C uses, for retailers and distributors or for different regions.
+Use them, for example, to build special catalogs for B2B and B2C uses, for retailers and distributors, or for different regions.
 
 When creating a catalog, all products are included by default, but you can filter the list by:
 
diff --git a/docs/pim/create_custom_catalog_filter.md b/docs/pim/create_custom_catalog_filter.md
index 21e63cb6a0..e174bd9961 100644
--- a/docs/pim/create_custom_catalog_filter.md
+++ b/docs/pim/create_custom_catalog_filter.md
@@ -17,8 +17,7 @@ To create a custom catalog filter, first you need to create a filter class in `A
 [[= include_file('code_samples/catalog/custom_catalog_filter/src/CatalogFilter/ProductNameFilter.php') =]]
 ```
 
-The filter must implement `Ibexa\Contracts\ProductCatalog\CatalogFilters\FilterDefinitionInterface`,
-provide the filter identifier and name, and the group in which it's displayed in the editing menu.
+The filter must implement `Ibexa\Contracts\ProductCatalog\CatalogFilters\FilterDefinitionInterface`, provide the filter identifier and name, and the group in which it's displayed in the editing menu.
 
 The example above uses the built-in `ProductName` Search Criterion.
 
@@ -88,7 +87,7 @@ To ensure this template is used to render the catalog filter form, add the follo
 
 ## Check results
 
-Finally, you can check the results of our work.
+Finally, you can check the results.
 Go to **Product catalog** -> **Catalogs** and create a new catalog.
 From the filter list, select **Product name**, type the name of an existing product and click **Save**.
 
diff --git a/docs/pim/create_custom_name_schema_strategy.md b/docs/pim/create_custom_name_schema_strategy.md
index 1b1fdd9ec9..3b03f3b54c 100644
--- a/docs/pim/create_custom_name_schema_strategy.md
+++ b/docs/pim/create_custom_name_schema_strategy.md
@@ -5,12 +5,12 @@ description: Create custom name schema strategy to generate URL aliases based on
 # Create custom name schema strategy
 
 You can create custom name schema strategy to generate URL aliases based on attribute values.
-Make sure the attributes are configured correctly. 
+Make sure the attributes are configured correctly.
 Each attribute that you want to include in the URL alias must have a name schema strategy.
 
 ## Create converting class
 
-Start by creating a `PercentNameSchemaStrategy` class, which implements `\Ibexa\Contracts\ProductCatalog\NameSchema\NameSchemaStrategyInterface`. 
+Start by creating a `PercentNameSchemaStrategy` class, which implements `\Ibexa\Contracts\ProductCatalog\NameSchema\NameSchemaStrategyInterface`.
 This class is responsible for converting attribute values into a string of URL parameters:
 
 ``` php
diff --git a/docs/pim/create_product_code_generator.md b/docs/pim/create_product_code_generator.md
index 938cc9ef3f..05ef3379ce 100644
--- a/docs/pim/create_product_code_generator.md
+++ b/docs/pim/create_product_code_generator.md
@@ -18,8 +18,7 @@ First, create the generator strategy class:
 [[= include_file('code_samples/catalog/custom_code_generator_strategy/src/CodeGenerator/Strategy/CustomIncrementalCodeGenerator.php') =]]
 ```
 
-This generator uses the provided context to get product information (in this case the code of the base product)
-and the incremental number.
+This generator uses the provided context to get product information (in this case the code of the base product) and the incremental number.
 
 Then, register the strategy generator as a service and tag it with `ibexa.product_catalog.code_generator`:
 
@@ -27,5 +26,4 @@ Then, register the strategy generator as a service and tag it with `ibexa.produc
 [[= include_file('code_samples/catalog/custom_code_generator_strategy/config/custom_services.yaml') =]]
 ```
 
-Use the defined `type` in [catalog configuration](pim_configuration.md#code-generation-strategy)
-to apply codes generated by this strategy to new product variants.
+Use the defined `type` in [catalog configuration](pim_configuration.md#code-generation-strategy) to apply codes generated by this strategy to new product variants.
diff --git a/docs/pim/enable_purchasing_products.md b/docs/pim/enable_purchasing_products.md
index 79ad8ae1be..3abdbe3e24 100644
--- a/docs/pim/enable_purchasing_products.md
+++ b/docs/pim/enable_purchasing_products.md
@@ -21,8 +21,7 @@ To enable adding product to cart and purchasing from the catalog, the following
 
 All currencies available in the system must be enabled in the back office under **Product Catalog** -> **Currencies**.
 
-Additionally, you must configure currencies valid for specific SiteAccesses
-under the `ibexa.system.<scope>.product_catalog.currencies` [configuration key](configuration.md#configuration-files):
+Additionally, you must configure currencies valid for specific SiteAccesses under the `ibexa.system.<scope>.product_catalog.currencies` [configuration key](configuration.md#configuration-files):
 
 ``` yaml
 ibexa:
@@ -66,9 +65,7 @@ This example uses the currencies and regions set in the [VAT rates' example belo
 
 By default, the system always uses the first currency and the first region configured.
 
-To implement a different logic, for example a switcher for preferred currencies and regions,
-you need to subscribe to `Ibexa\Contracts\ProductCatalog\Events\CurrencyResolveEvent`
-and `Ibexa\Contracts\ProductCatalog\Events\RegionResolveEvent` in your customization.
+To implement a different logic, for example a switcher for preferred currencies and regions, you need to subscribe to `Ibexa\Contracts\ProductCatalog\Events\CurrencyResolveEvent` and `Ibexa\Contracts\ProductCatalog\Events\RegionResolveEvent` in your customization.
 
 ## VAT rates
 
diff --git a/docs/pim/pim_configuration.md b/docs/pim/pim_configuration.md
index 377ed934a2..1196e223f3 100644
--- a/docs/pim/pim_configuration.md
+++ b/docs/pim/pim_configuration.md
@@ -64,7 +64,7 @@ ibexa:
 ```
 
 VAT rates configuration accepts additional flags under the `extras` key.
-It's an extension point that you can build upon to add custom functionalities. 
+It's an extension point that you can build upon to add custom functionalities.
 You can use it, for example, to pass additional information to the UI or define region-specific exclusions when calculating the tax values.
 
 For each VAT category value, setting a value to "null" (~) is equal to making the following setting:
diff --git a/docs/pim/pim_guide.md b/docs/pim/pim_guide.md
index 2c952882a8..f7dca092db 100644
--- a/docs/pim/pim_guide.md
+++ b/docs/pim/pim_guide.md
@@ -6,7 +6,7 @@ description: The PIM product guide provides a full description of the features a
 
 ## What is PIM
 
-PIM is a Product Information Management module that lets you create, configure and manage products, their specifications, assets, variants, and prices, but also group products into categories and catalogs.
+PIM is a Product Information Management module that lets you create, configure, and manage products, their specifications, assets, variants, and prices, but also group products into categories and catalogs.
 
 ## Availability
 
@@ -14,14 +14,12 @@ PIM is available in all [[= product_name =]] editions.
 
 ## How does PIM work
 
-Products in [[= product_name =]]’s PIM have underlying content items enriched with 
-product-specific information such as attributes, assets, prices, and others.
+Products in [[= product_name =]]’s PIM have underlying content items enriched with product-specific information such as attributes, assets, prices, and others.
 
 PIM lets you group products into categories and catalogs.
 
-Catalogs are collections of products selected by using configurable filters. 
-they're specific to each of your sites or storefronts and only contain 
-the products in them that you wish to sell in their associated storefronts.
+Catalogs are collections of products selected by using configurable filters.
+They're specific to each of your sites or storefronts and only contain the products in them that you wish to sell in their associated storefronts.
 
 Catalogs contain a complete list of related products that can be displayed on a store site. You can have as many catalogs as required.
 
@@ -35,44 +33,41 @@ Product specifications rely on product attributes. Available attributes are defi
 
 ### Product attributes
 
-Each product has its own, specific attributes. You can describe a product in technical terms, 
-define its physical characteristics such as size, color or shape, or functional characteristics 
-(for example, for a laptop it could be the operating system, amount of memory or available ports).
+Each product has its own, specific attributes. You can describe a product in technical terms, define its physical characteristics such as size, color, or shape, or functional characteristics (for example, for a laptop it could be the operating system, amount of memory, or available ports).
 
-Product attributes can belong to one of existing types (numbers, selection, checkout, etc.), 
-but you can also [add custom attribute types](create_custom_attribute_type.md).
+Product attributes can belong to one of existing types (for example, numbers, selection, or checkout), but you can also [add custom attribute types](create_custom_attribute_type.md).
 You can configure selected product attributes to be used as a basis for variants.
 
 ![Product attributes](img/product_attributes.png)
 
 ### Product variants
 
-One product can have multiple versions, for example, there can be a t-shirt in different colors. 
+One product can have multiple versions, for example, there can be a t-shirt in different colors.
 You can [create variants of products](product_api.md#creating-variants), differing in some characteristics, based on product attributes.
 
 ![Product variants](img/product_attributes.png)
 
 ### Product assets
 
-Each product or product variant can have assets in a form of images. 
-They can be assigned to the base product or per one or more of its variants. 
-For easier management you can create collections - by using them you can group assets that correspond to specific values of attributes. 
+Each product or product variant can have assets in a form of images.
+They can be assigned to the base product or per one or more of its variants.
+For easier management you can create collections - by using them you can group assets that correspond to specific values of attributes.
 Created collection is automatically assigned to the variant or variants that have these attribute values.
 
 ![Products assets](img/product_assets.png)
 
 ### Availability
 
-Product availability defines whether a product is available in the catalog. 
+Product availability defines whether a product is available in the catalog.
 For each product you can [set availability]([[= user_doc =]]/pim/manage_availability_and_stock/) per variant or per base product.
-When a product is available, it can have numerical stock defined, that you can set. 
+When a product is available, it can have numerical stock defined, that you can set.
 The stock can also be set to infinite, for example, for digital, downloadable products.
 A product can only be ordered when it has either positive stock, or stock set to infinite.
 
 ### Product categories
 
-Product categories help you to organize your products within PIM and also create relationships between them. 
-Each product can belong to multiple categories of, depending on user’s choice, different or similar character. 
+Product categories help you to organize your products within PIM and also create relationships between them.
+Each product can belong to multiple categories of, depending on user’s choice, different or similar character.
 Category can also be assigned to multiple products.
 
 One of the reasons for applying product categories is assisting users in searching for products.
@@ -82,8 +77,7 @@ Before you can assign categories to products, you need to [enable product catego
 
 ### Currencies
 
-Currencies are used when calculating product price. In the system you can find a list of available currencies,
-but you can also create custom ones by providing its code.
+Currencies are used when calculating product price. In the system you can find a list of available currencies, but you can also create custom ones by providing its code.
 
 ### Regions
 
@@ -97,36 +91,34 @@ To set up different VAT rates for different regions (countries),you need to firs
 
 ### Base price
 
-For each product or product variant you can set a base price. 
+For each product or product variant you can set a base price.
 If you use more than one currency, in the product’s page you can see base price per currency.
 
 ### Custom price
 
-You can set up different prices depending on customer group or currency. 
-Each customer group can have a default price discount that applies to all products. 
-For example, you can offer a 10% discount for all products in the catalog to users who belong to the Resellers customer group. 
+You can set up different prices depending on customer group or currency.
+Each customer group can have a default price discount that applies to all products.
+For example, you can offer a 10% discount for all products in the catalog to users who belong to the Resellers customer group.
 You can also set different prices for specific products or product variants for different customer groups.
 
 ### Product completeness
 
-Created product has its own list of the tasks required for product configuration: 
-attributes, assets, content, prices, availability, and so on. 
+Created product has its own list of the tasks required for product configuration: attributes, assets, content, prices, availability, and more.
 You can check how complete the configuration is in the product’s view.
 
-When you create or edit a product, under the product name, 
-you can see visual indication of what part of product information (tasks) you have completed, and what part is still missing.
+When you create or edit a product, under the product name, you can see visual indication of what part of product information (tasks) you have completed, and what part is still missing.
 
 ### Catalogs
 
-With catalogs you can create product lists for special purposes, for example, for B2B and B2C uses, for retailers and distributors or for different regions. 
+With catalogs you can create product lists for special purposes, for example, for B2B and B2C uses, for retailers and distributors, or for different regions.
 Catalogs contain a sub-set of products from the system.
 
-You can copy existing catalogs, for example, to create a variant version of an offer with slightly differing filters. 
+You can copy existing catalogs, for example, to create a variant version of an offer with slightly differing filters.
 You can then modify the copied catalog and save the updated version.
 
 ### Catalog filters and custom filter
 
-When you create a new catalog, all products are included in it by default. 
+When you create a new catalog, all products are included in it by default.
 To have a better overview for a specific group of products, you can filter the list by:
 
 - price (Solr or Elasticsearch only)
@@ -171,13 +163,13 @@ In your specific scenario, you can implement the support for availability and pr
 ##### Filtering
 
 Filtering and pagination function the same as with the local PIM, relying on product attributes for effective organization of product data.
-However, criteria and sort clauses within local PIM correspond with [[= product_name =]]'s content model.
+However, criteria and Sort Clauses within local PIM correspond with [[= product_name =]]'s content model.
 Depending on your source of product information, you might need to adjust the implementation to be compatible with your data format.
 For reference, you could review the `CriterionVisitor.php` file that is part of [Remote PIM example package](add_remote_pim_support.md#install-remote-pim-example-package).
 
 ##### Catalogs
 
-Catalogs can be created just like with the local PIM, but the criteria are limited to type, availability and attributes.
+Catalogs can be created just like with the local PIM, but the criteria are limited to type, availability, and attributes.
 
 #### Limitations
 
@@ -202,8 +194,8 @@ Therefore, if your specific requirements aren't met, you must extend the applica
 
 ##### Simplified presentation of PIM-related blocks and views
 
-Enabling Remote PIM impacts a number of application views and blocks, such as Product view, Product list, Catalog and Product Collection.
-they're simplified, for example, they don't include thumbnails and other assets, or refer to URL aliases.
+Enabling Remote PIM impacts a number of application views and blocks, such as Product view, Product list, Catalog, and Product Collection.
+They're simplified, for example, they don't include thumbnails and other assets, or refer to URL aliases.
 You can customize them by extending the default implementation.
 
 ##### Limited HTTP Caching
@@ -212,7 +204,7 @@ In the context of remote PIM, it's impossible to use [content-aware HTTP caching
 
 ## How to get started
 
-To start working with the products, you need to enable purchasing from the catalog. 
+To start working with the products, you need to enable purchasing from the catalog.
 For this, the following configuration is required:
 
 - at least one region and one currency added in the shop,
@@ -226,32 +218,37 @@ Next, follow steps from [product management in User Documentation]([[= user_doc
 
 ### Product technical and marketing information
 
-Products added in the shop have both technical and marketing information. 
-You can see all the attributes, specification and variants in a very detailed way, which helps you to manage and present all the products in the technical way. 
-In addition, each product and its variants may have assets in the form of images and a description. 
+Products added in the shop have both technical and marketing information.
+You can see all the attributes, specification and variants in a very detailed way, which helps you to manage and present all the products in the technical way.
+In addition, each product and its variants may have assets in the form of images and a description.
 Products have underlying content items, which means you can customize the content structure to contain all the marketing information about the product that you need.
 
 ### Detailed specification with multiple attribute types
 
-Product attributes help you to create products with detailed, complicated specification. 
-Thanks to this, you can create product variants based on multiple product attributes that include different information about a product. 
+Product attributes help you to create products with detailed, complicated specification.
+Thanks to this, you can create product variants based on multiple product attributes that include different information about a product.
 Additionally, product attributes are collected in groups so they're easier to manage.
 
 ![Multiple attribute types](img/product_attribute_types.png)
 
 ### Multiple-level variants
 
-Product variants enable you to have multiple versions of one product, differing in some characteristics. Each product can have more than one variant on one or more levels. It makes it possible to have multiple-level variants of the products complicated in terms of specifications, such as laptops.
+Product variants enable you to have multiple versions of one product, differing in some characteristics.
+Each product can have more than one variant on one or more levels.
+It makes it possible to have multiple-level variants of the products complicated in terms of specifications, such as laptops.
 
 ![Multiple-level variants](img/multilevel_variants.png)
 
 ### Extensible availability
 
-By default, you can configure products with specific number in stock, or with infinite availability. You can also extend the availability mechanism to cover other use cases, such as pre-orders.
+By default, you can configure products with specific number in stock, or with infinite availability.
+You can also extend the availability mechanism to cover other use cases, such as pre-orders.
 
 ### Regional pricing including regional VAT rates
 
-Each product type can have different regional pricing and regional VAT rate. What is more, you can configure VAT rate globally or set it individually. Thanks to this, the management of the products that can be sold to various markets is easier and more intuitive.
+Each product type can have different regional pricing and regional VAT rate.
+What is more, you can configure VAT rate globally or set it individually.
+Thanks to this, the management of the products that can be sold to various markets is easier and more intuitive.
 
 ![Regional pricing](img/regional_vat.png)
 
@@ -267,16 +264,15 @@ The taxonomy mechanism enables creating tags or categories with a tree structure
 
 ### Grouping products into catalogs
 
-You can group all the products into smaller catalogs. 
-They contain subsets of the whole product list and you can use them to build special catalogs, 
-for example, for retailers and distributors or for different regions.
+You can group all the products into smaller catalogs.
+They contain subsets of the whole product list and you can use them to build special catalogs, for example, for retailers and distributors, or for different regions.
 
 ![Grouping products into catalogs](img/grouping_products.png)
 
 ### General and variant-specific assets
 
-Products and product variants can have their image assets. 
-You can set up general assets — it means that the product has an asset visible in the main product view. 
+Products and product variants can have their image assets.
+You can set up general assets — it means that the product has an asset visible in the main product view.
 Additionally, you can assign assets to product variants and place them in a collection.
 
 ![General and variant-specific assets](img/general_assets.png)
\ No newline at end of file
diff --git a/docs/pim/price_api.md b/docs/pim/price_api.md
index 02f2b6954e..23529285d3 100644
--- a/docs/pim/price_api.md
+++ b/docs/pim/price_api.md
@@ -15,8 +15,7 @@ To access a whole list of currencies, use `CurrencyServiceInterface::findCurrenc
 [[= include_file('code_samples/api/product_catalog/src/Command/CurrencyCommand.php', 49, 57) =]]
 ```
 
-To create a new currency, use `CurrencyServiceInterface::createCurrency()`
-and provide it with a `CurrencyCreateStruct` with code, number of fractional digits and a flag indicating if the currency is enabled:
+To create a new currency, use `CurrencyServiceInterface::createCurrency()` and provide it with a `CurrencyCreateStruct` with code, number of fractional digits and a flag indicating if the currency is enabled:
 
 ``` php
 [[= include_file('code_samples/api/product_catalog/src/Command/CurrencyCommand.php', 64, 67) =]]
diff --git a/docs/pim/prices.md b/docs/pim/prices.md
index 43aaf8c878..459dad7f56 100644
--- a/docs/pim/prices.md
+++ b/docs/pim/prices.md
@@ -16,12 +16,9 @@ You can also set different prices for specific products or product variants for
 
 ### Assign prices dynamically
 
-You could create a customer group resolver that provides custom price logic, 
-for example, by retrieving user address from the customer profile, and assigning 
-a customer group to the customer based on the address. 
+You could create a customer group resolver that provides custom price logic, for example, by retrieving user address from the customer profile, and assigning a customer group to the customer based on the address.
 
-Such resolver must implement the `Ibexa\Contracts\ProductCatalog\CustomerGroupResolverInterface` 
-interface. 
+Such resolver must implement the `Ibexa\Contracts\ProductCatalog\CustomerGroupResolverInterface` interface.
 
 You must then register it as a service with the `ibexa.product_catalog.customer_group.resolver` tag.
 
@@ -32,5 +29,4 @@ To use currencies in your shop, you need to first enable them in the back office
 
 ## VAT
 
-You can [configure VAT rate globally](pim_configuration.md#vat-rates) (per SiteAccess),
-or set it individually for each product type and product.
+You can [configure VAT rate globally](pim_configuration.md#vat-rates) (per SiteAccess), or set it individually for each product type and product.
diff --git a/docs/pim/product_api.md b/docs/pim/product_api.md
index 7d25aa4899..3423b017a8 100644
--- a/docs/pim/product_api.md
+++ b/docs/pim/product_api.md
@@ -64,8 +64,7 @@ The default offset is 0, and limit's 25.
 [[= include_file('code_samples/api/product_catalog/src/Command/ProductVariantCommand.php', 57, 60) =]]
 ```
 
-From a variant, you can access the attributes that are used to generate the variant
-by using `ProductVariant::getDiscriminatorAttributes()`.
+From a variant, you can access the attributes that are used to generate the variant by using `ProductVariant::getDiscriminatorAttributes()`.
 
 ``` php
 [[= include_file('code_samples/api/product_catalog/src/Command/ProductVariantCommand.php', 61, 68) =]]
@@ -128,9 +127,8 @@ You can then use `ProductAvailabilityServiceInterface::getStock` to get the stoc
 [[= include_file('code_samples/api/product_catalog/src/Command/ProductCommand.php', 98, 103) =]]        }
 ```
 
-To change availability for a product, use `updateProductAvailability()` with a `ProductAvailabilityUpdateStruct`
-and provide it with the product object. The second parameter defines whether product is available,
-and the third whether its stock is infinite. The fourth parameter is the stock number:
+To change availability for a product, use `updateProductAvailability()` with a `ProductAvailabilityUpdateStruct` and provide it with the product object.
+The second parameter defines whether product is available, and the third whether its stock is infinite. The fourth parameter is the stock number:
 
 ``` php
 [[= include_file('code_samples/api/product_catalog/src/Command/ProductCommand.php', 106, 109) =]]
@@ -138,8 +136,7 @@ and the third whether its stock is infinite. The fourth parameter is the stock n
 
 ## Attributes
 
-To get information about product attribute groups, use the `AttributeGroupServiceInterface`,
-or `LocalAttributeGroupServiceInterface` to modify attribute groups.
+To get information about product attribute groups, use the `AttributeGroupServiceInterface`, or `LocalAttributeGroupServiceInterface` to modify attribute groups.
 
 `AttributeGroupServiceInterface::getAttributeGroup()` enables you to get a single attribute group by its identifier.
 `AttributeGroupServiceInterface::findAttributeGroups()` get all attribute groups, base on optional query:
@@ -149,22 +146,19 @@ or `LocalAttributeGroupServiceInterface` to modify attribute groups.
 [[= include_file('code_samples/api/product_catalog/src/Command/AttributeCommand.php', 85, 90) =]]
 ```
 
-To create an attribute group, use `LocalAttributeGroupServiceinterface::createAttributeGroup`
-and provide it with an `AttributeGroupCreateStruct`:
+To create an attribute group, use `LocalAttributeGroupServiceinterface::createAttributeGroup` and provide it with an `AttributeGroupCreateStruct`:
 
 ``` php
 [[= include_file('code_samples/api/product_catalog/src/Command/AttributeCommand.php', 59, 63) =]]
 ```
 
-To get information about product attributes, use the `AttributeDefinitionServiceInterface`,
-or `LocalAttributeDefinitionServiceInterface` to modify attributes.
+To get information about product attributes, use the `AttributeDefinitionServiceInterface`, or `LocalAttributeDefinitionServiceInterface` to modify attributes.
 
 ``` php
 [[= include_file('code_samples/api/product_catalog/src/Command/AttributeCommand.php', 71, 73) =]]
 ```
 
-To create an attribute, use `LocalAttributeGroupServiceinterface::createAttributeDefinition`
-and provide it with an `AttributeDefinitionCreateStruct`:
+To create an attribute, use `LocalAttributeGroupServiceinterface::createAttributeDefinition` and provide it with an `AttributeDefinitionCreateStruct`:
 
 ``` php
 [[= include_file('code_samples/api/product_catalog/src/Command/AttributeCommand.php', 76, 82) =]]
diff --git a/docs/pim/products.md b/docs/pim/products.md
index ca088780cb..1c30153aa1 100644
--- a/docs/pim/products.md
+++ b/docs/pim/products.md
@@ -14,24 +14,23 @@ Product code can have up to 64 characters. It can contain only letters, numbers,
 ## Product types
 
 Product types represent categories that a product can belong to.
-A product type can be, for example, a sofa or a keyboard.
+A product type can be, for example, a sofa, or a keyboard.
 
-Product types, like content types, define the global properties of products and Fields a product consists of.
+Product types, like content types, define the global properties of products and fields a product consists of.
 A product type also defines the attributes that all products of this type can have.
 
 You can choose between two available types: `Physical` and `Virtual`:
 
-- `Physical` - tangible products with assigned stock. 
+- `Physical` - tangible products with assigned stock.
 They can use measurement attributes. They require shipment in the online purchase process.
 Examples: heaters, laptops, phones.
 - `Virtual` - non-tangible items. They can be sold individually, or as part of a product bundle.
-They don't require shipment in the online process. Examples: memberships, services, warranties. 
+They don't require shipment in the online process. Examples: memberships, services, warranties.
 
 ## Product attributes
 
-Product attributes provide different information about a product
-and can be used to create [product variants](#product-variants).
-Typical product attribute examples are: length, weight, color, format, and so on.
+Product attributes provide different information about a product and can be used to create [product variants](#product-variants).
+Typical product attribute examples are: length, weight, color, format, and more.
 
 The following attribute types are available:
 
@@ -49,11 +48,9 @@ You can assign both whole attribute groups or individual attributes to a product
 
 ## Product variants
 
-Product variants represent different versions of a product, for example, clothes in different colors,
-or laptops with different amounts of RAM.
+Product variants represent different versions of a product, for example, clothes in different colors, or laptops with different amounts of RAM.
 
-You can create product variants automatically based on attributes
-that have the "Used for product variants" flag enabled in the product type definition.
+You can create product variants automatically based on attributes that have the "Used for product variants" flag enabled in the product type definition.
 
 You can create variants for any combination of values of selected attributes.
 In the back office you can automatically generate all possible variants for a product.

From 41111e5ca8ea2bd037bb8b039da43c391dcdb691 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 09:27:25 +0200
Subject: [PATCH 48/77] Fixes in 'resources'

---
 .../contributing/contribute_translations.md   |  3 +-
 .../contributing/package_structure.md         |  8 ++---
 .../contributing/report_and_follow_issues.md  |  7 ++--
 docs/resources/new_in_doc.md                  |  6 ++--
 docs/resources/phpstorm_plugin.md             | 33 ++++++++-----------
 docs/resources/release_process_and_roadmap.md | 17 +++++-----
 docs/resources/resources.md                   |  3 +-
 7 files changed, 32 insertions(+), 45 deletions(-)

diff --git a/docs/resources/contributing/contribute_translations.md b/docs/resources/contributing/contribute_translations.md
index 694c3302e8..901c233425 100644
--- a/docs/resources/contributing/contribute_translations.md
+++ b/docs/resources/contributing/contribute_translations.md
@@ -11,8 +11,7 @@ You can use an XLIFF editor of your choice to contribute strings in your languag
 
 ## Translating interface using Crowdin
 
-If you wish to contribute to an existing translation of back office or start a new one you can
-use the Crowdin website.
+If you wish to contribute to an existing translation of back office or start a new one you can use the Crowdin website.
 
 Visit [[[= product_name =]]'s Crowdin page](https://crowdin.com/project/ibexa-dxp), choose a language, and you can see a list of files containing strings. Here you can suggest your translations.
 
diff --git a/docs/resources/contributing/package_structure.md b/docs/resources/contributing/package_structure.md
index 9642ce6d78..8d3ec4df41 100644
--- a/docs/resources/contributing/package_structure.md
+++ b/docs/resources/contributing/package_structure.md
@@ -4,15 +4,14 @@ description: All code contributions to Ibexa DXP must follow package and bundle
 
 # Package and bundle structure and namespaces
 
-If you wish to contribute to [[= product_name =]] development,
-you need to adhere to the package and bundle structure and namespace standards.
+If you wish to contribute to [[= product_name =]] development, you need to adhere to the package and bundle structure and namespace standards.
 
 The following conventions apply to contributions to [[= product_name_base =]] core code, not to third party packages.
 
 !!! note
 
     New code needs to follow the rules outlined here.
-    they're being applied progressively to existing code.
+    They're being applied progressively to existing code.
 
 ## Root PHP namespace
 
@@ -91,8 +90,7 @@ class IbexaCommerceShopBundle // ...
 
 ### Contracts
 
-A package may introduce a namespace for contracts, to be consumed by first and third party packages
-and projects, which must be prefixed as:
+A package may introduce a namespace for contracts, to be consumed by first and third party packages and projects, which must be prefixed as:
 
 ```php
 namespace Ibexa\Contracts;
diff --git a/docs/resources/contributing/report_and_follow_issues.md b/docs/resources/contributing/report_and_follow_issues.md
index 3434946b9b..532b910a4d 100644
--- a/docs/resources/contributing/report_and_follow_issues.md
+++ b/docs/resources/contributing/report_and_follow_issues.md
@@ -8,8 +8,7 @@ description: You can report encountered issues to Ibexa DXP JIRA or use it to fo
 
 ## Finding an existing issue
 
-Before you create a new bug report or an improvement suggestion, 
-search the JIRA project for similar reported issues.
+Before you create a new bug report or an improvement suggestion, search the JIRA project for similar reported issues.
 If you find any, update them with your comment or additional information instead of creating a new one.
 
 ## Reporting an issue
@@ -26,11 +25,11 @@ Click **Create** at the top of the bugtracker window and fill in the following f
 
 |||
 |------|------|
-|**Project**|Select **Ibexa IBX**.|
+|**Project**|Select **[[= product_name_base =]] IBX**.|
 |**Issue type**|Choose **Bug** or **Improvement** depending on what you're reporting, don't use other issue types (they're for internal use only).|
 |**Summary**|Write a short sentence describing what you're reporting.|
 |**Priority**|Select the priority you consider the issue to be. Please try to keep a cool head while selecting it. A 1 pixel alignment bug isn't a "blocker".|
-|**Component/s**|This is important, as it makes your issue appear on the radar (dashboards, filters) of people dealing with various parts of Ibexa projects.|
+|**Component/s**|This is important, as it makes your issue appear on the radar (dashboards, filters) of people dealing with various parts of [[= product_name_base =]] projects.|
 |**Affect version/s**|Add the versions of the application you experienced the issue on.|
 |**Assignee**|Leave blank, unless you're willing to work on the issue yourself.|
 |**Reporter**|Leave as is (yourself).|
diff --git a/docs/resources/new_in_doc.md b/docs/resources/new_in_doc.md
index 7f0c85e521..ccebd0d2b6 100644
--- a/docs/resources/new_in_doc.md
+++ b/docs/resources/new_in_doc.md
@@ -300,7 +300,7 @@ This page contains recent highlights and notable changes in [[= product_name =]]
 
 - [Updated configuration for triggers](https://doc.ibexa.co/en/master/personalization/api_reference/tracking_api/#tracking-events-based-on-recommendations)
 - [Send messages with recommendations](https://doc.ibexa.co/en/master/personalization/integrate_recommendation_service/#send-messages-with-recommendations)
-- [Email triggers](https://doc.ibexa.co/projects/userguide/en/master/personalization/triggers/) in User Documentation 
+- [Email triggers](https://doc.ibexa.co/projects/userguide/en/master/personalization/triggers/) in User Documentation
 
 ### PIM
 
@@ -431,7 +431,7 @@ This page contains recent highlights and notable changes in [[= product_name =]]
         - [CatalogStatus Criterion](https://doc.ibexa.co/en/master/search/criteria_reference/catalogstatus_criterion/)
         - [FloatAttributeRange Criterion](https://doc.ibexa.co/en/master/search/criteria_reference/floatattributerange_criterion/)
         - [IntegerAttributeRange Criterion](https://doc.ibexa.co/en/master/search/criteria_reference/integerattributerange_criterion/)
-    
+
 ### Infrastructure and maintenance
 
 - [Configure and customize Fastly](https://doc.ibexa.co/en/master/infrastructure_and_maintenance/cache/http_cache/fastly/)
@@ -502,7 +502,7 @@ This page contains recent highlights and notable changes in [[= product_name =]]
     and [Sort Clauses](https://doc.ibexa.co/en/master/search/sort_clause_reference/order_sort_clauses/)
     - Payment [Search Criteria](https://doc.ibexa.co/en/master/search/criteria_reference/payment_search_criteria/)
     and [Sort Clauses](https://doc.ibexa.co/en/master/search/sort_clause_reference/payment_sort_clauses/)
-    - Payment method [Search Criteria](https://doc.ibexa.co/en/master/search/criteria_reference/payment_method_search_criteria/) 
+    - Payment method [Search Criteria](https://doc.ibexa.co/en/master/search/criteria_reference/payment_method_search_criteria/)
     and [Sort Clauses](https://doc.ibexa.co/en/master/search/sort_clause_reference/payment_method_sort_clauses/)
     - Shipment [Search Criteria](https://doc.ibexa.co/en/master/search/criteria_reference/shipment_search_criteria/)
     and [Sort Clauses](https://doc.ibexa.co/en/master/search/sort_clause_reference/shipment_sort_clauses/)
diff --git a/docs/resources/phpstorm_plugin.md b/docs/resources/phpstorm_plugin.md
index 9a0a6833da..f10f0005db 100644
--- a/docs/resources/phpstorm_plugin.md
+++ b/docs/resources/phpstorm_plugin.md
@@ -4,8 +4,7 @@ description: The Ibexa DXP PHPStorm plugin helps you speed up your development b
 
 # [[= product_name =]] plugin for PhpStorm
 
-[[= product_name =]] plugin for PhpStorm helps you to work with [[= product_name =]] by speeding up installation
-and providing file templates, intentions, autocompletion, and other features.
+[[= product_name =]] plugin for PhpStorm helps you to work with [[= product_name =]] by speeding up installation and providing file templates, intentions, autocompletion, and other features.
 
 ## Requirements
 
@@ -14,8 +13,7 @@ and providing file templates, intentions, autocompletion, and other features.
 
 ## Install PhpStorm plugin
 
-You can install the [[= product_name =]] plugin for PhpStorm from the JetBrains Marketplace,
-or manually, from a downloaded .jar file.
+You can install the [[= product_name =]] plugin for PhpStorm from the JetBrains Marketplace, or manually, from a downloaded .jar file.
 
 ### Install from JetBrains Marketplace
 
@@ -29,13 +27,11 @@ You can also install the plugin manually from a `.jar` file:
 
 1\. Download the latest version of the plugin from [JetBrains Marketplace](https://plugins.jetbrains.com/plugin/17239-ibexa-dxp/versions).
 
-2\. In PhpStorm settings/preferences (depending on your system), select **Plugins** > (gear icon) > **Install plugin from Disk...**
-and select the downloaded file.
+2\. In PhpStorm settings/preferences (depending on your system), select **Plugins** > (gear icon) > **Install plugin from Disk...** and select the downloaded file.
 
 ## Configuration
 
-Plugin configuration is available in PhpStorm settings/preferences (depending on your system), 
-under **PHP** > **Frameworks** > **[[= product_name =]]**.
+Plugin configuration is available in PhpStorm settings/preferences (depending on your system), under **PHP** > **Frameworks** > **[[= product_name =]]**.
 
 You can use it to:
 
@@ -46,14 +42,13 @@ You can use it to:
 
 !!! note
 
-    Some plugin features depends on the selected product edition and version. 
-    For example, "deprecated namespaces usage" inspection is enabled only if the project uses v4.x.  
+    Some plugin features depends on the selected product edition and version.
+    For example, "deprecated namespaces usage" inspection is enabled only if the project uses v4.x.
 
 Plugin configuration is automatically resolved when opening [[= product_name =]] project for the first time.
 If detection is successful, a notification appears with an "Enable [[= product_name =]] support for this project" link.
 
-If you created your project by using [[= product_name =]] project wizard, the plugin is automatically enabled and configured based 
-on wizard data.
+If you created your project by using [[= product_name =]] project wizard, the plugin is automatically enabled and configured based on wizard data.
 
 ## Features
 
@@ -68,7 +63,7 @@ In project settings form you can choose:
 - Product edition: [[= product_name_oss =]], [[= product_name_content =]], [[= product_name_exp =]], [[= product_name_com =]]
 - Authentication token (for Content, Experience and Commerce editions)
 - Product version: Default (latest LTS version), Latest (fast track or LTS), Latest LTS and "Next 3.x" (unstable, based on the 3.x branch) and "Next 4.x" (unstable, based on the 4.x branch)
-- Generate [[[= product_name_cloud =]] configuration](install_on_ibexa_cloud.md) 
+- Generate [[[= product_name_cloud =]] configuration](install_on_ibexa_cloud.md)
 - Composer settings
 
 ![Create a project](phpstorm_plugin_create_project.png)
@@ -146,9 +141,9 @@ and in PHP files:
 | Abbreviation | Comment |
 |---|---|
 | `ibx_create_c` | Create content |
-| `ibx_create_cd` | Create content draft | 
+| `ibx_create_cd` | Create content draft |
 | `ibx_create_ct` | Create content type |
-| `ibx_find_c` | Create and execute content query | 
+| `ibx_find_c` | Create and execute content query |
 | `ibx_find_ci` | Create and execute content info query |
 | `ibx_find_l` | Create and execute location query |
 | `ibx_load_c` | Load content by ID |
@@ -214,8 +209,7 @@ To enable autocompletion, you must place the file in the `config` directory and
 
 Parameter names suggestions are available in `Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface::{hasParameter,getParameter}` method calls.
 
-Suggested results take into account namespace argument, if its value can be resolved without running interpreter
-(for example, string literal or const reference).
+Suggested results take into account namespace argument, if its value can be resolved without running interpreter (for example, string literal or const reference).
 
 ### Query type name autocompletion
 
@@ -225,12 +219,11 @@ Suggestions are based on service definitions tagged as `ibexa.query_type`.
 
 ### Query type parameter autocompletion
 
-Parameter name suggestions are available for Query types which implement the `Ibexa\Core\QueryType\QueryType` interface
-or extend the `Ibexa\Core\QueryType\OptionsResolverBasedQueryType` class in the following places:
+Parameter name suggestions are available for Query types which implement the `Ibexa\Core\QueryType\QueryType` interface or extend the `Ibexa\Core\QueryType\OptionsResolverBasedQueryType` class in the following places:
 
 * `Ibexa\Core\QueryType\QueryType::getQuery` method calls
 * `Ibexa\Core\QueryType\QueryType::getQuery` method definition
-* `Ibexa\Core\QueryType\OptionsResolverBasedQueryType::doGetQuery` method definition 
+* `Ibexa\Core\QueryType\OptionsResolverBasedQueryType::doGetQuery` method definition
 
 ![Query Type parameter autocompletion](phpstorm_plugin_query_type_params.png)
 
diff --git a/docs/resources/release_process_and_roadmap.md b/docs/resources/release_process_and_roadmap.md
index 78d2f406de..dfa9e2a517 100644
--- a/docs/resources/release_process_and_roadmap.md
+++ b/docs/resources/release_process_and_roadmap.md
@@ -15,19 +15,18 @@ description: "Ibexa DXP releases new versions periodically in different flavors:
 Additionally, [[= product_name =]] also has an open-source version called [[= product_name_oss =]].
 [[= product_name_oss =]] is developed by [[= product_name_base =]] together with the open source community.
 The [[= product_name_oss =]] code is available on GitHub under the GPLv2 license.
-It comes with no commercial support and maintenance services. 
+It comes with no commercial support and maintenance services.
 
-We manage the release of [[= product_name =]] using an agile iterative process and a continuous software development model, which is why we provide two kinds of [[= product_name =]] releases:
+[[= product_name_base =]] manage the release of [[= product_name =]] using an agile iterative process and a continuous software development model, which is why we provide two kinds of [[= product_name =]] releases:
 
 - Long Term Support releases (LTS) which are supported by [[= product_name_base =]] for a long period of time.
 - Fast Track releases (FT) give access to the latest features and are supported for a short period of time. they're maintained only until the next FT release is introduced.
 
-FT releases are tailored for those who want to stay up-to-date with newest functionalities,
-while LTS releases are suitable for highly stable enterprise rollouts.
+FT releases are tailored for those who want to stay up-to-date with newest functionalities, while LTS releases are suitable for highly stable enterprise rollouts.
 
 ## Versioning conventions
 
-All [[= product_name =]] editions use [semantic versioning](https://semver.org/).  
+All [[= product_name =]] editions use [semantic versioning](https://semver.org/).
 
 The version number of [[= product_name =]] and all its internal components follows the semantic versioning conventions: vX.Y.Z.
 
@@ -35,13 +34,13 @@ The version number of [[= product_name =]] and all its internal components follo
 - Y represents new features and functionalities.
 - Z represents patches, bug fixes, smaller improvements, etc.
 
-Distribution files of our three editions are as follows:
+Distribution files of [[= product_name_base =]] three editions are as follows:
 
 - for [[= product_name_headless =]]: ibexa-headless-vX.Y.Z.tgz
 - for [[= product_name_exp =]]: ibexa-experience-vX.Y.Z.tgz
 - for [[= product_name_com =]]: ibexa-commerce-vX.Y.Z.tgz
 
-Our support and maintenance services specific to each release are only available from a given start date until an end date.
-The time in between the start and end dates is what we call the product's **Service Life**.
+[[= product_name_base =]] supports and maintenances services specific to each release are only available from a given start date until an end date.
+The time in between the start and end dates is what [[= product_name_base =]] calls the product's **Service Life**.
 
-You can find the specific dates of service life for each release on our [support portal service life page](https://support.ibexa.co/Public/Service-Life).
+You can find the specific dates of service life for each release on [[= product_name_base =]] [support portal service life page](https://support.ibexa.co/Public/Service-Life).
diff --git a/docs/resources/resources.md b/docs/resources/resources.md
index e583db0813..b00b71f9e1 100644
--- a/docs/resources/resources.md
+++ b/docs/resources/resources.md
@@ -5,8 +5,7 @@ page_type: landing_page
 
 # Resources
 
-See additional information about [[= product_name =]] development process,
-helpful tools, and learn how you can contribute to the creation of the platform.
+See additional information about [[= product_name =]] development process, helpful tools, and learn how you can contribute to the creation of the platform.
 
 [[= cards([
     "resources/release_process_and_roadmap",

From ed5398e319bc1bdcc037e3c9bfdc93653850a70f Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 10:15:42 +0200
Subject: [PATCH 49/77] Fixes in 'search references' and aggregations

---
 .../logged_at_criterion.md                       |  3 +--
 .../object_criterion.md                          |  3 +--
 .../object_name_criterion.md                     |  3 +--
 .../user_criterion.md                            |  3 +--
 .../aggregation_reference.md                     |  2 +-
 .../authorterm_aggregation.md                    |  4 ++++
 .../basepricestats_aggregation.md                |  7 +++++--
 .../checkboxterm_aggregation.md                  |  4 ++++
 .../contenttypegroupterm_aggregation.md          |  4 ++++
 .../contenttypeterm_aggregation.md               |  4 ++++
 .../countryterm_aggregation.md                   |  4 ++++
 .../custompricestats_aggregation.md              |  7 +++++--
 .../datemetadatarange_aggregation.md             |  4 ++++
 .../daterange_aggregation.md                     |  6 +++++-
 .../datetimerange_aggregation.md                 |  6 +++++-
 .../floatrange_aggregation.md                    |  4 ++++
 .../floatstats_aggregation.md                    |  8 ++++++--
 .../integerrange_aggregation.md                  |  4 ++++
 .../integerstats_aggregation.md                  |  7 +++++--
 .../keywordterm_aggregation.md                   |  4 ++++
 .../languageterm_aggregation.md                  |  4 ++++
 .../locationchildrenterm_aggregation.md          |  6 +++++-
 .../objectstateterm_aggregation.md               |  4 ++++
 .../product_attribute_aggregations.md            |  7 +++++--
 .../productavailabilityterm_aggregation.md       |  4 ++++
 .../productpricerange_aggregation.md             |  4 ++++
 .../productstockrange_aggregation.md             |  4 ++++
 .../producttypeterm_aggregation.md               |  4 ++++
 .../rawrange_aggregation.md                      |  4 ++++
 .../rawstats_aggregation.md                      |  8 ++++++--
 .../aggregation_reference/rawterm_aggregation.md |  4 ++++
 .../sectionterm_aggregation.md                   |  6 +++++-
 .../selectionterm_aggregation.md                 |  4 ++++
 .../subtreeterm_aggregation.md                   |  6 +++++-
 .../taxonomyentryid_aggregation.md               |  4 ++++
 .../timerange_aggregation.md                     |  6 +++++-
 .../usermetadataterm_aggregation.md              |  4 ++++
 .../visibilityterm_aggregation.md                |  4 ++++
 .../criteria_reference/ancestor_criterion.md     |  8 ++++++--
 .../attributegroupidentifier_criterion.md        |  5 +++++
 .../attributename_criterion.md                   |  5 +++++
 .../criteria_reference/baseprice_criterion.md    |  5 +++++
 .../catalogidentifier_criterion.md               |  5 +++++
 .../criteria_reference/catalogname_criterion.md  |  5 +++++
 .../catalogstatus_criterion.md                   |  5 +++++
 .../checkboxattribute_criterion.md               |  5 +++++
 .../colorattribute_criterion.md                  |  5 +++++
 .../criteria_reference/contentid_criterion.md    |  8 ++++++--
 .../criteria_reference/contentname_criterion.md  |  5 +++--
 .../contenttypegroupid_criterion.md              |  8 ++++++--
 .../contenttypeid_criterion.md                   |  8 ++++++--
 .../contenttypeidentifier_criterion.md           |  8 ++++++--
 .../criteria_reference/createdat_criterion.md    |  5 +++++
 .../createdatrange_criterion.md                  |  5 +++++
 .../criteria_reference/currencycode_criterion.md |  5 +++++
 .../customergroupid_criterion.md                 |  8 ++++++--
 .../criteria_reference/customprice_criterion.md  |  5 +++++
 .../criteria_reference/datemetadata_criterion.md |  8 ++++++--
 .../search/criteria_reference/depth_criterion.md |  8 ++++++--
 .../search/criteria_reference/field_criterion.md | 11 +++++++----
 .../fieldrelation_criterion.md                   |  8 ++++++--
 .../floatattribute_criterion.md                  |  5 +++++
 .../floatattributerange_criterion.md             |  5 +++++
 .../criteria_reference/fulltext_criterion.md     |  9 +++++++--
 .../search/criteria_reference/image_criterion.md |  2 +-
 .../imagedimensions_criterion.md                 |  2 +-
 .../imagefilesize_criterion.md                   |  4 ++--
 .../criteria_reference/imageheight_criterion.md  |  2 +-
 .../imagemimetype_criterion.md                   |  4 ++--
 .../imageorientation_criterion.md                |  4 ++--
 .../criteria_reference/imagewidth_criterion.md   |  2 +-
 .../integerattribute_criterion.md                |  5 +++++
 .../integerattributerange_criterion.md           |  5 +++++
 .../iscurrencyenabled_criterion.md               |  5 +++++
 .../criteria_reference/isfieldempty_criterion.md |  8 ++++++--
 .../ismainlocation_criterion.md                  |  8 ++++++--
 .../isproductbased_criterion.md                  |  5 +++++
 .../criteria_reference/isuserbased_criterion.md  | 12 ++++++++----
 .../isuserenabled_criterion.md                   | 13 ++++++++-----
 .../criteria_reference/isvirtual_criterion.md    | 10 +++++++---
 .../criteria_reference/languagecode_criterion.md | 11 +++++++----
 .../criteria_reference/locationid_criterion.md   | 10 +++++++---
 .../locationremoteid_criterion.md                | 10 +++++++---
 .../criteria_reference/logicaland_criterion.md   |  8 ++++++--
 .../criteria_reference/logicalnot_criterion.md   |  8 ++++++--
 .../criteria_reference/logicalor_criterion.md    |  8 ++++++--
 .../maplocationdistance_criterion.md             |  8 ++++++--
 .../criteria_reference/matchall_criterion.md     |  8 ++++++--
 .../criteria_reference/matchnone_criterion.md    |  8 ++++++--
 .../objectstateid_criterion.md                   |  8 ++++++--
 .../objectstateidentifier_criterion.md           |  8 ++++++--
 .../order_company_associated_criterion.md        |  2 +-
 .../order_company_name_criterion.md              |  2 +-
 .../order_created_criterion.md                   |  2 +-
 .../order_currency_code_criterion.md             |  2 +-
 .../order_customer_name_criterion.md             |  2 +-
 .../order_identifier_criterion.md                |  2 +-
 .../criteria_reference/order_owner_criterion.md  |  2 +-
 .../criteria_reference/order_price_criterion.md  |  2 +-
 .../criteria_reference/order_source_criterion.md |  2 +-
 .../criteria_reference/order_status_criterion.md |  2 +-
 .../parentlocationid_criterion.md                |  5 +++++
 .../parentlocationremoteId_criterion.md          |  7 ++++++-
 .../payment_createdat_criterion.md               |  2 +-
 .../payment_currency_criterion.md                |  2 +-
 .../criteria_reference/payment_id_criterion.md   |  2 +-
 .../payment_identifier_criterion.md              |  2 +-
 .../payment_logicaland_criterion.md              |  2 +-
 .../payment_logicalor_criterion.md               |  2 +-
 .../payment_method_createdat_criterion.md        |  2 +-
 .../payment_method_enabled_criterion.md          |  2 +-
 .../payment_method_id_criterion.md               |  2 +-
 .../payment_method_identifier_criterion.md       |  2 +-
 .../payment_method_logicaland_criterion.md       |  2 +-
 .../payment_method_logicalor_criterion.md        |  2 +-
 .../payment_method_name_criterion.md             |  2 +-
 .../payment_method_search_criteria.md            |  2 +-
 .../payment_method_type_criterion.md             |  2 +-
 .../payment_method_updatedat_criterion.md        |  2 +-
 .../payment_order_criterion.md                   |  2 +-
 .../payment_payment_method_criterion.md          |  2 +-
 .../payment_search_criteria.md                   |  2 +-
 .../payment_status_criterion.md                  |  2 +-
 .../payment_updatedat_criterion.md               |  2 +-
 .../price_currency_criterion.md                  |  4 ++--
 .../price_customergroup_criterion.md             |  4 ++--
 .../price_isbaseprice_criterion.md               |  4 ++--
 .../price_iscustomprice_criterion.md             |  4 ++--
 .../price_logicaland_criterion.md                |  2 +-
 .../price_logicalor_criterion.md                 |  2 +-
 .../price_product_criterion.md                   |  4 ++--
 .../criteria_reference/price_search_criteria.md  |  2 +-
 .../criteria_reference/priority_criterion.md     |  5 +++++
 .../product_search_criteria.md                   |  2 +-
 .../productavailability_criterion.md             |  5 +++++
 .../productcategory_criterion.md                 |  5 +++++
 .../criteria_reference/productcode_criterion.md  |  5 +++++
 .../criteria_reference/productname_criterion.md  |  5 +++++
 .../criteria_reference/productstock_criterion.md |  5 +++++
 .../productstockrange_criterion.md               |  5 +++++
 .../criteria_reference/producttype_criterion.md  |  5 +++++
 ...rangemeasurementattributemaximum_criterion.md |  5 +++++
 ...rangemeasurementattributeminimum_criterion.md |  5 +++++
 .../criteria_reference/remoteid_criterion.md     |  5 +++++
 .../search_criteria_reference.md                 |  3 +--
 .../criteria_reference/sectionid_criterion.md    |  8 ++++++--
 .../sectionidentifier_criterion.md               |  8 ++++++--
 .../selectionattribute_criterion.md              |  5 +++++
 .../shipment_createdat_criterion.md              |  2 +-
 .../shipment_currency_criterion.md               |  4 ++--
 .../criteria_reference/shipment_id_criterion.md  |  4 ++--
 .../shipment_identifier_criterion.md             |  4 ++--
 .../shipment_logicaland_criterion.md             |  2 +-
 .../shipment_logicalor_criterion.md              |  2 +-
 .../shipment_owner_criterion.md                  |  2 +-
 .../shipment_search_criteria.md                  |  2 +-
 .../shipment_shipping_method_criterion.md        |  4 ++--
 .../shipment_status_criterion.md                 |  4 ++--
 .../shipment_updatedat_criterion.md              |  2 +-
 .../criteria_reference/sibling_criterion.md      |  8 ++++++--
 .../simplemeasurementattribute_criterion.md      |  5 +++++
 .../criteria_reference/subtree_criterion.md      |  8 ++++++--
 .../criteria_reference/taxonomy_entry_id.md      |  8 ++++++--
 .../criteria_reference/useremail_criterion.md    |  8 ++++++--
 .../criteria_reference/userid_criterion.md       |  8 ++++++--
 .../criteria_reference/userlogin_criterion.md    |  8 ++++++--
 .../criteria_reference/usermetadata_criterion.md |  8 ++++++--
 .../criteria_reference/visibility_criterion.md   | 16 ++++++++++------
 168 files changed, 628 insertions(+), 193 deletions(-)

diff --git a/docs/search/activity_log_search_reference/logged_at_criterion.md b/docs/search/activity_log_search_reference/logged_at_criterion.md
index ec69838960..b48457b347 100644
--- a/docs/search/activity_log_search_reference/logged_at_criterion.md
+++ b/docs/search/activity_log_search_reference/logged_at_criterion.md
@@ -1,7 +1,6 @@
 # LoggedAt Criterion
 
-The `LoggedAtCriterion` Activity Log Criterion
-matches activity log group that has a log entry created before or after a given date time.
+The `LoggedAtCriterion` Activity Log Criterion matches activity log group that has a log entry created before or after a given date time.
 
 ## Arguments
 
diff --git a/docs/search/activity_log_search_reference/object_criterion.md b/docs/search/activity_log_search_reference/object_criterion.md
index 7d1eaa623c..7be18ad3c5 100644
--- a/docs/search/activity_log_search_reference/object_criterion.md
+++ b/docs/search/activity_log_search_reference/object_criterion.md
@@ -1,7 +1,6 @@
 # Object Criterion
 
-The `ObjectCriterion` Activity Log Criterion
-matches log group with a log entry about the given class name, and eventually one of the given IDs.
+The `ObjectCriterion` Activity Log Criterion matches log group with a log entry about the given class name, and eventually one of the given IDs.
 
 ## Arguments
 
diff --git a/docs/search/activity_log_search_reference/object_name_criterion.md b/docs/search/activity_log_search_reference/object_name_criterion.md
index bb495887d8..48ad0b1248 100644
--- a/docs/search/activity_log_search_reference/object_name_criterion.md
+++ b/docs/search/activity_log_search_reference/object_name_criterion.md
@@ -1,7 +1,6 @@
 # Object Name Criterion
 
-The `ObjectNameCriterion` Activity Log Criterion
-matches log groups that have a log entry with an object having a given string as name, or part of their name.
+The `ObjectNameCriterion` Activity Log Criterion matches log groups that have a log entry with an object having a given string as name, or part of their name.
 
 ## Arguments
 
diff --git a/docs/search/activity_log_search_reference/user_criterion.md b/docs/search/activity_log_search_reference/user_criterion.md
index 2440790e37..def4663f95 100644
--- a/docs/search/activity_log_search_reference/user_criterion.md
+++ b/docs/search/activity_log_search_reference/user_criterion.md
@@ -1,7 +1,6 @@
 # User Criterion
 
-The `UserCriterion` Activity Log Criterion
-matches log groups that have an activity by one of the users given by their IDs.
+The `UserCriterion` Activity Log Criterion matches log groups that have an activity by one of the users given by their IDs.
 
 ## Argument
 
diff --git a/docs/search/aggregation_reference/aggregation_reference.md b/docs/search/aggregation_reference/aggregation_reference.md
index 0d713f2e4f..7ae970f8e7 100644
--- a/docs/search/aggregation_reference/aggregation_reference.md
+++ b/docs/search/aggregation_reference/aggregation_reference.md
@@ -11,7 +11,7 @@ There are three types of aggregations:
 
 - Term aggregations group by value and count object in each group
 - Range aggregations count values in specified ranges
-- Stats aggregations compute stats over numeric fields: minimum, average and maximum value, count and sum of values
+- Stats aggregations compute stats over numeric fields: minimum, average and maximum value, count, and sum of values
 
 !!! tip
 
diff --git a/docs/search/aggregation_reference/authorterm_aggregation.md b/docs/search/aggregation_reference/authorterm_aggregation.md
index e4a3ce48bb..448d582948 100644
--- a/docs/search/aggregation_reference/authorterm_aggregation.md
+++ b/docs/search/aggregation_reference/authorterm_aggregation.md
@@ -1,3 +1,7 @@
+---
+description: AuthorTermAggregation
+---
+
 # AuthorTermAggregation
 
 The field-based [AuthorTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-AuthorTermAggregation.html) aggregates search results by the value of the Author field.
diff --git a/docs/search/aggregation_reference/basepricestats_aggregation.md b/docs/search/aggregation_reference/basepricestats_aggregation.md
index 88b61d1a7d..f504602d16 100644
--- a/docs/search/aggregation_reference/basepricestats_aggregation.md
+++ b/docs/search/aggregation_reference/basepricestats_aggregation.md
@@ -1,7 +1,10 @@
+---
+description: BasePriceStatsAggregation
+---
+
 # BasePriceStatsAggregation
 
-The BasePriceStatsAggregation aggregates search results by the value of the product's price
-and provides statistical information for the values. You can use the provided getters to access the values:
+The BasePriceStatsAggregation aggregates search results by the value of the product's pricecand provides statistical information for the values. You can use the provided getters to access the values:
 
 - sum (`getSum()`)
 - count of values (`getCount()`)
diff --git a/docs/search/aggregation_reference/checkboxterm_aggregation.md b/docs/search/aggregation_reference/checkboxterm_aggregation.md
index 3a409402b1..49c23d6816 100644
--- a/docs/search/aggregation_reference/checkboxterm_aggregation.md
+++ b/docs/search/aggregation_reference/checkboxterm_aggregation.md
@@ -1,3 +1,7 @@
+---
+description: CheckboxTermAggregation
+---
+
 # CheckboxTermAggregation
 
 The field-based [CheckboxTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-CheckboxTermAggregation.html) aggregates search results by the value of the Checkbox field.
diff --git a/docs/search/aggregation_reference/contenttypegroupterm_aggregation.md b/docs/search/aggregation_reference/contenttypegroupterm_aggregation.md
index 1033f3c69d..5033095ee3 100644
--- a/docs/search/aggregation_reference/contenttypegroupterm_aggregation.md
+++ b/docs/search/aggregation_reference/contenttypegroupterm_aggregation.md
@@ -1,3 +1,7 @@
+---
+description: ContentTypeGroupTermAggregation
+---
+
 # ContentTypeGroupTermAggregation
 
 The [ContentTypeGroupTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-ContentTypeGroupTermAggregation.html) aggregates search results by the content item's content type group.
diff --git a/docs/search/aggregation_reference/contenttypeterm_aggregation.md b/docs/search/aggregation_reference/contenttypeterm_aggregation.md
index 4f3694043f..aafdc79fee 100644
--- a/docs/search/aggregation_reference/contenttypeterm_aggregation.md
+++ b/docs/search/aggregation_reference/contenttypeterm_aggregation.md
@@ -1,3 +1,7 @@
+---
+description: ContentTypeTermAggregation
+---
+
 # ContentTypeTermAggregation
 
 The [ContentTypeTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-ContentTypeTermAggregation.html) aggregates search results by the content item's content type.
diff --git a/docs/search/aggregation_reference/countryterm_aggregation.md b/docs/search/aggregation_reference/countryterm_aggregation.md
index f05f7fb4da..c0828c7f10 100644
--- a/docs/search/aggregation_reference/countryterm_aggregation.md
+++ b/docs/search/aggregation_reference/countryterm_aggregation.md
@@ -1,3 +1,7 @@
+---
+description: CountryTermAggregation
+---
+
 # CountryTermAggregation
 
 The field-based [CountryTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-CountryTermAggregation.html) aggregates search results by the value of the Country field.
diff --git a/docs/search/aggregation_reference/custompricestats_aggregation.md b/docs/search/aggregation_reference/custompricestats_aggregation.md
index bba30bd0c3..08413b7888 100644
--- a/docs/search/aggregation_reference/custompricestats_aggregation.md
+++ b/docs/search/aggregation_reference/custompricestats_aggregation.md
@@ -1,7 +1,10 @@
+---
+description: CustomPriceStatsAggregation
+---
+
 # CustomPriceStatsAggregation
 
-The CustomPriceStatsAggregation aggregates search results by the value of the custom product's price
-and provides statistical information for the values. You can use the provided getters to access the values:
+The CustomPriceStatsAggregation aggregates search results by the value of the custom product's price and provides statistical information for the values. You can use the provided getters to access the values:
 
 - sum (`getSum()`)
 - count of values (`getCount()`)
diff --git a/docs/search/aggregation_reference/datemetadatarange_aggregation.md b/docs/search/aggregation_reference/datemetadatarange_aggregation.md
index baf2785194..0c3b42ec53 100644
--- a/docs/search/aggregation_reference/datemetadatarange_aggregation.md
+++ b/docs/search/aggregation_reference/datemetadatarange_aggregation.md
@@ -1,3 +1,7 @@
+---
+description: DateMetadataRangeAggregation
+---
+
 # DateMetadataRangeAggregation
 
 The [DateMetadataRangeAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-CountryTermAggregation.html) aggregates search results by the value of the content items' date metadata.
diff --git a/docs/search/aggregation_reference/daterange_aggregation.md b/docs/search/aggregation_reference/daterange_aggregation.md
index 8610db02ce..f1a87e3436 100644
--- a/docs/search/aggregation_reference/daterange_aggregation.md
+++ b/docs/search/aggregation_reference/daterange_aggregation.md
@@ -1,6 +1,10 @@
+---
+description: DateRangeAggregation
+---
+
 # DateRangeAggregation
 
-The field-based [DateRangeAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-DateRangeAggregation.html) aggregates search results by the value of the Date, DateTime or Time field.
+The field-based [DateRangeAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-DateRangeAggregation.html) aggregates search results by the value of the Date, DateTime, or Time field.
 
 ## Arguments
 
diff --git a/docs/search/aggregation_reference/datetimerange_aggregation.md b/docs/search/aggregation_reference/datetimerange_aggregation.md
index 8a70814a5f..6eafeb5fec 100644
--- a/docs/search/aggregation_reference/datetimerange_aggregation.md
+++ b/docs/search/aggregation_reference/datetimerange_aggregation.md
@@ -1,6 +1,10 @@
+---
+description: DateTimeRangeAggregation
+---
+
 # DateTimeRangeAggregation
 
-The field-based [DateTimeRangeAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-DateTimeRangeAggregation.html) aggregates search results by the value of the Date, DateTime or Time field.
+The field-based [DateTimeRangeAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-DateTimeRangeAggregation.html) aggregates search results by the value of the Date, DateTime, or Time field.
 
 ## Arguments
 
diff --git a/docs/search/aggregation_reference/floatrange_aggregation.md b/docs/search/aggregation_reference/floatrange_aggregation.md
index 6086012648..c5b5eb6dd1 100644
--- a/docs/search/aggregation_reference/floatrange_aggregation.md
+++ b/docs/search/aggregation_reference/floatrange_aggregation.md
@@ -1,3 +1,7 @@
+---
+description: FloatRangeAggregation
+---
+
 # FloatRangeAggregation
 
 The field-based [FloatRangeAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-FloatRangeAggregation.html) aggregates search results by the value of the Float field.
diff --git a/docs/search/aggregation_reference/floatstats_aggregation.md b/docs/search/aggregation_reference/floatstats_aggregation.md
index 710fb5f870..c04c103d4e 100644
--- a/docs/search/aggregation_reference/floatstats_aggregation.md
+++ b/docs/search/aggregation_reference/floatstats_aggregation.md
@@ -1,7 +1,11 @@
+---
+description: FloatStatsAggregation
+---
+
 # FloatStatsAggregation
 
-The field-based [FloatStatsAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-FloatStatsAggregation.html) aggregates search results by the value of the Float field
-and provides statistical information for the values. You can use the provided getters to access the values:
+The field-based [FloatStatsAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-FloatStatsAggregation.html) aggregates search results by the value of the Float field and provides statistical information for the values.
+You can use the provided getters to access the values:
 
 - sum (`getSum()`)
 - count of values (`getCount()`)
diff --git a/docs/search/aggregation_reference/integerrange_aggregation.md b/docs/search/aggregation_reference/integerrange_aggregation.md
index c16e7e8eaf..836f28ae65 100644
--- a/docs/search/aggregation_reference/integerrange_aggregation.md
+++ b/docs/search/aggregation_reference/integerrange_aggregation.md
@@ -1,3 +1,7 @@
+---
+description: IntegerRangeAggregation
+---
+
 # IntegerRangeAggregation
 
 The field-based [IntegerRangeAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-IntegerRangeAggregation.html) aggregates search results by the value of the Integer field.
diff --git a/docs/search/aggregation_reference/integerstats_aggregation.md b/docs/search/aggregation_reference/integerstats_aggregation.md
index f32dac1bce..90bbee9015 100644
--- a/docs/search/aggregation_reference/integerstats_aggregation.md
+++ b/docs/search/aggregation_reference/integerstats_aggregation.md
@@ -1,7 +1,10 @@
+---
+description: IntegerStatsAggregation
+---
+
 # IntegerStatsAggregation
 
-The field-based [IntegerStatsAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-IntegerStatsAggregation.html) aggregates search results by the value of the Integer field
-and provides statistical information for the values. You can use the provided getters to access the values:
+The field-based [IntegerStatsAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-IntegerStatsAggregation.html) aggregates search results by the value of the Integer field and provides statistical information for the values. You can use the provided getters to access the values:
 
 - sum (`getSum()`)
 - count of values (`getCount()`)
diff --git a/docs/search/aggregation_reference/keywordterm_aggregation.md b/docs/search/aggregation_reference/keywordterm_aggregation.md
index 11543be631..8610eaa8d6 100644
--- a/docs/search/aggregation_reference/keywordterm_aggregation.md
+++ b/docs/search/aggregation_reference/keywordterm_aggregation.md
@@ -1,3 +1,7 @@
+---
+description: KeywordTermAggregation
+---
+
 # KeywordTermAggregation
 
 The field-based [KeywordTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-KeywordTermAggregation.html) aggregates search results by the value of the Keyword field.
diff --git a/docs/search/aggregation_reference/languageterm_aggregation.md b/docs/search/aggregation_reference/languageterm_aggregation.md
index 1e4bded3ab..744d8bfe63 100644
--- a/docs/search/aggregation_reference/languageterm_aggregation.md
+++ b/docs/search/aggregation_reference/languageterm_aggregation.md
@@ -1,3 +1,7 @@
+---
+description: LanguageTermAggregation
+---
+
 # LanguageTermAggregation
 
 The [LanguageTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-LanguageTermAggregation.html) aggregates search results by the content item's language.
diff --git a/docs/search/aggregation_reference/locationchildrenterm_aggregation.md b/docs/search/aggregation_reference/locationchildrenterm_aggregation.md
index bdcc750a9a..ab5975b0fe 100644
--- a/docs/search/aggregation_reference/locationchildrenterm_aggregation.md
+++ b/docs/search/aggregation_reference/locationchildrenterm_aggregation.md
@@ -1,6 +1,10 @@
+---
+description: LocationChildrenTermAggregation
+---
+
 # LocationChildrenTermAggregation
 
-The [LocationChildrenTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Location-LocationChildrenTermAggregation.html) aggregates search results by the number of children of a Location.
+The [LocationChildrenTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Location-LocationChildrenTermAggregation.html) aggregates search results by the number of children of a location.
 
 ## Arguments
 
diff --git a/docs/search/aggregation_reference/objectstateterm_aggregation.md b/docs/search/aggregation_reference/objectstateterm_aggregation.md
index b9aac3dd2b..c1e3bb3854 100644
--- a/docs/search/aggregation_reference/objectstateterm_aggregation.md
+++ b/docs/search/aggregation_reference/objectstateterm_aggregation.md
@@ -1,3 +1,7 @@
+---
+description: ObjectStateTermAggregation
+---
+
 # ObjectStateTermAggregation
 
 The [ObjectStateTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-ObjectStateTermAggregation.html) aggregates search results by the content item's Object state.
diff --git a/docs/search/aggregation_reference/product_attribute_aggregations.md b/docs/search/aggregation_reference/product_attribute_aggregations.md
index ded0c85e5d..d6a533713e 100644
--- a/docs/search/aggregation_reference/product_attribute_aggregations.md
+++ b/docs/search/aggregation_reference/product_attribute_aggregations.md
@@ -1,3 +1,7 @@
+---
+description: Product attribute aggregations aggregate search results by the value of the product's attributes.
+---
+
 # Product attribute aggregations
 
 Product attribute aggregations aggregate search results by the value of the product's attributes.
@@ -17,8 +21,7 @@ Depending on attribute type, the following aggregations are available:
 - `name` - name of the Aggregation
 - `attributeDefinitionIdentifier` - identifier of the attribute
 
-Range aggregations (`ProductAttributeFloatRangeAggregation` and `ProductAttributeIntegerRangeAggregation`)
-additionally take:
+Range aggregations (`ProductAttributeFloatRangeAggregation` and `ProductAttributeIntegerRangeAggregation`) additionally take:
 
 - `ranges` - array of Range objects that define the borders of the specific range sets
 
diff --git a/docs/search/aggregation_reference/productavailabilityterm_aggregation.md b/docs/search/aggregation_reference/productavailabilityterm_aggregation.md
index 468823836f..45058d73d6 100644
--- a/docs/search/aggregation_reference/productavailabilityterm_aggregation.md
+++ b/docs/search/aggregation_reference/productavailabilityterm_aggregation.md
@@ -1,3 +1,7 @@
+---
+description: ProductAvailabilityTerm
+---
+
 # ProductAvailabilityTerm
 
 The ProductAvailabilityTermAggregation aggregates search results by product availability (available/unavailable).
diff --git a/docs/search/aggregation_reference/productpricerange_aggregation.md b/docs/search/aggregation_reference/productpricerange_aggregation.md
index c228ea602a..aa6774888c 100644
--- a/docs/search/aggregation_reference/productpricerange_aggregation.md
+++ b/docs/search/aggregation_reference/productpricerange_aggregation.md
@@ -1,3 +1,7 @@
+---
+description: ProductPriceRangeAggregation
+---
+
 # ProductPriceRangeAggregation
 
 The ProductPriceRangeAggregation aggregates search results by the value of the product's price.
diff --git a/docs/search/aggregation_reference/productstockrange_aggregation.md b/docs/search/aggregation_reference/productstockrange_aggregation.md
index a67297f614..0b29292bc6 100644
--- a/docs/search/aggregation_reference/productstockrange_aggregation.md
+++ b/docs/search/aggregation_reference/productstockrange_aggregation.md
@@ -1,3 +1,7 @@
+---
+description: ProductStockRangeAggregation
+---
+
 # ProductStockRangeAggregation
 
 The ProductStockRangeAggregation aggregates search results by products' numerical stock.
diff --git a/docs/search/aggregation_reference/producttypeterm_aggregation.md b/docs/search/aggregation_reference/producttypeterm_aggregation.md
index 13b18152ea..aac92ab6d7 100644
--- a/docs/search/aggregation_reference/producttypeterm_aggregation.md
+++ b/docs/search/aggregation_reference/producttypeterm_aggregation.md
@@ -1,3 +1,7 @@
+---
+description: ProductTypeTerm
+---
+
 # ProductTypeTerm
 
 The ProductTypeTermAggregation aggregates search results by the product type.
diff --git a/docs/search/aggregation_reference/rawrange_aggregation.md b/docs/search/aggregation_reference/rawrange_aggregation.md
index 8084c89b3f..afe0b9ddd9 100644
--- a/docs/search/aggregation_reference/rawrange_aggregation.md
+++ b/docs/search/aggregation_reference/rawrange_aggregation.md
@@ -1,3 +1,7 @@
+---
+description: RawRangeAggregation
+---
+
 # RawRangeAggregation
 
 The [RawRangeAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-RawRangeAggregation.html) aggregates search results by the value of the selected search index field.
diff --git a/docs/search/aggregation_reference/rawstats_aggregation.md b/docs/search/aggregation_reference/rawstats_aggregation.md
index a4b76c65b1..967ea04304 100644
--- a/docs/search/aggregation_reference/rawstats_aggregation.md
+++ b/docs/search/aggregation_reference/rawstats_aggregation.md
@@ -1,7 +1,11 @@
+---
+description: RawStatsAggregation
+---
+
 # RawStatsAggregation
 
-The [RawStatsAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-RawStatsAggregation.html) aggregates search results by the value of the selected search index field
-and provides statistical information for the values. You can use the provided getters to access the values:
+The [RawStatsAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-RawStatsAggregation.html) aggregates search results by the value of the selected search index field and provides statistical information for the values.
+You can use the provided getters to access the values:
 
 - sum (`getSum()`)
 - count of values (`getCount()`)
diff --git a/docs/search/aggregation_reference/rawterm_aggregation.md b/docs/search/aggregation_reference/rawterm_aggregation.md
index c7ce430b46..bf7b9855fc 100644
--- a/docs/search/aggregation_reference/rawterm_aggregation.md
+++ b/docs/search/aggregation_reference/rawterm_aggregation.md
@@ -1,3 +1,7 @@
+---
+description: RawTermAggregation
+---
+
 # RawTermAggregation
 
 The [RawTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-RawTermAggregation.html) aggregates search results by the value of the selected search index field.
diff --git a/docs/search/aggregation_reference/sectionterm_aggregation.md b/docs/search/aggregation_reference/sectionterm_aggregation.md
index a8976ea44c..ab57cd870f 100644
--- a/docs/search/aggregation_reference/sectionterm_aggregation.md
+++ b/docs/search/aggregation_reference/sectionterm_aggregation.md
@@ -1,6 +1,10 @@
+---
+description: SectionTermAggregation
+---
+
 # SectionTermAggregation
 
-The [SectionTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-SectionTermAggregation.html) aggregates search results by the content item's Section.
+The [SectionTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-SectionTermAggregation.html) aggregates search results by the content item's section.
 
 ## Arguments
 
diff --git a/docs/search/aggregation_reference/selectionterm_aggregation.md b/docs/search/aggregation_reference/selectionterm_aggregation.md
index 2951cca5bc..0b09dcf111 100644
--- a/docs/search/aggregation_reference/selectionterm_aggregation.md
+++ b/docs/search/aggregation_reference/selectionterm_aggregation.md
@@ -1,3 +1,7 @@
+---
+description: SelectionTermAggregation
+---
+
 # SelectionTermAggregation
 
 The field-based [SelectionTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-SelectionTermAggregation.html) aggregates search results by the value of the Selection field.
diff --git a/docs/search/aggregation_reference/subtreeterm_aggregation.md b/docs/search/aggregation_reference/subtreeterm_aggregation.md
index f77c073be6..87aaab2c5d 100644
--- a/docs/search/aggregation_reference/subtreeterm_aggregation.md
+++ b/docs/search/aggregation_reference/subtreeterm_aggregation.md
@@ -1,6 +1,10 @@
+---
+description: SubtreeTermAggregation
+---
+
 # SubtreeTermAggregation
 
-The [SubtreeTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Location-SubtreeTermAggregation.html) aggregates search results by the Location's subtree path.
+The [SubtreeTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Location-SubtreeTermAggregation.html) aggregates search results by the location's subtree path.
 
 ## Arguments
 
diff --git a/docs/search/aggregation_reference/taxonomyentryid_aggregation.md b/docs/search/aggregation_reference/taxonomyentryid_aggregation.md
index bddfa11464..cff1e2b455 100644
--- a/docs/search/aggregation_reference/taxonomyentryid_aggregation.md
+++ b/docs/search/aggregation_reference/taxonomyentryid_aggregation.md
@@ -1,3 +1,7 @@
+---
+description: TaxonomyEntryIdAggregation
+---
+
 # TaxonomyEntryIdAggregation
 
 The `TaxonomyEntryIdAggregation` aggregates search results by the content item's taxonomy entry or a product's category.
diff --git a/docs/search/aggregation_reference/timerange_aggregation.md b/docs/search/aggregation_reference/timerange_aggregation.md
index 2ef07cc216..2dc2cbf36a 100644
--- a/docs/search/aggregation_reference/timerange_aggregation.md
+++ b/docs/search/aggregation_reference/timerange_aggregation.md
@@ -1,6 +1,10 @@
+---
+description: TimeRangeAggregation
+---
+
 # TimeRangeAggregation
 
-The field-based [TimeRangeAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-TimeRangeAggregation.html) aggregates search results by the value of the Date, DateTime or Time field.
+The field-based [TimeRangeAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-Field-TimeRangeAggregation.html) aggregates search results by the value of the Date, DateTime, or Time field.
 
 ## Arguments
 
diff --git a/docs/search/aggregation_reference/usermetadataterm_aggregation.md b/docs/search/aggregation_reference/usermetadataterm_aggregation.md
index 3c0f29e7fb..6f58e5a84e 100644
--- a/docs/search/aggregation_reference/usermetadataterm_aggregation.md
+++ b/docs/search/aggregation_reference/usermetadataterm_aggregation.md
@@ -1,3 +1,7 @@
+---
+description: UserMetadataTermAggregation
+---
+
 # UserMetadataTermAggregation
 
 The [UserMetadataTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-UserMetadataTermAggregation.html) aggregates search results by the User content item's metadata.
diff --git a/docs/search/aggregation_reference/visibilityterm_aggregation.md b/docs/search/aggregation_reference/visibilityterm_aggregation.md
index 7c71413fcb..79b824efd1 100644
--- a/docs/search/aggregation_reference/visibilityterm_aggregation.md
+++ b/docs/search/aggregation_reference/visibilityterm_aggregation.md
@@ -1,3 +1,7 @@
+---
+description: VisibilityTermAggregation
+---
+
 # VisibilityTermAggregation
 
 The [VisibilityTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-VisibilityTermAggregation.html) aggregates search results by the content item's visibility.
diff --git a/docs/search/criteria_reference/ancestor_criterion.md b/docs/search/criteria_reference/ancestor_criterion.md
index 2bd0188b5b..77ca54efe1 100644
--- a/docs/search/criteria_reference/ancestor_criterion.md
+++ b/docs/search/criteria_reference/ancestor_criterion.md
@@ -1,7 +1,11 @@
+---
+description: Ancestor Search Criterion
+edition: commerce
+---
+
 # Ancestor Criterion
 
-The [`Ancestor` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-Ancestor.html)
-searches for content that is an ancestor of the provided Location, including this Location.
+The [`Ancestor` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-Ancestor.html) searches for content that is an ancestor of the provided location, including this location.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/attributegroupidentifier_criterion.md b/docs/search/criteria_reference/attributegroupidentifier_criterion.md
index 1b6521011d..fe0ba0cce8 100644
--- a/docs/search/criteria_reference/attributegroupidentifier_criterion.md
+++ b/docs/search/criteria_reference/attributegroupidentifier_criterion.md
@@ -1,3 +1,8 @@
+---
+description: AttributeGroupIdentifier Search Criterion
+edition: commerce
+---
+
 # AttributeGroupIdentifier Criterion
 
 The `AttributeGroupIdentifier` Search Criterion searches for products by the value of their attribute group identifier.
diff --git a/docs/search/criteria_reference/attributename_criterion.md b/docs/search/criteria_reference/attributename_criterion.md
index b80ecf4365..04bbe25542 100644
--- a/docs/search/criteria_reference/attributename_criterion.md
+++ b/docs/search/criteria_reference/attributename_criterion.md
@@ -1,3 +1,8 @@
+---
+description: AttributeName Search Criterion
+edition: commerce
+---
+
 # AttributeName Criterion
 
 The `AttributeName` Search Criterion searches for products by the value of their attribute name.
diff --git a/docs/search/criteria_reference/baseprice_criterion.md b/docs/search/criteria_reference/baseprice_criterion.md
index 13d9077931..0847e7709e 100644
--- a/docs/search/criteria_reference/baseprice_criterion.md
+++ b/docs/search/criteria_reference/baseprice_criterion.md
@@ -1,3 +1,8 @@
+---
+description: BasePrice Search Criterion
+edition: commerce
+---
+
 # BasePrice Criterion
 
 The [`BasePrice` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-ProductCatalog-Values-Product-Query-Criterion-BasePrice.html) searches for products by their base price.
diff --git a/docs/search/criteria_reference/catalogidentifier_criterion.md b/docs/search/criteria_reference/catalogidentifier_criterion.md
index 227c8db2c8..6ee43f54ea 100644
--- a/docs/search/criteria_reference/catalogidentifier_criterion.md
+++ b/docs/search/criteria_reference/catalogidentifier_criterion.md
@@ -1,3 +1,8 @@
+---
+description: CatalogIdentifier Search Criterion
+edition: commerce
+---
+
 # CatalogIdentifier Criterion
 
 The `CatalogIdentifier` Search Criterion searches for a catalog by the value of its identifier.
diff --git a/docs/search/criteria_reference/catalogname_criterion.md b/docs/search/criteria_reference/catalogname_criterion.md
index 463d68989c..6aca6d91e7 100644
--- a/docs/search/criteria_reference/catalogname_criterion.md
+++ b/docs/search/criteria_reference/catalogname_criterion.md
@@ -1,3 +1,8 @@
+---
+description: CatalogName Search Criterion
+edition: commerce
+---
+
 # CatalogName Criterion
 
 The `CatalogName` Search Criterion searches for catalogs by the value of their name.
diff --git a/docs/search/criteria_reference/catalogstatus_criterion.md b/docs/search/criteria_reference/catalogstatus_criterion.md
index 9c2135ee49..ec537f6771 100644
--- a/docs/search/criteria_reference/catalogstatus_criterion.md
+++ b/docs/search/criteria_reference/catalogstatus_criterion.md
@@ -1,3 +1,8 @@
+---
+description: CatalogStatus Search Criterion
+edition: commerce
+---
+
 # CatalogStatus Criterion
 
 The `CatalogStatus` Search Criterion searches for catalogs by the value of their status.
diff --git a/docs/search/criteria_reference/checkboxattribute_criterion.md b/docs/search/criteria_reference/checkboxattribute_criterion.md
index ee0836c3a4..133519a8ef 100644
--- a/docs/search/criteria_reference/checkboxattribute_criterion.md
+++ b/docs/search/criteria_reference/checkboxattribute_criterion.md
@@ -1,3 +1,8 @@
+---
+description: CheckboxAttribute Search Criterion
+edition: commerce
+---
+
 # CheckboxAttribute Criterion
 
 The `CheckboxAttribute` Search Criterion searches for products by the value of their checkbox attribute.
diff --git a/docs/search/criteria_reference/colorattribute_criterion.md b/docs/search/criteria_reference/colorattribute_criterion.md
index bcb61e9fef..7eadc1553c 100644
--- a/docs/search/criteria_reference/colorattribute_criterion.md
+++ b/docs/search/criteria_reference/colorattribute_criterion.md
@@ -1,3 +1,8 @@
+---
+description: ColorAttribute Search Criterion
+edition: commerce
+---
+
 # ColorAttribute Criterion
 
 The `ColorAttribute` Search Criterion searches for products by the value of their color attribute.
diff --git a/docs/search/criteria_reference/contentid_criterion.md b/docs/search/criteria_reference/contentid_criterion.md
index 1f69f4ea47..fed235dc87 100644
--- a/docs/search/criteria_reference/contentid_criterion.md
+++ b/docs/search/criteria_reference/contentid_criterion.md
@@ -1,7 +1,11 @@
+---
+description: ContentId Search Criterion
+edition: commerce
+---
+
 # ContentId Criterion
 
-The [`ContentId` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-ContentId.html)
-searches for content by its ID.
+The [`ContentId` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-ContentId.html) searches for content by its ID.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/contentname_criterion.md b/docs/search/criteria_reference/contentname_criterion.md
index c8a5f67a90..9f1bd13b1c 100644
--- a/docs/search/criteria_reference/contentname_criterion.md
+++ b/docs/search/criteria_reference/contentname_criterion.md
@@ -1,10 +1,11 @@
 ---
+description: ContentName Search Criterion
+edition: commerce
 ---
 
 # ContentName Criterion
 
-The [`ContentName` Search Criterion](https://github.com/ibexa/core/blob/main/src/contracts/Repository/Values/Content/Query/Criterion/ContentName.php)
-searches for content by its name.
+The [`ContentName` Search Criterion](https://github.com/ibexa/core/blob/main/src/contracts/Repository/Values/Content/Query/Criterion/ContentName.php) searches for content by its name.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/contenttypegroupid_criterion.md b/docs/search/criteria_reference/contenttypegroupid_criterion.md
index 6f9b10194b..66c947e159 100644
--- a/docs/search/criteria_reference/contenttypegroupid_criterion.md
+++ b/docs/search/criteria_reference/contenttypegroupid_criterion.md
@@ -1,7 +1,11 @@
+---
+description: ContentTypeGroupId Search Criterion
+edition: commerce
+---
+
 # ContentTypeGroupId Criterion
 
-The [`ContentTypeGroupId` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-ContentTypeGroupId.html)
-searches for content based on the ID of its content type group.
+The [`ContentTypeGroupId` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-ContentTypeGroupId.html) searches for content based on the ID of its content type group.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/contenttypeid_criterion.md b/docs/search/criteria_reference/contenttypeid_criterion.md
index b7d5f9edd1..8eaae892fc 100644
--- a/docs/search/criteria_reference/contenttypeid_criterion.md
+++ b/docs/search/criteria_reference/contenttypeid_criterion.md
@@ -1,7 +1,11 @@
+---
+description: ContentTypeId Search Criterion
+edition: commerce
+---
+
 # ContentTypeId Criterion
 
-The [`ContentTypeId` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-ContentTypeId.html)
-searches for content based on the ID of its content type.
+The [`ContentTypeId` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-ContentTypeId.html) searches for content based on the ID of its content type.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/contenttypeidentifier_criterion.md b/docs/search/criteria_reference/contenttypeidentifier_criterion.md
index fd6ef223c2..7180489217 100644
--- a/docs/search/criteria_reference/contenttypeidentifier_criterion.md
+++ b/docs/search/criteria_reference/contenttypeidentifier_criterion.md
@@ -1,7 +1,11 @@
+---
+description: ContentTypeIdentifier Search Criterion
+edition: commerce
+---
+
 # ContentTypeIdentifier Criterion
 
-The [`ContentTypeIdentifier` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-ContentTypeId.html)
-searches for content based on the identifier of its content type.
+The [`ContentTypeIdentifier` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-ContentTypeId.html) searches for content based on the identifier of its content type.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/createdat_criterion.md b/docs/search/criteria_reference/createdat_criterion.md
index 7eb9eb06c9..b7d70da318 100644
--- a/docs/search/criteria_reference/createdat_criterion.md
+++ b/docs/search/criteria_reference/createdat_criterion.md
@@ -1,3 +1,8 @@
+---
+description: CreatedAt Search Criterion
+edition: commerce
+---
+
 # CreatedAt Criterion
 
 The `CreatedAt` Search Criterion searches for products based on the date when they were created.
diff --git a/docs/search/criteria_reference/createdatrange_criterion.md b/docs/search/criteria_reference/createdatrange_criterion.md
index 1b461050e0..1d4c5ea8d9 100644
--- a/docs/search/criteria_reference/createdatrange_criterion.md
+++ b/docs/search/criteria_reference/createdatrange_criterion.md
@@ -1,3 +1,8 @@
+---
+description: CreatedAtRange Search Criterion
+edition: commerce
+---
+
 # CreatedAtRange Criterion
 
 The `CreatedAtRange` Search Criterion searches for products based on the date range when they were created.
diff --git a/docs/search/criteria_reference/currencycode_criterion.md b/docs/search/criteria_reference/currencycode_criterion.md
index 4a0d995720..4e2903e8bd 100644
--- a/docs/search/criteria_reference/currencycode_criterion.md
+++ b/docs/search/criteria_reference/currencycode_criterion.md
@@ -1,3 +1,8 @@
+---
+description: CurrencyCode Search Criterion
+edition: commerce
+---
+
 # CurrencyCode Criterion
 
 The `CurrencyCodeCriterion` Search Criterion searches for currencies by their codes.
diff --git a/docs/search/criteria_reference/customergroupid_criterion.md b/docs/search/criteria_reference/customergroupid_criterion.md
index ce0e13ce14..c92dbb1279 100644
--- a/docs/search/criteria_reference/customergroupid_criterion.md
+++ b/docs/search/criteria_reference/customergroupid_criterion.md
@@ -1,7 +1,11 @@
+---
+description: CustomerGroupId Search Criterion
+edition: commerce
+---
+
 # CustomerGroupId Criterion
 
-The `CustomerGroupId` Search Criterion
-searches for content based on the ID of its customer group.
+The `CustomerGroupId` Search Criterion searches for content based on the ID of its customer group.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/customprice_criterion.md b/docs/search/criteria_reference/customprice_criterion.md
index 93e8ab12ca..49982a4d1c 100644
--- a/docs/search/criteria_reference/customprice_criterion.md
+++ b/docs/search/criteria_reference/customprice_criterion.md
@@ -1,3 +1,8 @@
+---
+description: CustomPrice Search Criterion
+edition: commerce
+---
+
 # CustomPrice Criterion
 
 The `CustomPrice` Search Criterion searches for products by their custom price for a specific customer group.
diff --git a/docs/search/criteria_reference/datemetadata_criterion.md b/docs/search/criteria_reference/datemetadata_criterion.md
index dfe709620e..8ca934bcae 100644
--- a/docs/search/criteria_reference/datemetadata_criterion.md
+++ b/docs/search/criteria_reference/datemetadata_criterion.md
@@ -1,7 +1,11 @@
+---
+description: DateMetadata Search Criterion
+edition: commerce
+---
+
 # DateMetadata Criterion
 
-The [`DateMetadata` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-DateMetadata.html)
-searches for content based on the date when it was created or last modified.
+The [`DateMetadata` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-DateMetadata.html) searches for content based on the date when it was created or last modified.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/depth_criterion.md b/docs/search/criteria_reference/depth_criterion.md
index fd8e52b72b..361fa42340 100644
--- a/docs/search/criteria_reference/depth_criterion.md
+++ b/docs/search/criteria_reference/depth_criterion.md
@@ -1,7 +1,11 @@
+---
+description: Depth Search Criterion
+edition: commerce
+---
+
 # Depth Criterion
 
-The [`Location\Depth` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-Location-Depth.html)
-searches for Locations based on their depth in the content tree.
+The [`Location\Depth` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-Location-Depth.html) searches for locations based on their depth in the content tree.
 
 This Criterion is available only for Location Search.
 
diff --git a/docs/search/criteria_reference/field_criterion.md b/docs/search/criteria_reference/field_criterion.md
index 7df0882309..aa6723f55f 100644
--- a/docs/search/criteria_reference/field_criterion.md
+++ b/docs/search/criteria_reference/field_criterion.md
@@ -1,7 +1,11 @@
+---
+description: Field Search Criterion
+edition: commerce
+---
+
 # Field Criterion
 
-The [`Field` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-Field.html)
-searches for content based on the content of one of its fields.
+The [`Field` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-Field.html) searches for content based on the content of one of its fields.
 
 ## Arguments
 
@@ -11,8 +15,7 @@ searches for content based on the content of one of its fields.
 
 The `LIKE` operator works together with wildcards (`*`). Without a wildcards its results are the same as for the `EQ` operator.
 
-The `CONTAINS` operator works with collection fields like the Country field type,
-enabling you to retrieve results when the query value is one of the values of the collection.
+The `CONTAINS` operator works with collection fields like the Country field type, enabling you to retrieve results when the query value is one of the values of the collection.
 Querying for a collection with the `EQ` operator returns result only when the whole collection equals the query values.
 
 ## Limitations
diff --git a/docs/search/criteria_reference/fieldrelation_criterion.md b/docs/search/criteria_reference/fieldrelation_criterion.md
index 1200802a22..3547991c95 100644
--- a/docs/search/criteria_reference/fieldrelation_criterion.md
+++ b/docs/search/criteria_reference/fieldrelation_criterion.md
@@ -1,7 +1,11 @@
+---
+description: FieldRelation Search Criterion
+edition: commerce
+---
+
 # FieldRelation Criterion
 
-The [`FieldRelation` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-FieldRelation.html)
-searches for content based on the content items it has Relations to.
+The [`FieldRelation` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-FieldRelation.html) searches for content based on the content items it has Relations to.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/floatattribute_criterion.md b/docs/search/criteria_reference/floatattribute_criterion.md
index ac8b94f8e9..b67125b46a 100644
--- a/docs/search/criteria_reference/floatattribute_criterion.md
+++ b/docs/search/criteria_reference/floatattribute_criterion.md
@@ -1,3 +1,8 @@
+---
+description: FloatAttribute Search Criterion
+edition: commerce
+---
+
 # FloatAttribute Criterion
 
 The `FloatAttribute` Search Criterion searches for products by the value of their float attribute.
diff --git a/docs/search/criteria_reference/floatattributerange_criterion.md b/docs/search/criteria_reference/floatattributerange_criterion.md
index c7edf29441..2f8254664f 100644
--- a/docs/search/criteria_reference/floatattributerange_criterion.md
+++ b/docs/search/criteria_reference/floatattributerange_criterion.md
@@ -1,3 +1,8 @@
+---
+description: FloatAttributeRange Search Criterion
+edition: commerce
+---
+
 # FloatAttributeRange Criterion
 
 The `FloatAttributeRange` Search Criterion searches for products by the range of values of their float attribute.
diff --git a/docs/search/criteria_reference/fulltext_criterion.md b/docs/search/criteria_reference/fulltext_criterion.md
index 80da04a403..80658cec35 100644
--- a/docs/search/criteria_reference/fulltext_criterion.md
+++ b/docs/search/criteria_reference/fulltext_criterion.md
@@ -1,7 +1,12 @@
+---
+description: FullText Search Criterion
+edition: commerce
+---
+
+
 # FullText Criterion
 
-The [`FullText` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-FullText.html)
-searches for content based on the full text content of its fields.
+The [`FullText` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-FullText.html) searches for content based on the full text content of its fields.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/image_criterion.md b/docs/search/criteria_reference/image_criterion.md
index 6250dae93e..6bd91f64cd 100644
--- a/docs/search/criteria_reference/image_criterion.md
+++ b/docs/search/criteria_reference/image_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Image Criterion
+description: Image Search Criterion
 ---
 
 # Image Criterion
diff --git a/docs/search/criteria_reference/imagedimensions_criterion.md b/docs/search/criteria_reference/imagedimensions_criterion.md
index f16a6eb803..20efff7d87 100644
--- a/docs/search/criteria_reference/imagedimensions_criterion.md
+++ b/docs/search/criteria_reference/imagedimensions_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Image Dimensions Criterion
+description: Image Dimensions Search Criterion
 ---
 
 # Image Dimension Criterion
diff --git a/docs/search/criteria_reference/imagefilesize_criterion.md b/docs/search/criteria_reference/imagefilesize_criterion.md
index 25ef00afba..5a0f1170e2 100644
--- a/docs/search/criteria_reference/imagefilesize_criterion.md
+++ b/docs/search/criteria_reference/imagefilesize_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Image FileSize Criterion
+description: Image FileSize Search Criterion
 ---
 
 # Image FileSize Criterion
@@ -46,7 +46,7 @@ $query->query = new Criterion\FileSize('image', 0, 1.5);
             "ImageFileSizeCriterion":{
                 "fieldDefIdentifier": "image",
                 "size": {
-                    "min": 0, 
+                    "min": 0,
                     "max": 1.5
                 }
             }
diff --git a/docs/search/criteria_reference/imageheight_criterion.md b/docs/search/criteria_reference/imageheight_criterion.md
index bdd00bba32..5f1ff96c79 100644
--- a/docs/search/criteria_reference/imageheight_criterion.md
+++ b/docs/search/criteria_reference/imageheight_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Image Height Criterion
+description: Image Height Search Criterion
 ---
 
 # Image Height Criterion
diff --git a/docs/search/criteria_reference/imagemimetype_criterion.md b/docs/search/criteria_reference/imagemimetype_criterion.md
index ee011079c3..96a12a78de 100644
--- a/docs/search/criteria_reference/imagemimetype_criterion.md
+++ b/docs/search/criteria_reference/imagemimetype_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Image MimeType Criterion
+description: Image MimeType Search Criterion
 ---
 
 # Image MimeType Criterion
@@ -19,7 +19,7 @@ The `MimeType` Search Criterion searches for image with specified mime type(s).
 $query->query = new Criterion\MimeType('image', 'image/jpeg');
 ```
 
-or 
+or
 
 ```php
 $mimeTypes = [
diff --git a/docs/search/criteria_reference/imageorientation_criterion.md b/docs/search/criteria_reference/imageorientation_criterion.md
index 71838053d9..3b7f57b453 100644
--- a/docs/search/criteria_reference/imageorientation_criterion.md
+++ b/docs/search/criteria_reference/imageorientation_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Image Orientation Criterion
+description: Image Orientation Search Criterion
 ---
 
 # Image Orientation Criterion
@@ -57,7 +57,7 @@ $query->query = new Criterion\Orientation('image', $orientations);
     }
 
     OR
-    
+
     "Query": {
         "Filter": {
             "ImageOrientationCriterion": {
diff --git a/docs/search/criteria_reference/imagewidth_criterion.md b/docs/search/criteria_reference/imagewidth_criterion.md
index 2a3986f225..34ec3293c7 100644
--- a/docs/search/criteria_reference/imagewidth_criterion.md
+++ b/docs/search/criteria_reference/imagewidth_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Image Width Criterion
+description: Image Width Search Criterion
 ---
 
 # Image Width Criterion
diff --git a/docs/search/criteria_reference/integerattribute_criterion.md b/docs/search/criteria_reference/integerattribute_criterion.md
index 61834e559a..7ed4ebec1a 100644
--- a/docs/search/criteria_reference/integerattribute_criterion.md
+++ b/docs/search/criteria_reference/integerattribute_criterion.md
@@ -1,3 +1,8 @@
+---
+description: IntegerAttribute Search Criterion
+edition: commerce
+---
+
 # IntegerAttribute Criterion
 
 The `IntegerAttribute` Search Criterion searches for products by the value of their integer attribute.
diff --git a/docs/search/criteria_reference/integerattributerange_criterion.md b/docs/search/criteria_reference/integerattributerange_criterion.md
index e737a11653..5a33f0005a 100644
--- a/docs/search/criteria_reference/integerattributerange_criterion.md
+++ b/docs/search/criteria_reference/integerattributerange_criterion.md
@@ -1,3 +1,8 @@
+---
+description: IntegerAttributeRange Search Criterion
+edition: commerce
+---
+
 # IntegerAttributeRange Criterion
 
 The `IntegerAttributeRange` Search Criterion searches for products by the range of values of their integer attribute.
diff --git a/docs/search/criteria_reference/iscurrencyenabled_criterion.md b/docs/search/criteria_reference/iscurrencyenabled_criterion.md
index 2d3869920f..7bc0a7b810 100644
--- a/docs/search/criteria_reference/iscurrencyenabled_criterion.md
+++ b/docs/search/criteria_reference/iscurrencyenabled_criterion.md
@@ -1,3 +1,8 @@
+---
+description: IsCurrencyEnabledCriterion Search Criterion
+edition: commerce
+---
+
 # IsCurrencyEnabledCriterion Criterion
 
 The `IsCurrencyEnabledCriterion` Search Criterion searches for currencies that are enabled in the system.
diff --git a/docs/search/criteria_reference/isfieldempty_criterion.md b/docs/search/criteria_reference/isfieldempty_criterion.md
index 3cccbedb25..ff6a4632ca 100644
--- a/docs/search/criteria_reference/isfieldempty_criterion.md
+++ b/docs/search/criteria_reference/isfieldempty_criterion.md
@@ -1,7 +1,11 @@
+---
+description: IsFieldEmpty Search Criterion
+edition: commerce
+---
+
 # IsFieldEmpty Criterion
 
-The [`IsFieldEmpty` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-IsFieldEmpty.html)
-searches for content based on whether a specified Field is empty or not.
+The [`IsFieldEmpty` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-IsFieldEmpty.html) searches for content based on whether a specified field is empty or not.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/ismainlocation_criterion.md b/docs/search/criteria_reference/ismainlocation_criterion.md
index 9d92192fea..6fbe794c1b 100644
--- a/docs/search/criteria_reference/ismainlocation_criterion.md
+++ b/docs/search/criteria_reference/ismainlocation_criterion.md
@@ -1,7 +1,11 @@
+---
+description: IsMainLocation Search Criterion
+edition: commerce
+---
+
 # IsMainLocation Criterion
 
-The [`IsMainLocation` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-LanguageCode.html)
-searches for Locations based on whether they're the main Location of a content item or not.
+The [`IsMainLocation` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-LanguageCode.html) searches for locations based on whether they're the main Location of a content item or not.
 
 This Criterion is available only for Location Search.
 
diff --git a/docs/search/criteria_reference/isproductbased_criterion.md b/docs/search/criteria_reference/isproductbased_criterion.md
index e82ad0bad5..d9e70ab748 100644
--- a/docs/search/criteria_reference/isproductbased_criterion.md
+++ b/docs/search/criteria_reference/isproductbased_criterion.md
@@ -1,3 +1,8 @@
+---
+description: IsProductBased Search Criterion
+edition: commerce
+---
+
 # IsProductBased Criterion
 
 The `IsProductBased` Search Criterion searches for content that plays the role of a Product.
diff --git a/docs/search/criteria_reference/isuserbased_criterion.md b/docs/search/criteria_reference/isuserbased_criterion.md
index edcb0f281e..ef7a2c79e8 100644
--- a/docs/search/criteria_reference/isuserbased_criterion.md
+++ b/docs/search/criteria_reference/isuserbased_criterion.md
@@ -1,11 +1,15 @@
+---
+description: IsUserBased Search Criterion
+edition: commerce
+---
+
 # IsUserBased Criterion
 
-The [`IsUserBased` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-IsUserBased.html)
-searches for content that plays the role of a User account.
+The [`IsUserBased` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-IsUserBased.html) searches for content that plays the role of a User account.
 
 !!! note
 
-    In the default setup only the User content type is treated as User accounts.
+    In the default setup only the user content type is treated as user accounts.
     However, you can also [set other content types to be treated as such](repository_configuration.md#user-identifiers).
 
 ## Arguments
@@ -15,7 +19,7 @@ or non-User-based content
 
 ## Limitations
 
-The `IsUserBased` Criterion isn't available in Solr or Elastic search engines.
+The `IsUserBased` Criterion isn't available in Solr or Elasticsearch engines.
 
 ## Example
 
diff --git a/docs/search/criteria_reference/isuserenabled_criterion.md b/docs/search/criteria_reference/isuserenabled_criterion.md
index 8740ae5a0a..8d2a05aa6d 100644
--- a/docs/search/criteria_reference/isuserenabled_criterion.md
+++ b/docs/search/criteria_reference/isuserenabled_criterion.md
@@ -1,16 +1,19 @@
+---
+description: IsUserEnabled Search Criterion
+edition: commerce
+---
+
 # IsUserEnabled Criterion
 
-The [`IsUserEnabled` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-IsUserEnabled.html)
-searches for User accounts that are enabled or disabled.
+The [`IsUserEnabled` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-IsUserEnabled.html) searches for user accounts that are enabled or disabled.
 
 ## Arguments
 
-- (optional) `value` - bool representing whether to search for enabled (default `true`)
-or disabled User accounts
+- (optional) `value` - bool representing whether to search for enabled (default `true`) or disabled user accounts
 
 ## Limitations
 
-The `IsUserEnabled` Criterion isn't available in Solr or Elastic search engines.
+The `IsUserEnabled` Criterion isn't available in Solr or Elasticsearch engines.
 
 ## Example
 
diff --git a/docs/search/criteria_reference/isvirtual_criterion.md b/docs/search/criteria_reference/isvirtual_criterion.md
index 2b1af1241b..df4942de28 100644
--- a/docs/search/criteria_reference/isvirtual_criterion.md
+++ b/docs/search/criteria_reference/isvirtual_criterion.md
@@ -1,11 +1,15 @@
+---
+description: IsVirtual Search Criterion
+edition: commerce
+---
+
 # IsVirtual Criterion
 
-The `IsVirtual` Search Criterion searches for virtual or physical products. 
+The `IsVirtual` Search Criterion searches for virtual or physical products.
 
 ## Arguments
 
-- (optional) `isVirtual` - bool representing whether to search for virtual (default `true`)
-or physical (`false`) products.
+- (optional) `isVirtual` - bool representing whether to search for virtual (default `true`) or physical (`false`) products.
 
 ## Example
 
diff --git a/docs/search/criteria_reference/languagecode_criterion.md b/docs/search/criteria_reference/languagecode_criterion.md
index d861abd22f..f153919cce 100644
--- a/docs/search/criteria_reference/languagecode_criterion.md
+++ b/docs/search/criteria_reference/languagecode_criterion.md
@@ -1,13 +1,16 @@
+---
+description: LanguageCode Search Criterion
+edition: commerce
+---
+
 # LanguageCode Criterion
 
-The [`LanguageCode` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-Location.html)
-searches for content based on whether it's translated into the selected language.
+The [`LanguageCode` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-Location.html) searches for content based on whether it's translated into the selected language.
 
 ## Arguments
 
 - `value` - string(s) representing the language codes to search for
-- (optional) `matchAlwaysAvailable` - bool representing whether content with the `alwaysAvailable` flag
-should be returned even if it doesn't contain the selected language (default `true`)
+- (optional) `matchAlwaysAvailable` - bool representing whether content with the `alwaysAvailable` flag should be returned even if it doesn't contain the selected language (default `true`)
 
 ## Example
 
diff --git a/docs/search/criteria_reference/locationid_criterion.md b/docs/search/criteria_reference/locationid_criterion.md
index fa951e53ef..114b737d9d 100644
--- a/docs/search/criteria_reference/locationid_criterion.md
+++ b/docs/search/criteria_reference/locationid_criterion.md
@@ -1,11 +1,15 @@
+---
+description: LocationId Search Criterion
+edition: commerce
+---
+
 # LocationId Criterion
 
-The [`LocationId` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-LocationId.html)
-searches for content based in the Location ID.
+The [`LocationId` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-LocationId.html) searches for content based in the location ID.
 
 ## Arguments
 
-- `value` - int(s) representing the Location ID(s)
+- `value` - int(s) representing the location ID(s)
 
 ## Example
 
diff --git a/docs/search/criteria_reference/locationremoteid_criterion.md b/docs/search/criteria_reference/locationremoteid_criterion.md
index 5e950efce8..0061c61a59 100644
--- a/docs/search/criteria_reference/locationremoteid_criterion.md
+++ b/docs/search/criteria_reference/locationremoteid_criterion.md
@@ -1,11 +1,15 @@
+---
+description: LocationRemoteId Search Criterion
+edition: commerce
+---
+
 # LocationRemoteId Criterion
 
-The [`LocationRemoteId` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-LocationRemoteId.html)
-searches for content based in the Location remote ID.
+The [`LocationRemoteId` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-LocationRemoteId.html) searches for content based in the location remote ID.
 
 ## Arguments
 
-- `value` - string(s) representing the Location remote ID(s)
+- `value` - string(s) representing the location remote ID(s)
 
 ## Example
 
diff --git a/docs/search/criteria_reference/logicaland_criterion.md b/docs/search/criteria_reference/logicaland_criterion.md
index c5573fd6d4..dc22fe7da7 100644
--- a/docs/search/criteria_reference/logicaland_criterion.md
+++ b/docs/search/criteria_reference/logicaland_criterion.md
@@ -1,7 +1,11 @@
+---
+description: LogicalAnd Search Criterion
+edition: commerce
+---
+
 # LogicalAnd Criterion
 
-The [`LogicalAnd` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-LogicalAnd.html)
-matches content if all provided Criteria match.
+The [`LogicalAnd` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-LogicalAnd.html) matches content if all provided Criteria match.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/logicalnot_criterion.md b/docs/search/criteria_reference/logicalnot_criterion.md
index af3f583671..7c349d050f 100644
--- a/docs/search/criteria_reference/logicalnot_criterion.md
+++ b/docs/search/criteria_reference/logicalnot_criterion.md
@@ -1,7 +1,11 @@
+---
+description: LogicalNot Search Criterion
+edition: commerce
+---
+
 # LogicalNot Criterion
 
-The [`LogicalNot` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-LogicalNot.html)
-matches content URL if the provided Criterion doesn't match.
+The [`LogicalNot` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-LogicalNot.html) matches content URL if the provided Criterion doesn't match.
 
 It takes only one Criterion in the array parameter.
 
diff --git a/docs/search/criteria_reference/logicalor_criterion.md b/docs/search/criteria_reference/logicalor_criterion.md
index 5e5fd1c6bb..c834afd06f 100644
--- a/docs/search/criteria_reference/logicalor_criterion.md
+++ b/docs/search/criteria_reference/logicalor_criterion.md
@@ -1,7 +1,11 @@
+---
+description: LogicalOr Search Criterion
+edition: commerce
+---
+
 # LogicalOr Criterion
 
-The [`LogicalOr` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-LogicalOr.html)
-matches content if at least one of the provided Criteria matches.
+The [`LogicalOr` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-LogicalOr.html) matches content if at least one of the provided Criteria matches.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/maplocationdistance_criterion.md b/docs/search/criteria_reference/maplocationdistance_criterion.md
index 7d93ce0583..080502107c 100644
--- a/docs/search/criteria_reference/maplocationdistance_criterion.md
+++ b/docs/search/criteria_reference/maplocationdistance_criterion.md
@@ -1,7 +1,11 @@
+---
+description: MapLocationDistance Search Criterion
+edition: commerce
+---
+
 # MapLocationDistance Criterion
 
-The [`MapLocationDistance` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-MapLocationDistance.html)
-searches content based on the distance between the location contained in a MapLocation field and the provided coordinates.
+The [`MapLocationDistance` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-MapLocationDistance.html) searches content based on the distance between the location contained in a MapLocation field and the provided coordinates.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/matchall_criterion.md b/docs/search/criteria_reference/matchall_criterion.md
index 39bebd7092..84acde3934 100644
--- a/docs/search/criteria_reference/matchall_criterion.md
+++ b/docs/search/criteria_reference/matchall_criterion.md
@@ -1,7 +1,11 @@
+---
+description: MatchAll Search Criterion
+edition: commerce
+---
+
 # MatchAll Criterion
 
-The [`MatchAll` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-MatchAll.html)
-is an auxiliary Criterion that returns all search results.
+The [`MatchAll` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-MatchAll.html) is an auxiliary Criterion that returns all search results.
 It's used internally when no filter or query is provided on a Query object.
 
 The Criterion takes no arguments.
diff --git a/docs/search/criteria_reference/matchnone_criterion.md b/docs/search/criteria_reference/matchnone_criterion.md
index 5af5e069d6..01a35cde2f 100644
--- a/docs/search/criteria_reference/matchnone_criterion.md
+++ b/docs/search/criteria_reference/matchnone_criterion.md
@@ -1,7 +1,11 @@
+---
+description: MatchNone Search Criterion
+edition: commerce
+---
+
 # MatchNone Criterion
 
-The [`MatchNone` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-MatchNone.html)
-is an auxiliary Criterion that returns no search results.
+The [`MatchNone` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-MatchNone.html) is an auxiliary Criterion that returns no search results.
 It's used internally when no filter or query is provided on a Query object.
 
 The Criterion takes no arguments.
diff --git a/docs/search/criteria_reference/objectstateid_criterion.md b/docs/search/criteria_reference/objectstateid_criterion.md
index c1217de9f7..ca04486f24 100644
--- a/docs/search/criteria_reference/objectstateid_criterion.md
+++ b/docs/search/criteria_reference/objectstateid_criterion.md
@@ -1,7 +1,11 @@
+---
+description: ObjectStateId Search Criterion
+edition: commerce
+---
+
 # ObjectStateId Criterion
 
-The [`ObjectStateId` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-ObjectStateId.html)
-searches for content based on its Object State ID.
+The [`ObjectStateId` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-ObjectStateId.html) searches for content based on its Object State ID.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/objectstateidentifier_criterion.md b/docs/search/criteria_reference/objectstateidentifier_criterion.md
index 3a0a94258b..71798942de 100644
--- a/docs/search/criteria_reference/objectstateidentifier_criterion.md
+++ b/docs/search/criteria_reference/objectstateidentifier_criterion.md
@@ -1,7 +1,11 @@
+---
+description: ObjectStateIdentifier Search Criterion
+edition: commerce
+---
+
 # ObjectStateIdentifier Criterion
 
-The [`ObjectStateIdentifier` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-ObjectStateId.html)
-searches for content based on its Object State identifier.
+The [`ObjectStateIdentifier` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-ObjectStateId.html) searches for content based on its Object State identifier.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/order_company_associated_criterion.md b/docs/search/criteria_reference/order_company_associated_criterion.md
index 21e888a257..ee55c07a30 100644
--- a/docs/search/criteria_reference/order_company_associated_criterion.md
+++ b/docs/search/criteria_reference/order_company_associated_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Order IsCompanyAssociated Criterion
+description: Order IsCompanyAssociated Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/order_company_name_criterion.md b/docs/search/criteria_reference/order_company_name_criterion.md
index a594cfda90..1f65ad8494 100644
--- a/docs/search/criteria_reference/order_company_name_criterion.md
+++ b/docs/search/criteria_reference/order_company_name_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Order CompanyName Criterion
+description: Order CompanyName Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/order_created_criterion.md b/docs/search/criteria_reference/order_created_criterion.md
index 729ae60b29..aa59007fff 100644
--- a/docs/search/criteria_reference/order_created_criterion.md
+++ b/docs/search/criteria_reference/order_created_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Order CreatedAt Criterion
+description: Order CreatedAt Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/order_currency_code_criterion.md b/docs/search/criteria_reference/order_currency_code_criterion.md
index 31246f83d6..9348a743a3 100644
--- a/docs/search/criteria_reference/order_currency_code_criterion.md
+++ b/docs/search/criteria_reference/order_currency_code_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Order CurrencyCode Criterion
+description: Order CurrencyCode Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/order_customer_name_criterion.md b/docs/search/criteria_reference/order_customer_name_criterion.md
index a0cdf9f841..80b0fc08d5 100644
--- a/docs/search/criteria_reference/order_customer_name_criterion.md
+++ b/docs/search/criteria_reference/order_customer_name_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Order CustomerName Criterion
+description: Order CustomerName Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/order_identifier_criterion.md b/docs/search/criteria_reference/order_identifier_criterion.md
index 97e1619a71..4da72e5ab1 100644
--- a/docs/search/criteria_reference/order_identifier_criterion.md
+++ b/docs/search/criteria_reference/order_identifier_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Order Identifier Criterion
+description: Order Identifier Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/order_owner_criterion.md b/docs/search/criteria_reference/order_owner_criterion.md
index 5b074a5e35..320071b135 100644
--- a/docs/search/criteria_reference/order_owner_criterion.md
+++ b/docs/search/criteria_reference/order_owner_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Order OwnerCriterion Criterion
+description: Order OwnerCriterion Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/order_price_criterion.md b/docs/search/criteria_reference/order_price_criterion.md
index afaa3aa789..745ca2a126 100644
--- a/docs/search/criteria_reference/order_price_criterion.md
+++ b/docs/search/criteria_reference/order_price_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Order Price Criterion
+description: Order Price Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/order_source_criterion.md b/docs/search/criteria_reference/order_source_criterion.md
index b0de30c95a..53abd3a519 100644
--- a/docs/search/criteria_reference/order_source_criterion.md
+++ b/docs/search/criteria_reference/order_source_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Order Source Criterion
+description: Order Source Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/order_status_criterion.md b/docs/search/criteria_reference/order_status_criterion.md
index 5e03e2c0e8..e6f3f5cb48 100644
--- a/docs/search/criteria_reference/order_status_criterion.md
+++ b/docs/search/criteria_reference/order_status_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Order Status Criterion
+description: Order Status Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/parentlocationid_criterion.md b/docs/search/criteria_reference/parentlocationid_criterion.md
index c8766fcb97..020c78bd21 100644
--- a/docs/search/criteria_reference/parentlocationid_criterion.md
+++ b/docs/search/criteria_reference/parentlocationid_criterion.md
@@ -1,3 +1,8 @@
+---
+description: ParentLocationId Search Criterion
+edition: commerce
+---
+
 # ParentLocationId Criterion
 
 The [`ParentLocationId` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-ParentLocationId.html)
diff --git a/docs/search/criteria_reference/parentlocationremoteId_criterion.md b/docs/search/criteria_reference/parentlocationremoteId_criterion.md
index 9dd0112c11..33ed7dd9e7 100644
--- a/docs/search/criteria_reference/parentlocationremoteId_criterion.md
+++ b/docs/search/criteria_reference/parentlocationremoteId_criterion.md
@@ -1,6 +1,11 @@
+---
+description: ParentLocationRemoteId Search Criterion
+edition: commerce
+---
+
 # ParentLocationRemoteId Criterion
 
-The `ParentLocationRemoteId` Search Criterion searches for content based on the Location remote ID of its parent.
+The `ParentLocationRemoteId` Search Criterion searches for content based on the location remote ID of its parent.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/payment_createdat_criterion.md b/docs/search/criteria_reference/payment_createdat_criterion.md
index 089907fcdc..d43536e7e1 100644
--- a/docs/search/criteria_reference/payment_createdat_criterion.md
+++ b/docs/search/criteria_reference/payment_createdat_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Payment CreatedAt Criterion
+description: Payment CreatedAt Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/payment_currency_criterion.md b/docs/search/criteria_reference/payment_currency_criterion.md
index 0cc61b97aa..524561faed 100644
--- a/docs/search/criteria_reference/payment_currency_criterion.md
+++ b/docs/search/criteria_reference/payment_currency_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Payment Currency Criterion
+description: Payment Currency Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/payment_id_criterion.md b/docs/search/criteria_reference/payment_id_criterion.md
index a88ddd70d2..3ccd16044d 100644
--- a/docs/search/criteria_reference/payment_id_criterion.md
+++ b/docs/search/criteria_reference/payment_id_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Payment Id Criterion
+description: Payment Id Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/payment_identifier_criterion.md b/docs/search/criteria_reference/payment_identifier_criterion.md
index f011cf1df5..0f6ca32dfc 100644
--- a/docs/search/criteria_reference/payment_identifier_criterion.md
+++ b/docs/search/criteria_reference/payment_identifier_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Payment Identifier Criterion
+description: Payment Identifier Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/payment_logicaland_criterion.md b/docs/search/criteria_reference/payment_logicaland_criterion.md
index 6ac2f2f158..fc51f0ab28 100644
--- a/docs/search/criteria_reference/payment_logicaland_criterion.md
+++ b/docs/search/criteria_reference/payment_logicaland_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Payment LogicalAnd Criterion
+description: Payment LogicalAnd Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/payment_logicalor_criterion.md b/docs/search/criteria_reference/payment_logicalor_criterion.md
index 6332467125..0ab036ebc9 100644
--- a/docs/search/criteria_reference/payment_logicalor_criterion.md
+++ b/docs/search/criteria_reference/payment_logicalor_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Payment LogicalOr Criterion
+description: Payment LogicalOr Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/payment_method_createdat_criterion.md b/docs/search/criteria_reference/payment_method_createdat_criterion.md
index bc839c9f73..eac4ce8ab2 100644
--- a/docs/search/criteria_reference/payment_method_createdat_criterion.md
+++ b/docs/search/criteria_reference/payment_method_createdat_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Payment Method CreatedAt Criterion
+description: Payment Method CreatedAt Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/payment_method_enabled_criterion.md b/docs/search/criteria_reference/payment_method_enabled_criterion.md
index 9fbdb89776..b9671b987d 100644
--- a/docs/search/criteria_reference/payment_method_enabled_criterion.md
+++ b/docs/search/criteria_reference/payment_method_enabled_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Payment Method Enabled Criterion
+description: Payment Method Enabled Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/payment_method_id_criterion.md b/docs/search/criteria_reference/payment_method_id_criterion.md
index eb10551b69..c1ca101653 100644
--- a/docs/search/criteria_reference/payment_method_id_criterion.md
+++ b/docs/search/criteria_reference/payment_method_id_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Payment Method Id Criterion
+description: Payment Method Id Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/payment_method_identifier_criterion.md b/docs/search/criteria_reference/payment_method_identifier_criterion.md
index 47da32af4c..04fdcc21a0 100644
--- a/docs/search/criteria_reference/payment_method_identifier_criterion.md
+++ b/docs/search/criteria_reference/payment_method_identifier_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Payment Method Identifier Criterion
+description: Payment Method Identifier Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/payment_method_logicaland_criterion.md b/docs/search/criteria_reference/payment_method_logicaland_criterion.md
index 9683602a46..b903040e18 100644
--- a/docs/search/criteria_reference/payment_method_logicaland_criterion.md
+++ b/docs/search/criteria_reference/payment_method_logicaland_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Payment Method LogicalAnd Criterion
+description: Payment Method LogicalAnd Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/payment_method_logicalor_criterion.md b/docs/search/criteria_reference/payment_method_logicalor_criterion.md
index 6391d313e0..92b0992efe 100644
--- a/docs/search/criteria_reference/payment_method_logicalor_criterion.md
+++ b/docs/search/criteria_reference/payment_method_logicalor_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Payment Method LogicalOr Criterion
+description: Payment Method LogicalOr Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/payment_method_name_criterion.md b/docs/search/criteria_reference/payment_method_name_criterion.md
index 395c96f14d..0131233c5c 100644
--- a/docs/search/criteria_reference/payment_method_name_criterion.md
+++ b/docs/search/criteria_reference/payment_method_name_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Payment Method Name Criterion
+description: Payment Method Name Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/payment_method_search_criteria.md b/docs/search/criteria_reference/payment_method_search_criteria.md
index ad8ed0ac0c..42aa35b1d2 100644
--- a/docs/search/criteria_reference/payment_method_search_criteria.md
+++ b/docs/search/criteria_reference/payment_method_search_criteria.md
@@ -8,7 +8,7 @@ page_type: reference
 
 Payment Method Search Criteria are only supported by [Payment Method Search (`PaymentMethodService::findPaymentMethods`)](payment_method_api.md#get-multiple-payment-methods).
 
-With these Criteria you can filter payment methods by their payment method identifier, payment method creation date, payment method type, status, and so on.
+With these Criteria you can filter payment methods by their payment method identifier, payment method creation date, payment method type, status, and more.
 
 ## Payment method Search Criteria
 
diff --git a/docs/search/criteria_reference/payment_method_type_criterion.md b/docs/search/criteria_reference/payment_method_type_criterion.md
index d3388836a5..db7e4be3c9 100644
--- a/docs/search/criteria_reference/payment_method_type_criterion.md
+++ b/docs/search/criteria_reference/payment_method_type_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Payment Method Type Criterion
+description: Payment Method Type Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/payment_method_updatedat_criterion.md b/docs/search/criteria_reference/payment_method_updatedat_criterion.md
index 04998f2d95..be34b4d8d6 100644
--- a/docs/search/criteria_reference/payment_method_updatedat_criterion.md
+++ b/docs/search/criteria_reference/payment_method_updatedat_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Payment Method UpdatedAt Criterion
+description: Payment Method UpdatedAt Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/payment_order_criterion.md b/docs/search/criteria_reference/payment_order_criterion.md
index 1d93dc08cb..05b8eacc1a 100644
--- a/docs/search/criteria_reference/payment_order_criterion.md
+++ b/docs/search/criteria_reference/payment_order_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Payment Order Criterion
+description: Payment Order Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/payment_payment_method_criterion.md b/docs/search/criteria_reference/payment_payment_method_criterion.md
index 20a865f590..1b9bba10b2 100644
--- a/docs/search/criteria_reference/payment_payment_method_criterion.md
+++ b/docs/search/criteria_reference/payment_payment_method_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Payment PaymentMethod Criterion
+description: Payment PaymentMethod Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/payment_search_criteria.md b/docs/search/criteria_reference/payment_search_criteria.md
index 2f695b6a41..f71208e013 100644
--- a/docs/search/criteria_reference/payment_search_criteria.md
+++ b/docs/search/criteria_reference/payment_search_criteria.md
@@ -8,7 +8,7 @@ page_type: reference
 
 Payment Search Criteria are only supported by [Payment Search (`PaymentServiceInterface::findPayments`)](payment_api.md#get-multiple-payments).
 
-With these Criteria you can filter payments by their payment identifier, payment creation date, payment status, payment method, order, and so on.
+With these Criteria you can filter payments by their payment identifier, payment creation date, payment status, payment method, order, and more.
 
 ## Payment Search Criteria
 
diff --git a/docs/search/criteria_reference/payment_status_criterion.md b/docs/search/criteria_reference/payment_status_criterion.md
index 50561d1865..c0a037e994 100644
--- a/docs/search/criteria_reference/payment_status_criterion.md
+++ b/docs/search/criteria_reference/payment_status_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Payment Status Criterion
+description: Payment Status Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/payment_updatedat_criterion.md b/docs/search/criteria_reference/payment_updatedat_criterion.md
index 07f0866cc1..ec947465a8 100644
--- a/docs/search/criteria_reference/payment_updatedat_criterion.md
+++ b/docs/search/criteria_reference/payment_updatedat_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Payment UpdatedAt Criterion
+description: Payment UpdatedAt Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/price_currency_criterion.md b/docs/search/criteria_reference/price_currency_criterion.md
index 8e5a3b3f87..8d3dd0a10b 100644
--- a/docs/search/criteria_reference/price_currency_criterion.md
+++ b/docs/search/criteria_reference/price_currency_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Price Currency Criterion
+description: Price Currency Search Criterion
 ---
 
 # Price Currency Criterion
@@ -17,7 +17,7 @@ The `Currency` Search Criterion searches for prices based on the given currency.
 ``` php
 $currency = $priceService->getPriceById('EUR');
 
-$query = new PriceQuery( 
+$query = new PriceQuery(
     new \Ibexa\Contracts\ProductCatalog\Values\Price\Query\Criterion\Currency($currency)
 );
 ```
diff --git a/docs/search/criteria_reference/price_customergroup_criterion.md b/docs/search/criteria_reference/price_customergroup_criterion.md
index 9652ffc054..a23aa07446 100644
--- a/docs/search/criteria_reference/price_customergroup_criterion.md
+++ b/docs/search/criteria_reference/price_customergroup_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Price CustomerGroup Criterion
+description: Price CustomerGroup Search Criterion
 ---
 
 # Price CustomerGroup Criterion
@@ -17,7 +17,7 @@ The `CustomerGroup` Search Criterion searches for prices based on the customer g
 ``` php
 $customerGroup = $customerGroupService->getCustomerGroup(123);
 
-$query = new PriceQuery( 
+$query = new PriceQuery(
     new \Ibexa\Contracts\ProductCatalog\Values\Price\Query\Criterion\CustomerGroup($customerGroup)
 );
 ```
diff --git a/docs/search/criteria_reference/price_isbaseprice_criterion.md b/docs/search/criteria_reference/price_isbaseprice_criterion.md
index 8bf30eaf97..28e8cd2478 100644
--- a/docs/search/criteria_reference/price_isbaseprice_criterion.md
+++ b/docs/search/criteria_reference/price_isbaseprice_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Price IsBasePrice Criterion
+description: Price IsBasePrice Search Criterion
 ---
 
 # Price IsBasePrice Criterion
@@ -19,7 +19,7 @@ The `IsBasePrice` Criterion isn't available in Solr or Elasticsearch engines.
 ### PHP
 
 ``` php
-$query = new PriceQuery( 
+$query = new PriceQuery(
     new \Ibexa\Contracts\ProductCatalog\Values\Price\Query\Criterion\IsBasePrice()
 );
 ```
\ No newline at end of file
diff --git a/docs/search/criteria_reference/price_iscustomprice_criterion.md b/docs/search/criteria_reference/price_iscustomprice_criterion.md
index 7d0f98253d..9793e76b44 100644
--- a/docs/search/criteria_reference/price_iscustomprice_criterion.md
+++ b/docs/search/criteria_reference/price_iscustomprice_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Price IsCustomPrice Criterion
+description: Price IsCustomPrice Search Criterion
 ---
 
 # Price IsCustomPrice Criterion
@@ -19,7 +19,7 @@ The `IsCustomPrice` Criterion isn't available in Solr or Elasticsearch engines.
 ### PHP
 
 ``` php
-$query = new PriceQuery( 
+$query = new PriceQuery(
     new \Ibexa\Contracts\ProductCatalog\Values\Price\Query\Criterion\IsCustomPrice()
 );
 ```
\ No newline at end of file
diff --git a/docs/search/criteria_reference/price_logicaland_criterion.md b/docs/search/criteria_reference/price_logicaland_criterion.md
index bc4c156b93..ee9ab7c48b 100644
--- a/docs/search/criteria_reference/price_logicaland_criterion.md
+++ b/docs/search/criteria_reference/price_logicaland_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Price LogicalAnd Criterion
+description: Price LogicalAnd Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/price_logicalor_criterion.md b/docs/search/criteria_reference/price_logicalor_criterion.md
index 2a93813650..d3e93a6dc9 100644
--- a/docs/search/criteria_reference/price_logicalor_criterion.md
+++ b/docs/search/criteria_reference/price_logicalor_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Price LogicalOr Criterion
+description: Price LogicalOr Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/price_product_criterion.md b/docs/search/criteria_reference/price_product_criterion.md
index a26be76bbc..6aaf93a57d 100644
--- a/docs/search/criteria_reference/price_product_criterion.md
+++ b/docs/search/criteria_reference/price_product_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Price Product Criterion
+description: Price Product Search Criterion
 ---
 
 # Price Product Criterion
@@ -15,7 +15,7 @@ The `Product` Search Criterion searches for prices based on product codes.
 ### PHP
 
 ``` php
-$query = new PriceQuery( 
+$query = new PriceQuery(
     new \Ibexa\Contracts\ProductCatalog\Values\Price\Query\Criterion\Product('ergo_desk')
 );
 ```
diff --git a/docs/search/criteria_reference/price_search_criteria.md b/docs/search/criteria_reference/price_search_criteria.md
index 55986d9eaa..b0b50c4c76 100644
--- a/docs/search/criteria_reference/price_search_criteria.md
+++ b/docs/search/criteria_reference/price_search_criteria.md
@@ -7,7 +7,7 @@ page_type: reference
 
 Price Search Criteria are only supported by [Price Search (`ProductPriceServiceInterface::findPrices`)](price_api.md#prices).
 
-With these Criteria you can filter prices by currency, customer group, product, and so on.
+With these Criteria you can filter prices by currency, customer group, product, and more.
 
 ## Price Search Criteria
 
diff --git a/docs/search/criteria_reference/priority_criterion.md b/docs/search/criteria_reference/priority_criterion.md
index 072719c799..436ef4503f 100644
--- a/docs/search/criteria_reference/priority_criterion.md
+++ b/docs/search/criteria_reference/priority_criterion.md
@@ -1,3 +1,8 @@
+---
+description: Priority Search Criterion
+edition: commerce
+---
+
 # Priority Criterion
 
 The [`Location\Priority` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-Location-Priority.html)
diff --git a/docs/search/criteria_reference/product_search_criteria.md b/docs/search/criteria_reference/product_search_criteria.md
index bf977135fe..ecfc0469a1 100644
--- a/docs/search/criteria_reference/product_search_criteria.md
+++ b/docs/search/criteria_reference/product_search_criteria.md
@@ -1,5 +1,5 @@
 ---
-description: Product Search Criteria 
+description: Product Search Criteria
 page_type: reference
 ---
 
diff --git a/docs/search/criteria_reference/productavailability_criterion.md b/docs/search/criteria_reference/productavailability_criterion.md
index d79e3220ba..678ea72da3 100644
--- a/docs/search/criteria_reference/productavailability_criterion.md
+++ b/docs/search/criteria_reference/productavailability_criterion.md
@@ -1,3 +1,8 @@
+---
+description: ProductAvailability Search Criterion
+edition: commerce
+---
+
 # ProductAvailability Criterion
 
 The `ProductAvailability` Search Criterion searches for products by their availability.
diff --git a/docs/search/criteria_reference/productcategory_criterion.md b/docs/search/criteria_reference/productcategory_criterion.md
index cf17b6a41e..cee0be8260 100644
--- a/docs/search/criteria_reference/productcategory_criterion.md
+++ b/docs/search/criteria_reference/productcategory_criterion.md
@@ -1,3 +1,8 @@
+---
+description: ProductCategory Search Criterion
+edition: commerce
+---
+
 # ProductCategory Criterion
 
 The `ProductCategory` Search Criterion searches for products by the category they're assigned to.
diff --git a/docs/search/criteria_reference/productcode_criterion.md b/docs/search/criteria_reference/productcode_criterion.md
index 3ba1867a8d..3dd564fdf5 100644
--- a/docs/search/criteria_reference/productcode_criterion.md
+++ b/docs/search/criteria_reference/productcode_criterion.md
@@ -1,3 +1,8 @@
+---
+description: ProductCode Search Criterion
+edition: commerce
+---
+
 # ProductCode Criterion
 
 The `ProductCode` Search Criterion searches for products by their codes.
diff --git a/docs/search/criteria_reference/productname_criterion.md b/docs/search/criteria_reference/productname_criterion.md
index 33a673f144..486f637ac8 100644
--- a/docs/search/criteria_reference/productname_criterion.md
+++ b/docs/search/criteria_reference/productname_criterion.md
@@ -1,3 +1,8 @@
+---
+description: ProductName Search Criterion
+edition: commerce
+---
+
 # ProductName Criterion
 
 The `ProductName` Search Criterion searches for products by theis names.
diff --git a/docs/search/criteria_reference/productstock_criterion.md b/docs/search/criteria_reference/productstock_criterion.md
index 29bf6b6965..be97cb74ec 100644
--- a/docs/search/criteria_reference/productstock_criterion.md
+++ b/docs/search/criteria_reference/productstock_criterion.md
@@ -1,3 +1,8 @@
+---
+description: ProductStock Search Criterion
+edition: commerce
+---
+
 # ProductStock Criterion
 
 The `ProductStock` Search Criterion searches for products by their numerical stock.
diff --git a/docs/search/criteria_reference/productstockrange_criterion.md b/docs/search/criteria_reference/productstockrange_criterion.md
index da6548c146..a28d533a73 100644
--- a/docs/search/criteria_reference/productstockrange_criterion.md
+++ b/docs/search/criteria_reference/productstockrange_criterion.md
@@ -1,3 +1,8 @@
+---
+description: ProductStockRange Search Criterion
+edition: commerce
+---
+
 # ProductStockRange Criterion
 
 The `ProductStockRange` Search Criterion searches for products by their numerical stock.
diff --git a/docs/search/criteria_reference/producttype_criterion.md b/docs/search/criteria_reference/producttype_criterion.md
index 37b57d7135..d0e76ed464 100644
--- a/docs/search/criteria_reference/producttype_criterion.md
+++ b/docs/search/criteria_reference/producttype_criterion.md
@@ -1,3 +1,8 @@
+---
+description: ProductType Search Criterion
+edition: commerce
+---
+
 # ProductType Criterion
 
 The `ProductType` Search Criterion searches for products by their codes.
diff --git a/docs/search/criteria_reference/rangemeasurementattributemaximum_criterion.md b/docs/search/criteria_reference/rangemeasurementattributemaximum_criterion.md
index ee0ce321b4..229b7e2e59 100644
--- a/docs/search/criteria_reference/rangemeasurementattributemaximum_criterion.md
+++ b/docs/search/criteria_reference/rangemeasurementattributemaximum_criterion.md
@@ -1,3 +1,8 @@
+---
+description: RangeMeasurementAttributeMaximum Search Criterion
+edition: commerce
+---
+
 # RangeMeasurementAttributeMaximum Criterion
 
 The `RangeMeasurementAttributeMaximum` Search Criterion searches for products by the maximum value of their measurement (range) attribute.
diff --git a/docs/search/criteria_reference/rangemeasurementattributeminimum_criterion.md b/docs/search/criteria_reference/rangemeasurementattributeminimum_criterion.md
index c80876a0da..f2c1a75b18 100644
--- a/docs/search/criteria_reference/rangemeasurementattributeminimum_criterion.md
+++ b/docs/search/criteria_reference/rangemeasurementattributeminimum_criterion.md
@@ -1,3 +1,8 @@
+---
+description: RangeMeasurementAttributeMinimum Search Criterion
+edition: commerce
+---
+
 # RangeMeasurementAttributeMinimum Criterion
 
 The `RangeMeasurementAttributeMinimum` Search Criterion searches for products by the minimum value of their measurement (range) attribute.
diff --git a/docs/search/criteria_reference/remoteid_criterion.md b/docs/search/criteria_reference/remoteid_criterion.md
index 73ef1c28d4..066a0cb2c3 100644
--- a/docs/search/criteria_reference/remoteid_criterion.md
+++ b/docs/search/criteria_reference/remoteid_criterion.md
@@ -1,3 +1,8 @@
+---
+description: RemoteId / ContentRemoteId Search Criterion
+edition: commerce
+---
+
 # RemoteId / ContentRemoteId Criterion
 
 The [`RemoteId` / `ContentRemoteId` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-RemoteId.html)
diff --git a/docs/search/criteria_reference/search_criteria_reference.md b/docs/search/criteria_reference/search_criteria_reference.md
index bf98c31017..9ddf49edc6 100644
--- a/docs/search/criteria_reference/search_criteria_reference.md
+++ b/docs/search/criteria_reference/search_criteria_reference.md
@@ -4,8 +4,7 @@ description: Search Criteria help define and fine-tune search queries for conten
 
 # Search Criteria reference
 
-Search Criteria are filters for Content and Location Search and
-[Repository filtering](search_api.md#repository-filtering).
+Search Criteria are filters for content and location Search and [Repository filtering](search_api.md#repository-filtering).
 
 Criteria can take some of the following arguments:
 
diff --git a/docs/search/criteria_reference/sectionid_criterion.md b/docs/search/criteria_reference/sectionid_criterion.md
index efafd14af0..736e7336c9 100644
--- a/docs/search/criteria_reference/sectionid_criterion.md
+++ b/docs/search/criteria_reference/sectionid_criterion.md
@@ -1,7 +1,11 @@
+---
+description: SectionId Search Criterion
+edition: commerce
+---
+
 # SectionId Criterion
 
-The [`SectionId` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-SectionId.html)
-searches for content based on the ID of the Section it's assigned to.
+The [`SectionId` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-SectionId.html) searches for content based on the ID of the Section it's assigned to.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/sectionidentifier_criterion.md b/docs/search/criteria_reference/sectionidentifier_criterion.md
index 4ced12b44d..01e6067d03 100644
--- a/docs/search/criteria_reference/sectionidentifier_criterion.md
+++ b/docs/search/criteria_reference/sectionidentifier_criterion.md
@@ -1,7 +1,11 @@
+---
+description: SectionIdentifier Search Criterion
+edition: commerce
+---
+
 # SectionIdentifier Criterion
 
-The [`SectionIdentifier` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-SectionIdentifier.html)
-searches for content based on the identifier of the Section it's assigned to.
+The [`SectionIdentifier` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-SectionIdentifier.html) searches for content based on the identifier of the Section it's assigned to.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/selectionattribute_criterion.md b/docs/search/criteria_reference/selectionattribute_criterion.md
index 2d79712a12..80f3ce855e 100644
--- a/docs/search/criteria_reference/selectionattribute_criterion.md
+++ b/docs/search/criteria_reference/selectionattribute_criterion.md
@@ -1,3 +1,8 @@
+---
+description: SelectionAttribute Search Criterion
+edition: commerce
+---
+
 # SelectionAttribute Criterion
 
 The `SelectionAttribute` Search Criterion searches for products by the value of their selection attribute.
diff --git a/docs/search/criteria_reference/shipment_createdat_criterion.md b/docs/search/criteria_reference/shipment_createdat_criterion.md
index 6837ef0d6a..be1ed48ff6 100644
--- a/docs/search/criteria_reference/shipment_createdat_criterion.md
+++ b/docs/search/criteria_reference/shipment_createdat_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Shipment CreatedAt Criterion
+description: Shipment CreatedAt Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/shipment_currency_criterion.md b/docs/search/criteria_reference/shipment_currency_criterion.md
index 78fe110038..eeb2e7e9b2 100644
--- a/docs/search/criteria_reference/shipment_currency_criterion.md
+++ b/docs/search/criteria_reference/shipment_currency_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Shipment Currency Criterion
+description: Shipment Currency Search Criterion
 edition: commerce
 ---
 
@@ -16,7 +16,7 @@ The `Currency` Search Criterion searches for shipments based on the currency cod
 ### PHP
 
 ``` php
-$query = new ShipmentQuery( 
+$query = new ShipmentQuery(
     new \Ibexa\Contracts\Shipping\Shipment\Query\Criterion\Currency('USD', 'CZK')
 );
 ```
diff --git a/docs/search/criteria_reference/shipment_id_criterion.md b/docs/search/criteria_reference/shipment_id_criterion.md
index 1679d6b286..782150cccd 100644
--- a/docs/search/criteria_reference/shipment_id_criterion.md
+++ b/docs/search/criteria_reference/shipment_id_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Shipment Id Criterion
+description: Shipment Id Search Criterion
 edition: commerce
 ---
 
@@ -16,7 +16,7 @@ The `Id` Search Criterion searches for shipments based on the shipment ID.
 ### PHP
 
 ``` php
-$query = new ShipmentQuery( 
+$query = new ShipmentQuery(
     new \Ibexa\Contracts\Shipping\Shipment\Query\Criterion\Id(2)
 );
 ```
diff --git a/docs/search/criteria_reference/shipment_identifier_criterion.md b/docs/search/criteria_reference/shipment_identifier_criterion.md
index d5a747c67a..df67826223 100644
--- a/docs/search/criteria_reference/shipment_identifier_criterion.md
+++ b/docs/search/criteria_reference/shipment_identifier_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Shipment Identifier Criterion
+description: Shipment Identifier Search Criterion
 edition: commerce
 ---
 
@@ -16,7 +16,7 @@ The `Identifier` Search Criterion searches for shipments based on the shipment i
 ### PHP
 
 ``` php
-$query = new ShipmentQuery( 
+$query = new ShipmentQuery(
     new \Ibexa\Contracts\Shipping\Shipment\Query\Criterion\Identifier('f1t7z-3rb3rt')
 );
 ```
diff --git a/docs/search/criteria_reference/shipment_logicaland_criterion.md b/docs/search/criteria_reference/shipment_logicaland_criterion.md
index 1c1bca7d71..c77c345282 100644
--- a/docs/search/criteria_reference/shipment_logicaland_criterion.md
+++ b/docs/search/criteria_reference/shipment_logicaland_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Shipment LogicalAnd Criterion
+description: Shipment LogicalAnd Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/shipment_logicalor_criterion.md b/docs/search/criteria_reference/shipment_logicalor_criterion.md
index 55686eda3e..2903abb758 100644
--- a/docs/search/criteria_reference/shipment_logicalor_criterion.md
+++ b/docs/search/criteria_reference/shipment_logicalor_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Shipment LogicalOr Criterion
+description: Shipment LogicalOr Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/shipment_owner_criterion.md b/docs/search/criteria_reference/shipment_owner_criterion.md
index d9a25ab57b..79c9e81c3c 100644
--- a/docs/search/criteria_reference/shipment_owner_criterion.md
+++ b/docs/search/criteria_reference/shipment_owner_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Shipment Owner Criterion
+description: Shipment Owner Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/shipment_search_criteria.md b/docs/search/criteria_reference/shipment_search_criteria.md
index 1d43a4e467..43c9cbff8c 100644
--- a/docs/search/criteria_reference/shipment_search_criteria.md
+++ b/docs/search/criteria_reference/shipment_search_criteria.md
@@ -7,7 +7,7 @@ edition: commerce
 
 Shipment Search Criteria are only supported by [Shipment Search (`ShipmentService::findShipments`)](shipment_api.md#get-multiple-shipments).
 
-With these Criteria you can filter shipments by their shipment identifier, shipment creation date, shipment status, shipping method, and so on.
+With these Criteria you can filter shipments by their shipment identifier, shipment creation date, shipment status, shipping method, and more.
 
 ## Shipment Search Criteria
 
diff --git a/docs/search/criteria_reference/shipment_shipping_method_criterion.md b/docs/search/criteria_reference/shipment_shipping_method_criterion.md
index c8a2157173..2a503ead43 100644
--- a/docs/search/criteria_reference/shipment_shipping_method_criterion.md
+++ b/docs/search/criteria_reference/shipment_shipping_method_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Shipment ShippingMethod Criterion
+description: Shipment ShippingMethod Search Criterion
 edition: commerce
 ---
 
@@ -16,7 +16,7 @@ The `ShippingMethod` Search Criterion searches for shipments based on a shipping
 ### PHP
 
 ``` php
-$query = new ShipmentQuery( 
+$query = new ShipmentQuery(
     new \Ibexa\Contracts\Shipping\Shipment\Query\Criterion\ShippingMethod($shippingMethod)
 );
 ```
diff --git a/docs/search/criteria_reference/shipment_status_criterion.md b/docs/search/criteria_reference/shipment_status_criterion.md
index 2d0ea888af..3e2c0d40bc 100644
--- a/docs/search/criteria_reference/shipment_status_criterion.md
+++ b/docs/search/criteria_reference/shipment_status_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Shipment Status Criterion
+description: Shipment Status Search Criterion
 edition: commerce
 ---
 
@@ -16,7 +16,7 @@ The `Status` Search Criterion searches for shipments based on shipment status.
 ### PHP
 
 ``` php
-$query = new ShipmentQuery( 
+$query = new ShipmentQuery(
     new \Ibexa\Contracts\Shipping\Shipment\Query\Criterion\Status('pending')
 );
 ```
diff --git a/docs/search/criteria_reference/shipment_updatedat_criterion.md b/docs/search/criteria_reference/shipment_updatedat_criterion.md
index d38c04d766..e7e84e13b7 100644
--- a/docs/search/criteria_reference/shipment_updatedat_criterion.md
+++ b/docs/search/criteria_reference/shipment_updatedat_criterion.md
@@ -1,5 +1,5 @@
 ---
-description: Shipment UpdatedAt Criterion
+description: Shipment UpdatedAt Search Criterion
 edition: commerce
 ---
 
diff --git a/docs/search/criteria_reference/sibling_criterion.md b/docs/search/criteria_reference/sibling_criterion.md
index a2fae5215e..db9961cbac 100644
--- a/docs/search/criteria_reference/sibling_criterion.md
+++ b/docs/search/criteria_reference/sibling_criterion.md
@@ -1,7 +1,11 @@
+---
+description: Sibling Search Criterion
+edition: commerce
+---
+
 # Sibling Criterion
 
-The [`Sibling` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-Sibling.html)
-searches for content under the same parent as the indicated Location.
+The [`Sibling` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-Sibling.html) searches for content under the same parent as the indicated location.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/simplemeasurementattribute_criterion.md b/docs/search/criteria_reference/simplemeasurementattribute_criterion.md
index e26ec572ba..fb21a1e88b 100644
--- a/docs/search/criteria_reference/simplemeasurementattribute_criterion.md
+++ b/docs/search/criteria_reference/simplemeasurementattribute_criterion.md
@@ -1,3 +1,8 @@
+---
+description: SimpleMeasurementAttribute Search Criterion
+edition: commerce
+---
+
 # SimpleMeasurementAttribute Criterion
 
 The `SimpleMeasurementAttribute` Search Criterion searches for products by the value of their measurement (single) attribute.
diff --git a/docs/search/criteria_reference/subtree_criterion.md b/docs/search/criteria_reference/subtree_criterion.md
index 3f58aaac6d..dcd89e9b79 100644
--- a/docs/search/criteria_reference/subtree_criterion.md
+++ b/docs/search/criteria_reference/subtree_criterion.md
@@ -1,7 +1,11 @@
+---
+description: Subtree Search Criterion
+edition: commerce
+---
+
 # Subtree Criterion
 
-The [`Subtree` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-Subtree.html)
-searches for content based on its Location ID subtree path.
+The [`Subtree` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-Subtree.html) searches for content based on its Location ID subtree path.
 It returns the content item and all the content items below it in the subtree.
 
 ## Arguments
diff --git a/docs/search/criteria_reference/taxonomy_entry_id.md b/docs/search/criteria_reference/taxonomy_entry_id.md
index 4852317722..37725c4784 100644
--- a/docs/search/criteria_reference/taxonomy_entry_id.md
+++ b/docs/search/criteria_reference/taxonomy_entry_id.md
@@ -1,7 +1,11 @@
+---
+description: TaxonomyEntryId Search Criterion
+edition: commerce
+---
+
 # TaxonomyEntryId Criterion
 
-The [`TaxonomyEntryId` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Taxonomy-Search-Query-Criterion-TaxonomyEntryId.html)
-searches for content based on the ID of the Taxonomy Entry it's assigned to.
+The [`TaxonomyEntryId` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Taxonomy-Search-Query-Criterion-TaxonomyEntryId.html) searches for content based on the ID of the Taxonomy Entry it's assigned to.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/useremail_criterion.md b/docs/search/criteria_reference/useremail_criterion.md
index 73f5500784..a223ed4c24 100644
--- a/docs/search/criteria_reference/useremail_criterion.md
+++ b/docs/search/criteria_reference/useremail_criterion.md
@@ -1,7 +1,11 @@
+---
+description: UserEmail Search Criterion
+edition: commerce
+---
+
 # UserEmail Criterion
 
-The [`UserEmail` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-UserEmail.html)
-searches for content based on the email assigned to the User account.
+The [`UserEmail` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-UserEmail.html) searches for content based on the email assigned to the user account.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/userid_criterion.md b/docs/search/criteria_reference/userid_criterion.md
index 08043893a9..3288a6fc3c 100644
--- a/docs/search/criteria_reference/userid_criterion.md
+++ b/docs/search/criteria_reference/userid_criterion.md
@@ -1,7 +1,11 @@
+---
+description: UserId Search Criterion
+edition: commerce
+---
+
 # UserId Criterion
 
-The [`UserId` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-UserId.html)
-searches for content based on the User ID.
+The [`UserId` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-UserId.html) searches for content based on the User ID.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/userlogin_criterion.md b/docs/search/criteria_reference/userlogin_criterion.md
index 2c5ad7eb4d..2736654d10 100644
--- a/docs/search/criteria_reference/userlogin_criterion.md
+++ b/docs/search/criteria_reference/userlogin_criterion.md
@@ -1,7 +1,11 @@
+---
+description: UserLogin Search Criterion
+edition: commerce
+---
+
 # UserLogin Criterion
 
-The [`UserLogin` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-UserLogin.html)
-searches for content based on the User ID.
+The [`UserLogin` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-UserLogin.html) searches for content based on the User ID.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/usermetadata_criterion.md b/docs/search/criteria_reference/usermetadata_criterion.md
index a9760a502d..0cdbfc6029 100644
--- a/docs/search/criteria_reference/usermetadata_criterion.md
+++ b/docs/search/criteria_reference/usermetadata_criterion.md
@@ -1,7 +1,11 @@
+---
+description: UserMetadata Search Criterion
+edition: commerce
+---
+
 # UserMetadata Criterion
 
-The [`UserMetadata` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-UserMetadata.html)
-searches for content based on its creator or modifier.
+The [`UserMetadata` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-UserMetadata.html) searches for content based on its creator or modifier.
 
 ## Arguments
 
diff --git a/docs/search/criteria_reference/visibility_criterion.md b/docs/search/criteria_reference/visibility_criterion.md
index 9fe2765dec..aa6f74d39d 100644
--- a/docs/search/criteria_reference/visibility_criterion.md
+++ b/docs/search/criteria_reference/visibility_criterion.md
@@ -1,13 +1,17 @@
+---
+description: Visibility Search Criterion
+edition: commerce
+---
+
 # Visibility Criterion
 
-The [`Visibility` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-Visibility.html)
-searches for content based on whether it's visible or not.
+The [`Visibility` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-Visibility.html) searches for content based on whether it's visible or not.
 
-This Criterion takes into account both hiding content and hiding Locations.
+This Criterion takes into account both hiding content and hiding locations.
 
-When used with Content Search, the Criterion takes into account all assigned Locations.
-This means that hidden content is returned if it has at least one visible Location.
-Use Location Search to avoid this.
+When used with Content Search, the Criterion takes into account all assigned locations.
+This means that hidden content is returned if it has at least one visible location.
+Use location Search to avoid this.
 
 ## Arguments
 

From abf65fb312249c1da01ddd064cc66b1539b45477 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 10:57:09 +0200
Subject: [PATCH 50/77] Fixes in 'search'

---
 .../objectstateidentifier_criterion.md        |  2 +-
 .../create_custom_aggregation.md              | 49 ++++--------
 .../create_custom_search_criterion.md         |  3 +-
 .../create_custom_sort_clause.md              |  2 +-
 ...customize_elasticsearch_index_structure.md | 12 +--
 .../index_custom_elasticsearch_data.md        |  5 +-
 .../manipulate_elasticsearch_query.md         |  3 +-
 .../solr_document_field_mappers.md            | 38 ++++------
 docs/search/search.md                         |  3 +-
 docs/search/search_api.md                     | 74 ++++++++-----------
 .../search_criteria_and_sort_clauses.md       | 24 +++---
 .../configure_elastic_search.md               | 68 ++++++-----------
 .../elastic_search/elastic_search_overview.md | 11 ++-
 .../elastic_search/install_elastic_search.md  |  3 +-
 .../configure_repository.md                   |  3 +-
 .../legacy_search_overview.md                 |  5 +-
 docs/search/search_engines/search_engines.md  |  3 +-
 .../solr_search_engine/configure_solr.md      | 18 ++---
 .../solr_search_engine/install_solr.md        | 13 ++--
 .../solr_search_engine/solr_overview.md       |  8 +-
 .../baseprice_sort_clause.md                  |  4 +
 .../contentid_sort_clause.md                  |  7 +-
 .../contentname_sort_clause.md                |  7 +-
 .../contenttranslatedname_sort_clause.md      |  7 +-
 .../contenttypename_sort_clause.md            |  7 +-
 .../createdat_sort_clause.md                  |  4 +
 .../customfield_sort_clause.md                |  7 +-
 .../customprice_sort_clause.md                |  7 +-
 .../datemodified_sort_clause.md               |  7 +-
 .../datepublished_sort_clause.md              |  7 +-
 .../datetrashed_sort_clause.md                |  7 +-
 .../depth_sort_clause.md                      |  7 +-
 .../field_sort_clause.md                      | 10 ++-
 .../sort_clause_reference/id_sort_clause.md   |  7 +-
 .../ismainlocation_sort_clause.md             |  7 +-
 .../maplocationdistance_sort_clause.md        | 10 ++-
 .../order_sort_clauses.md                     |  4 +-
 .../sort_clause_reference/path_sort_clause.md |  7 +-
 .../payment_method_sort_clauses.md            |  2 +-
 .../payment_sort_clauses.md                   |  2 +-
 .../priority_sort_clause.md                   |  7 +-
 .../product_sort_clauses.md                   |  2 +-
 .../productavailability_sort_clause.md        |  4 +
 .../productcode_sort_clause.md                |  4 +
 .../productname_sort_clause.md                |  4 +
 .../random_sort_clause.md                     |  7 +-
 .../score_sort_clause.md                      |  7 +-
 .../sectionidentifier_sort_clause.md          |  7 +-
 .../sectionname_sort_clause.md                |  7 +-
 .../shipment_sort_clauses.md                  |  2 +-
 .../userlogin_sort_clause.md                  |  7 +-
 .../visibility_sort_clause.md                 |  7 +-
 .../id_url_sort_clause.md                     |  7 +-
 .../logicaland_url_criterion.md               |  7 +-
 .../logicalnot_url_criterion.md               |  7 +-
 .../logicalor_url_criterion.md                |  7 +-
 .../matchall_url_criterion.md                 |  7 +-
 .../matchnone_url_criterion.md                |  7 +-
 .../pattern_url_criterion.md                  |  7 +-
 .../sectionid_url_criterion.md                |  7 +-
 .../sectionidentifier_url_criterion.md        |  7 +-
 .../url_search_sort_clauses.md                |  2 +-
 .../url_url_sort_clause.md                    |  7 +-
 .../validity_url_criterion.md                 |  4 +
 .../visibleonly_url_criterion.md              |  7 +-
 65 files changed, 331 insertions(+), 291 deletions(-)

diff --git a/docs/search/criteria_reference/objectstateidentifier_criterion.md b/docs/search/criteria_reference/objectstateidentifier_criterion.md
index 71798942de..51272bef34 100644
--- a/docs/search/criteria_reference/objectstateidentifier_criterion.md
+++ b/docs/search/criteria_reference/objectstateidentifier_criterion.md
@@ -37,7 +37,7 @@ $query->query = new Criterion\ObjectStateIdentifier(['not_locked'], 'ez_lock');
             </ObjectStateIdentifierCriterion>
         </Filter>
     </Query>
-    ``` 
+    ```
 
 === "JSON"
 
diff --git a/docs/search/extensibility/create_custom_aggregation.md b/docs/search/extensibility/create_custom_aggregation.md
index 3555cc4ed8..815b29cb92 100644
--- a/docs/search/extensibility/create_custom_aggregation.md
+++ b/docs/search/extensibility/create_custom_aggregation.md
@@ -5,7 +5,7 @@ description: Create custom Aggregation to use with Solr and Elasticsearch search
 # Create custom Aggregation
 
 To create a custom Aggregation, create an aggregation class.
-In the following example, an aggregation groups the Location query results by the Location priority:
+In the following example, an aggregation groups the location query results by the Location priority:
 
 === "Solr"
 
@@ -26,8 +26,7 @@ In the following example, an aggregation groups the Location query results by th
 The `PriorityRangeAggregation` class extends `AbstractRangeAggregation`.
 The name of the class indicates that it aggregates the results by using the Range aggregation.
 
-An aggregation must implement the `Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation` 
-interface or inherit one of following abstract classes:
+An aggregation must implement the `Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation` interface or inherit one of following abstract classes:
 
 - `Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation`
 - `Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation`
@@ -41,22 +40,16 @@ An aggregation can also implement one of the following interfaces:
 
 !!! note "Aggregation definition"
 
-    An aggregation definition must contain at least the name of an aggregation 
-    and optional aggregation parameters, such as, for example, the path (string) 
-    that is used to limit aggregation results to a specific subtree, Content 
-    Type identifier, or field definition identifier, which is mapped 
-    to the search index field name.
-    
+    An aggregation definition must contain at least the name of an aggregation and optional aggregation parameters, such as, for example, the path (string) that is used to limit aggregation results to a specific subtree, content type identifier, or field definition identifier, which is mapped to the search index field name.
+
     Aggregation definition must be independent of the search engine used.
 
 A custom aggregation requires that the following elements are provided:
 
 - An aggregation visitor that returns an array of results
-- A result extractor that transforms raw aggregation results from the search engine 
-into `AggregationResult` objects
+- A result extractor that transforms raw aggregation results from the search engine into `AggregationResult` objects
 
-In simpler cases, you can apply one of the built-in visitors that correspond 
-to the aggregation type.
+In simpler cases, you can apply one of the built-in visitors that correspond to the aggregation type.
 The example below uses `RangeAggregationVisitor`:
 
 === "Solr"
@@ -101,8 +94,7 @@ You provide it with two arguments:
 
     Tag the service with `ibexa.elasticsearch.query.location.aggregation_visitor`.
 
-For the result extractor, you can use the built-in `RangeAggregationResultExtractor`
-and provide it with the aggregation class in the `aggregationClass` parameter.
+For the result extractor, you can use the built-in `RangeAggregationResultExtractor` and provide it with the aggregation class in the `aggregationClass` parameter.
 
 === "Solr"
 
@@ -176,8 +168,7 @@ In a more complex use case, you must create your own visitor and extractor.
     --8<--
     ```
 
-The `canVisit()` method checks whether the provided aggregation is of the supported type
-(in this case, your custom `PriorityRangeAggregation`).
+The `canVisit()` method checks whether the provided aggregation is of the supported type (in this case, your custom `PriorityRangeAggregation`).
 
 The `visit()` method returns an array of results.
 
@@ -185,8 +176,7 @@ The `visit()` method returns an array of results.
 
 === "Solr"
 
-    You must also create a result extractor, which implements  `Ibexa\Solr\ResultExtractor\AggregationResultExtractor` 
-    that transforms raw aggregation results from Solr into `AggregationResult` objects:
+    You must also create a result extractor, which implements  `Ibexa\Solr\ResultExtractor\AggregationResultExtractor` that transforms raw aggregation results from Solr into `AggregationResult` objects:
 
     ``` php
     --8<--
@@ -194,15 +184,13 @@ The `visit()` method returns an array of results.
     --8<--
     ```
 
-    The `canVisit()` method checks whether the provided aggregation is of the supported type
-    (in this case, your custom `PriorityRangeAggregation`).
+    The `canVisit()` method checks whether the provided aggregation is of the supported type (in this case, your custom `PriorityRangeAggregation`).
 
     The `extract()` method converts the [raw data provided by the search engine](https://solr.apache.org/guide/8_8/search-sample.html#aggregation) to a `RangeAggregationResult` object.
 
 === "Elasticsearch"
 
-    You must also create a result extractor, which implements  `Ibexa\Contracts\ElasticSearchEngine\Query\AggregationResultExtractor` 
-    that transforms raw aggregation results from Elasticsearch into `AggregationResult` objects:
+    You must also create a result extractor, which implements  `Ibexa\Contracts\ElasticSearchEngine\Query\AggregationResultExtractor` that transforms raw aggregation results from Elasticsearch into `AggregationResult` objects:
 
     ``` php
     --8<--
@@ -210,8 +198,7 @@ The `visit()` method returns an array of results.
     --8<--
     ```
 
-    The `supports()` method checks whether the provided aggregation is of the supported type
-    (in this case, your custom `PriorityRangeAggregation`).
+    The `supports()` method checks whether the provided aggregation is of the supported type (in this case, your custom `PriorityRangeAggregation`).
 
     The `extract()` method converts the [raw data provided by the search engine](https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations.html) to a `RangeAggregationResult` object.
 
@@ -220,8 +207,7 @@ Finally, register both the aggregation visitor and the result extractor as servi
 
 === "Solr"
 
-    Tag the aggregation visitor with `ibexa.search.solr.query.location.aggregation.visitor`
-    and the result extractor with `ibexa.search.solr.query.location.aggregation.result.extractor`:
+    Tag the aggregation visitor with `ibexa.search.solr.query.location.aggregation.visitor` and the result extractor with `ibexa.search.solr.query.location.aggregation.result.extractor`:
 
     ``` yaml
     --8<--
@@ -229,13 +215,11 @@ Finally, register both the aggregation visitor and the result extractor as servi
     --8<--
     ```
 
-    For content-based aggregations, use the `ibexa.search.solr.query.content.aggregation.visitor`
-    and `ibexa.search.solr.query.content.aggregation.result.extractor` tags respectively.
+    For content-based aggregations, use the `ibexa.search.solr.query.content.aggregation.visitor` and `ibexa.search.solr.query.content.aggregation.result.extractor` tags respectively.
 
 === "Elasticsearch"
 
-    Tag the aggregation visitor with `ibexa.elasticsearch.query.location.aggregation_visitor`
-    and the result extractor with `ibexa.elasticsearch.query.location.aggregation_result_extractor`:
+    Tag the aggregation visitor with `ibexa.elasticsearch.query.location.aggregation_visitor` and the result extractor with `ibexa.elasticsearch.query.location.aggregation_result_extractor`:
 
     ``` yaml
     --8<--
@@ -243,5 +227,4 @@ Finally, register both the aggregation visitor and the result extractor as servi
     --8<--
     ```
 
-    For content-based aggregations, use the `ibexa.search.elasticsearch.query.content.aggregation.visitor`
-    and `ibexa.search.elasticsearch.query.content.aggregation.result.extractor` tags respectively.
+    For content-based aggregations, use the `ibexa.search.elasticsearch.query.content.aggregation.visitor` and `ibexa.search.elasticsearch.query.content.aggregation.result.extractor` tags respectively.
diff --git a/docs/search/extensibility/create_custom_search_criterion.md b/docs/search/extensibility/create_custom_search_criterion.md
index 83bbb9330a..7cdd58980b 100644
--- a/docs/search/extensibility/create_custom_search_criterion.md
+++ b/docs/search/extensibility/create_custom_search_criterion.md
@@ -8,8 +8,7 @@ To provide support for a custom Search Criterion, do the following.
 
 ## Create Criterion class
 
-First, create a `CameraManufacturerCriterion.php` file 
-that contains the Criterion class:
+First, create a `CameraManufacturerCriterion.php` file that contains the Criterion class:
 
 === "Solr"
 
diff --git a/docs/search/extensibility/create_custom_sort_clause.md b/docs/search/extensibility/create_custom_sort_clause.md
index a372b43872..43de9bad0f 100644
--- a/docs/search/extensibility/create_custom_sort_clause.md
+++ b/docs/search/extensibility/create_custom_sort_clause.md
@@ -52,7 +52,7 @@ Then, add a `ScoreVisitor` class that implements `SortClauseVisitor`:
 
 Finally, register the visitor as a service.
 
-Sort Clauses can be valid for both content and Location search.
+Sort Clauses can be valid for both content and location search.
 To choose the search type, use either `content` or `location` in the tag when registering the visitor as a service:
 
 === "Solr"
diff --git a/docs/search/extensibility/customize_elasticsearch_index_structure.md b/docs/search/extensibility/customize_elasticsearch_index_structure.md
index f6a3091d31..d64cf1b257 100644
--- a/docs/search/extensibility/customize_elasticsearch_index_structure.md
+++ b/docs/search/extensibility/customize_elasticsearch_index_structure.md
@@ -8,15 +8,13 @@ You can customize the structure of your Elasticsearch search index to manage how
 
 This lets you control the size of [Elasticsearch shards](https://www.elastic.co/guide/en/elasticsearch/reference/current/scalability.html) that the index is divided into.
 
-By customizing the structure to your needs, you can avoid "oversharding" (having too many shards),
-which negatively affects performance and can lead to instability.
+By customizing the structure to your needs, you can avoid "oversharding" (having too many shards), which negatively affects performance and can lead to instability.
 
 For more information about adapting the size of your search index shards, see [Elasticsearch documentation](https://www.elastic.co/guide/en/elasticsearch/reference/8.4/size-your-shards.html).
 
 ## Selecting indexing strategy
 
-In your Elasticsearch configuration you can select one of four built-in strategies
-that control grouping documents in the index.
+In your Elasticsearch configuration you can select one of four built-in strategies that control grouping documents in the index.
 
 The strategies are:
 
@@ -25,8 +23,7 @@ The strategies are:
 - `ContentTypeGroupResolver`- groups documents by content type ID.
 - `CompositeGroupResolver` - allows combining multiple group resolves together to have a more granular index.
 
-The default strategy is the composite of language and content type ID,
-resulting in indexes in the form of `<repository>_<document_type>_<language>_<content_type_id>`.
+The default strategy is the composite of language and content type ID, resulting in indexes in the form of `<repository>_<document_type>_<language>_<content_type_id>`.
 
 To change the strategy, use the `ibexa_elasticsearch.document_group_resolver` [configuration key](configuration.md#configuration-files):
 
@@ -35,8 +32,7 @@ ibexa_elasticsearch:
     document_group_resolver: 'Ibexa\Elasticsearch\ElasticSearch\Index\Group\ContentTypeGroupResolver'
 ```
 
-Select the strategy based on the structure of your Repository, taking into accounts data such as the number of content items,
-content types or languages.
+Select the strategy based on the structure of your repository, taking into accounts data such as the number of content items, content types, or languages.
 
 ## Custom indexing strategy
 
diff --git a/docs/search/extensibility/index_custom_elasticsearch_data.md b/docs/search/extensibility/index_custom_elasticsearch_data.md
index f0461cf0a3..5bfdced07b 100644
--- a/docs/search/extensibility/index_custom_elasticsearch_data.md
+++ b/docs/search/extensibility/index_custom_elasticsearch_data.md
@@ -12,12 +12,11 @@ To do so, subscribe to one of the following events:
 - `Ibexa\Contracts\ElasticSearchEngine\Mapping\Event\ContentIndexCreateEvent`
 - `Ibexa\Contracts\ElasticSearchEngine\Mapping\Event\LocationIndexCreateEvent`
 
-These events are called when the index is created for the content and Location documents, respectively.
+These events are called when the index is created for the content and location documents.
 
 You can pass the event to a subscriber which gives you access to the document that you can modify.
 
-In the following example, when an index in created for a content or a Location document,
-the event subscriber adds a `custom_field` of the type `StringField` to the index:
+In the following example, when an index in created for a content or a Location document, the event subscriber adds a `custom_field` of the type `StringField` to the index:
 
 ``` php hl_lines="19 20 21"
 <?php
diff --git a/docs/search/extensibility/manipulate_elasticsearch_query.md b/docs/search/extensibility/manipulate_elasticsearch_query.md
index af243ea264..98573ad949 100644
--- a/docs/search/extensibility/manipulate_elasticsearch_query.md
+++ b/docs/search/extensibility/manipulate_elasticsearch_query.md
@@ -9,8 +9,7 @@ To do it, subscribe to `Ibexa\Contracts\ElasticSearchEngine\Query\Event\QueryFil
 
 The following example shows how to add an additional Search Criterion to all queries.
 
-Depending on your configuration, this might impact all search queries,
-including those used for search and content tree in the back office.
+Depending on your configuration, this might impact all search queries, including those used for search and content tree in the back office.
 
 ``` php hl_lines="34"
 <?php
diff --git a/docs/search/extensibility/solr_document_field_mappers.md b/docs/search/extensibility/solr_document_field_mappers.md
index d398541eec..8c42f79e8c 100644
--- a/docs/search/extensibility/solr_document_field_mappers.md
+++ b/docs/search/extensibility/solr_document_field_mappers.md
@@ -6,33 +6,27 @@ description: Use document field mappers to add additional data in Solr search en
 
 You can use document field mappers to index additional data in the search engine.
 
-The additional data can come from external sources
-(for example, the [Personalization service](personalization.md)), or from internal ones.
-An example of indexing internal data is indexing data through the Location hierarchy: 
-from the parent Location to the child Location, or indexing child data on the parent Location.
-You can use this to find the content with full-text search, or to simplify a search 
-in a complicated data model.
+The additional data can come from external sources (for example, the [Personalization service](personalization.md)), or from internal ones.
+An example of indexing internal data is indexing data through the Location hierarchy: from the parent location to the child location, or indexing child data on the parent location.
+You can use this to find the content with full-text search, or to simplify a search in a complicated data model.
 
 To do this effectively, you must understand how the data is indexed with the Solr search engine.
 Solr uses [documents](https://solr.apache.org/guide/7_7/overview-of-documents-fields-and-schema-design.html#how-solr-sees-the-world) as a unit of data that is indexed.
-Documents are indexed per translation, as content blocks. 
+Documents are indexed per translation, as content blocks.
 A block is a nested document structure.
-When used in [[= product_name =]], a parent document represents content, 
-and Locations are indexed as child documents of the content item.
-To avoid duplication, full-text data is indexed on the Content document only. 
+When used in [[= product_name =]], a parent document represents content, and locations are indexed as child documents of the content item.
+To avoid duplication, full-text data is indexed on the content document only.
 Knowing this, you can index additional data by the following:
 
-- All block documents (meaning content and its Locations, all translations)
+- All block documents (meaning content and its locations, all translations)
 - All block documents per translation
 - Content documents
 - Content documents per translation
 - Location documents
 
-Additional data is indexed by implementing a document field mapper and registering it 
-at one of the five extension points described above.
-You can create the field mapper class anywhere inside your bundle,
-as long as you register it as a Symfony service.
-There are three different field mappers. 
+Additional data is indexed by implementing a document field mapper and registering it at one of the five extension points described above.
+You can create the field mapper class anywhere inside your bundle, as long as you register it as a Symfony service.
+There are three different field mappers.
 Each mapper implements two methods, by the same name, but accepting different arguments:
 
 - `ContentFieldMapper`
@@ -58,10 +52,8 @@ Mappers can be used on the extension points by registering them with the [servic
 - Location documents
     - `ibexa.search.solr.field.mapper.location`
 
-The following example shows how you can index data from the parent Location content, 
-to make it available for full-text search on the child content.
-The example relies on a use case of indexing webinar data on the webinar events, 
-which are children of the webinar. 
+The following example shows how you can index data from the parent location content, to make it available for full-text search on the child content.
+The example relies on a use case of indexing webinar data on the webinar events, which are children of the webinar.
 The field mapper could then look like this:
 
 ```php
@@ -76,7 +68,5 @@ You index full text data only on the content document, therefore, you would regi
 
 !!! caution "Permission issues when using Repository API in document field mappers"
 
-    Document field mappers are low-level and expect to be able to index all content 
-    regardless of current user permissions.
-    If you use PHP API in your custom document field mappers, apply [`sudo()`](php_api.md#using-sudo),
-    or use the Persistence SPI layer as in the example above.
+    Document field mappers are low-level and expect to be able to index all content regardless of current user permissions.
+    If you use PHP API in your custom document field mappers, apply [`sudo()`](php_api.md#using-sudo), or use the Persistence SPI layer as in the example above.
diff --git a/docs/search/search.md b/docs/search/search.md
index 4abcb4f656..384d0c64c7 100644
--- a/docs/search/search.md
+++ b/docs/search/search.md
@@ -5,7 +5,8 @@ page_type: landing_page
 
 # Search
 
-[[= 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.
+[[= 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_engines",
diff --git a/docs/search/search_api.md b/docs/search/search_api.md
index b8935b9b6f..d5fa6e46ac 100644
--- a/docs/search/search_api.md
+++ b/docs/search/search_api.md
@@ -10,23 +10,19 @@ To do this, you can use the [`SearchService`](#searchservice) or [Repository fil
 
 ## SearchService
 
-[`SearchService`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-SearchService.html)
-enables you to perform search queries using the PHP API.
+[`SearchService`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-SearchService.html) enables you to perform search queries using the PHP API.
 
 The service should be [injected into the constructor of your command or controller](php_api.md#service-container).
 
 !!! tip "SearchService in the back office"
 
-    `SearchService` is also used in the back office of [[= product_name =]],
-    in components such as Universal Discovery Widget or Sub-items List.
+    `SearchService` is also used in the back office of [[= product_name =]], in components such as Universal Discovery Widget or Sub-items List.
 
 ### Performing a search
 
-To search through content you need to create a [`LocationQuery`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-LocationQuery.html)
-and provide your search criteria as a series of Criterion objects.
+To search through content you need to create a [`LocationQuery`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-LocationQuery.html) and provide your Search Criteria as a series of Criterion objects.
 
-For example, to search for all content of a selected content type, use one Criterion,
-[`Criterion\ContentTypeIdentifier`](contenttypeidentifier_criterion.md) (line 14).
+For example, to search for all content of a selected content type, use one Criterion, [`Criterion\ContentTypeIdentifier`](contenttypeidentifier_criterion.md) (line 14).
 
 The following command takes the content type identifier as an argument and lists all results:
 
@@ -41,8 +37,7 @@ The following command takes the content type identifier as an argument and lists
 retrieves [`ContentInfo`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Persistence-Content-ContentInfo.html) objects of the found content items.
 You can also use [`SearchService::findContent`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-SearchService.html#method_findContent) to get full Content objects, together with their field information.
 
-To query for a single result, for example by providing a Content ID,
-use the [`SearchService::findSingle`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-SearchService.html#method_findSingle) method:
+To query for a single result, for example by providing a Content ID, use the [`SearchService::findSingle`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-SearchService.html#method_findSingle) method:
 
 ``` php
 $criterion = new Criterion\ContentId($contentId);
@@ -56,7 +51,8 @@ $output->writeln($result->getName());
 
 !!! note "Search result limit"
 
-    By default search returns up to 25 results. You can change it by setting a different limit to the query:
+    By default search returns up to 25 results.
+    You can change it by setting a different limit to the query:
 
     ``` php
     $query->limit = 100;
@@ -79,7 +75,7 @@ To process a large result set, use [`Ibexa\Contracts\Core\Repository\Iterator\Ba
 `BatchIterator` divides the results of search or filtering into smaller batches.
 This enables iterating over results that are too large to handle due to memory constraints.
 
-`BatchIterator` takes one of the available adapters ([`\Ibexa\Contracts\Core\Repository\Iterator\BatchIteratorAdapter`](../api/php_api/php_api_reference/namespaces/ibexa-contracts-core-repository-iterator-batchiteratoradapter.html)) and optional batch size. For example: 
+`BatchIterator` takes one of the available adapters ([`\Ibexa\Contracts\Core\Repository\Iterator\BatchIteratorAdapter`](../api/php_api/php_api_reference/namespaces/ibexa-contracts-core-repository-iterator-batchiteratoradapter.html)) and optional batch size. For example:
 
 ``` php
 $query = new LocationQuery;
@@ -109,18 +105,15 @@ The following BatchIterator adapters are available, for both `query` and `filter
 
 ## Repository filtering
 
-You can use the `ContentService::find(Filter)` method to find content items or
-`LocationService::find(Filter)` to find Locations using a defined Filter.
+You can use the `ContentService::find(Filter)` method to find content items or `LocationService::find(Filter)` to find Locations using a defined Filter.
 
-`ContentService::find` returns an iterable [`ContentList`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-ContentList.html)
-while `LocationService::find` returns an iterable [`LocationList`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-LocationList.html).
+`ContentService::find` returns an iterable [`ContentList`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-ContentList.html) while `LocationService::find` returns an iterable [`LocationList`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-LocationList.html).
 
 Filtering differs from search. It doesn't use the `SearchService` and isn't based on indexed data.
 
-[`Filter`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Filter-Filter.html) enables you to configure a query using chained methods to select criteria, sorting, limit and offset.
+[`Filter`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Filter-Filter.html) enables you to configure a query using chained methods to select criteria, sorting, limit, and offset.
 
-For example, the following command lists all content items under the specified parent Location
-and sorts them by name in descending order:
+For example, the following command lists all content items under the specified parent location and sorts them by name in descending order:
 
 ``` php hl_lines="13-16"
 // ...
@@ -157,8 +150,7 @@ You can use the following methods of the Filter:
 - `sliceBy` - set limit and offset for pagination
 - `reset` - remove all Criteria, Sort Clauses, and pagination settings
 
-The following example filters for Folder content items under the parent Location 2,
-sorts them by publication date and returns 10 results, starting from the third one:
+The following example filters for Folder content items under the parent Location 2, sorts them by publication date and returns 10 results, starting from the third one:
 
 ``` php
 $filter = new Filter();
@@ -171,23 +163,20 @@ $filter
 
 !!! note "Search Criteria and Sort Clause availability"
 
-    Not all Search Criteria and Sort Clauses are available for use in Repository filtering.
+    Not all Search Criteria and Sort Clauses are available for use in repository filtering.
 
-    Only Criteria implementing [`FilteringCriterion`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Filter-FilteringCriterion.html)
-    and Sort Clauses implementing [`FilteringSortClause`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Filter-FilteringSortClause.html)
-    are supported.
+    Only Criteria implementing [`FilteringCriterion`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Filter-FilteringCriterion.html) and Sort Clauses implementing [`FilteringSortClause`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Filter-FilteringSortClause.html) are supported.
 
-    See [Search Criteria](search_criteria_reference.md)
-    and [Sort Clause reference](sort_clause_reference.md) for details.
+    See [Search Criteria](search_criteria_reference.md) and [Sort Clause reference](sort_clause_reference.md) for details.
 
 !!! tip
 
-    it's recommended to use an IDE that can recognize type hints when working with Repository Filtering.
+    It's recommended to use an IDE that can recognize type hints when working with Repository Filtering.
     If you try to use an unsupported Criterion or Sort Clause, the IDE indicates an issue.
 
 ## Searching in a controller
 
-You can use the `SearchService` or Repository filtering in a controller, as long as you provide the required parameters.
+You can use the `SearchService` or repository filtering in a controller, as long as you provide the required parameters.
 For example, in the code below, `locationId` is provided to list all children of a Location by using the `SearchService`.
 
 ``` php hl_lines="22-24"
@@ -270,7 +259,8 @@ that doesn't belong to the provided Section:
 
 ### Combining independent Criteria
 
-Criteria are independent of one another. This can lead to unexpected behavior, for instance because content can have multiple Locations.
+Criteria are independent of one another.
+This can lead to unexpected behavior, for instance because content can have multiple locations.
 
 For example, a content item has two Locations: visible Location A and hidden Location B.
 You perform the following query:
@@ -282,12 +272,11 @@ $query->filter = new Criterion\LogicalAnd([
 ]);
 ```
 
-The query searches for Location B using the [`LocationId` Criterion](locationid_criterion.md),
-and for visible content using the [`Visibility` Criterion](visibility_criterion.md).
+The query searches for location B using the [`LocationId` Criterion](locationid_criterion.md), and for visible content using the [`Visibility` Criterion](visibility_criterion.md).
 
-Even though the Location B is hidden, the query finds the content because both conditions are satisfied:
+Even though the location B is hidden, the query finds the content because both conditions are satisfied:
 
-- the content item has Location B
+- the content item has location B
 - the content item is visible (it has the visible Location A)
 
 
@@ -295,8 +284,7 @@ Even though the Location B is hidden, the query finds the content because both c
 
 To sort the results of a query, use one of more [Sort Clauses](sort_clause_reference.md).
 
-For example, to order search results by their publicationg date, from oldest to newest,
-and then alphabetically by content name, add the following Sort Clauses to the query:
+For example, to order search results by their publicationg date, from oldest to newest, and then alphabetically by content name, add the following Sort Clauses to the query:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/FindComplexCommand.php', 55, 59) =]]
@@ -357,23 +345,20 @@ Aggregation results contain the name of the result and the count of found items:
 With field aggregations you can group search results according to the value of a specific field.
 In this case the aggregation takes the content type identifier and the field identifier as parameters.
 
-The following example creates an aggregation named `selection` that groups results
-according to the value of the `topic` field in the `article` content type:
+The following example creates an aggregation named `selection` that groups results according to the value of the `topic` field in the `article` content type:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/FindWithAggregationCommand.php', 39, 40) =]]
 ```
 
 With term aggregation you can define additional limits to the results.
-The following example limits the number of terms returned to 5
-and only considers terms that have 10 or more results:
+The following example limits the number of terms returned to 5 and only considers terms that have 10 or more results:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/FindWithAggregationCommand.php', 34, 37) =]]
 ```
 
-To use a range aggregation, you must provide a `ranges` array containing a set of `Range` objects
-that define the borders of the specific range sets.
+To use a range aggregation, you must provide a `ranges` array containing a set of `Range` objects that define the borders of the specific range sets.
 
 ``` php
 $query->aggregations[] = new IntegerRangeAggregation('range', 'person', 'age',
@@ -386,9 +371,8 @@ $query->aggregations[] = new IntegerRangeAggregation('range', 'person', 'age',
 
 !!! note
 
-    The beginning of the range is included and the end is excluded,
-    so a range between 1 and 30 includes value `1`, but not `30`.
-    
+    The beginning of the range is included and the end is excluded, so a range between 1 and 30 includes value `1`, but not `30`.
+
     `null` means that a range doesn't have an end.
     In the example all values above (and including) 60 are included in the last range.
 
diff --git a/docs/search/search_criteria_and_sort_clauses.md b/docs/search/search_criteria_and_sort_clauses.md
index 3d8d0f70ce..952d41f5f6 100644
--- a/docs/search/search_criteria_and_sort_clauses.md
+++ b/docs/search/search_criteria_and_sort_clauses.md
@@ -12,15 +12,13 @@ For an example of how to use and combine Criteria and Sort Clauses, refer to [Se
 ## Search engine handling of Search Criteria and Sort Clauses
 
 As Search Criteria and Sort Clauses are value objects which are used to define the query from API perspective, they're common for all storage engines.
-Each storage engine needs to implement its own handlers for the corresponding Criterion and Sort Clause value object,
-which are used to translate the value object into a storage-specific search query.
+Each storage engine needs to implement its own handlers for the corresponding Criterion and Sort Clause value object, which are used to translate the value object into a storage-specific search query.
 
-As an example take a look at the [`ContentId` Criterion handler](https://github.com/ibexa/core/blob/main/src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/ContentId.php) in Legacy search engine
-or [`ContentId` Criterion handler](https://github.com/ibexa/solr/blob/main/src/lib/Query/Common/CriterionVisitor/ContentIdIn.php) in Solr search engine.
+As an example take a look at the [`ContentId` Criterion handler](https://github.com/ibexa/core/blob/main/src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/ContentId.php) in Legacy search engine or [`ContentId` Criterion handler](https://github.com/ibexa/solr/blob/main/src/lib/Query/Common/CriterionVisitor/ContentIdIn.php) in Solr search engine.
 
 ## Custom Criteria and Sort Clauses
 
-Sometimes you can find that standard Search Criteria and Sort Clauses provided with [[= product_name =]] aren't sufficient for your needs. Most often this is the case if you have a custom field type using external storage which cannot be searched using the standard Field Criterion.
+Sometimes you can find that standard Search Criteria and Sort Clauses provided with [[= product_name =]] aren't sufficient for your needs. Most often this is the case if you have a custom field type using external storage which cannot be searched using the standard field Criterion.
 
 !!! note
 
@@ -31,13 +29,11 @@ In such cases you can implement a custom Criterion or Sort Clause, together with
 !!! caution "Using Field Criterion or Sort Clause with large databases"
 
     Field Criterion and Sort Clause don't perform well by design when using SQL database.
-    If you have a large database and want to use them, you either need to use the Solr search engine,
-    or develop your own Custom Criterion or Sort Clause. This way you can avoid using the attributes (fields) database table,
-    and instead use a custom simplified table which can handle the amount of data you have.
+    If you have a large database and want to use them, you either need to use the Solr search engine, or develop your own Custom Criterion or Sort Clause. This way you can avoid using the attributes (fields) database table, and instead use a custom simplified table which can handle the amount of data you have.
 
 ### Difference between Content and Location Search
 
-There are two basic types of searches, you can either search for Locations or for Content.
+There are two basic types of searches, you can either search for locations or for content.
 Each type has dedicated methods in the Search Service:
 
 | Type of search | Method in Search Service |
@@ -48,7 +44,7 @@ Each type has dedicated methods in the Search Service:
 | Location       | `findLocations()`        |
 
 All Criteria and Sort Clauses are accepted with Location Search, but not all of them can be used with Content Search.
-The reason for this is that while one Location always has exactly one content item, one content item can have multiple Locations.
+The reason for this is that while one Location always has exactly one content item, one content item can have multiple locations.
 In this context some Criteria and Sort Clauses would produce ambiguous queries that would not be accepted by Content Search.
 
 Content Search explicitly refuses to accept Criteria and Sort Clauses implementing these abstract classes:
@@ -58,7 +54,8 @@ Content Search explicitly refuses to accept Criteria and Sort Clauses implementi
 
 ### Configuring custom Criterion and Sort Clause handlers
 
-After you have implemented your Criterion / Sort Clause and its handler, you need to configure the handler for the [service container](php_api.md#service-container) by using dedicated service tags for each type of search. Doing so automatically registers it and handle your Criterion / Search Clause when it's given as a parameter to one of the Search Service methods.
+After you have implemented your Criterion / Sort Clause and its handler, you need to configure the handler for the [service container](php_api.md#service-container) by using dedicated service tags for each type of search.
+Doing so automatically registers it and handle your Criterion / Search Clause when it's given as a parameter to one of the Search Service methods.
 
 Available tags for Criterion handlers in Legacy Storage Engine are:
 
@@ -104,12 +101,13 @@ Ibexa\Core\Search\Legacy\Content\Location\Gateway\SortClauseHandler\Location\Dep
     tags:
         - {name: ibexa.search.legacy.gateway.sort_clause_handler.location}
 ```
-    
+
 For more information about passing parameters, see [Symfony Service Container documentation]([[= symfony_doc =]]/book/service_container.html#service-parameters).
 
 ## Search using custom Field Criterion [REST]
 
-REST search can be performed via `POST /views` using custom `FieldCriterion`. This allows you to build custom content logic queries with nested logical operators OR/AND/NOT.
+REST search can be performed via `POST /views` using custom `FieldCriterion`.
+This allows you to build custom content logic queries with nested logical operators OR/AND/NOT.
 
 Custom Field Criterion search mirrors the one already existing in PHP API `Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Field` by exposing it to REST.
 
diff --git a/docs/search/search_engines/elastic_search/configure_elastic_search.md b/docs/search/search_engines/elastic_search/configure_elastic_search.md
index a96576c397..4b888e127b 100644
--- a/docs/search/search_engines/elastic_search/configure_elastic_search.md
+++ b/docs/search/search_engines/elastic_search/configure_elastic_search.md
@@ -13,7 +13,7 @@ There are two possibilities of connection:
 - using [cluster of Elasticsearch nodes](#configure-clustering)
 - using [Elasticsearch Cloud](#configure-elasticsearch-cloud)
 
-No matter which option you choose, you have to define the connection settings under the `connections` key. 
+No matter which option you choose, you have to define the connection settings under the `connections` key.
 Set a name of the connection:
 
 ``` yaml
@@ -24,8 +24,7 @@ ibexa_elasticsearch:
 
 !!! tip "A default connection"
 
-    If you define more than one connection, for example, to create a separate connection for
-    each repository, you must select the one that [[= product_name =]] should use with the following setting:
+    If you define more than one connection, for example, to create a separate connection for each repository, you must select the one that [[= product_name =]] should use with the following setting:
 
     ``` yaml
     ibexa_elasticsearch:
@@ -52,7 +51,7 @@ distinct, you can change the default number.
 - `scheme` - a protocol used to access the node. Default value: `http`.
 - `path` - by default, path isn't used. Default value: `null`.
 If you have several Elasticsearch instances that run on the same host, and want to make them
-distinct, you can define a path for each instance.  
+distinct, you can define a path for each instance.
 - `user`/`pass` - credentials, if needed to log in to the host. Default values: `null`.
 
 Next, list the addresses of cluster nodes under the `hosts` key:
@@ -73,8 +72,7 @@ The easiest one is to pass them as a string:
 - https://<my.elasticsearch.domain>:9200/<path>/
 ```
 
-You can also pass the host configuration as an object that lists parameter-value pairs,
-for example, when your authentication settings contain special characters.  
+You can also pass the host configuration as an object that lists parameter-value pairs, for example, when your authentication settings contain special characters.
 
 ``` yaml
 - { host: '<my.elasticsearch.domain>', scheme: 'http', port: 9200, path: '/', user: <username>, pass: <password> }
@@ -108,16 +106,12 @@ ibexa_elasticsearch:
 
 ### Multi-node cluster behavior
 
-When you configure a cluster-based connection, and the cluster consists of many nodes, you can
-choose strategies that govern how the cluster reacts to changing operating conditions, or how
-workload is distributed among the nodes.
+When you configure a cluster-based connection, and the cluster consists of many nodes, you can choose strategies that govern how the cluster reacts to changing operating conditions, or how workload is distributed among the nodes.
 
 #### Connection pool
 
 With this setting you decide how a list of hosts that form a cluster is managed.
-The list of active hosts tends to change in time, due to different reasons, such as connectivity
-issues, host malfunction, or the fact that you add new hosts to the cluster to increase
-its performance.
+The list of active hosts tends to change in time, due to different reasons, such as connectivity issues, host malfunction, or the fact that you add new hosts to the cluster to increase its performance.
 By default, the `StaticNoPingConnectionPool` setting is used.
 
 You can change the default setting with the following key:
@@ -132,13 +126,11 @@ For more information and a list of available choices, see [Connection pool](http
 
 !!! tip "Load tests recommendation"
 
-    If you change the connection pool setting, it's recommended that you to perform load tests
-    to check whether the change doesn't negatively impact the performance of your environment.
+    If you change the connection pool setting, it's recommended that you to perform load tests to check whether the change doesn't negatively impact the performance of your environment.
 
 #### Connection selector
 
-When the cluster consists of many hosts, the `connection_selector` setting decides what strategy
-is used to pick a node to send query requests to.
+When the cluster consists of many hosts, the `connection_selector` setting decides what strategy is used to pick a node to send query requests to.
 By default, the `RoundRobinSelector` setting is used.
 
 If you prefer a different strategy, or have created your own, custom strategy, you can change the default setting with the following key:
@@ -153,8 +145,7 @@ For more information and a list of available choices, see [Selectors](https://ww
 
 ##### Number of retries
 
-The `retries` setting configures the number of attempts that [[= product_name =]] makes to connect
-to the nodes of the cluster before it throws an exception.
+The `retries` setting configures the number of attempts that [[= product_name =]] makes to connect to the nodes of the cluster before it throws an exception.
 By default, `null` is used, which means that the number of retries equals to the number of nodes in the cluster.
 
 ``` yaml
@@ -163,8 +154,7 @@ By default, `null` is used, which means that the number of retries equals to the
     retries: null
 ```
 
-Depending on the connection pool that you select, [[= product_name =]]'s reaction to reaching the maximum
-number of retries might differ.
+Depending on the connection pool that you select, [[= product_name =]]'s reaction to reaching the maximum number of retries might differ.
 
 For more information, see [Set retries](https://www.elastic.co/guide/en/elasticsearch/client/php-api/7.x/set-retries.html).
 
@@ -174,8 +164,7 @@ As an alternative to using your own cluster, you can use Elasticsearch Cloud, a
 With Elasticsearch Cloud you don't have to build or manage your own Elasticsearch cluster.
 Also, you do all the configuration and administration in a graphical user interface.
 
-To connect to a cloud solution with [[= product_name =]], you must set the `elastic_cloud_id` parameter by
-providing an alphanumerical ID string that you get from the cloud's user interface, for example:
+To connect to a cloud solution with [[= product_name =]], you must set the `elastic_cloud_id` parameter by providing an alphanumerical ID string that you get from the cloud's user interface, for example:
 
 ``` yaml
 <connection_name>:
@@ -226,15 +215,13 @@ ibexa_elasticsearch:
 
 ### API key authentication
 
-If your Elasticsearch cluster is protected by API keys, you must provide the key and secret in authentication configuration to
-connect [[= product_name =]] with the cluster. With API key authentication you can define different
-authorization levels, such as [`create_index`, `index`, etc.](https://www.elastic.co/guide/en/elasticsearch/reference/7.x/security-privileges.html#privileges-list-indices).
+If your Elasticsearch cluster is protected by API keys, you must provide the key and secret in authentication configuration to connect [[= product_name =]] with the cluster.
+With API key authentication you can define different authorization levels, such as [`create_index`, `index`, etc.](https://www.elastic.co/guide/en/elasticsearch/reference/7.x/security-privileges.html#privileges-list-indices).
 Such approach proves useful if the cluster is available to the public.
 
 For more information, see [Create API key](https://www.elastic.co/guide/en/elasticsearch/reference/7.x/security-api-create-api-key.html).
 
-When using API key authentication, you must pass the following parameters to
-authenticate access to the cluster:
+When using API key authentication, you must pass the following parameters to authenticate access to the cluster:
 
 ``` yaml
 <connection_name>:
@@ -283,9 +270,7 @@ ibexa_elasticsearch:
                     pass: ~
 ```
 
-If you don't have a client certificate signed by public certificate authority,
-but you have a self-signed CA certificate generated by `elasticsearch-certutil` or another tool (for example for development purposes),
-use the following `ssl` configuration:
+If you don't have a client certificate signed by public certificate authority, but you have a self-signed CA certificate generated by `elasticsearch-certutil` or another tool (for example for development purposes), use the following `ssl` configuration:
 
 ``` yaml
 ibexa_elasticsearch:
@@ -297,11 +282,10 @@ ibexa_elasticsearch:
                 ca_cert:
                     path: '/path/to/ca_cert.pem'
 ```
-    
+
 If you configure both `ca_cert` and `cert` entries, the `ca_cert` parameter takes precedence over the `cert` parameter.
 
-After you have configured SSL, you can still disable it, for example when the certificates
-expire, or you're migrating to a new set of certificates.
+After you have configured SSL, you can still disable it, for example when the certificates expire, or you're migrating to a new set of certificates.
 To do this, pass the following setting under the `ssl` key:
 
 ``` yaml
@@ -364,8 +348,7 @@ Index names use the following pattern:
 
     `<repository>_<document_type>_<language_code>_<content_type_id>`
 
-    By default, repository name is set to `default`, however, in the context of an [[= product_name =]] instance,
-    there can be [several repositories with different names](repository_configuration.md#defining-custom-connection).
+    By default, repository name is set to `default`, however, in the context of an [[= product_name =]] instance, there can be [several repositories with different names](repository_configuration.md#defining-custom-connection).
     Document type can be either `content` or `location`.
     In a language code, hyphens are replaced with underscores, and all characters must be lowercase.
     An index name can therefore look like this:
@@ -373,8 +356,7 @@ Index names use the following pattern:
     `default_content_eng_gb_2`
 
     You can use the `patterns` setting when your data contains content in different languages.
-    You can create index templates with settings that apply to a specific language only,
-    for example, to eliminate stop words from the index, or help divide concatenations.
+    You can create index templates with settings that apply to a specific language only, for example, to eliminate stop words from the index, or help divide concatenations.
     You use patterns to identify index templates that contain settings specific for a given language:
 
   ``` yaml
@@ -390,8 +372,7 @@ Index names use the following pattern:
 
 For more information and a list of available settings, see [Elasticsearch documentation](https://www.elastic.co/guide/en/elasticsearch/reference/7.x/index-modules.html#index-modules-settings).
 
-    For example, you can define settings that convert text into a format that is optimized for
-    search, like a normalizer that changes a case of all phrases in the index:
+    For example, you can define settings that convert text into a format that is optimized for search, like a normalizer that changes a case of all phrases in the index:
 
   ``` yaml
     ibexa_elasticsearch:
@@ -413,8 +394,7 @@ For more information and a list of available settings, see [Elasticsearch docume
 
 For more information about mappings, see [Elasticsearch documentation](https://www.elastic.co/guide/en/elasticsearch/reference/7.x/mapping.html).
 
-    When you create a custom index template, with settings for your own field and document
-    types, make sure that it contains mappings for all searchable fields that are available in [[= product_name =]].
+    When you create a custom index template, with settings for your own field and document types, make sure that it contains mappings for all searchable fields that are available in [[= product_name =]].
     For an example of default configuration with a list of searchable fields.
     To see the default configuration, go to `vendor/ibexa/elasticsearch/src/bundle/Resources/config/` and open the `default-config.yaml` file.
 
@@ -423,8 +403,7 @@ For more information about mappings, see [Elasticsearch documentation](https://w
 Your search results can be adjusted by configuring additional parameters.
 For a list of available mapping parameters and their usage, see [Elasticsearch documentation](https://www.elastic.co/guide/en/elasticsearch/reference/7.x/mapping-params.html).
 
-For example, you can apply a mapping parameter, in this case, a normalizer, to a specific
-mapping under the `dynamic_templates` key:
+For example, you can apply a mapping parameter, in this case, a normalizer, to a specific mapping under the `dynamic_templates` key:
 
 ``` yaml
 ibexa_elasticsearch:
@@ -544,5 +523,4 @@ For more information about how Elasticsearch handles settings and mappings from
 
 # Extend Elasticsearch
 
-To learn how you can create document field mappers, custom Search Criteria, 
-custom Sort Clauses and Aggregations, see [Create custom Search Criterion](create_custom_search_criterion.md).
+To learn how you can create document field mappers, custom Search Criteria, custom Sort Clauses and Aggregations, see [Create custom Search Criterion](create_custom_search_criterion.md).
diff --git a/docs/search/search_engines/elastic_search/elastic_search_overview.md b/docs/search/search_engines/elastic_search/elastic_search_overview.md
index 90179d06ee..f1222b9924 100644
--- a/docs/search/search_engines/elastic_search/elastic_search_overview.md
+++ b/docs/search/search_engines/elastic_search/elastic_search_overview.md
@@ -4,17 +4,16 @@ description: Elasticsearch search engine overview.
 
 # Elasticsearch search engine
 
-Elasticsearch is an open-source, distributed, Java-based search engine that responds to queries
-in real-time and is easily scalable in reaction to changing processing needs.
+Elasticsearch is an open-source, distributed, Java-based search engine that responds to queries in real-time and is scalable in reaction to changing processing needs.
 
-Elasticsearch enables you to use filtering, query, query-time boosting, fulltext search and aggregations. 
+Elasticsearch enables you to use filtering, query, query-time boosting, fulltext search, and aggregations.
 It organizes data into documents, that then are grouped into indices.
 
 As a result of having distributed architecture, Elasticsearch can analyze massive amounts of data with almost real-time performance.
-Instead of searching text directly, it searches and index. Thanks to this mechanism, it's able to achieve fast response.
+Instead of searching text directly, it searches and index.
+Thanks to this mechanism, it's able to achieve fast response.
 
-For a detailed description of advanced settings that you might require in a specific production environment, 
-see the documentation provided by Elastic.
+For a detailed description of advanced settings that you might require in a specific production environment, see the documentation provided by Elastic.
 Start with the [Set up Elasticsearch](https://www.elastic.co/guide/en/elasticsearch/reference/7.7/setup.html) section.
 
 **Prerequisite**
diff --git a/docs/search/search_engines/elastic_search/install_elastic_search.md b/docs/search/search_engines/elastic_search/install_elastic_search.md
index 9818606777..c43f71fa7e 100644
--- a/docs/search/search_engines/elastic_search/install_elastic_search.md
+++ b/docs/search/search_engines/elastic_search/install_elastic_search.md
@@ -60,8 +60,7 @@ All configuration is made in the `/config/packages/ibexa_elasticsearch.yaml` fil
 
 !!! note
 
-    All the settings, their order and meaning, correspond to the settings that are described in
-    the Elasticsearch documentation.
+    All the settings, their order and meaning, correspond to the settings that are described in the Elasticsearch documentation.
 
 First, decide how [[= product_name =]] connects to Elasticsearch and configure other connection settings.
 
diff --git a/docs/search/search_engines/legacy_search_engine/configure_repository.md b/docs/search/search_engines/legacy_search_engine/configure_repository.md
index 2f7de7dc66..b2c9cef2f0 100644
--- a/docs/search/search_engines/legacy_search_engine/configure_repository.md
+++ b/docs/search/search_engines/legacy_search_engine/configure_repository.md
@@ -4,8 +4,7 @@ description: Configure Legacy search engine to use it with Ibexa DXP.
 
 # Configure repository with Legacy search engine
 
-Search can be configured independently from storage, and the following configuration example shows both the default values, 
-and how you configure legacy as the search engine:
+Search can be configured independently from storage, and the following configuration example shows both the default values, and how you configure legacy as the search engine:
 
 ``` yaml
 ibexa:
diff --git a/docs/search/search_engines/legacy_search_engine/legacy_search_overview.md b/docs/search/search_engines/legacy_search_engine/legacy_search_overview.md
index 1a2eebf753..b4beb931d7 100644
--- a/docs/search/search_engines/legacy_search_engine/legacy_search_overview.md
+++ b/docs/search/search_engines/legacy_search_engine/legacy_search_overview.md
@@ -14,7 +14,6 @@ For more information, check [search engine comparison](search_engines.md#search-
 !!! tip
 
     The features and performance of Legacy search engine are limited.
-    If you have specific search or performance needs, it's recommended to use [Solr](solr_overview.md)
-    or [Elasticsearch](elastic_search_overview.md) instead.
-    
+    If you have specific search or performance needs, it's recommended to use [Solr](solr_overview.md) or [Elasticsearch](elastic_search_overview.md) instead.
+
     Using the Legacy search engine disables most shop features, such as product search.
diff --git a/docs/search/search_engines/search_engines.md b/docs/search/search_engines/search_engines.md
index 02cbae1d5a..fe65995ec9 100644
--- a/docs/search/search_engines/search_engines.md
+++ b/docs/search/search_engines/search_engines.md
@@ -21,8 +21,7 @@ Currently, they exist in their own [[= product_name =]] Bundles:
 | Index-time boosting | No | No | Query-time boosting\*\*\* |
 | Aggregations | No | Yes | Yes |
 
-\* Usage of Criteria and Sort Clauses for fields doesn't perform well on medium to larger 
-amount of data with Legacy Search Engine (SQL).
+\* Usage of Criteria and Sort Clauses for fields doesn't perform well on medium to larger amount of data with Legacy Search Engine (SQL).
 
 \*\* For more information about fulltext search syntax support, see [Fulltext Criterion](fulltext_criterion.md).
 
diff --git a/docs/search/search_engines/solr_search_engine/configure_solr.md b/docs/search/search_engines/solr_search_engine/configure_solr.md
index 97d145e901..8f97fd2eeb 100644
--- a/docs/search/search_engines/solr_search_engine/configure_solr.md
+++ b/docs/search/search_engines/solr_search_engine/configure_solr.md
@@ -13,17 +13,16 @@ description: Configure Solr search engine to use it with Ibexa DXP.
 
 !!! tip "How boosting interacts with Search API"
 
-    Boosting of fields or documents affects the score (relevance) of your search result hits
-    when using Search API for any Criteria you specify on `$query->query`, or in REST by using `Query` element.
+    Boosting of fields or documents affects the score (relevance) of your search result hits when using Search API for any Criteria you specify on `$query->query`, or in REST by using `Query` element.
     When you don't specify anything to sort on, the result is sorted by this relevance.
-    Anything set on `$query->filter`, or in REST using `Filter` element, *doesn't* affect scoring and only works
-    as a pure filter for the result. Thus make sure to place Criteria you want to affect scoring on `query`.
+    Anything set on `$query->filter`, or in REST using `Filter` element, *doesn't* affect scoring and only works as a pure filter for the result. Thus make sure to place Criteria you want to affect scoring on `query`.
 
 Boosting currently happens when indexing, so if you change your configuration you need to re-index.
 
-Boosting tells the search engine which parts of the content model have more importance when searching, and is an important part of tuning your search results relevance. Importance is defined using a numeric value, where `1.0` is default, values higher than that are more important, and values lower (down to `0.0`) are less important.
+Boosting tells the search engine which parts of the content model have more importance when searching, and is an important part of tuning your search results relevance.
+Importance is defined using a numeric value, where `1.0` is default, values higher than that are more important, and values lower (down to `0.0`) are less important.
 
-Boosting is configured per connection that you configure to use for a given Repository, like in this `config/packages/ibexa_solr.yaml` example:
+Boosting is configured per connection that you configure to use for a given repository, like in this `config/packages/ibexa_solr.yaml` example:
 
 ``` yaml
 ibexa_solr:
@@ -119,7 +118,7 @@ The configuration above results in the following boosting (content type / Field)
     Remember to clear the cache and perform search engine reindex afterwords.
 
     The above configuration results in the following boosting (content type / field):
-    
+
     - `folder/name: 20.0`
     - `folder/description: 10.0`
 
@@ -137,7 +136,7 @@ ibexa_solr:
             # ...
             indexing_depth:
                 # Default value: 0 - no relation indexing, 1 - direct relations, 2nd level  relations, 3rd level  relations (maximum value).
-                default: 1      
+                default: 1
                 content_type:
                     # Index depth defined for specific content type
                     article: 2
@@ -240,5 +239,4 @@ ibexa_solr:
 
 # Extend Solr
 
-To learn how you can create document field mappers, custom Search Criteria, 
-custom Sort Clauses and Aggregations, see [Search extensibility](create_custom_search_criterion.md).
+To learn how you can create document field mappers, custom Search Criteria, custom Sort Clauses and Aggregations, see [Search extensibility](create_custom_search_criterion.md).
diff --git a/docs/search/search_engines/solr_search_engine/install_solr.md b/docs/search/search_engines/solr_search_engine/install_solr.md
index 25cea6ed37..694811ad4a 100644
--- a/docs/search/search_engines/solr_search_engine/install_solr.md
+++ b/docs/search/search_engines/solr_search_engine/install_solr.md
@@ -6,7 +6,7 @@ description: Install Solr search engine to use it with Ibexa DXP.
 
 ## Configure and start Solr
 
-The example presents a configuration with a single core. 
+The example presents a configuration with a single core.
 For configuring Solr in other ways, including examples, see [Solr Cores and `solr.xml`](https://cwiki.apache.org/confluence/display/solr/Solr+Cores+and+solr.xml) and [core administration](https://wiki.apache.org/solr/CoreAdmin).
 
 ### Download Solr files
@@ -50,7 +50,7 @@ To set SolrCloud up follow [SolrCloud reference guide](https://lucene.apache.org
 
 ### Continue Solr configuration
 
-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.
+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. it's strongly recommended to set-up `solrconfig.xml` like this:
 
@@ -81,7 +81,8 @@ Execute the script from the [[= product_name =]] root directory for further info
 
 ## Configure the bundle
 
-The Solr Search Engine Bundle can be configured in many ways. The config further below assumes you have parameters set up for Solr DSN and search engine *(however both are optional)*, for example:
+The Solr Search Engine Bundle can be configured in many ways.
+The config further below assumes you have parameters set up for Solr DSN and search engine *(however both are optional)*, for example:
 
 ``` yaml
     env(SEARCH_ENGINE): solr
@@ -91,7 +92,7 @@ The Solr Search Engine Bundle can be configured in many ways. The config further
 
 ### Single-core example (default)
 
-Out of the box in [[= product_name =]] the following is enabled for a simple setup:
+Out of the box in [[= product_name =]] the following is enabled for a setup:
 
 ``` yaml
 ibexa_solr:
@@ -109,8 +110,8 @@ ibexa_solr:
 
 ### Shared-core example
 
-The following example separates one language. The installation contains several similar languages,
-and one very different language that should receive proper language analysis for proper stemming and sorting behavior by Solr:
+The following example separates one language.
+The installation contains several similar languages, and one different language that should receive proper language analysis for proper stemming and sorting behavior by Solr:
 
 ``` yaml
 ibexa_solr:
diff --git a/docs/search/search_engines/solr_search_engine/solr_overview.md b/docs/search/search_engines/solr_search_engine/solr_overview.md
index b4fc8784d8..086fcd6c1b 100644
--- a/docs/search/search_engines/solr_search_engine/solr_overview.md
+++ b/docs/search/search_engines/solr_search_engine/solr_overview.md
@@ -4,10 +4,10 @@ description: Solr search engine overview.
 
 # Solr search engine
 
-[Solr search engine](https://github.com/ibexa/solr) allows you to use advanced search features: filtering, query, fulltext search and aggregations.
+[Solr search engine](https://github.com/ibexa/solr) allows you to use advanced search features: filtering, query, fulltext search, and aggregations.
 
-When you enable Solr and re-index your content, all your existing Search queries using `SearchService` are powered by Solr automatically. 
-This allows you to scale up your [[= product_name =]] installation and be able to continue development locally against SQL engine, and have a test infrastructure, Staging and Prod powered by Solr. 
-By this, it also removes considerable load from your database. 
+When you enable Solr and re-index your content, all your existing Search queries using `SearchService` are powered by Solr automatically.
+This allows you to scale up your [[= product_name =]] installation and be able to continue development locally against SQL engine, and have a test infrastructure, Staging, and Prod powered by Solr.
+By this, it also removes considerable load from your database.
 
 For more information on the architecture of [[= product_name =]], see [Architecture](architecture.md).
\ No newline at end of file
diff --git a/docs/search/sort_clause_reference/baseprice_sort_clause.md b/docs/search/sort_clause_reference/baseprice_sort_clause.md
index f8dcb8bc26..b4e0672699 100644
--- a/docs/search/sort_clause_reference/baseprice_sort_clause.md
+++ b/docs/search/sort_clause_reference/baseprice_sort_clause.md
@@ -1,3 +1,7 @@
+---
+description: BasePrice Sort Clause
+---
+
 # BasePrice Sort Clause
 
 The `BasePrice` Sort Clause sorts search results by the product's base price.
diff --git a/docs/search/sort_clause_reference/contentid_sort_clause.md b/docs/search/sort_clause_reference/contentid_sort_clause.md
index cc9533d059..27c08213c8 100644
--- a/docs/search/sort_clause_reference/contentid_sort_clause.md
+++ b/docs/search/sort_clause_reference/contentid_sort_clause.md
@@ -1,7 +1,10 @@
+---
+description: ContentId Sort Clause
+---
+
 # ContentId Sort Clause
 
-The [`ContentId` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-ContentId.html)
-sorts search results by the content items' IDs.
+The [`ContentId` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-ContentId.html) sorts search results by the content items' IDs.
 
 ## Arguments
 
diff --git a/docs/search/sort_clause_reference/contentname_sort_clause.md b/docs/search/sort_clause_reference/contentname_sort_clause.md
index 6f25fe5ac5..28a3022808 100644
--- a/docs/search/sort_clause_reference/contentname_sort_clause.md
+++ b/docs/search/sort_clause_reference/contentname_sort_clause.md
@@ -1,7 +1,10 @@
+---
+description: ContentName Sort Clause
+---
+
 # ContentName Sort Clause
 
-The [`ContentName` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-ContentName.html)
-sorts search results by the content items' names.
+The [`ContentName` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-ContentName.html) sorts search results by the content items' names.
 
 ## Arguments
 
diff --git a/docs/search/sort_clause_reference/contenttranslatedname_sort_clause.md b/docs/search/sort_clause_reference/contenttranslatedname_sort_clause.md
index 41e9375b40..c46e759234 100644
--- a/docs/search/sort_clause_reference/contenttranslatedname_sort_clause.md
+++ b/docs/search/sort_clause_reference/contenttranslatedname_sort_clause.md
@@ -1,7 +1,10 @@
+---
+description: ContentTranslatedName Sort Clause
+---
+
 # ContentTranslatedName Sort Clause
 
-The [`ContentTranslatedName` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-ContentTranslatedName.html)
-sorts search results by the content items' translated names.
+The [`ContentTranslatedName` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-ContentTranslatedName.html) sorts search results by the content items' translated names.
 
 ## Arguments
 
diff --git a/docs/search/sort_clause_reference/contenttypename_sort_clause.md b/docs/search/sort_clause_reference/contenttypename_sort_clause.md
index 46820328bc..9246dfcd88 100644
--- a/docs/search/sort_clause_reference/contenttypename_sort_clause.md
+++ b/docs/search/sort_clause_reference/contenttypename_sort_clause.md
@@ -1,7 +1,10 @@
+---
+description: ContentTypeName Sort Clause
+---
+
 # ContentTypeName Sort Clause
 
-The [`ContentTypeName` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Trash-ContentTypeName.html)
-sorts the results of searching in Trash by the name of the content item's content type.
+The [`ContentTypeName` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Trash-ContentTypeName.html) sorts the results of searching in Trash by the name of the content item's content type.
 
 ## Arguments
 
diff --git a/docs/search/sort_clause_reference/createdat_sort_clause.md b/docs/search/sort_clause_reference/createdat_sort_clause.md
index bd8cbeb3b8..2ef171dc82 100644
--- a/docs/search/sort_clause_reference/createdat_sort_clause.md
+++ b/docs/search/sort_clause_reference/createdat_sort_clause.md
@@ -1,3 +1,7 @@
+---
+description: CreatedAt Sort Clause
+---
+
 # CreatedAt Sort Clause
 
 The `CreatedAt` Sort Clause sorts search results by the date and time of the creation of a product.
diff --git a/docs/search/sort_clause_reference/customfield_sort_clause.md b/docs/search/sort_clause_reference/customfield_sort_clause.md
index c171ba524c..6228697237 100644
--- a/docs/search/sort_clause_reference/customfield_sort_clause.md
+++ b/docs/search/sort_clause_reference/customfield_sort_clause.md
@@ -1,7 +1,10 @@
+---
+description: CustomField Sort Clause
+---
+
 # CustomField Sort Clause
 
-The [`CustomField` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-CustomField.html)
-sorts search results by raw search index fields.
+The [`CustomField` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-CustomField.html) sorts search results by raw search index fields.
 
 ## Arguments
 
diff --git a/docs/search/sort_clause_reference/customprice_sort_clause.md b/docs/search/sort_clause_reference/customprice_sort_clause.md
index 1c43f029fa..3402e245b8 100644
--- a/docs/search/sort_clause_reference/customprice_sort_clause.md
+++ b/docs/search/sort_clause_reference/customprice_sort_clause.md
@@ -1,11 +1,14 @@
+---
+description: CustomPrice Sort Clause
+---
+
 # CustomPrice Sort Clause
 
 The `CustomPrice` Sort Clause sorts search results by the product's custom price for a selected customer group.
 
 ## Arguments
 
-- `currency` - a `CurrencyInterface` object representing the currency to check price for
-[[= include_file('docs/snippets/sort_direction.md') =]]
+- `currency` - a `CurrencyInterface` object representing the currency to check price for [[= include_file('docs/snippets/sort_direction.md') =]]
 - (optional) `customerGroup` - a `CustomerGroupInterface` object representing the customer group to check prices for.
 If you don't provide a customer group, the query uses the group related to the current user.
 
diff --git a/docs/search/sort_clause_reference/datemodified_sort_clause.md b/docs/search/sort_clause_reference/datemodified_sort_clause.md
index e2ad72ceb6..c150e52fb1 100644
--- a/docs/search/sort_clause_reference/datemodified_sort_clause.md
+++ b/docs/search/sort_clause_reference/datemodified_sort_clause.md
@@ -1,7 +1,10 @@
+---
+description: DateModified Sort Clause
+---
+
 # DateModified Sort Clause
 
-The [`DateModified` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-DateModified.html)
-sorts search results by the date and time of the last modification of a content item.
+The [`DateModified` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-DateModified.html) sorts search results by the date and time of the last modification of a content item.
 
 ## Arguments
 
diff --git a/docs/search/sort_clause_reference/datepublished_sort_clause.md b/docs/search/sort_clause_reference/datepublished_sort_clause.md
index 6b6d43e5f3..63a6a522d5 100644
--- a/docs/search/sort_clause_reference/datepublished_sort_clause.md
+++ b/docs/search/sort_clause_reference/datepublished_sort_clause.md
@@ -1,7 +1,10 @@
+---
+description: DatePublished Sort Clause
+---
+
 # DatePublished Sort Clause
 
-The [`DatePublished` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-DatePublished.html)
-sorts search results by the date and time of the first publication of a content item.
+The [`DatePublished` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-DatePublished.html) sorts search results by the date and time of the first publication of a content item.
 
 ## Arguments
 
diff --git a/docs/search/sort_clause_reference/datetrashed_sort_clause.md b/docs/search/sort_clause_reference/datetrashed_sort_clause.md
index 60d505c44f..1982d5e70b 100644
--- a/docs/search/sort_clause_reference/datetrashed_sort_clause.md
+++ b/docs/search/sort_clause_reference/datetrashed_sort_clause.md
@@ -1,7 +1,10 @@
+---
+description: DateTrashed Sort Clause
+---
+
 # DateTrashed Sort Clause
 
-The [`DateTrashed` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Trash-DateTrashed.html)
-sorts the results of searching in Trash by the date and time when the content item was sent to trash.
+The [`DateTrashed` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Trash-DateTrashed.html) sorts the results of searching in Trash by the date and time when the content item was sent to trash.
 
 ## Arguments
 
diff --git a/docs/search/sort_clause_reference/depth_sort_clause.md b/docs/search/sort_clause_reference/depth_sort_clause.md
index 8d92fabb5f..e8e2765811 100644
--- a/docs/search/sort_clause_reference/depth_sort_clause.md
+++ b/docs/search/sort_clause_reference/depth_sort_clause.md
@@ -1,7 +1,10 @@
+---
+description: Depth Sort Clause
+---
+
 # Depth Sort Clause
 
-The [`Location\Depth` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-Depth.html)
-sorts search results by the depth of the Location in the content tree.
+The [`Location\Depth` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-Depth.html) sorts search results by the depth of the Location in the content tree.
 
 ## Arguments
 
diff --git a/docs/search/sort_clause_reference/field_sort_clause.md b/docs/search/sort_clause_reference/field_sort_clause.md
index 8145a59188..4dccf23db5 100644
--- a/docs/search/sort_clause_reference/field_sort_clause.md
+++ b/docs/search/sort_clause_reference/field_sort_clause.md
@@ -1,7 +1,10 @@
+---
+description: Field Sort Clause
+---
+
 # Field Sort Clause
 
-The [`Field` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Field.html)
-sorts search results by the value of one of the content items' fields.
+The [`Field` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Field.html) sorts search results by the value of one of the content items' fields.
 
 Search results of the provided content type are sorted in field value order.
 Results of the query that don't belong to the content type are ranked lower.
@@ -9,8 +12,7 @@ Results of the query that don't belong to the content type are ranked lower.
 ## Arguments
 
 - `typeIdentifier` - string representing the identifier of the content type to which the field belongs
-- `fieldIdentifier` - string representing the identifier of the field to sort by
-[[= include_file('docs/snippets/sort_direction.md') =]]
+- `fieldIdentifier` - string representing the identifier of the field to sort by [[= include_file('docs/snippets/sort_direction.md') =]]
 
 ## Limitations
 
diff --git a/docs/search/sort_clause_reference/id_sort_clause.md b/docs/search/sort_clause_reference/id_sort_clause.md
index ca0bfb68ff..1bdf574be8 100644
--- a/docs/search/sort_clause_reference/id_sort_clause.md
+++ b/docs/search/sort_clause_reference/id_sort_clause.md
@@ -1,7 +1,10 @@
+---
+description: Id Sort Clause
+---
+
 # Id Sort Clause
 
-The [`Location\Id` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-Id.html)
-sorts search results by the ID of the Location.
+The [`Location\Id` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-Id.html) sorts search results by the ID of the Location.
 
 ## Arguments
 
diff --git a/docs/search/sort_clause_reference/ismainlocation_sort_clause.md b/docs/search/sort_clause_reference/ismainlocation_sort_clause.md
index 5ead5b6df8..f471a648aa 100644
--- a/docs/search/sort_clause_reference/ismainlocation_sort_clause.md
+++ b/docs/search/sort_clause_reference/ismainlocation_sort_clause.md
@@ -1,7 +1,10 @@
+---
+description: IsMainLocation Sort Clause
+---
+
 # IsMainLocation Sort Clause
 
-The [`Location\IsMainLocation` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-IsMainLocation.html)
-sorts search results by whether their Location is the main Location of the content item.
+The [`Location\IsMainLocation` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-IsMainLocation.html) sorts search results by whether their Location is the main Location of the content item.
 
 Locations that aren't main Locations are ranked as lower values (for example, with ascending order they are returned first).
 
diff --git a/docs/search/sort_clause_reference/maplocationdistance_sort_clause.md b/docs/search/sort_clause_reference/maplocationdistance_sort_clause.md
index 19a9058640..e0553a511f 100644
--- a/docs/search/sort_clause_reference/maplocationdistance_sort_clause.md
+++ b/docs/search/sort_clause_reference/maplocationdistance_sort_clause.md
@@ -1,15 +1,17 @@
+---
+description: MapLocationDistance Sort Clause
+---
+
 # MapLocationDistance Sort Clause
 
-The [`MapLocationDistance` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-MapLocationDistance.html)
-sorts search results by the distance of the indicated MapLocation field to the provided location.
+The [`MapLocationDistance` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-MapLocationDistance.html) sorts search results by the distance of the indicated MapLocation field to the provided location.
 
 ## Arguments
 
 - `typeIdentifier` - string representing the identifier of the content type to which the MapLocation field belongs
 - `fieldIdentifier` - string representing the identifier of the MapLocation field to sort by
 - `latitude` - float representing the latitude of the location to calculate distance to
-- `longitude`- float representing the longitude of the location to calculate distance to
-[[= include_file('docs/snippets/sort_direction.md') =]]
+- `longitude`- float representing the longitude of the location to calculate distance to [[= include_file('docs/snippets/sort_direction.md') =]]
 
 ## Limitations
 
diff --git a/docs/search/sort_clause_reference/order_sort_clauses.md b/docs/search/sort_clause_reference/order_sort_clauses.md
index d3d5f7ce4f..b8a27d1d32 100644
--- a/docs/search/sort_clause_reference/order_sort_clauses.md
+++ b/docs/search/sort_clause_reference/order_sort_clauses.md
@@ -3,13 +3,11 @@ description: Order Sort Clauses
 edition: commerce
 ---
 
----
-
 # Order Sort Clauses
 
 Order Sort Clauses are only supported by [Order Search (`OrderService::findOrders`)](order_management_api.md#get-multiple-orders).
 
-By using Sort Clauses you can filter orders by specific attributes, for example: creation date, status, etc.
+By using Sort Clauses you can filter orders by specific attributes, for example: creation date, status, and more.
 
 | Sort Clause | Sorting based on |
 |-----|-----|
diff --git a/docs/search/sort_clause_reference/path_sort_clause.md b/docs/search/sort_clause_reference/path_sort_clause.md
index 5f483be5bd..20a5d23dda 100644
--- a/docs/search/sort_clause_reference/path_sort_clause.md
+++ b/docs/search/sort_clause_reference/path_sort_clause.md
@@ -1,7 +1,10 @@
+---
+description: Path Sort Clause
+---
+
 # Path Sort Clause
 
-The [`Location\Path` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-Path.html)
-sorts search results by the pathString of the Location.
+The [`Location\Path` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-Path.html) sorts search results by the pathString of the Location.
 
 !!! note
 
diff --git a/docs/search/sort_clause_reference/payment_method_sort_clauses.md b/docs/search/sort_clause_reference/payment_method_sort_clauses.md
index 8d0d346f7a..d43e4b78f7 100644
--- a/docs/search/sort_clause_reference/payment_method_sort_clauses.md
+++ b/docs/search/sort_clause_reference/payment_method_sort_clauses.md
@@ -9,7 +9,7 @@ page_type: reference
 
 Payment Method Sort Clauses are only supported by [Payment Method Search (`PaymentMethodService::findPaymentMethods`)](payment_method_api.md#get-multiple-payment-methods).
 
-By using Sort Clauses you can filter payment methods by specific attributes, for example: creation date, ID, and so on.
+By using Sort Clauses you can filter payment methods by specific attributes, for example: creation date, ID, and more.
 
 | Sort Clause | Sorting based on |
 |-----|-----|
diff --git a/docs/search/sort_clause_reference/payment_sort_clauses.md b/docs/search/sort_clause_reference/payment_sort_clauses.md
index 1c186a9d35..364e628683 100644
--- a/docs/search/sort_clause_reference/payment_sort_clauses.md
+++ b/docs/search/sort_clause_reference/payment_sort_clauses.md
@@ -8,7 +8,7 @@ edition: commerce
 
 Payment Sort Clauses are only supported by [Payment Search (`PaymentServiceInterface::findPayments`)](payment_api.md#get-multiple-payments).
 
-By using Sort Clauses you can filter payments by specific attributes, for example: creation date, status, and so on.
+By using Sort Clauses you can filter payments by specific attributes, for example: creation date, status, and more.
 
 | Sort Clause | Sorting based on |
 |-----|-----|
diff --git a/docs/search/sort_clause_reference/priority_sort_clause.md b/docs/search/sort_clause_reference/priority_sort_clause.md
index 5b94e9170a..02712dd10b 100644
--- a/docs/search/sort_clause_reference/priority_sort_clause.md
+++ b/docs/search/sort_clause_reference/priority_sort_clause.md
@@ -1,7 +1,10 @@
+---
+description: Priority Sort Clause
+---
+
 # Priority Sort Clause
 
-The [`Location\Priority` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-Priority.html)
-sorts search results by the priority of the Location.
+The [`Location\Priority` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-Priority.html) sorts search results by the priority of the Location.
 
 ## Arguments
 
diff --git a/docs/search/sort_clause_reference/product_sort_clauses.md b/docs/search/sort_clause_reference/product_sort_clauses.md
index 08782751dc..77aebe252b 100644
--- a/docs/search/sort_clause_reference/product_sort_clauses.md
+++ b/docs/search/sort_clause_reference/product_sort_clauses.md
@@ -7,7 +7,7 @@ page_type: reference
 
 Product Sort Clauses are only supported by [Product Search (`ProductServiceInterface::findProduct`)](product_api.md#products).
 
-By using Sort Clause you can filter product by specific attributes, for example: price, code, availability etc.
+By using Sort Clause you can filter product by specific attributes, for example: price, code, or availability.
 
 | Sort Clause | Sorting based on |
 |-----|-----|
diff --git a/docs/search/sort_clause_reference/productavailability_sort_clause.md b/docs/search/sort_clause_reference/productavailability_sort_clause.md
index 6b996de968..4129785d5a 100644
--- a/docs/search/sort_clause_reference/productavailability_sort_clause.md
+++ b/docs/search/sort_clause_reference/productavailability_sort_clause.md
@@ -1,3 +1,7 @@
+---
+description: ProductAvailability Sort Clause
+---
+
 # ProductAvailability Sort Clause
 
 The `ProductAvailability` Sort Clause sorts search results by whether they have availability or not.
diff --git a/docs/search/sort_clause_reference/productcode_sort_clause.md b/docs/search/sort_clause_reference/productcode_sort_clause.md
index 5a8927a71b..4eabf93258 100644
--- a/docs/search/sort_clause_reference/productcode_sort_clause.md
+++ b/docs/search/sort_clause_reference/productcode_sort_clause.md
@@ -1,3 +1,7 @@
+---
+description: ProductCode Sort Clause
+---
+
 # ProductCode Sort Clause
 
 The `ProductCode` Sort Clause sorts search results by the Product code.
diff --git a/docs/search/sort_clause_reference/productname_sort_clause.md b/docs/search/sort_clause_reference/productname_sort_clause.md
index bf3000f774..4321cff756 100644
--- a/docs/search/sort_clause_reference/productname_sort_clause.md
+++ b/docs/search/sort_clause_reference/productname_sort_clause.md
@@ -1,3 +1,7 @@
+---
+description: ProductName Sort Clause
+---
+
 # ProductName Sort Clause
 
 The `ProductName` Sort Clause sorts search results by the Product code.
diff --git a/docs/search/sort_clause_reference/random_sort_clause.md b/docs/search/sort_clause_reference/random_sort_clause.md
index 30a9955423..d125e0d142 100644
--- a/docs/search/sort_clause_reference/random_sort_clause.md
+++ b/docs/search/sort_clause_reference/random_sort_clause.md
@@ -1,7 +1,10 @@
+---
+description: Random Sort Clause
+---
+
 # Random Sort Clause
 
-The [`Random` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Random.html)
-orders search results randomly.
+The [`Random` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Random.html) orders search results randomly.
 
 ## Arguments
 
diff --git a/docs/search/sort_clause_reference/score_sort_clause.md b/docs/search/sort_clause_reference/score_sort_clause.md
index 719ae688aa..aeb71d29a7 100644
--- a/docs/search/sort_clause_reference/score_sort_clause.md
+++ b/docs/search/sort_clause_reference/score_sort_clause.md
@@ -1,7 +1,10 @@
+---
+description: Score Sort Clause
+---
+
 # Score Sort Clause
 
-The [`Score` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Score.html)
-orders search results by their score.
+The [`Score` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Score.html) orders search results by their score.
 
 ## Arguments
 
diff --git a/docs/search/sort_clause_reference/sectionidentifier_sort_clause.md b/docs/search/sort_clause_reference/sectionidentifier_sort_clause.md
index 2f4bad81ef..5cb575f37d 100644
--- a/docs/search/sort_clause_reference/sectionidentifier_sort_clause.md
+++ b/docs/search/sort_clause_reference/sectionidentifier_sort_clause.md
@@ -1,7 +1,10 @@
+---
+description: SectionIdentifier Sort Clause
+---
+
 # SectionIdentifier Sort Clause
 
-The [`SectionIdentifier` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-SectionIdentifier.html)
-sorts search results by the Section IDs of the content items.
+The [`SectionIdentifier` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-SectionIdentifier.html) sorts search results by the Section IDs of the content items.
 
 ## Arguments
 
diff --git a/docs/search/sort_clause_reference/sectionname_sort_clause.md b/docs/search/sort_clause_reference/sectionname_sort_clause.md
index 292388ec1c..4f65c8ae5f 100644
--- a/docs/search/sort_clause_reference/sectionname_sort_clause.md
+++ b/docs/search/sort_clause_reference/sectionname_sort_clause.md
@@ -1,7 +1,10 @@
+---
+description: SectionName Sort Clause
+---
+
 # SectionName Sort Clause
 
-The [`SectionName` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-SectionName.html)
-sorts search results by the Section name of the content items.
+The [`SectionName` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-SectionName.html) sorts search results by the Section name of the content items.
 
 ## Arguments
 
diff --git a/docs/search/sort_clause_reference/shipment_sort_clauses.md b/docs/search/sort_clause_reference/shipment_sort_clauses.md
index 83c51ab401..f971d0abc8 100644
--- a/docs/search/sort_clause_reference/shipment_sort_clauses.md
+++ b/docs/search/sort_clause_reference/shipment_sort_clauses.md
@@ -9,7 +9,7 @@ page_type: reference
 
 Shipment Sort Clauses are only supported by [Shipment Search (`ShipmentService::findShipments`)](shipment_api.md#get-multiple-shipments).
 
-By using Sort Clauses you can filter shipments by specific attributes, for example: creation date, status, and so on.
+By using Sort Clauses you can filter shipments by specific attributes, for example: creation date, status, and more.
 
 | Sort Clause | Sorting based on |
 |-----|-----|
diff --git a/docs/search/sort_clause_reference/userlogin_sort_clause.md b/docs/search/sort_clause_reference/userlogin_sort_clause.md
index 2e201c638c..11a4d2b29a 100644
--- a/docs/search/sort_clause_reference/userlogin_sort_clause.md
+++ b/docs/search/sort_clause_reference/userlogin_sort_clause.md
@@ -1,7 +1,10 @@
+---
+description: UserLogin Sort Clause
+---
+
 # UserLogin Sort Clause
 
-The [`UserLogin` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Trash-UserLogin.html)
-sorts the results of searching in Trash by the login of the content item's creator.
+The [`UserLogin` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Trash-UserLogin.html) sorts the results of searching in Trash by the login of the content item's creator.
 
 ## Arguments
 
diff --git a/docs/search/sort_clause_reference/visibility_sort_clause.md b/docs/search/sort_clause_reference/visibility_sort_clause.md
index 18f6971e8c..fc0f57bf48 100644
--- a/docs/search/sort_clause_reference/visibility_sort_clause.md
+++ b/docs/search/sort_clause_reference/visibility_sort_clause.md
@@ -1,7 +1,10 @@
+---
+description: Visibility Sort Clause
+---
+
 # Visibility Sort Clause
 
-The [`Location\Visibility` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-Visibility.html)
-sorts search results by whether the Location is visible or not.
+The [`Location\Visibility` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-Visibility.html) sorts search results by whether the Location is visible or not.
 
 Locations that aren't visible are ranked as higher values (for example, with ascending order they're returned last).
 
diff --git a/docs/search/url_search_reference/id_url_sort_clause.md b/docs/search/url_search_reference/id_url_sort_clause.md
index c86d544c03..64bc427a7a 100644
--- a/docs/search/url_search_reference/id_url_sort_clause.md
+++ b/docs/search/url_search_reference/id_url_sort_clause.md
@@ -1,7 +1,10 @@
+---
+description: Id Sort Clause
+---
+
 # Id Sort Clause
 
-The [`SortClause\Id` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-SortClause-Id.html)
-sorts search results by the ID of the URL.
+The [`SortClause\Id` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-SortClause-Id.html) sorts search results by the ID of the URL.
 
 ## Arguments
 
diff --git a/docs/search/url_search_reference/logicaland_url_criterion.md b/docs/search/url_search_reference/logicaland_url_criterion.md
index e6c54fc565..5cc0b30433 100644
--- a/docs/search/url_search_reference/logicaland_url_criterion.md
+++ b/docs/search/url_search_reference/logicaland_url_criterion.md
@@ -1,7 +1,10 @@
+---
+description: LogicalAnd Criterion
+---
+
 # LogicalAnd Criterion
 
-The [`LogicalAnd` URL Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-Criterion-LogicalAnd.html)
-matches a URL if all provided Criteria match.
+The [`LogicalAnd` URL Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-Criterion-LogicalAnd.html) matches a URL if all provided Criteria match.
 
 ## Arguments
 
diff --git a/docs/search/url_search_reference/logicalnot_url_criterion.md b/docs/search/url_search_reference/logicalnot_url_criterion.md
index 9a2c8e07b9..7d840b7f12 100644
--- a/docs/search/url_search_reference/logicalnot_url_criterion.md
+++ b/docs/search/url_search_reference/logicalnot_url_criterion.md
@@ -1,7 +1,10 @@
+---
+description: LogicalNot Criterion
+---
+
 # LogicalNot Criterion
 
-The [`LogicalNot` URL Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-Criterion-LogicalNot.html)
-matches a URL if the provided Criterion doesn't match.
+The [`LogicalNot` URL Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-Criterion-LogicalNot.html) matches a URL if the provided Criterion doesn't match.
 
 It takes only one Criterion in the array parameter.
 
diff --git a/docs/search/url_search_reference/logicalor_url_criterion.md b/docs/search/url_search_reference/logicalor_url_criterion.md
index cc3157a572..49c2dd8fad 100644
--- a/docs/search/url_search_reference/logicalor_url_criterion.md
+++ b/docs/search/url_search_reference/logicalor_url_criterion.md
@@ -1,7 +1,10 @@
+---
+description: LogicalOr Criterion
+---
+
 # LogicalOr Criterion
 
-The [`LogicalOr` URL Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-Criterion-LogicalOr.html)
-matches a URL if at least one of the provided Criteria match.
+The [`LogicalOr` URL Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-Criterion-LogicalOr.html) matches a URL if at least one of the provided Criteria match.
 
 ## Arguments
 
diff --git a/docs/search/url_search_reference/matchall_url_criterion.md b/docs/search/url_search_reference/matchall_url_criterion.md
index a0f4276b5c..4f4e977463 100644
--- a/docs/search/url_search_reference/matchall_url_criterion.md
+++ b/docs/search/url_search_reference/matchall_url_criterion.md
@@ -1,7 +1,10 @@
+---
+description: MatchAll Criterion
+---
+
 # MatchAll Criterion
 
-The [`MatchAll` URL Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-Criterion-MatchAll.html)
-is an auxiliary Criterion that returns all search results.
+The [`MatchAll` URL Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-Criterion-MatchAll.html) is an auxiliary Criterion that returns all search results.
 It's used internally when no filter or query is provided on a Query object.
 
 The Criterion takes no arguments.
diff --git a/docs/search/url_search_reference/matchnone_url_criterion.md b/docs/search/url_search_reference/matchnone_url_criterion.md
index 93a858ae86..21bd56fc7c 100644
--- a/docs/search/url_search_reference/matchnone_url_criterion.md
+++ b/docs/search/url_search_reference/matchnone_url_criterion.md
@@ -1,7 +1,10 @@
+---
+description: MatchNone Criterion
+---
+
 # MatchNone Criterion
 
-The [`MatchNone` URL Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-Criterion-MatchNone.html)
-is an auxiliary Criterion that returns no search results.
+The [`MatchNone` URL Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-Criterion-MatchNone.html) is an auxiliary Criterion that returns no search results.
 It's used internally when no filter or query is provided on a Query object.
 
 The Criterion takes no arguments.
diff --git a/docs/search/url_search_reference/pattern_url_criterion.md b/docs/search/url_search_reference/pattern_url_criterion.md
index b95d9e1904..9e403075f2 100644
--- a/docs/search/url_search_reference/pattern_url_criterion.md
+++ b/docs/search/url_search_reference/pattern_url_criterion.md
@@ -1,7 +1,10 @@
+---
+description: Pattern Criterion
+---
+
 # Pattern Criterion
 
-The [`Pattern` URL Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-Criterion-SectionId.html)
-matches URLs that contain the provided pattern.
+The [`Pattern` URL Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-Criterion-SectionId.html) matches URLs that contain the provided pattern.
 
 ## Arguments
 
diff --git a/docs/search/url_search_reference/sectionid_url_criterion.md b/docs/search/url_search_reference/sectionid_url_criterion.md
index 3455c90641..ac5dd4202d 100644
--- a/docs/search/url_search_reference/sectionid_url_criterion.md
+++ b/docs/search/url_search_reference/sectionid_url_criterion.md
@@ -1,7 +1,10 @@
+---
+description: SectionId Criterion
+---
+
 # SectionId Criterion
 
-The [`SectionId` URL Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-Criterion-SectionId.html)
-matches URLs based on the ID of the related content Section.
+The [`SectionId` URL Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-Criterion-SectionId.html) matches URLs based on the ID of the related content Section.
 
 ## Arguments
 
diff --git a/docs/search/url_search_reference/sectionidentifier_url_criterion.md b/docs/search/url_search_reference/sectionidentifier_url_criterion.md
index 46e8202a61..c0bb134c62 100644
--- a/docs/search/url_search_reference/sectionidentifier_url_criterion.md
+++ b/docs/search/url_search_reference/sectionidentifier_url_criterion.md
@@ -1,7 +1,10 @@
+---
+description: SectionIdentifier Criterion
+---
+
 # SectionIdentifier Criterion
 
-The [SectionIdentifier URL Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-Criterion-SectionIdentifier.html)
-matches URLs related to the content placed in a specified section identifier.
+The [SectionIdentifier URL Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-Criterion-SectionIdentifier.html) matches URLs related to the content placed in a specified section identifier.
 
 ## Arguments
 
diff --git a/docs/search/url_search_reference/url_search_sort_clauses.md b/docs/search/url_search_reference/url_search_sort_clauses.md
index f1dd506078..e052cc26a7 100644
--- a/docs/search/url_search_reference/url_search_sort_clauses.md
+++ b/docs/search/url_search_reference/url_search_sort_clauses.md
@@ -6,7 +6,7 @@ page_type: reference
 # URL Sort Clauses
 
 URL Sort Clauses are the sorting options for URLs.
-they're only supported by [URL Search (`URLService::findUrls`)](url_api.md).
+They're only supported by [URL Search (`URLService::findUrls`)](url_api.md).
 
 All URL Sort Clauses can take the following optional argument:
 
diff --git a/docs/search/url_search_reference/url_url_sort_clause.md b/docs/search/url_search_reference/url_url_sort_clause.md
index 52d116bc23..d719ebfe8f 100644
--- a/docs/search/url_search_reference/url_url_sort_clause.md
+++ b/docs/search/url_search_reference/url_url_sort_clause.md
@@ -1,7 +1,10 @@
+---
+description: URL Sort Clause
+---
+
 # URL Sort Clause
 
-The [`SortClause\Url` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-SortClause-URL.html)
-sorts search results by the URLs.
+The [`SortClause\Url` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-SortClause-URL.html) sorts search results by the URLs.
 
 ## Arguments
 
diff --git a/docs/search/url_search_reference/validity_url_criterion.md b/docs/search/url_search_reference/validity_url_criterion.md
index 4de8c71588..e9ff4658e7 100644
--- a/docs/search/url_search_reference/validity_url_criterion.md
+++ b/docs/search/url_search_reference/validity_url_criterion.md
@@ -1,3 +1,7 @@
+---
+description: Validity Criterion
+---
+
 # Validity Criterion
 
 The [Validity URL Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-Criterion-Validity.html) matches URLs based on a validity flag.
diff --git a/docs/search/url_search_reference/visibleonly_url_criterion.md b/docs/search/url_search_reference/visibleonly_url_criterion.md
index 47e0cb4e44..862f51c4a2 100644
--- a/docs/search/url_search_reference/visibleonly_url_criterion.md
+++ b/docs/search/url_search_reference/visibleonly_url_criterion.md
@@ -1,6 +1,9 @@
+---
+description: VisibleOnly Criterion
+---
+
 # VisibleOnly Criterion
 
-The [`VisibleOnly` URL Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-Criterion-VisibleOnly.html)
-matches URLs from the published content.
+The [`VisibleOnly` URL Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-URL-Query-Criterion-VisibleOnly.html) matches URLs from the published content.
 
 The Criterion takes no arguments.

From db45a5c6050900f2fd45e86bc33a0eb55d83ca49 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 11:18:24 +0200
Subject: [PATCH 51/77] Fixes in 'snippets'

---
 docs/snippets/catalog_permissions_note.md    |  2 +-
 docs/snippets/page_block_cache_clear.md      |  6 ++++--
 docs/snippets/rendering_dump_variable.md     |  2 +-
 docs/snippets/update/db/db_backup_warning.md |  2 +-
 docs/snippets/update/db/update_db_2.5-3.3.md |  6 ++----
 docs/snippets/update/finish_the_update.md    |  4 ++--
 docs/snippets/update/merge_composer.md       | 12 +++++-------
 docs/snippets/update/notify_support.md       |  3 ++-
 docs/snippets/update/update_app.md           |  2 +-
 9 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/docs/snippets/catalog_permissions_note.md b/docs/snippets/catalog_permissions_note.md
index 568d71face..bcea114516 100644
--- a/docs/snippets/catalog_permissions_note.md
+++ b/docs/snippets/catalog_permissions_note.md
@@ -1,4 +1,4 @@
 !!! note
 
     By default, the anonymous user doesn't have permissions to view products.
-    To change this, add the `Product/View` Policy to the Anonymous Role.
+    To change this, add the `Product/View` Policy to the Anonymous role.
diff --git a/docs/snippets/page_block_cache_clear.md b/docs/snippets/page_block_cache_clear.md
index 47d227a8db..6823f7a239 100644
--- a/docs/snippets/page_block_cache_clear.md
+++ b/docs/snippets/page_block_cache_clear.md
@@ -1,9 +1,11 @@
 !!! caution "Clear the persistence cache"
 
-    Persistence cache must be cleared after any modifications have been made to the block config in Page Builder, such as adding, removing or altering the Page blocks, block attributes, validators or views configuration.
+    Persistence cache must be cleared after any modifications have been made to the block config in Page Builder, such as adding, removing or altering the page blocks, block attributes, validators or views configuration.
 
     To clear the persistence cache run `./bin/console cache:pool:clear [cache-pool]` command.
-    The default cache-pool is named `cache.tagaware.filesystem`. The default cache-pool when running redis is named `cache.redis`. If you have customized the [persistence cache configuration](https://doc.ibexa.co/en/latest/infrastructure_and_maintenance/cache/persistence_cache/#what-is-cached), the name of your cache pool might be different.
+    The default cache-pool is named `cache.tagaware.filesystem`.
+    The default cache-pool when running redis is named `cache.redis`.
+    If you have customized the [persistence cache configuration](https://doc.ibexa.co/en/latest/infrastructure_and_maintenance/cache/persistence_cache/#what-is-cached), the name of your cache pool might be different.
 
     In prod mode, you also need to clear the symfony cache by running `./bin/console c:c`.
     In dev mode, the Symfony cache is rebuilt automatically.
\ No newline at end of file
diff --git a/docs/snippets/rendering_dump_variable.md b/docs/snippets/rendering_dump_variable.md
index 441bdd07c5..d8d160502b 100644
--- a/docs/snippets/rendering_dump_variable.md
+++ b/docs/snippets/rendering_dump_variable.md
@@ -1,7 +1,7 @@
 !!! tip
 
     For development purposes, you can list all available variables, or a single variable, and their values, by using the `dump()` Twig function:
-    
+
     ``` html+twig
     {{ dump() }}
     {{ dump(content) }}
diff --git a/docs/snippets/update/db/db_backup_warning.md b/docs/snippets/update/db/db_backup_warning.md
index 9f5bf1df31..42b9737e0a 100644
--- a/docs/snippets/update/db/db_backup_warning.md
+++ b/docs/snippets/update/db/db_backup_warning.md
@@ -3,7 +3,7 @@
     Always back up your data before running any database update scripts.
 
     After updating the database, clear the cache.
-    
+
     Don't use `--force` argument for `mysql` / `psql` commands when performing update queries.
     If there is any problem during the update, it's best if the query fails immediately, so you can fix the underlying problem before you execute the update again.
     If you leave this for later you risk ending up with an incompatible database, though the problems might not surface immediately.
diff --git a/docs/snippets/update/db/update_db_2.5-3.3.md b/docs/snippets/update/db/update_db_2.5-3.3.md
index 9fc914f031..e75c35a309 100644
--- a/docs/snippets/update/db/update_db_2.5-3.3.md
+++ b/docs/snippets/update/db/update_db_2.5-3.3.md
@@ -4,8 +4,7 @@ Apply the following database update script:
 mysql -u <username> -p <password> <database_name> < vendor/ibexa/installer/upgrade/db/mysql/ezplatform-2.5-to-ibexa-3.3.0.sql
 ```
 
-If you're updating from an installation based on the `ezsystems/ezplatform-ee` metarepository, 
-run the following command to upgrade your database:
+If you're updating from an installation based on the `ezsystems/ezplatform-ee` metarepository, run the following command to upgrade your database:
 
 ``` bash
 php bin/console ibexa:upgrade
@@ -21,5 +20,4 @@ Check the Location ID of the "Components" content item and set it as a value of
 - 60 # Components
 ```
 
-If you're upgrading between [[= product_name_com =]] versions,
-add the `content/read` Policy with the Owner Limitation set to `self` to the "Ecommerce registered users" Role.
+If you're upgrading between [[= product_name_com =]] versions, add the `content/read` Policy with the Owner limitation set to `self` to the "Ecommerce registered users" Role.
diff --git a/docs/snippets/update/finish_the_update.md b/docs/snippets/update/finish_the_update.md
index 0fef50769c..3b70a38dbc 100644
--- a/docs/snippets/update/finish_the_update.md
+++ b/docs/snippets/update/finish_the_update.md
@@ -39,14 +39,14 @@ git merge update-[[= target_version =]]
 !!! note "Insecure password hashes"
 
     To ensure that no users have unsupported, insecure password hashes, run the following command:
-    
+
     ``` bash
     # In v1 and v2:
     php bin/console ezplatform:user:validate-password-hashes
     # In v3:
     php bin/console ibexa:user:validate-password-hashes
     ```
-    
+
     This command checks if all user hashes are up-to-date and informs you if any of them need to be updated.
 
 ### D. Complete the update
diff --git a/docs/snippets/update/merge_composer.md b/docs/snippets/update/merge_composer.md
index 27079ad0a0..bd5c429ef3 100644
--- a/docs/snippets/update/merge_composer.md
+++ b/docs/snippets/update/merge_composer.md
@@ -1,7 +1,6 @@
 ### A. Resolve conflicts
 
-If you get a lot of conflicts and you installed from the [support.ez.no / support.ibexa.co](https://support.ibexa.co) tarball
-or from [ezplatform.com](https://ezplatform.com), you may have incomplete history.
+If you get a lot of conflicts and you installed from the [support.ez.no / support.ibexa.co](https://support.ibexa.co) tarball or from [ezplatform.com](https://ezplatform.com), you may have incomplete history.
 
 To load the full history, run `git fetch upstream --unshallow` from the `update-[[= target_version =]]` branch, and run the merge again.
 
@@ -30,7 +29,8 @@ git checkout --theirs composer.json && git diff HEAD composer.json
 
 This command shows the differences between the target `composer.json` and your own in the diff output.
 
-Updating `composer.json` changes the requirements for all of the `ezsystems` / `ibexa`  packages. Keep those changes.
+Updating `composer.json` changes the requirements for all of the `ezsystems` / `ibexa`  packages.
+Keep those changes.
 The other changes remove what you added for your own project.
 Use `git checkout -p` to selectively cancel those changes (and retain your additions):
 
@@ -42,9 +42,7 @@ Answer `no` (don't discard) to the requirement changes of `ezsystems` / `ibexa`
 Answer `yes` (discard) to removals of your changes.
 
 After you're done, inspect the file (you can use an editor or run `git diff composer.json`).
-You may also test the file with `composer validate`,
-and test the dependencies by running `composer update --dry-run`
-(it outputs what it would do to the dependencies, without applying the changes).
+You may also test the file with `composer validate`, and test the dependencies by running `composer update --dry-run` (it outputs what it would do to the dependencies, without applying the changes).
 
 When finished, run `git add composer.json` and commit.
 
@@ -52,5 +50,5 @@ When finished, run `git add composer.json` and commit.
 
 Depending on the local changes you have done, you may get other conflicts on configuration files, kernel, etc.
 
-For each change, edit the file, identify the conflicting changes and resolve the conflict.
+For each change, edit the file, identify the conflicting changes, and resolve the conflict.
 Run `git add <conflicting-file>` to add the changes.
diff --git a/docs/snippets/update/notify_support.md b/docs/snippets/update/notify_support.md
index b5127a87f5..9682b49a2c 100644
--- a/docs/snippets/update/notify_support.md
+++ b/docs/snippets/update/notify_support.md
@@ -1,5 +1,6 @@
 ## Notify support
 
-Please tell support that you have updated your installation. They update your support portal to match the new version.
+Please tell support that you have updated your installation.
+They update your support portal to match the new version.
 This ensures that you receive notifications about new maintenance releases and security advisories for the correct version.
 You can contact support at support@ibexa.co or through your [Support portal](https://support.ibexa.co).
diff --git a/docs/snippets/update/update_app.md b/docs/snippets/update/update_app.md
index 46626dc9e2..7ae7e0e15c 100644
--- a/docs/snippets/update/update_app.md
+++ b/docs/snippets/update/update_app.md
@@ -6,7 +6,7 @@ If you want to first test how the update proceeds without actually updating any
 composer update --dry-run
 ```
 
-Then, run `composer update` to update the dependencies. 
+Then, run `composer update` to update the dependencies.
 
 ``` bash
 composer update

From ec4ce7773cdd08b78bf412d416fea915da52a0fa Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 11:41:48 +0200
Subject: [PATCH 52/77] Fixes in 'templates'

---
 docs/templating/assets.md                     | 15 ++++------
 .../design_engine/add_new_design.md           | 28 +++++++------------
 .../templating/design_engine/design_engine.md |  8 ++++--
 .../embed_and_list_content/embed_content.md   |  3 +-
 .../embed_and_list_content/list_content.md    | 16 +++++------
 .../embed_and_list_content/render_images.md   | 25 +++++++----------
 docs/templating/image_variations.md           | 27 ++++++++----------
 docs/templating/layout/add_breadcrumbs.md     |  5 ++--
 .../layout/add_forgot_password_option.md      |  3 +-
 docs/templating/layout/add_login_form.md      | 22 +++++++--------
 docs/templating/layout/add_navigation_menu.md | 13 ++++-----
 docs/templating/layout/add_search_form.md     | 14 ++++------
 .../layout/customize_storefront_layout.md     | 12 ++++----
 .../built-in_query_types.md                   | 21 ++++++--------
 .../content_queries.md                        | 19 +++++--------
 .../queries_and_controllers/controllers.md    |  6 ++--
 .../create_custom_query_type.md               |  9 ++----
 .../render_content/customize_product_view.md  |  3 +-
 .../render_content/render_content.md          | 24 +++++++---------
 .../render_content/render_content_in_php.md   |  5 ++--
 docs/templating/render_content/render_page.md | 16 +++++------
 .../templates/create_custom_view_matcher.md   | 11 +++-----
 .../templates/template_configuration.md       | 12 ++++----
 docs/templating/templates/templates.md        | 12 +++-----
 .../templates/view_matcher_reference.md       | 28 +++++++++++--------
 docs/templating/templating.md                 |  3 +-
 .../cart_twig_functions.md                    |  4 ++-
 .../checkout_twig_functions.md                | 18 ++++++------
 .../content_twig_functions.md                 | 14 ++++------
 .../date_twig_filters.md                      |  3 +-
 .../field_twig_functions.md                   | 15 ++++------
 .../image_twig_functions.md                   | 23 +++++++--------
 .../other_twig_filters.md                     |  5 ++--
 .../product_twig_functions.md                 |  6 ++--
 .../site_context_twig_functions.md            |  3 +-
 .../storefront_twig_functions.md              |  5 ++--
 .../twig_function_reference.md                |  4 +--
 .../url_twig_functions.md                     | 14 +++++-----
 .../user_twig_functions.md                    |  3 +-
 .../urls_and_routes/custom_breadcrumbs.md     |  6 ++--
 .../urls_and_routes/urls_and_routes.md        | 13 ++++-----
 41 files changed, 210 insertions(+), 286 deletions(-)

diff --git a/docs/templating/assets.md b/docs/templating/assets.md
index 636475054d..a600391e4c 100644
--- a/docs/templating/assets.md
+++ b/docs/templating/assets.md
@@ -4,18 +4,15 @@ description: Add assets (CSS, JS, image and other files) to your site and manage
 
 # Assets
 
-Assets enable you to add CSS, JS, image or other files to your project,
-to style and customize its look and behavior.
+Assets enable you to add CSS, JS, image, or other files to your project, to style and customize its look and behavior.
 
 ## Asset files
 
-To add assets to the project, provide asset files (such as CSS or JS files)
-in the `assets` folder, for example under `assets/css` and `assets/js`.
+To add assets to the project, provide asset files (such as CSS or JS files) in the `assets` folder, for example under `assets/css` and `assets/js`.
 
 ## Configure assets
 
-All asset files must be added to `webpack.config.js` in the root folder,
-so that Webpack Encore can use them.
+All asset files must be added to `webpack.config.js` in the root folder, so that Webpack Encore can use them.
 To do it, use `Encore.addStyleEntry` for CSS files and `Encore.addEntry` for other files, such as JS:
 
 ``` js
@@ -30,8 +27,7 @@ Encore.addEntry('script', [
 
 ## Include assets in templates
 
-To include assets in your templates, add them to the template's `<head>` tag,
-and provide the name of the asset entry you configured in `webpack.config.js`, for example:
+To include assets in your templates, add them to the template's `<head>` tag, and provide the name of the asset entry you configured in `webpack.config.js`, for example:
 
 ``` html+twig
 {{ encore_entry_link_tags('style') }}
@@ -43,8 +39,7 @@ and provide the name of the asset entry you configured in `webpack.config.js`, f
 
     After you add the asset files, clear the cache and run `yarn encore <dev|prod>`.
 
-To include a single asset file in your template, for example an image,
-use the [`asset()`]([[= symfony_doc =]]/reference/twig_reference.html#asset) Twig function:
+To include a single asset file in your template, for example an image, use the [`asset()`]([[= symfony_doc =]]/reference/twig_reference.html#asset) Twig function:
 
 ``` html+twig
 <img src="{{ asset('assets/images/logo.png') }}">
diff --git a/docs/templating/design_engine/add_new_design.md b/docs/templating/design_engine/add_new_design.md
index 6efb8045fe..3c69bc4b2e 100644
--- a/docs/templating/design_engine/add_new_design.md
+++ b/docs/templating/design_engine/add_new_design.md
@@ -4,21 +4,18 @@ description: Add a new design for a special marketing campaign site.
 
 # Add new design
 
-To create different designs for different version of the website,
-you configure different sites based on the [SiteAccess](multisite.md) content.
+To create different designs for different version of the website, you configure different sites based on the [SiteAccess](multisite.md) content.
 
-This example shows how to prepare a site for a "Summer Sale" marketing campaign
-and provide it with a distinct design.
+This example shows how to prepare a site for a "Summer Sale" marketing campaign and provide it with a distinct design.
 
 ## Configure a new SiteAccess
 
-First, in the SiteAccess configuration, under the `ibexa.siteaccess` [configuration key](configuration.md#configuration-files),
-add the `campaign` SiteAccess:
+First, in the SiteAccess configuration, under the `ibexa.siteaccess` [configuration key](configuration.md#configuration-files), add the `campaign` SiteAccess:
 
 ``` yaml
 ibexa:
     siteaccess:
-        list: 
+        list:
             - import
             - site
             - admin
@@ -47,7 +44,7 @@ Next, configure a new `summersale` design for this theme, also named `summersale
 
 Notice that the `standard` theme is automatically added at the end of the `summersale` design's theme list.
 
-Ensure that the `campaign` site uses this design (while the default `site` uses the default `standard` design)
+Ensure that the `campaign` site uses this design (while the default `site` uses the default `standard` design).
 
 ``` yaml
 [[= include_file('code_samples/front/add_design/config/packages/views.yaml', 4, 6) =]][[= include_file('code_samples/front/add_design/config/packages/views.yaml', 13, 19) =]]
@@ -56,11 +53,9 @@ Ensure that the `campaign` site uses this design (while the default `site` uses
 ## Add templates
 
 Now, create templates for the two sites.
-Templates for the main site should be placed in `templates/themes/standard`,
-and templates for the campaign site in `templates/themes/summersale`.
+Templates for the main site should be placed in `templates/themes/standard`, and templates for the campaign site in `templates/themes/summersale`.
 
-First, modify the built-in general [page layout](template_configuration.md#page-layout) `templates/themes/standard/pagelayout.html.twig`
-by including a header and a footer section:
+First, modify the built-in general [page layout](template_configuration.md#page-layout) `templates/themes/standard/pagelayout.html.twig` by including a header and a footer section:
 
 ``` html+twig hl_lines="3 8"
 [[= include_file('code_samples/front/add_design/templates/themes/standard/pagelayout.html.twig', 18, 28) =]]
@@ -105,17 +100,14 @@ Create a separate `templates/themes/summersale/parts/header.html.twig` file with
 ```
 
 Preview the Article through the `campaign` SiteAccess: `<yourdomain>/campaign/<article-name>`.
-You can see that the page uses the campaign header, while the rest of the layout, including the footer,
-is the same as in the main site.
+You can see that the page uses the campaign header, while the rest of the layout, including the footer, is the same as in the main site.
 This is because you defined `standard` design as fallback for this SiteAccess:
 
 ``` yaml
 [[= include_file('code_samples/front/add_design/config/packages/views.yaml', 0, 3) =]]
 ```
 
-In this case, if the design engine cannot find a template for the current design,
-it uses the template from the next configured design.
-In the case above, the engine doesn't find the footer template for the `campaign` SiteAccess,
-so it uses the one from `standard`.
+In this case, if the design engine cannot find a template for the current design, it uses the template from the next configured design.
+In the case above, the engine doesn't find the footer template for the `campaign` SiteAccess, so it uses the one from `standard`.
 
 This way you don't need to provide all templates for a new design, but only those that you want to be different than the fallback one.
diff --git a/docs/templating/design_engine/design_engine.md b/docs/templating/design_engine/design_engine.md
index 904e18df72..b04b94e3ee 100644
--- a/docs/templating/design_engine/design_engine.md
+++ b/docs/templating/design_engine/design_engine.md
@@ -29,13 +29,13 @@ Each scope can use only one design.
 
 ## Design theme list
 
-A theme is a set of directories to look for templates in. At application level, theme's templates are placed in a directory under `templates/themes` which has the same name as the theme.
+A theme is a set of directories to look for templates in.
+At application level, theme's templates are placed in a directory under `templates/themes` which has the same name as the theme.
 For example, templates placed in `templates/themes/standard` directory are automatically added to the `standard` theme.
 
 !!! caution
 
-    After you create a new directory with a theme in `templates/themes`,
-    you must clear the cache (`php bin/console cache:clear`), even if you work in the dev environment.
+    After you create a new directory with a theme in `templates/themes`, you must clear the cache (`php bin/console cache:clear`), even if you work in the dev environment.
 
 The order of themes in a design is important.
 The design engine attempts to apply the first theme in configuration (for example, `theme2`).
@@ -51,6 +51,7 @@ Do this, for example, when you create a SiteAccess with a special design for a c
 !!! tip
 
     You can check the final design theme lists with the following command:
+
     ```shell
     php bin/console debug:container --parameter=ibexa.design.list --format=json
     ```
@@ -88,6 +89,7 @@ ibexa_design_engine:
 !!! tip
 
     You can check the final template directory list per theme with the following command:
+
     ```shell
     php bin/console debug:container --parameter=ibexa.design.templates.path_map --format=json
     ```
diff --git a/docs/templating/embed_and_list_content/embed_content.md b/docs/templating/embed_and_list_content/embed_content.md
index 496d9b0cc6..f2fd959e5b 100644
--- a/docs/templating/embed_and_list_content/embed_content.md
+++ b/docs/templating/embed_and_list_content/embed_content.md
@@ -42,8 +42,7 @@ This configuration points to a custom `RelationController` that should render al
 
 This controller uses the Public PHP API to get [the Relations of a content item](browsing_content.md#relations) (lines 27-28).
 
-The controller takes the custom parameter called `accepted_content_types` (line 23),
-which is an array of content type identifiers that are rendered.
+The controller takes the custom parameter called `accepted_content_types` (line 23), which is an array of content type identifiers that are rendered.
 
 This way you can control which content types you want to show or exclude.
 
diff --git a/docs/templating/embed_and_list_content/list_content.md b/docs/templating/embed_and_list_content/list_content.md
index 2ab7b18564..cab88055c9 100644
--- a/docs/templating/embed_and_list_content/list_content.md
+++ b/docs/templating/embed_and_list_content/list_content.md
@@ -4,8 +4,7 @@ description: Create and render a list of content items, for example, content in
 
 # List content
 
-To render a list of content items, for example, content in a folder, blog posts in a blog, and so on,
-you can use one of two methods:
+To render a list of content items, for example, content in a folder, or blog posts in a blog, you can use one of two methods:
 
 - use a [Query type](#list-children-with-query-type)
 - create a content type with a [Content Query Field](#list-children-in-content-query-field)
@@ -37,17 +36,16 @@ Then, place the following template in `templates/themes/<my_theme>/full/folder.h
 [[= include_file('code_samples/front/list_content/templates/themes/my_theme/full/folder.html.twig') =]]
 ```
 
-This template uses the [`ibexa_render()` Twig function](content_twig_functions.md#ibexa_render)
-to render every child of the folder with the default template for the `line` view.
+This template uses the [`ibexa_render()` Twig function](content_twig_functions.md#ibexa_render) to render every child of the folder with the default template for the `line` view.
 
 ## List children in Content query Field
 
-A [Content query Field](contentqueryfield.md) is a Field that defines a query.
-The following example shows how to use a Content query Field to render a Blog with its Blog Post children.
+A [Content query Field](contentqueryfield.md) is a field that defines a query.
+The following example shows how to use a Content query field to render a Blog with its Blog Post children.
 
-First, create a Blog content type that contains a Content query Field with the identifier `query`.
+First, create a Blog content type that contains a Content query field with the identifier `query`.
 
-In the Field definition, select "Children" as the Query type. 
+In the Field definition, select "Children" as the Query type.
 Provide the `content` parameter that the Query type requires:
 
 ```
@@ -64,7 +62,7 @@ Then, in the content view configuration, add the configuration under `content_qu
 [[= include_file('code_samples/front/list_content/config/packages/views.yaml', 8, 9) =]][[= include_file('code_samples/front/list_content/config/packages/views.yaml', 22, 28) =]]
 ```
 
-The `match` configuration matches both the content type and the identifier of the Content query Field.
+The `match` configuration matches both the content type and the identifier of the Content query field.
 
 Finally, in the template `templates/themes/<my_theme/content_query/blog_posts.html.twig`, render all results of the query:
 
diff --git a/docs/templating/embed_and_list_content/render_images.md b/docs/templating/embed_and_list_content/render_images.md
index f95e229942..00a904b119 100644
--- a/docs/templating/embed_and_list_content/render_images.md
+++ b/docs/templating/embed_and_list_content/render_images.md
@@ -4,7 +4,7 @@ description: Render content images and configure their variations.
 
 # Render images
 
-To render images contained in Image Asset or Image Fields, use the [`ibexa_render_field()`](field_twig_functions.md#ibexa_render_field) Twig function.
+To render images contained in Image Asset or Image fields, use the [`ibexa_render_field()`](field_twig_functions.md#ibexa_render_field) Twig function.
 
 ``` html+twig
 {{ ibexa_render_field(content, 'image') }}
@@ -24,11 +24,9 @@ You can pass the name of an [image variation](#configure-image-variation) as an
 
 If a content item contains more than one image, you may want to select the first filled image to render.
 
-This enables you to avoid a situation where, for example, the featured image in an article is missing,
-because the first image Field was left empty.
+This enables you to avoid a situation where, for example, the featured image in an article is missing, because the first image field was left empty.
 
-The [`ibexa_content_field_identifier_first_filled_image()`](image_twig_functions.md#ibexa_content_field_identifier_first_filled_image) Twig function
-returns the identifier of the first image Field that isn't empty.
+The [`ibexa_content_field_identifier_first_filled_image()`](image_twig_functions.md#ibexa_content_field_identifier_first_filled_image) Twig function returns the identifier of the first image field that isn't empty.
 
 ``` html+twig
 {% set firstImage = ibexa_content_field_identifier_first_filled_image(content) %}
@@ -38,8 +36,8 @@ returns the identifier of the first image Field that isn't empty.
 
 !!! caution
 
-    This function works only for [Image](imagefield.md) Fields.
-    It doesn't work for [ImageAsset](imageassetfield.md) Fields.
+    This function works only for [Image](imagefield.md) fields.
+    It doesn't work for [ImageAsset](imageassetfield.md) fields.
 
 ## Configure image variation
 
@@ -47,8 +45,7 @@ The same image can have multiple variations differing in things such as scale, c
 
 You can use the built-in image variations or [configure your own](image_variations.md#custom-image-variations).
 
-The following example creates a custom variation that scales the image down to a 200 x 200 thumbnail
-and renders it in grayscale:
+The following example creates a custom variation that scales the image down to a 200 x 200 thumbnail and renders it in grayscale:
 
 ``` yaml
 ibexa:
@@ -78,13 +75,13 @@ In the [image editor](configure_image_editor.md) you can define a focal point fo
 The focal point doesn't have an instant effect when you use the default templates.
 However, you can use it to select the part of the image the view focuses on when the image is cropped.
 
-The following example shows how to use an image contained in an Image Field as a focussed background.
+The following example shows how to use an image contained in an Image field as a focussed background.
 
 !!! note
 
     This implementation is only an example and depends on the JavaScript framework you're using.
 
-First, in the main template, render the Image Field with a custom template:
+First, in the main template, render the Image field with a custom template:
 
 ``` html+twig
 {{ ibexa_render_field(content, 'image', {
@@ -92,8 +89,7 @@ First, in the main template, render the Image Field with a custom template:
 }) }}
 ```
 
-Then, create the custom Field template in `templates/fields/image.html.twig`,
-[overriding the default `ezimage_field` template block](render_content.md#field-templates):
+Then, create the custom Field template in `templates/fields/image.html.twig`, [overriding the default `ezimage_field` template block](render_content.md#field-templates):
 
 ``` html+twig
 {% block ezimage_field %}
@@ -116,5 +112,4 @@ Then, create the custom Field template in `templates/fields/image.html.twig`,
 {% endblock %}
 ```
 
-This template uses the focal point information contained in the image's additional data
-to position the background so that the focussed part of the image is displayed.
+This template uses the focal point information contained in the image's additional data to position the background so that the focussed part of the image is displayed.
diff --git a/docs/templating/image_variations.md b/docs/templating/image_variations.md
index 608e9a3e8b..bb9177a917 100644
--- a/docs/templating/image_variations.md
+++ b/docs/templating/image_variations.md
@@ -5,15 +5,13 @@ page_type: reference
 
 # Image variations
 
-With image variations you can render different versions of one image by means 
-of scaling, cropping and other filters.
+With image variations you can render different versions of one image by means of scaling, cropping and other filters.
 
-Built-in image variations include four versions that provide the image at a specific scale:
-`tiny`, `small`, `medium`, and `large`.
+Built-in image variations include four versions that provide the image at a specific scale: `tiny`, `small`, `medium`, and `large`.
 
 You can also create custom image variations.
 
-See [Render images](render_images.md) for an example of variation name usage as `alias` parameter when rendering an image field. 
+See [Render images](render_images.md) for an example of variation name usage as `alias` parameter when rendering an image field.
 
 ## Custom image variations
 
@@ -31,12 +29,12 @@ ibexa:
                         <filter>: <parameters>
 ```
 
-Variation name must be unique. 
+Variation name must be unique.
 It may contain characters, numbers, underscores (`_`) or hyphens (`-`), but no spaces.
 
 Each variation takes the following parameters:
 
-- `reference` - (optional) name of a reference variation to base the variation on. 
+- `reference` - (optional) name of a reference variation to base the variation on.
 If set to `null` or `~`, the variation takes the original image for reference.
 - `filters` - array of variation filters and their parameters.
 - `post_processors` - used to reduce the final image size and to improve load performance of assets.
@@ -57,23 +55,22 @@ If set to `null` or `~`, the variation takes the original image for reference.
 | `border` | `[thickBorderX, thickBorderY, color=#000]` | Adds a border around the image. Thickness is defined in px. Color is `#000` by default. |
 | `filter/noise` | `[radius=0]` | Smooths the contours of an image (`imagick`/`gmagick` only). `radius` is in px. |
 | `filter/swirl` | `[degrees=60]` | Swirls the pixels of the center of the image (`imagick`/`gmagick` only). `degrees` defaults to 60.|
-| `resize` | {size: `[width, height]`} | Simple resize filter (provided by LiipImagineBundle). |
+| `resize` | {size: `[width, height]`} | Resize filter (provided by LiipImagineBundle). |
 | `colorspace/gray` | N/A | Converts the image to grayscale. |
 
 !!! note
 
-    After you change the image variation configuration, remove the existing variations
-    with the `liip:imagine:cache:remove` command and provide the variation name:
-    
+    After you change the image variation configuration, remove the existing variations with the `liip:imagine:cache:remove` command and provide the variation name:
+
     ``` bash
     php bin/console liip:imagine:cache:remove --filter=large
     ```
-    
+
     Next, clear the cache.
-    
+
     You can also remove all generated image variations:
-    
+
     ``` bash
     php bin/console liip:imagine:cache:remove -v
     ```
-    
+
diff --git a/docs/templating/layout/add_breadcrumbs.md b/docs/templating/layout/add_breadcrumbs.md
index b1bd64f592..8d4b6b13c8 100644
--- a/docs/templating/layout/add_breadcrumbs.md
+++ b/docs/templating/layout/add_breadcrumbs.md
@@ -14,11 +14,10 @@ Then, to render breadcrumbs, create a `BreadcrumbController.php` file in `src/Co
 [[= include_file('code_samples/front/layouts/breadcrumbs/src/Controller/BreadcrumbController.php') =]]
 ```
 
-The controller uses the [Ancestor Search Criterion](ancestor_criterion.md)
-to find all Ancestors of the current Location (line 27).
+The controller uses the [Ancestor Search Criterion](ancestor_criterion.md) to find all Ancestors of the current Location (line 27).
 It then places the ancestors in the `breadcrumbs` variable that you can use in the template.
 
-Next, call this controller from the page layout template and pass the current Location ID as a parameter:
+Next, call this controller from the page layout template and pass the current location ID as a parameter:
 
 ``` html+twig
 [[= include_file('code_samples/front/layouts/breadcrumbs/templates/themes/my_theme/pagelayout.html.twig', 0, 8) =]]
diff --git a/docs/templating/layout/add_forgot_password_option.md b/docs/templating/layout/add_forgot_password_option.md
index 786df1923c..45c98d4e75 100644
--- a/docs/templating/layout/add_forgot_password_option.md
+++ b/docs/templating/layout/add_forgot_password_option.md
@@ -21,8 +21,7 @@ ibexa:
                     mail: <path_to_template>
 ```
 
-Under the `templates` key, provide the path to templates responsible for rendering the forgot password form (`form`) and email (`mail`),
-which users receive after they request a password change.
+Under the `templates` key, provide the path to templates responsible for rendering the forgot password form (`form`) and email (`mail`), which users receive after they request a password change.
 
 The [default templates](https://github.com/ibexa/user/tree/main/src/bundle/Resources/views) for forgot password form and email are located in `ibexa/user/src/bundle/Resources/views`.
 The [templates](https://github.com/ibexa/admin-ui/tree/main/src/bundle/Resources/views/themes/admin/account/forgot_password) specific for the back office are in `ibexa/admin-ui/src/bundle/Resources/views/themes/admin/account`.
diff --git a/docs/templating/layout/add_login_form.md b/docs/templating/layout/add_login_form.md
index 88fa067075..2f276fc5d3 100644
--- a/docs/templating/layout/add_login_form.md
+++ b/docs/templating/layout/add_login_form.md
@@ -4,8 +4,9 @@ description: Customize the login form for new users in your site front end.
 
 # Add login form
 
-You can create a login form for your users. 
-Follow the instruction below to create a template with login form. If you want to configure more options for example, password expiration, see [other user management templates](user_registration.md#other-user-management-templates).
+You can create a login form for your users.
+Follow the instruction below to create a template with login form.
+If you want to configure more options for example, password expiration, see [other user management templates](user_registration.md#other-user-management-templates).
 
 First, make sure you have configured [login methods](login_methods.md).
 
@@ -51,11 +52,9 @@ In `templates/themes/<theme_name>/login`, create an `expired_credentials.html.tw
 
 ## Customize login form
 
-You can use a custom template for example to display information about password expiration
-or to customize [other user management templates](user_registration.md#other-user-management-templates).
+You can use a custom template for example to display information about password expiration or to customize [other user management templates](user_registration.md#other-user-management-templates).
 
-In case of more advanced template customization, you can use a subscriber,
-for example in `src/EventSubscriber/LoginFormViewSubscriber.php`:
+In case of more advanced template customization, you can use a subscriber, for example in `src/EventSubscriber/LoginFormViewSubscriber.php`:
 
 ``` php hl_lines="23 35 40 42"
 <?php
@@ -83,20 +82,20 @@ final class LoginFormViewSubscriber implements EventSubscriberInterface
             MVCEvents::PRE_CONTENT_VIEW => 'onPreContentView',
         ];
     }
-    
+
     public function onPreContentView(PreContentViewEvent $event): void
     {
         $view = $event->getContentView();
-        
+
         if (!($view instanceof LoginFormView)) {
             return ;
         }
-        
+
         $view->addParameters([
             'foo' => 'foo',
             'bar' => 'bar'
         ]);
-        
+
         if ($view->getLastAuthenticationException() instanceof CredentialsExpiredException) {
             // View with instruction to unlock account
             $view->setTemplateIdentifier('login/expired_credentials.html.twig');
@@ -109,8 +108,7 @@ In the provided example, in line 23, the `PRE_CONTENT_VIEW` event is used.
 You can also pass additional parameters to the view (line 35).
 In this case, at the instance of exception (line 40), the subscriber displays the `expired_credentials.html.twig` template (line 42).
 
-Remember to provide a template and point to it in the subscriber
-(in this case, in `templates/login/expired_credentials.html.twig`):
+Remember to provide a template and point to it in the subscriber (in this case, in `templates/login/expired_credentials.html.twig`):
 
 ```html+twig
 {% extends '@ibexadesign/Security/base.html.twig' %}
diff --git a/docs/templating/layout/add_navigation_menu.md b/docs/templating/layout/add_navigation_menu.md
index 31d403ecb1..e7edce9a06 100644
--- a/docs/templating/layout/add_navigation_menu.md
+++ b/docs/templating/layout/add_navigation_menu.md
@@ -15,7 +15,7 @@ To select items that should be rendered in the menu, you can use one of the foll
 
 ## Render menu using a query
 
-To create a menu that contains a specific set of content items, for example all content under the root Location, use a [Query Type](content_queries.md).
+To create a menu that contains a specific set of content items, for example all content under the root location, use a [Query Type](content_queries.md).
 
 First, in `src/QueryType`, create a custom `MenuQueryType.php` file that queries for all items that you want in the menu:
 
@@ -23,8 +23,7 @@ First, in `src/QueryType`, create a custom `MenuQueryType.php` file that queries
 [[= include_file('code_samples/front/layouts/menu/src/QueryType/MenuQueryType.php') =]]
 ```
 
-In this case, it queries for all visible children of Location `2`, the root Location, (lines 15-16)
-and renders them in order according to their Location priority.
+In this case, it queries for all visible children of location `2`, the root location, (lines 15-16) and renders them in order according to their location priority.
 
 The Query Type has the name `Menu` (line 28).
 You can use it in the template to render the menu.
@@ -34,8 +33,7 @@ Add the following [`ibexa_render_content_query` function](content_twig_functions
 [[= include_file('code_samples/front/layouts/menu/templates/themes/my_theme/pagelayout.html.twig', 0, 7) =]]
 ```
 
-Next, add the `templates/themes/<theme_name>/pagelayout_menu.html.twig` template,
-which renders the individual items of the menu:
+Next, add the `templates/themes/<theme_name>/pagelayout_menu.html.twig` template, which renders the individual items of the menu:
 
 ``` html+twig
 [[= include_file('code_samples/front/layouts/menu/templates/themes/my_theme/pagelayout_menu.html.twig') =]]
@@ -43,8 +41,7 @@ which renders the individual items of the menu:
 
 ## Create a MenuBuilder
 
-To make a more configurable menu, where you select the specific items to render,
-use the [KNPMenuBundle](https://github.com/KnpLabs/KnpMenuBundle) that is installed together with the product.
+To make a more configurable menu, where you select the specific items to render, use the [KNPMenuBundle](https://github.com/KnpLabs/KnpMenuBundle) that is installed together with the product.
 
 To use it, first create a `MenuBuilder.php` file in `src/Menu`:
 
@@ -53,7 +50,7 @@ To use it, first create a `MenuBuilder.php` file in `src/Menu`:
 ```
 
 In the builder, you can define items that you want in the menu.
-For example, lines 21-23 add a specific Location by using the [`ibexa.url.alias`](url_twig_functions.md#ibexa.url.alias) route.
+For example, lines 21-23 add a specific location by using the [`ibexa.url.alias`](url_twig_functions.md#ibexa.url.alias) route.
 Line 27 adds a defined system route that leads to the search form.
 
 Next, register the menu builder as a service:
diff --git a/docs/templating/layout/add_search_form.md b/docs/templating/layout/add_search_form.md
index 349ac13cec..9e18a94144 100644
--- a/docs/templating/layout/add_search_form.md
+++ b/docs/templating/layout/add_search_form.md
@@ -4,16 +4,13 @@ description: Add a search bar and customize the search form in your site front e
 
 # Add search form to front page
 
-You can add a search form to selected parts of your front page
-and decide which parts of the form, such as filters, are rendered.
+You can add a search form to selected parts of your front page and decide which parts of the form, such as filters, are rendered.
 
-This example shows how to add a basic search bar to the top of every page
-and to configure search form and result rendering.
+This example shows how to add a basic search bar to the top of every page and to configure search form and result rendering.
 
 ## Add a search bar
 
-First, prepare a general layout template in a `templates/themes/<theme_name>/pagelayout.html.twig` file, 
-and include a search bar in this template:
+First, prepare a general layout template in a `templates/themes/<theme_name>/pagelayout.html.twig` file, and include a search bar in this template:
 
 ``` html+twig hl_lines="1"
 [[= include_file('code_samples/front/search/search_bar/templates/themes/my_theme/pagelayout.html.twig', 19, 22) =]]
@@ -51,7 +48,7 @@ Now, add the `full/search.html.twig` template:
 [[= include_file('code_samples/front/search/search_bar/templates/themes/my_theme/full/search.html.twig') =]]
 ```
 
-This template replaces the default table that displays search results with a simple unnumbered list.
+This template replaces the default table that displays search results with an unnumbered list.
 
 ## Render search form
 
@@ -63,5 +60,4 @@ Create the `parts/search_form.html.twig` file:
 ```
 
 This template renders only a basic query field and a submit button.
-`'render_rest': false` ensures that the fields you don't explicitly add to the template aren't rendered
-(in this case, date selection, content type, and so on).
+`'render_rest': false` ensures that the fields you don't explicitly add to the template aren't rendered (in this case, date selection, content type, and more).
diff --git a/docs/templating/layout/customize_storefront_layout.md b/docs/templating/layout/customize_storefront_layout.md
index 057fc25155..d8756affb1 100644
--- a/docs/templating/layout/customize_storefront_layout.md
+++ b/docs/templating/layout/customize_storefront_layout.md
@@ -5,8 +5,7 @@ edition: commerce
 
 # Customize storefront layout
 
-The built-in storefront offers a set of templates covering all functionalities of a shop,
-divided into smaller components.
+The built-in storefront offers a set of templates covering all functionalities of a shop, divided into smaller components.
 
 To customize your shop, you can override either whole templates, or specific components.
 The built-in templates belong to the `storefront` [theme](design_engine.md).
@@ -14,8 +13,7 @@ To override any of them, copy its directory structure in your template directory
 
 ## Template customization example
 
-As an example, to change the cart display when it contains no products,
-you need to override [`vendor/ibexa/storefront/src/bundle/Resources/views/themes/storefront/cart/component/maincart/maincart_empty_cart.html.twig`](https://github.com/ibexa/storefront/blob/main/src/bundle/Resources/views/themes/storefront/cart/component/maincart/maincart_empty_cart.html.twig) template.
+As an example, to change the cart display when it contains no products, you need to override [`vendor/ibexa/storefront/src/bundle/Resources/views/themes/storefront/cart/component/maincart/maincart_empty_cart.html.twig`](https://github.com/ibexa/storefront/blob/main/src/bundle/Resources/views/themes/storefront/cart/component/maincart/maincart_empty_cart.html.twig) template.
 
 To do it, create your own template in `templates/theme/storefront/cart/component/maincart/maincart_empty_cart.html.twig`.
 
@@ -136,7 +134,8 @@ Next, add the button in the Twig file.
 ### Main cart
 
 You must customize the base widget for the main cart view, because out-of-the-box it consists only of the container with items.
-Each item consists of `<div>` wrappers with quantity input and remove item button. With customization you can add layout containers and items' data such as title or price.
+Each item consists of `<div>` wrappers with quantity input and remove item button.
+With customization you can add layout containers and items' data such as title or price.
 
 Available Twigs:
 
@@ -214,8 +213,7 @@ with parameters:
 
 ### Summary
 
-You could extend the summary widget to let buyers navigate from this view, 
-for example, to checkout, or back to shopping, by adding respective buttons.
+You could extend the summary widget to let buyers navigate from this view, for example, to checkout, or back to shopping, by adding respective buttons.
 
 |Template|Component|
 |---|---|
diff --git a/docs/templating/queries_and_controllers/built-in_query_types.md b/docs/templating/queries_and_controllers/built-in_query_types.md
index a0bcbec2eb..efd1027d06 100644
--- a/docs/templating/queries_and_controllers/built-in_query_types.md
+++ b/docs/templating/queries_and_controllers/built-in_query_types.md
@@ -37,12 +37,11 @@ params:
 ### Sort order
 
 To provide a sort order to the `sort` parameter, use names of the Sort Clauses.
-To find them, refer to [Sort Clause](sort_clause_reference.md)
-and the [relevant Sort Clause class](https://github.com/ibexa/core/blob/main/src/bundle/Core/Resources/config/sort_spec.yml#L29)
+To find them, refer to [Sort Clause](sort_clause_reference.md) and the [relevant Sort Clause class](https://github.com/ibexa/core/blob/main/src/bundle/Core/Resources/config/sort_spec.yml#L29)
 
 ## Children
 
-The `Children` Query type retrieves children of the given Location.
+The `Children` Query type retrieves children of the given location.
 
 It takes `location` or `content` as parameters.
 
@@ -61,7 +60,7 @@ params:
 
 ## Siblings
 
-The `Siblings` Query type retrieves Locations that have the same parent as the provided content item or Location.
+The `Siblings` Query type retrieves locations that have the same parent as the provided content item or location.
 
 It takes `location` or `content` as parameters.
 
@@ -80,7 +79,7 @@ params:
 
 ## Ancestors
 
-The `Ancestors` Query type retrieves all ancestors (direct parents and their parents) of the provided Location.
+The `Ancestors` Query type retrieves all ancestors (direct parents and their parents) of the provided location.
 
 It takes `location` or `content` as parameters.
 
@@ -100,13 +99,11 @@ The `RelatedToContent` Query type retrieves content that is a reverse relation t
 !!! tip
 
     Reverse relations mean that the Query type shows content items that are *related to* the provided content item.
-    For example, if a blog post contains a link to an article, you can use a `RelatedToContent` query
-    to find the blog post from the article.
-    To find all relations of a content item (in this example, all content that the blog post is related to),
-    refer to [Embed content](embed_content.md#embed-relations-with-a-custom-controller). 
+    For example, if a blog post contains a link to an article, you can use a `RelatedToContent` query to find the blog post from the article.
+    To find all relations of a content item (in this example, all content that the blog post is related to), refer to [Embed content](embed_content.md#embed-relations-with-a-custom-controller).
 
 It takes `content` or `field` as required parameters.
-`field` indicates the Relation or RelationList Field that contains the Relations.
+`field` indicates the Relation or RelationList field that contains the relations.
 
 ``` yaml
 params:
@@ -120,11 +117,11 @@ params:
 
 ## GeoLocation
 
-The `GeoLocation` Query type retrieves content by distance of the location provided in a MapLocation Field.
+The `GeoLocation` Query type retrieves content by distance of the location provided in a MapLocation field.
 
 It takes the following parameters:
 
-- `field` - MapLocation Field identifier
+- `field` - MapLocation field identifier
 - `distance` - distance to check for
 - `latitude` and `longitude` - coordinates of the location to check distance to
 - (optional) `operator` - operator to check value against, by default `<=`
diff --git a/docs/templating/queries_and_controllers/content_queries.md b/docs/templating/queries_and_controllers/content_queries.md
index 0a67f1a860..e9c17e2102 100644
--- a/docs/templating/queries_and_controllers/content_queries.md
+++ b/docs/templating/queries_and_controllers/content_queries.md
@@ -25,8 +25,7 @@ You can also write [custom Query types](create_custom_query_type.md) for the cas
 
 ### Query type configuration
 
-To use a Query type, select the Query controller (`ibexa_query`) in the [content view configuration](template_configuration.md)
-and select the Query type under `params.query.query_type`:
+To use a Query type, select the Query controller (`ibexa_query`) in the [content view configuration](template_configuration.md) and select the Query type under `params.query.query_type`:
 
 ``` yaml hl_lines="2 6"
 folder:
@@ -44,7 +43,7 @@ folder:
 
 Use one of the following Query controller methods:
 
-- `locationQueryAction` runs a Location Search
+- `locationQueryAction` runs a location Search
 - `contentQueryAction` runs a content Search
 - `contentInfoQueryAction` runs a ContentInfo search
 - `pagingQueryAction` returns a `PagerFanta` object and can be used to quickly [paginate query results](#pagination)
@@ -63,13 +62,11 @@ All Query types take the following parameters:
 !!! tip
 
     Search results are a `SearchResult` object, which contains `SearchHit` objects.
-    To get the content or Locations that are in search results, you access the `valueObject`
-    of the `SearchHit`.
+    To get the content or Locations that are in search results, you access the `valueObject` of the `SearchHit`.
 
 ### Pagination
 
-To paginate the results of a query, use the `pagingQueryAction` of the Query controller
-and assign a limit per page in `params.query.limit`:
+To paginate the results of a query, use the `pagingQueryAction` of the Query controller and assign a limit per page in `params.query.limit`:
 
 ``` yaml hl_lines="4 12"
 [[= include_file('code_samples/front/query_pagination/config/packages/views.yaml', 8, 22) =]]
@@ -107,8 +104,7 @@ contentType: '@=returnedType'
 
 Select **Enable pagination** and set the number of items per page to paginate the results.
 
-You can override the pagination settings from field definition
-by setting the `enablePagination`, `disablePagination` or `itemsPerPage` parameters when rendering the content query field:
+You can override the pagination settings from field definition by setting the `enablePagination`, `disablePagination` or `itemsPerPage` parameters when rendering the content query field:
 
 ``` html+twig
 {{ ibexa_render_field(content, 'query', {
@@ -119,7 +115,7 @@ by setting the `enablePagination`, `disablePagination` or `itemsPerPage` paramet
 }) }}
 ```
 
-You can also define an offset for the results. 
+You can also define an offset for the results.
 Provide the offset in the Query type, or in parameters:
 
 ```
@@ -150,8 +146,7 @@ To render a content query field, in the content view configuration, use the `con
 [[= include_file('code_samples/front/list_content/config/packages/views.yaml', 8, 9) =]][[= include_file('code_samples/front/list_content/config/packages/views.yaml', 22, 28) =]]
 ```
 
-The identifier of the content query field must be matched by
-using the `'@Ibexa\FieldTypeQuery\ContentView\FieldDefinitionIdentifierMatcher'` matcher.
+The identifier of the content query field must be matched by using the `'@Ibexa\FieldTypeQuery\ContentView\FieldDefinitionIdentifierMatcher'` matcher.
 
 Query results are provided to the template in the `items` variable.
 See [List content](list_content.md#list-children-in-content-query-field) for an example of using the content query field.
diff --git a/docs/templating/queries_and_controllers/controllers.md b/docs/templating/queries_and_controllers/controllers.md
index ade94ecd62..485c9cd897 100644
--- a/docs/templating/queries_and_controllers/controllers.md
+++ b/docs/templating/queries_and_controllers/controllers.md
@@ -18,11 +18,9 @@ You indicate which controller to use in the [content view configuration](templat
 
 For a full example of using a custom controller, see [Embed content](embed_content.md#embed-relations-with-a-custom-controller).
 
-If you don't want to use the default view controller and only use a custom one,
-use the same configuration, but don't provide the `template` key.
+If you don't want to use the default view controller and only use a custom one, use the same configuration, but don't provide the `template` key.
 You have to indicate the template to use from the controller itself.
 
 !!! tip "Permissions for custom controllers"
 
-    See [permission documentation](permission_overview.md#permissions-for-custom-controllers) for information
-    about access control for custom controllers.
+    See [permission documentation](permission_overview.md#permissions-for-custom-controllers) for information about access control for custom controllers.
diff --git a/docs/templating/queries_and_controllers/create_custom_query_type.md b/docs/templating/queries_and_controllers/create_custom_query_type.md
index 7f235d1b57..4860f23f39 100644
--- a/docs/templating/queries_and_controllers/create_custom_query_type.md
+++ b/docs/templating/queries_and_controllers/create_custom_query_type.md
@@ -4,11 +4,9 @@ description: Create a Query type to search for content according to your custom
 
 # Create a custom Query type
 
-If you need to perform a more complex query than the [built-in Query types](built-in_query_types.md) allow,
-you can create a custom Query type.
+If you need to perform a more complex query than the [built-in Query types](built-in_query_types.md) allow, you can create a custom Query type.
 
-The following example shows how to create a custom Query type
-that renders the latest content items of selected Types.
+The following example shows how to create a custom Query type that renders the latest content items of selected Types.
 
 First, add the following `LatestContentQueryType.php` file to `src/QueryType`:
 
@@ -64,5 +62,4 @@ In the `configureOptions()` method you can define the allowed parameters, their
 
 !!! note
 
-    In contrast with the previous example, a Query type that extends `OptionsResolverBasedQueryType`
-    must implement the `doGetQuery()` method instead of `getQuery()`.
+    In contrast with the previous example, a Query type that extends `OptionsResolverBasedQueryType` must implement the `doGetQuery()` method instead of `getQuery()`.
diff --git a/docs/templating/render_content/customize_product_view.md b/docs/templating/render_content/customize_product_view.md
index 19014106fb..4024685e38 100644
--- a/docs/templating/render_content/customize_product_view.md
+++ b/docs/templating/render_content/customize_product_view.md
@@ -5,8 +5,7 @@ edition: commerce
 
 # Customize product view
 
-The built-in storefront offers a set of templates covering all functionalities of a shop,
-divided into smaller components.
+The built-in storefront offers a set of templates covering all functionalities of a shop, divided into smaller components.
 
 To customize your shop, you can override either whole templates, or specific components.
 The built-in templates belong to the `storefront` [theme](design_engine.md).
diff --git a/docs/templating/render_content/render_content.md b/docs/templating/render_content/render_content.md
index 0e1f69a743..43cd786d26 100644
--- a/docs/templating/render_content/render_content.md
+++ b/docs/templating/render_content/render_content.md
@@ -5,8 +5,7 @@ description: Customize rendering of content items on the site front end by using
 # Render content
 
 Content is rendered automatically by using default, basic templates.
-To render content with a custom template, you create a template file
-and inform the system, through configuration, when to use this template.
+To render content with a custom template, you create a template file and inform the system, through configuration, when to use this template.
 
 You do it by using the [content view configuration](template_configuration.md).
 
@@ -24,17 +23,16 @@ The indicated `template` is `@ibexadesign/full/article.html.twig`.
 
     This configuration uses the [design engine](design_engine.md), as indicated by the `@ibexadesign` in the template path.
     In this example, the theme used by the design is `my_theme`.
-    
+
     Using the design engine is recommended, but you can also set direct paths to templates, for example:
-    
+
     ``` yaml
     template: 'full/article.html.twig'
     ```
-    
+
     You must then ensure that the `templates/full` folder contains the template file.
 
-The configuration requires that you add the `article.html.twig` template file to `templates/themes/<theme_name>/full`,
-in this example, `templates/themes/my_theme/full`.
+The configuration requires that you add the `article.html.twig` template file to `templates/themes/<theme_name>/full`, in this example, `templates/themes/my_theme/full`.
 
 ``` html+twig
 [[= include_file('code_samples/front/render_content/templates/themes/my_theme/full/article.html.twig', 3, 18) =]]
@@ -42,8 +40,7 @@ in this example, `templates/themes/my_theme/full`.
 
 ## Get content information
 
-To render general content information, such as content name,
-use the [`ibexa_content_name()`](content_twig_functions.md#ibexa_content_name) Twig function.
+To render general content information, such as content name, use the [`ibexa_content_name()`](content_twig_functions.md#ibexa_content_name) Twig function.
 
 Content name is based on the [content name pattern](content_types.md#content-type-metadata) of the content type.
 
@@ -51,7 +48,7 @@ Content name is based on the [content name pattern](content_types.md#content-typ
 [[= include_file('code_samples/front/render_content/templates/themes/my_theme/full/article.html.twig', 3, 4) =]]
 ```
 
-You can get general information about the content, Location and view parameters by using the [available variables](templates.md#template-variables).
+You can get general information about the content, location and view parameters by using the [available variables](templates.md#template-variables).
 For example, to get the publication date of the current content item, use:
 
 ``` html+twig
@@ -60,9 +57,9 @@ For example, to get the publication date of the current content item, use:
 
 [[= include_file('docs/snippets/rendering_dump_variable.md') =]]
 
-## Render Fields
+## Render fields
 
-You can render a single Field of a content item by using the [`ibexa_render_field()`](field_twig_functions.md#ibexa_render_field) Twig function.
+You can render a single field of a content item by using the [`ibexa_render_field()`](field_twig_functions.md#ibexa_render_field) Twig function.
 It takes the content item and the identifier of the Field as arguments:
 
 ``` html+twig
@@ -90,8 +87,7 @@ for example `templates/themes/my_theme/fields`.
 [[= include_file('code_samples/front/render_content/templates/themes/my_theme/fields/author.html.twig') =]]
 ```
 
-The Field template must be placed in a block that corresponds to the field type identifier,
-in this case `{% block ezauthor_field %}`.
+The field template must be placed in a block that corresponds to the field type identifier, in this case `{% block ezauthor_field %}`.
 
 !!! tip "Template blocks"
 
diff --git a/docs/templating/render_content/render_content_in_php.md b/docs/templating/render_content/render_content_in_php.md
index b3c879f61d..6cd115bcdf 100644
--- a/docs/templating/render_content/render_content_in_php.md
+++ b/docs/templating/render_content/render_content_in_php.md
@@ -9,7 +9,8 @@ While in PHP, you may need to render the view of a content item (for example, fo
 !!! caution
 
     Avoid using PHP rendering in a controller as much as possible.
-    You can access a view directly through the route `/view/content/{contentId}/{viewType}[/{location}]`. For example, on a fresh installation, you can access `/view/content/52/line` which returns a small piece of HTML with a link to the content that could be used in Ajax.
+    You can access a view directly through the route `/view/content/{contentId}/{viewType}[/{location}]`.
+    For example, on a fresh installation, you can access `/view/content/52/line` which returns a small piece of HTML with a link to the content that could be used in Ajax.
     If you need a controller to have additional information available in the template or to customize the `Response` object, define the controller in a [view configuration](template_configuration.md) as shown in [Controllers](controllers.md), enhance the View object and return it.
 
 The following example is a command outputting the render of a content for a view type in the terminal.
@@ -38,7 +39,7 @@ Create the command in `src/Command/ViewCommand.php`:
 
     As `Ibexa\Core\MVC\Symfony\View\Builder\ContentViewBuilder` and `Ibexa\Core\MVC\Symfony\View\Renderer\TemplateRenderer` aren't part of the public PHP API's `Ibexa\Contracts` namespace, they might change without notice.
 
-Use the command with some simple views:
+Use the command with some views:
 
 ```bash
 php bin/console app:view --content-id=52
diff --git a/docs/templating/render_content/render_page.md b/docs/templating/render_content/render_page.md
index fc844e83b3..e1ed86f103 100644
--- a/docs/templating/render_content/render_page.md
+++ b/docs/templating/render_content/render_page.md
@@ -3,11 +3,12 @@ description: Prepare templates for Page layouts and render Page blocks.
 edition: experience
 ---
 
-# Render a Page
+# Render a page
 
-Page is a special content type that contains a [Page Field](pagefield.md).
+Page is a special content type that contains a [Page field](pagefield.md).
 
-A Page Field is a layout composed of zones. Each zone can contain multiple blocks.
+A Page field is a layout composed of zones.
+Each zone can contain multiple blocks.
 
 ## Render a layout
 
@@ -39,8 +40,8 @@ To render the "Right sidebar" layout, add the following template to `templates/t
 
 ## Render a block
 
-Every built-in Page block has a default template, [which you can override](#override-default-block-templates).
-Every Page block can also have multiple other templates.
+Every built-in page block has a default template, [which you can override](#override-default-block-templates).
+Every page block can also have multiple other templates.
 The editor chooses a template when creating a block in the Page Builder.
 
 [[% include 'snippets/page_block_cache_clear.md' %]]
@@ -74,8 +75,7 @@ For example:
 
 !!! tip
 
-    To use a different file structure when overriding default templates,
-    add an import statement to the template.
+    To use a different file structure when overriding default templates, add an import statement to the template.
 
     For example, in `templates/bundles/IbexaFieldTypePageBundle/blocks/contentlist.html.twig`:
 
@@ -84,4 +84,4 @@ For example:
     ```
 
     Then, place the actual template in the imported file `templates/blocks/contentlist/new_default.html.twig`.
-    
+
diff --git a/docs/templating/templates/create_custom_view_matcher.md b/docs/templating/templates/create_custom_view_matcher.md
index 11ae52a05a..730ce8ce68 100644
--- a/docs/templating/templates/create_custom_view_matcher.md
+++ b/docs/templating/templates/create_custom_view_matcher.md
@@ -4,8 +4,7 @@ description: You can create custom view matchers to configure template and contr
 
 # Create custom view matcher
 
-In addition to the [built-in view matchers](view_matcher_reference.md),
-you can also create custom matchers to use in [template configuration](template_configuration.md#view-rules-and-matching).
+In addition to the [built-in view matchers](view_matcher_reference.md), you can also create custom matchers to use in [template configuration](template_configuration.md#view-rules-and-matching).
 
 To do it, create a matcher class that implements `Ibexa\Core\MVC\Symfony\Matcher\ContentBased\MatcherInterface`.
 
@@ -13,7 +12,7 @@ To do it, create a matcher class that implements `Ibexa\Core\MVC\Symfony\Matcher
 
 The matcher class must implement the following methods:
 
-- `matchLocation` - checks if a Location object matches.
+- `matchLocation` - checks if a location object matches.
 - `matchContentInfo` - checks if a ContentInfo object matches.
 - `match` - checks if the View object matches.
 - `setMatchingConfig` - receives the matcher's config from the view rule.
@@ -25,8 +24,7 @@ This matcher identifies content items that have the provided owner or owners.
 [[= include_file('code_samples/front/view_matcher/src/View/Matcher/Owner.php') =]]
 ```
 
-The matcher checks whether the owner of the current content (by its ContentInfo or Location)
-matches any of the values passed in configuration.
+The matcher checks whether the owner of the current content (by its ContentInfo or location) matches any of the values passed in configuration.
 
 ## Matcher service
 
@@ -48,5 +46,4 @@ The following configuration uses a special template to render articles owned by
 
 !!! note
 
-    If you use a matcher that is a service instead of a simple class,
-    tag the service with `ibexa.view.matcher`.
+    If you use a matcher that is a service instead of a simple class, tag the service with `ibexa.view.matcher`.
diff --git a/docs/templating/templates/template_configuration.md b/docs/templating/templates/template_configuration.md
index 6f2d115511..b12bf09ea3 100644
--- a/docs/templating/templates/template_configuration.md
+++ b/docs/templating/templates/template_configuration.md
@@ -47,7 +47,8 @@ The default, built-in views are:
 - `asset_image` - used when an image asset is embedded in another content item
 
 The built-in views have built-in default templates.
-You can define any other custom views. For each custom view, you must define a custom template.
+You can define any other custom views.
+For each custom view, you must define a custom template.
 
 !!! tip "Direct path to previewing view types"
 
@@ -75,8 +76,7 @@ The `match` key can contain one or more [view matchers](view_matcher_reference.m
 You can use it together with the `template` key, or without it.
 
 `params` can provide additional parameters to the content view.
-Use them, for example, with [Query types](content_queries.md#query-types)
-or to provide [custom Twig variables](templates.md#custom-template-variables) to the template.
+Use them, for example, with [Query types](content_queries.md#query-types) or to provide [custom Twig variables](templates.md#custom-template-variables) to the template.
 
 ### Combining matchers
 
@@ -88,12 +88,12 @@ match:
     Identifier\Section: news
 ```
 
-In the example above, content which is either an article or a blog post is matched,
-but it must be in the "News" Section.
+In the example above, content which is either an article or a blog post is matched, but it must be in the "News" Section.
 
 ### Matching every content item
 
-When you use no matcher in a rule, this rule always match. Several values are available to declare no matcher:
+When you use no matcher in a rule, this rule always match.
+Several values are available to declare no matcher:
 
 ``` yaml
 match: ~
diff --git a/docs/templating/templates/templates.md b/docs/templating/templates/templates.md
index 71081dd0fb..6bc8bed709 100644
--- a/docs/templating/templates/templates.md
+++ b/docs/templating/templates/templates.md
@@ -16,13 +16,11 @@ Templates use the Twig template engine.
 Templates can inherit from other templates.
 Use this, for example, to inherit a general page layout including a [navigation menu](add_navigation_menu.md) in article templates.
 
-To inherit from other templates, a template must extend the parent templates
-using the [`extends()`](https://twig.symfony.com/doc/3.x/tags/extends.html) Twig function.
+To inherit from other templates, a template must extend the parent templates using the [`extends()`](https://twig.symfony.com/doc/3.x/tags/extends.html) Twig function.
 To extend a parent template, the child template must contain Twig blocks.
 These blocks are inserted in the parent template in relevant places.
 
-For example, to extend the [general layout of the page](template_configuration.md#view-rules-and-matching), which includes header, footer, navigation, and so on,
-in the child template place the content in a `content` block:
+For example, to extend the [general layout of the page](template_configuration.md#view-rules-and-matching), which includes, for example, header, footer, or navigation, in the child template place the content in a `content` block:
 
 ``` html+twig
 {% extends '@ibexadesign/pagelayout.html.twig' %}
@@ -95,8 +93,7 @@ twig_variables:
 {{ custom_variable.nested_variable }}
 ```
 
-You can use [Symfony Expression language]([[= symfony_doc =]]/components/expression_language.html)
-to access other values, for example:
+You can use [Symfony Expression language]([[= symfony_doc =]]/components/expression_language.html) to access other values, for example:
 
 ``` yaml
 params:
@@ -105,5 +102,4 @@ params:
 
 !!! note
 
-    A custom variable can overwrite an existing variable,
-    so it's good practice to avoid existing variable names such as `content` or `location`.
+    A custom variable can overwrite an existing variable, so it's good practice to avoid existing variable names such as `content` or `location`.
diff --git a/docs/templating/templates/view_matcher_reference.md b/docs/templating/templates/view_matcher_reference.md
index adf69fd722..687569c488 100644
--- a/docs/templating/templates/view_matcher_reference.md
+++ b/docs/templating/templates/view_matcher_reference.md
@@ -79,7 +79,8 @@ match:
 
 ## Id\Location
 
-Matches the ID number of a Location. In the case of a content item, matched against the main Location.
+Matches the ID number of a location.
+In the case of a content item, matched against the main location.
 
 ``` yaml
 match:
@@ -88,7 +89,8 @@ match:
 
 ## Id\LocationRemote
 
-Matches the Remote ID number of a Location. In the case of a content item, matched against the main Location.
+Matches the Remote ID number of a location.
+In the case of a content item, matched against the main location.
 
 ``` yaml
 match:
@@ -97,7 +99,8 @@ match:
 
 ## Id\ParentContentType
 
-Matches the ID number of the parent content type. In the case of a content item, matched against the main Location.
+Matches the ID number of the parent content type.
+In the case of a content item, matched against the main location.
 
 ``` yaml
 match:
@@ -106,7 +109,8 @@ match:
 
 ## Identifier\ParentContentType
 
-Matches the identifier of the parent content type. In the case of a content item, matched against the main Location.
+Matches the identifier of the parent content type.
+In the case of a content item, matched against the main location.
 
 ``` yaml
 match:
@@ -115,7 +119,8 @@ match:
 
 ## Id\ParentLocation
 
-Matches the ID number of the parent Location. In the case of a content item, matched against the main Location.
+Matches the ID number of the parent location.
+In the case of a content item, matched against the main location.
 
 ``` yaml
 match:
@@ -133,7 +138,7 @@ match:
 
 ## Id\Section
 
-Matches the ID number of the Section that the content item belongs to.
+Matches the ID number of the section that the content item belongs to.
 
 ``` yaml
 match:
@@ -142,7 +147,7 @@ match:
 
 ## Identifier\Section
 
-Matches the identifier of the Section that the content item belongs to.
+Matches the identifier of the section that the content item belongs to.
 
 ``` yaml
 match:
@@ -151,7 +156,8 @@ match:
 
 ## Depth
 
-Matches the depth of the Location. The depth of a top level Location is 1.
+Matches the depth of the location.
+The depth of a top level location is 1.
 
 ``` yaml
 match:
@@ -160,8 +166,8 @@ match:
 
 ## UrlAlias
 
-Matches the virtual URL of the Location.
-Matches when the URL alias of the Location starts with the value passed.
+Matches the virtual URL of the location.
+Matches when the URL alias of the location starts with the value passed.
 
 ``` yaml
 match:
@@ -216,7 +222,7 @@ match:
 
 ## Product catalog root
 
-`Ibexa\Contracts\ProductCatalog\ViewMatcher\LocationBased\RootLocation` matches depending on whether the Location is the root of a product catalog.
+`Ibexa\Contracts\ProductCatalog\ViewMatcher\LocationBased\RootLocation` matches depending on whether the location is the root of a product catalog.
 
 ``` yaml
 match:
diff --git a/docs/templating/templating.md b/docs/templating/templating.md
index 12dab1b679..555adf2440 100644
--- a/docs/templating/templating.md
+++ b/docs/templating/templating.md
@@ -7,8 +7,7 @@ page_type: landing_page
 
 To create a website front for your site, you can use the Twig-based templating system.
 
-You configure the templates to use by applying content view configuration
-that covers for different types of content and different parts of your website.
+You configure the templates to use by applying content view configuration that covers for different types of content and different parts of your website.
 
 The design engine lets you prepare differing template themes.
 Content view configuration is SiteAccess-aware.
diff --git a/docs/templating/twig_function_reference/cart_twig_functions.md b/docs/templating/twig_function_reference/cart_twig_functions.md
index 7028194154..79aea93ac3 100644
--- a/docs/templating/twig_function_reference/cart_twig_functions.md
+++ b/docs/templating/twig_function_reference/cart_twig_functions.md
@@ -10,7 +10,9 @@ You can use cart Twig functions to check whether products can be added to cart,
 
 ### `ibexa_can_be_added_to_cart()`
 
-The `ibexa_can_be_added_to_cart()` function checks whether the provided product can be added to cart. It eliminates products that aren't available, products that don't have a price that corresponds to a currency selected for the cart, and products, for which VAT category isn't set. It also eliminates products that have variants but aren't one of those variants.
+The `ibexa_can_be_added_to_cart()` function checks whether the provided product can be added to cart.
+It eliminates products that aren't available, products that don't have a price that corresponds to a currency selected for the cart, and products, for which VAT category isn't set.
+It also eliminates products that have variants but aren't one of those variants.
 
 ``` html+twig
 {% set is_disabled = (is_disabled or ibexa_can_be_added_to_cart(product) == false)|default(false) %}
diff --git a/docs/templating/twig_function_reference/checkout_twig_functions.md b/docs/templating/twig_function_reference/checkout_twig_functions.md
index 70060af672..5d1644b1bb 100644
--- a/docs/templating/twig_function_reference/checkout_twig_functions.md
+++ b/docs/templating/twig_function_reference/checkout_twig_functions.md
@@ -32,18 +32,17 @@ The `ibexa_checkout_steps()` function returns a list of steps configured in `fra
 
 The `ibexa_checkout_step_path()` function returns a path to the step.
 
-``` html+twig 
+``` html+twig
 <a href="{{ ibexa_checkout_step_path(checkout, step) }}">{{ <link_label> }}</a>
 ```
 
 ### `ibexa_checkout_step_url()`
 
-The `ibexa_checkout_step_url()` function returns a URL address of the step. 
-By setting the optional argument to `true` you can decide whether the function 
-returns a relative or absolute URL of the checkout step.
+The `ibexa_checkout_step_url()` function returns a URL address of the step.
+By setting the optional argument to `true` you can decide whether the function returns a relative or absolute URL of the checkout step.
 The default value of the optional argument is `false`, which stands for the absolute URL.
 
-``` html+twig 
+``` html+twig
 <a href="{{ ibexa_checkout_step_url(checkout, step, true) }}">{{ <target_page_label> }}</a>
 ```
 
@@ -61,20 +60,19 @@ The `ibexa_checkout_step_number` function returns a sequential number of the ste
 
 The `ibexa_checkout_summary_entries` function takes in a single argument, a cart summary object, and returns the checkout summary.
 
-``` html+twig 
+``` html+twig
 {% block items %}
     {% for entry in ibexa_checkout_summary_entries(summary) %}
         // ...
     {% endfor %}
-{% endblock %}  
+{% endblock %}
 ```
 
 ### `ibexa_checkout_summary_vat_summaries()`
 
-The `ibexa_checkout_summary_vat_summaries()` function takes in a single argument, a cart summary object, 
-and returns an array of VAT summary objects for the cart. 
+The `ibexa_checkout_summary_vat_summaries()` function takes in a single argument, a cart summary object, and returns an array of VAT summary objects for the cart.
 Each VAT summary relates to a certain VAT rate, and contains information about the VAT rate, and the VAT value.
 
-``` html+twig 
+``` html+twig
 {% set vat_summaries = ibexa_checkout_summary_vat_summaries(summary) %}
 ```
diff --git a/docs/templating/twig_function_reference/content_twig_functions.md b/docs/templating/twig_function_reference/content_twig_functions.md
index 8e2ee2b6c1..6b634d2bf5 100644
--- a/docs/templating/twig_function_reference/content_twig_functions.md
+++ b/docs/templating/twig_function_reference/content_twig_functions.md
@@ -24,13 +24,11 @@ You can provide `ibexa_render()` with either a content item or a Location object
 
 !!! tip
 
-    Depending on whether you pass a content item or a Location object,
-    the helper automatically selects and uses one of internal Twig functions:
-    `ibexa_render_content()` or `ibexa_render_location()`.
+    Depending on whether you pass a content item or a Location object, the helper automatically selects and uses one of internal Twig functions: `ibexa_render_content()` or `ibexa_render_location()`.
 
 |Argument|Type|Description|
 |------|------|------|
-|`content`</br>or</br>`location`|`Ibexa\Contracts\Core\Repository\Values\Content\Content`</br>or</br>`Ibexa\Contracts\Core\Repository\Values\Content\Location`|Content item or its Location.|
+|`content`</br>or</br>`location`|`Ibexa\Contracts\Core\Repository\Values\Content\Content`</br>or</br>`Ibexa\Contracts\Core\Repository\Values\Content\Location`|Content item or its location.|
 |`method`|`string`|(optional) [Rendering method](#rendering-methods). One of: `direct`, `inline`, `esi`, `ssi`. (Default method is `direct`)|
 |`viewType`|`string`|(optional) [View type](template_configuration.md#view-types). (Default view type is `embed`)|
 
@@ -58,8 +56,7 @@ You can pass one of the following rendering methods to `ibexa_render()`:
 `ibexa_content_name()` renders the name of a content item.
 
 The function uses prioritized languages from SiteAccess settings unless you pass another language as `forcedLanguage`.
-If the content item doesn't have a translation in the prioritized or passed language,
-the function returns the name in the main language.
+If the content item doesn't have a translation in the prioritized or passed language, the function returns the name in the main language.
 
 | Argument | Type | Description |
 |---------------|------|-------------|
@@ -86,8 +83,7 @@ the function returns the name in the main language.
 
 ### `ibexa_seo()`
 
-`ibexa_seo()` attaches [SEO](https://doc.ibexa.co/projects/userguide/en/latest/search_engine_optimization/seo/) 
-data to the content item's HTML code.
+`ibexa_seo()` attaches [SEO](https://doc.ibexa.co/projects/userguide/en/latest/search_engine_optimization/seo/) data to the content item's HTML code.
 
 | Argument | Type | Description |
 |---------------|------|-------------|
@@ -126,7 +122,7 @@ data to the content item's HTML code.
 
 ### `ibexa_render_location_query()`
 
-`ibexa_render_location_query` renders the results of a non-content related Location query made by using a Query type.
+`ibexa_render_location_query` renders the results of a non-content related location query made by using a Query type.
 
 |Argument|Type|Description|
 |------|------|------|
diff --git a/docs/templating/twig_function_reference/date_twig_filters.md b/docs/templating/twig_function_reference/date_twig_filters.md
index d7cbd61e4d..d261c26805 100644
--- a/docs/templating/twig_function_reference/date_twig_filters.md
+++ b/docs/templating/twig_function_reference/date_twig_filters.md
@@ -5,8 +5,7 @@ page_type: reference
 
 # Date Twig filters
 
-Date and time Twig filters format a date and time object (`DateTimeInterface`)
-in one of the formats defined in [user preferences](formatting_date_and_time.md#using-user-settings-menu).
+Date and time Twig filters format a date and time object (`DateTimeInterface`) in one of the formats defined in [user preferences](formatting_date_and_time.md#using-user-settings-menu).
 
 - `ibexa_full_datetime`
 - `ibexa_full_date`
diff --git a/docs/templating/twig_function_reference/field_twig_functions.md b/docs/templating/twig_function_reference/field_twig_functions.md
index eecc2b6e7a..ca7d5e10d4 100644
--- a/docs/templating/twig_function_reference/field_twig_functions.md
+++ b/docs/templating/twig_function_reference/field_twig_functions.md
@@ -5,8 +5,7 @@ page_type: reference
 
 # Field Twig functions
 
-Field Twig functions render specific fields of a content item
-and provide information about them.
+Field Twig functions render specific fields of a content item and provide information about them.
 
 - [`ibexa_render_field()`](#ibexa_render_field) renders the selected field of a content item.
 - [`ibexa_field_value()`](#ibexa_field_value) returns the field value object.
@@ -77,8 +76,7 @@ Some field types, like the [MapLocation field type](maplocationfield.md), expect
 
 The function returns the value of the field only.
 To render the field with default or custom templates, use [`ibexa_render_field()`](#ibexa_render_field) instead.
-If the content item doesn't have a translation in the prioritized or passed language,
-the function returns the value in the main language.
+If the content item doesn't have a translation in the prioritized or passed language, the function returns the value in the main language.
 
 | Argument | Type | Description |
 |-----|------|-----|
@@ -94,8 +92,7 @@ the function returns the value in the main language.
 
 `ibexa_field()` returns the field object.
 The field gives you access to the field value, the field's definition identifier, and field type identifier.
-If the content item doesn't have a translation in the prioritized or passed language,
-the function returns the field object in the main language.
+If the content item doesn't have a translation in the prioritized or passed language, the function returns the field object in the main language.
 
 | Argument | Type | Description |
 |-------|------|------|
@@ -119,8 +116,7 @@ You can use `ibexa_field()` to access the field type identifier:
 `ibexa_field_name()` returns the name of a content item's field.
 
 The function uses prioritized languages from SiteAccess settings unless you pass another language as `forcedLanguage`.
-If the content item doesn't have a translation in the prioritized or passed language,
-the function returns the name in the main language.
+If the content item doesn't have a translation in the prioritized or passed language, the function returns the name in the main language.
 
 | Argument | Type | Description |
 |---------------|------|-------------|
@@ -140,8 +136,7 @@ the function returns the name in the main language.
 `ibexa_field_description()` returns the description of a content item's field.
 
 The function uses prioritized languages from SiteAccess settings unless you pass another language as `forcedLanguage`.
-If the content item doesn't have a translation in the prioritized or passed language,
-the function returns the description in the main language.
+If the content item doesn't have a translation in the prioritized or passed language, the function returns the description in the main language.
 
 | Argument | Type | Description |
 |---------------|------|-------------|
diff --git a/docs/templating/twig_function_reference/image_twig_functions.md b/docs/templating/twig_function_reference/image_twig_functions.md
index c3f2751716..7568a42233 100644
--- a/docs/templating/twig_function_reference/image_twig_functions.md
+++ b/docs/templating/twig_function_reference/image_twig_functions.md
@@ -5,13 +5,12 @@ page_type: reference
 
 # Image Twig functions
 
-- [`ibexa_image_alias`](#ibexa_image_alias) returns the selected variation of an image Field.
-- [`ibexa_content_field_identifier_first_filled_image`](#ibexa_content_field_identifier_first_filled_image) returns the identifier of the first image Field in a content item that isn't empty.
+- [`ibexa_image_alias`](#ibexa_image_alias) returns the selected variation of an image field.
+- [`ibexa_content_field_identifier_first_filled_image`](#ibexa_content_field_identifier_first_filled_image) returns the identifier of the first image field in a content item that isn't empty.
 
 ## Image rendering
 
-To render images, use the [`ibexa_render_field()`](field_twig_functions.md#ibexa_render_field) Twig function
-with the variation name passed as an argument, for example:
+To render images, use the [`ibexa_render_field()`](field_twig_functions.md#ibexa_render_field) Twig function with the variation name passed as an argument, for example:
 
 ``` html+twig
 [[= include_file('docs/templating/twig_function_reference/field_twig_functions.md', 38, 45) =]]
@@ -21,12 +20,12 @@ with the variation name passed as an argument, for example:
 
 ### `ibexa_image_alias()`
 
-`ibexa_image_alias()` returns the selected variation of an image Field.
+`ibexa_image_alias()` returns the selected variation of an image field.
 
 | Argument | Type | Description |
 |-----|-----|-----|
-| `field` | `Ibexa\Contracts\Core\Repository\Values\Content\Field` | The image Field. |
-| `versionInfo` | `Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo` | The VersionInfo that the Field belongs to. |
+| `field` | `Ibexa\Contracts\Core\Repository\Values\Content\Field` | The image field. |
+| `versionInfo` | `Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo` | The VersionInfo that the field belongs to. |
 | `variantName` | `string` | Name of the image variation to be used. To display the original image variation, use `original` as the variation name. |
 
 ``` html+twig
@@ -36,8 +35,7 @@ with the variation name passed as an argument, for example:
 !!! tip
 
     You can access the name of a variation from the variation object with `variation.name`.
-    You can, for example, use it as parameter in the
-    [`ibexa_render_field()`](field_twig_functions.md#ibexa_render_field) Twig function.
+    You can, for example, use it as parameter in the [`ibexa_render_field()`](field_twig_functions.md#ibexa_render_field) Twig function.
 
 ### `ibexa_content_field_identifier_first_filled_image()`
 
@@ -45,8 +43,8 @@ with the variation name passed as an argument, for example:
 
 !!! caution
 
-    This function works only for [Image](imagefield.md) Fields.
-    It doesn't work for [ImageAsset](imageassetfield.md) Fields.
+    This function works only for [Image](imagefield.md) fields.
+    It doesn't work for [ImageAsset](imageassetfield.md) fields.
 
 | Argument | Type | Description |
 | ------ |----- | ----- |
@@ -58,8 +56,7 @@ with the variation name passed as an argument, for example:
 
 #### Examples
 
-You can use `ibexa_content_field_identifier_first_filled_image()`
-to find and render the first existing image in an article:
+You can use `ibexa_content_field_identifier_first_filled_image()` to find and render the first existing image in an article:
 
 ``` html+twig
 {% set firstImage = ibexa_content_field_identifier_first_filled_image(content) %}
diff --git a/docs/templating/twig_function_reference/other_twig_filters.md b/docs/templating/twig_function_reference/other_twig_filters.md
index a64de6cdc1..5aaa0ef427 100644
--- a/docs/templating/twig_function_reference/other_twig_filters.md
+++ b/docs/templating/twig_function_reference/other_twig_filters.md
@@ -21,7 +21,8 @@ page_type: reference
 
 #### Icon size variants
 
-The default icon size in the back office is `32px`. To change the default size, in the template add the modifier to the class name.
+The default icon size in the back office is `32px`.
+To change the default size, in the template add the modifier to the class name.
 
 ``` twig
 <svg class="ibexa-icon ibexa-icon--medium">
@@ -51,5 +52,5 @@ The list of available icon sizes:
 | `content` | `Ibexa\Contracts\Core\Repository\Values\Content\Content` | Content item to display the category name for. |
 
 ```html+twig
-{{ content|ibexa_taxonomy_entries_for_content|map(entry => "#{entry.name}")|join(', ') }} 
+{{ content|ibexa_taxonomy_entries_for_content|map(entry => "#{entry.name}")|join(', ') }}
 ```
\ No newline at end of file
diff --git a/docs/templating/twig_function_reference/product_twig_functions.md b/docs/templating/twig_function_reference/product_twig_functions.md
index 4a75df1e4f..86177bc24b 100644
--- a/docs/templating/twig_function_reference/product_twig_functions.md
+++ b/docs/templating/twig_function_reference/product_twig_functions.md
@@ -7,8 +7,7 @@ page_type: reference
 
 ### `ibexa_get_product`
 
-The `ibexa_get_product()` filter gets the selected product
-based on either a product object or a content item object that contains a product.
+The `ibexa_get_product()` filter gets the selected product based on either a product object or a content item object that contains a product.
 
 #### Examples
 
@@ -108,8 +107,7 @@ The `ibexa_get_product_stock` Twig function retrieves the stock quantity for a p
 
 ### `ibexa_format_price`
 
-The `ibexa_format_price` filter formats the price value by placing currency code 
-either on the left or on the right of the numerical value.
+The `ibexa_format_price` filter formats the price value by placing currency code either on the left or on the right of the numerical value.
 
 #### Examples
 
diff --git a/docs/templating/twig_function_reference/site_context_twig_functions.md b/docs/templating/twig_function_reference/site_context_twig_functions.md
index f997166f81..a8e040ffda 100644
--- a/docs/templating/twig_function_reference/site_context_twig_functions.md
+++ b/docs/templating/twig_function_reference/site_context_twig_functions.md
@@ -10,8 +10,7 @@ To determine if given location is site context-aware, you can use site context [
 
 ### `ibexa_site_context_aware()`
 
-`ibexa_site_context_aware()` checks whether a given location is site context-aware, meaning it's not excluded from Site context using the 
-`ibexa.system.<scope>.site_context.excluded_paths` configuration.
+`ibexa_site_context_aware()` checks whether a given location is site context-aware, meaning it's not excluded from Site context using the `ibexa.system.<scope>.site_context.excluded_paths` configuration.
 
 #### Examples
 
diff --git a/docs/templating/twig_function_reference/storefront_twig_functions.md b/docs/templating/twig_function_reference/storefront_twig_functions.md
index 47198c80e1..dce6c682da 100644
--- a/docs/templating/twig_function_reference/storefront_twig_functions.md
+++ b/docs/templating/twig_function_reference/storefront_twig_functions.md
@@ -57,8 +57,7 @@ You can use storefront Twig functions to control the rendering of storefront ele
 
 `ibexa_storefront_get_main_category()` returns the main (first-level) category for a given category.
 
-For example: if a given category is "Desks" and it has the following ancestors: "Furniture" > "Office" > "Desks",
-then the main category for "Office" is "Furniture".
+For example: if a given category is "Desks" and it has the following ancestors: "Furniture" > "Office" > "Desks", then the main category for "Office" is "Furniture".
 
 ``` html+twig
 {% set main_category = ibexa_storefront_get_main_category(category) %}
@@ -106,7 +105,7 @@ You can use this, for example, to [parametrize the display of products by using
 
 ### `ibexa_get_anonymous_user_id()`
 
-`ibexa_get_anonymous_user_id()` returns the configured User ID for the anonymous user (configured in `ibexa.system.<scope>.anonymous_user_id`).
+`ibexa_get_anonymous_user_id()` returns the configured user ID for the anonymous user (configured in `ibexa.system.<scope>.anonymous_user_id`).
 
 ``` html+twig
 {{ ibexa_get_anonymous_user_id() }}
diff --git a/docs/templating/twig_function_reference/twig_function_reference.md b/docs/templating/twig_function_reference/twig_function_reference.md
index 091a42af92..a9ef5c80c8 100644
--- a/docs/templating/twig_function_reference/twig_function_reference.md
+++ b/docs/templating/twig_function_reference/twig_function_reference.md
@@ -5,9 +5,7 @@ page_type: landing_page
 
 # Twig function reference
 
-In addition to the [native functions provided by Twig](https://twig.symfony.com/doc/3.x/functions/index.html),
-and [Twig extensions provided by Symfony]([[= symfony_doc =]]/reference/twig_reference.html),
-[[= product_name =]] offers the following custom Twig functions and filters:
+In addition to the [native functions provided by Twig](https://twig.symfony.com/doc/3.x/functions/index.html), and [Twig extensions provided by Symfony]([[= symfony_doc =]]/reference/twig_reference.html), [[= product_name =]] offers the following custom Twig functions and filters:
 
 [[= cards([
     "templating/twig_function_reference/cart_twig_functions",
diff --git a/docs/templating/twig_function_reference/url_twig_functions.md b/docs/templating/twig_function_reference/url_twig_functions.md
index c34ecfe201..721f55a882 100644
--- a/docs/templating/twig_function_reference/url_twig_functions.md
+++ b/docs/templating/twig_function_reference/url_twig_functions.md
@@ -5,9 +5,9 @@ page_type: reference
 
 # URL Twig functions
 
-- [`ibexa_path()`](#ibexa_path) returns the relative URL to a content item or Location.
-- [`ibexa_url()`](#ibexa_url) returns the absolute URL to a content item or Location.
-- [`ibexa.url.alias`](#ibexaurlalias) generates URLs for a Location from the given arguments.
+- [`ibexa_path()`](#ibexa_path) returns the relative URL to a content item or location.
+- [`ibexa_url()`](#ibexa_url) returns the absolute URL to a content item or location.
+- [`ibexa.url.alias`](#ibexaurlalias) generates URLs for a location from the given arguments.
 - [`ibexa_route()`](#ibexa_route) generates a RouteReference object from the given parameters.
 - [`ibexa_oauth2_connect_path()`](#ibexa_oauth2_connect_path) generates a relative path for the given OAuth2 route.
 - [`ibexa_oauth2_connect_url()`](#ibexa_oauth2_connect_url) generates an absolute URL for the given OAuth2 route.
@@ -16,11 +16,11 @@ page_type: reference
 
 ### `ibexa_path()`
 
-`ibexa_path()` returns the relative URL to a content item or Location.
+`ibexa_path()` returns the relative URL to a content item or location.
 
 |Argument|Type|Description|
 |------|------|------|
-|`name`|`string`</br>`Ibexa\Contracts\Core\Repository\Values\Content\Location`</br>`Ibexa\Contracts\Core\Repository\Values\Content\Content`</br>`Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo`</br>`Ibexa\Contracts\Core\Repository\Values\Content\Location`</br>`Ibexa\Core\MVC\Symfony\Routing\RouteReference`|The name of the route, Location or Content.|
+|`name`|`string`</br>`Ibexa\Contracts\Core\Repository\Values\Content\Location`</br>`Ibexa\Contracts\Core\Repository\Values\Content\Content`</br>`Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo`</br>`Ibexa\Contracts\Core\Repository\Values\Content\Location`</br>`Ibexa\Core\MVC\Symfony\Routing\RouteReference`|The name of the route, location, or content.|
 |`parameters`|`array`|Route parameters.|
 |`relative`|`boolean`|Whether to generate a relative path.|
 
@@ -30,11 +30,11 @@ page_type: reference
 
 ### `ibexa_url()`
 
-`ibexa_url()` returns the absolute URL to a content item or Location.
+`ibexa_url()` returns the absolute URL to a content item or location.
 
 |Argument|Type|Description|
 |------|------|------|
-|`name`|`string`</br>`Ibexa\Contracts\Core\Repository\Values\Content\Location`</br>`Ibexa\Contracts\Core\Repository\Values\Content\Content`</br>`Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo`</br>`Ibexa\Contracts\Core\Repository\Values\Content\Location`</br>`Ibexa\Core\MVC\Symfony\Routing\RouteReference`|The name of the route, Location or Content.|
+|`name`|`string`</br>`Ibexa\Contracts\Core\Repository\Values\Content\Location`</br>`Ibexa\Contracts\Core\Repository\Values\Content\Content`</br>`Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo`</br>`Ibexa\Contracts\Core\Repository\Values\Content\Location`</br>`Ibexa\Core\MVC\Symfony\Routing\RouteReference`|The name of the route, location, or content.|
 |`parameters`|`array`|Route parameters.|
 |`schemeRelative`|`boolean`|Whether to generate a relative URL.|
 
diff --git a/docs/templating/twig_function_reference/user_twig_functions.md b/docs/templating/twig_function_reference/user_twig_functions.md
index 76b70d614c..8030b19522 100644
--- a/docs/templating/twig_function_reference/user_twig_functions.md
+++ b/docs/templating/twig_function_reference/user_twig_functions.md
@@ -13,8 +13,7 @@ page_type: reference
 {{ ibexa_user_get_current().login }}
 ```
 
-You can get the underlying content item, for example to display the user's last name,
-by accessing the `content` property:
+You can get the underlying content item, for example to display the user's last name, by accessing the `content` property:
 
 ``` html+twig
 {{ ibexa_render_field(ibexa_user_get_current().content, 'last_name') }}
diff --git a/docs/templating/urls_and_routes/custom_breadcrumbs.md b/docs/templating/urls_and_routes/custom_breadcrumbs.md
index 4777eb7485..3da8df6e42 100644
--- a/docs/templating/urls_and_routes/custom_breadcrumbs.md
+++ b/docs/templating/urls_and_routes/custom_breadcrumbs.md
@@ -58,13 +58,11 @@ To create a custom breadcrumb generator you have to write a generator class and
 
 The generator must implement `BreadcrumbsGeneratorInterface` and its two methods.
 
-You can use `AbstractWhiteOctoberBreadcrumbsGenerator`
-which implements this interface and provides access to the WhiteOctober breadcrumbs library.
+You can use `AbstractWhiteOctoberBreadcrumbsGenerator` which implements this interface and provides access to the WhiteOctober breadcrumbs library.
 
 Every breadcrumb generator has to add a `translationParameters` array with `type`, `identifier` and `content_type_id`.
 Always create all three keys and leave the elements empty if not needed.
 
-If you can't or don't want to use `AbstractWhiteOctoberBreadcrumbsGenerator`,
-your generator's `renderBreadcrumbs()` method must handle rendering the HTML code for the breadcrumbs.
+If you can't or don't want to use `AbstractWhiteOctoberBreadcrumbsGenerator`, your generator's `renderBreadcrumbs()` method must handle rendering the HTML code for the breadcrumbs.
 
 The highest priority generator which matches `canRender()` renders the breadcrumbs for the current request.
diff --git a/docs/templating/urls_and_routes/urls_and_routes.md b/docs/templating/urls_and_routes/urls_and_routes.md
index 476ba68863..dab9be379b 100644
--- a/docs/templating/urls_and_routes/urls_and_routes.md
+++ b/docs/templating/urls_and_routes/urls_and_routes.md
@@ -5,7 +5,7 @@ description: Add links to content items or specific built-in and custom routes i
 # URLs and routes
 
 To link to a [Location](locations.md) or [Content item](content_model.md#content-items), use the [`ibexa_path()`](url_twig_functions.md#ibexa_path) Twig function.
-You need to provide the function with a Location, Content, ContentInfo or [RouteReference](#routereference) object:
+You need to provide the function with a location, content, ContentInfo, or [RouteReference](#routereference) object:
 
 ``` html+twig
 <p><a href="{{ ibexa_path(location) }}">Location</a></p>
@@ -13,7 +13,7 @@ You need to provide the function with a Location, Content, ContentInfo or [Route
 <p><a href="{{ ibexa_path(content.contentInfo) }}">Content Info</a></p>
 ```
 
-Use [`ibexa_url()`](url_twig_functions.md#ibexa_url) to get an absolute URL to a content item or Location:
+Use [`ibexa_url()`](url_twig_functions.md#ibexa_url) to get an absolute URL to a content item or location:
 
 ``` html+twig
 <p><a href="{{ ibexa_url(location) }}">Location</a></p>
@@ -21,11 +21,10 @@ Use [`ibexa_url()`](url_twig_functions.md#ibexa_url) to get an absolute URL to a
 
 ## RouteReference
 
-You can use the [`ibexa_route()`](url_twig_functions.md#ibexa_route) Twig function
-to create a RouteReference object based on the provided information.
+You can use the [`ibexa_route()`](url_twig_functions.md#ibexa_route) Twig function to create a RouteReference object based on the provided information.
 
 A RouteReference contains a route with its parameters and can be modified after it's created.
-Here, the route is based on the ID of the Location.
+Here, the route is based on the ID of the location.
 
 ``` html+twig
 {% set routeReference = ibexa_route("ibexa.url.alias", { 'locationId': 2 }) %}
@@ -33,7 +32,7 @@ Here, the route is based on the ID of the Location.
 ```
 
 A route can also be based on the ID of the content item.
-The resulting link points to the content item's main Location.
+The resulting link points to the content item's main location.
 
 ``` html+twig
 {% set routeReference = ibexa_route("ibexa.url.alias", { 'contentId': 456 }) %}
@@ -79,7 +78,7 @@ The following built-in routes are available for the front of the website.
 
 !!! tip
 
-    To view all routes existing in the system, including internal and Back-Office related ones, run:
+    To view all routes existing in the system, including internal and back office related ones, run:
 
     ``` bash
     php bin/console debug:router

From 32f607d676646e18d10ac82002010c5377445467 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 11:50:05 +0200
Subject: [PATCH 53/77] Fixes in 'tutorials'

---
 .../beginner_tutorial/2_create_the_content_model.md    | 10 +++++-----
 .../beginner_tutorial/3_customize_the_front_page.md    |  7 +++----
 .../beginner_tutorial/6_improve_configuration.md       |  2 +-
 .../beginner_tutorial/8_enable_account_registration.md |  6 +++---
 .../1_implement_the_point2d_value_class.md             |  3 ++-
 .../generic_field_type/2_define_point2d_field_type.md  |  2 +-
 .../creating_a_point2d_field_type.md                   |  3 ++-
 .../2_prepare_the_landing_page.md                      |  3 ++-
 8 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/docs/tutorials/beginner_tutorial/2_create_the_content_model.md b/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
index 0393635c3f..1c5d04a22e 100644
--- a/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
+++ b/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
@@ -13,21 +13,22 @@ Below is a short introduction that only covers points needed for this tutorial.
 ## Content model overview
 
 The [[= product_name =]] content repository is centered around **content items**.
-A content item is a single piece of content, for example an article, a product review, a place, etc.
+A content item is a single piece of content, for example an article, a product review, a place, and more.
 
 Every content item is an instance of a content type.
 Content types define what **Fields** are included in each content item.
 For example, an article could include fields such as *title*, *image*, *abstract*, *article's body*, *publication date* and *list of authors*.
 
 Fields can belong to one of the installed **field types**, about 30 in the default distribution.
-Each field type is built to represent a specific type of data: a text line, a block of rich text, an image, a collection of relations to content items, etc.
+Each field type is built to represent a specific type of data: a text line, a block of rich text, an image, a collection of relations to content items, and more.
 You can find a complete list in the [field types reference](field_type_reference.md) section.
 Every field type may have its own options, and comes with its own editing and viewing interfaces.
 
 ## Add a content type
 
 The site use two content types: **Ride** and **Landmark**.
-A Ride is a route of a bike trip. It can include one or more Landmarks - interesting places you can see along the way.
+A Ride is a route of a bike trip.
+It can include one or more Landmarks - interesting places you can see along the way.
 More than one Ride can visit the same Landmark, so it's similar to an N-N relationship model in a database.
 
 In this step you add the first content type, Ride.
@@ -70,8 +71,7 @@ Confirm the creation of the content type by clicking **Save and close**.
 
     For this tutorial, swap it with its child, a Folder called "Ibexa Platform".
 
-    To do this, in the main menu go to **Content** -> **Content structure** -> **Ibexa Digital Experience Platform**, select the **Locations** tab
-    and in the **Swap Locations** section navigate to "Ibexa Platform".
+    To do this, in the main menu go to **Content** -> **Content structure** -> **Ibexa Digital Experience Platform**, select the **Locations** tab and in the **Swap Locations** section navigate to "Ibexa Platform".
 
     You can learn how to work with Pages in [another tutorial](page_and_form_tutorial.md).
 
diff --git a/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md b/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md
index bd133eba1e..bf86f050f9 100644
--- a/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md
+++ b/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md
@@ -36,7 +36,7 @@ ibexa:
 ```
 
 This tells [[= product_name =]] to use the `template` when rendering content with Location ID `2`.
-`2` is the default Location for the root content item.
+`2` is the default location for the root content item.
 
 `Id\Location` is one of several [view matchers](view_matcher_reference.md) that you can use to customize rendering depending on different criteria.
 
@@ -67,7 +67,7 @@ Create a `home_page.html.twig` file in `templates/full/`:
 </div>
 ```
 
-Refresh the page and you can see a simple, unstyled version of the message.
+Refresh the page and you can see an unstyled version of the message.
 
 !!! note
 
@@ -217,8 +217,7 @@ Encore
     ]);
 ```
 
-`.addStyleEntry('tutorial', [])` and `.addEntry('tutorial-js', [])` refer respectively to
-`{{  encore_entry_link_tags('tutorial') }}` and `{{ encore_entry_script_tags('tutorial-js') }}` from `main_layout.html.twig`.
+`.addStyleEntry('tutorial', [])` and `.addEntry('tutorial-js', [])` refer to `{{  encore_entry_link_tags('tutorial') }}` and `{{ encore_entry_script_tags('tutorial-js') }}` from `main_layout.html.twig`.
 This configuration creates a bundle consisting of files to be added to a template.
 
 At this point the bundles are created and ready to be used.
diff --git a/docs/tutorials/beginner_tutorial/6_improve_configuration.md b/docs/tutorials/beginner_tutorial/6_improve_configuration.md
index 4de4a52763..6368f57225 100644
--- a/docs/tutorials/beginner_tutorial/6_improve_configuration.md
+++ b/docs/tutorials/beginner_tutorial/6_improve_configuration.md
@@ -7,7 +7,7 @@ description: See how you can manage Ibexa DXP configuration files.
 ## Define image variations
 
 Image variations are different versions of the same image.
-You can use them to scale images, crop them, add effects, etc.
+You can use them, for example, to scale images, crop them, or add effects.
 
 So far the images in the ride list are fitted to the templates automatically, and the result doesn't look good.
 Now you can create a variation to specify how you want the images to look in detail.
diff --git a/docs/tutorials/beginner_tutorial/8_enable_account_registration.md b/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
index 7d86163b44..6d5d32d343 100644
--- a/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
+++ b/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
@@ -116,7 +116,8 @@ Create this file as well (as `templates/user/registration_content_form.html.twig
 ```
 
 The third template you need to prepare covers the confirmation page that is displayed when a user completes the registration.
-First, point to the new template in the configuration. Add a `confirmation` key to `config/packages/views.yaml`:
+First, point to the new template in the configuration.
+Add a `confirmation` key to `config/packages/views.yaml`:
 
 ``` yaml hl_lines="4"
 user_registration:
@@ -163,8 +164,7 @@ Fill in the form and register a user.
 
 !!! tip
 
-    If you log in as the new user at this point, you need to go to the back office (`<yourdomain>/admin`)
-    to log out again re-log in as Admin.
+    If you log in as the new user at this point, you need to go to the back office (`<yourdomain>/admin`) to log out again re-log in as Admin.
 
 ## Set up Permissions
 
diff --git a/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md b/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md
index bb9f0891a8..8dc44e0633 100644
--- a/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md
+++ b/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md
@@ -37,7 +37,8 @@ The Point 2D is going to store two elements (coordinates for point 2D):
 - `x` value
 - `y` value
 
-At this point, it doesn't matter where they're stored. You want to focus on what the field type exposes as an API.
+At this point, it doesn't matter where they're stored.
+You want to focus on what the field type exposes as an API.
 
 `src/FieldType/Point2D/Value.php` should have the following properties:
 
diff --git a/docs/tutorials/generic_field_type/2_define_point2d_field_type.md b/docs/tutorials/generic_field_type/2_define_point2d_field_type.md
index 8458fd348a..e49b1a3da9 100644
--- a/docs/tutorials/generic_field_type/2_define_point2d_field_type.md
+++ b/docs/tutorials/generic_field_type/2_define_point2d_field_type.md
@@ -6,7 +6,7 @@ description: Learn how to create the Type class which contains the logic for the
 
 ## The Type class
 
-The Type contains logic of the field type: validating data, transforming from various formats, describing the validators, etc.
+The Type contains logic of the field type: validating data, transforming from various formats, describing the validators, and more.
 In this example Point 2D field type extends the `Ibexa\Contracts\Core\FieldType\Generic\Type` class.
 
 For more information about the Type class of a field type, see [Type class](type_and_value.md#type-class).
diff --git a/docs/tutorials/generic_field_type/creating_a_point2d_field_type.md b/docs/tutorials/generic_field_type/creating_a_point2d_field_type.md
index b0db2bb8ae..7a98186816 100644
--- a/docs/tutorials/generic_field_type/creating_a_point2d_field_type.md
+++ b/docs/tutorials/generic_field_type/creating_a_point2d_field_type.md
@@ -24,7 +24,8 @@ This tutorial is aimed at developers who are familiar with [[= product_name =]]
 
 ## Content of the tutorial
 
-This tutorial shows you how to use the Generic field type as a template for a custom field type. You:
+This tutorial shows you how to use the Generic field type as a template for a custom field type.
+You:
 
 - create a custom Point 2D field type with two coordinates as input, for example '4,5'
 - register the new field type as a service and define its template
diff --git a/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md b/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
index 81065c69fe..fa85db5381 100644
--- a/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
+++ b/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
@@ -64,7 +64,8 @@ First create a new file for layout configuration, `config/packages/ibexa_fieldty
 
     For a detailed description of creating a Page layout, see [Page layouts](render_page.md#render-a-layout).
 
-The `sidebar` (line 3) is the internal key of the layout. `name` (line 5) is displayed in the interface when the user selects a layout.
+The `sidebar` (line 3) is the internal key of the layout.
+`name` (line 5) is displayed in the interface when the user selects a layout.
 The `thumbnail` (line 7) points to an image file that is shown when creating a new landing page next to the name.
 Use the [supplied thumbnail file](https://github.com/ibexa/documentation-developer/blob/master/code_samples/tutorials/page_tutorial_starting_point/public/assets/images/layouts/sidebar.png) and place it in the `public/assets/images/layouts/` folder.
 

From ee63515726987a818935fa9684c79612203b1c83 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 11:52:33 +0200
Subject: [PATCH 54/77] Fixes in 'users'

---
 docs/users/user_management_guide.md | 2 +-
 docs/users/users.md                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/users/user_management_guide.md b/docs/users/user_management_guide.md
index 1be65c1943..28e08b2d15 100644
--- a/docs/users/user_management_guide.md
+++ b/docs/users/user_management_guide.md
@@ -124,7 +124,7 @@ User management helps prevent unauthorized access.
 
 ### Efficient user onboarding
 
-Invitations and easy account creation streamline the process of onboarding new users.
+Invitations and account creation streamline the process of onboarding new users.
 
 ### Targeted marketing
 
diff --git a/docs/users/users.md b/docs/users/users.md
index 1198096121..0f4798b4ab 100644
--- a/docs/users/users.md
+++ b/docs/users/users.md
@@ -5,7 +5,7 @@ page_type: landing_page
 
 # Users
 
-Users in [[= product_name =]] refer to all kinds of user accounts: administrators, editors, managers or shop customers.
+Users in [[= product_name =]] refer to all kinds of user accounts: administrators, editors, managers, or shop customers.
 All such user accounts have the same underlying mechanism and enable you to control access to te application, both the back office and the website front, by using the [permission system](permissions.md).
 
 ## Invite nad manage users

From 201c7ad83c979b77d630dfeafaa0dbf94f3fd919 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 12:34:00 +0200
Subject: [PATCH 55/77] Fixes - 'field'

---
 docs/content_management/content_relations.md  |  2 +-
 .../create_data_migration_step.md             |  3 +-
 .../data_migration/data_migration_actions.md  |  4 +-
 .../data_migration/importing_data.md          |  4 +-
 .../field_type_reference/contentqueryfield.md |  3 +-
 .../field_type_reference/countryfield.md      |  8 ++-
 .../field_type_reference/dateandtimefield.md  |  2 +-
 .../field_type_reference/datefield.md         |  3 +-
 .../field_type_reference/emailaddressfield.md |  3 +-
 .../field_type_reference.md                   | 14 ++--
 .../field_type_reference/floatfield.md        |  3 +-
 .../field_type_reference/imageassetfield.md   | 11 ++--
 .../field_type_reference/imagefield.md        | 30 ++++++---
 .../field_type_reference/integerfield.md      |  3 +-
 .../field_type_reference/isbnfield.md         |  6 +-
 .../field_type_reference/keywordfield.md      |  2 +-
 .../field_type_reference/maplocationfield.md  |  8 +--
 .../field_type_reference/matrixfield.md       | 12 ++--
 .../field_type_reference/measurementfield.md  | 20 ++----
 .../field_type_reference/nullfield.md         |  6 +-
 .../field_type_reference/pagefield.md         | 25 ++++----
 .../field_type_reference/relationfield.md     |  2 +-
 .../field_type_reference/relationlistfield.md |  3 +-
 .../field_type_reference/richtextfield.md     |  8 +--
 .../field_type_reference/selectionfield.md    |  5 +-
 .../field_type_reference/sesexternaldata.md   |  2 +-
 .../field_type_reference/sesselection.md      |  7 +-
 .../taxonomyentryassignmentfield.md           |  8 +--
 .../taxonomyentryfield.md                     |  2 +-
 .../field_type_reference/textblockfield.md    |  3 +-
 .../field_type_reference/textlinefield.md     | 10 ++-
 .../field_type_reference/timefield.md         |  3 +-
 .../field_type_reference/urlfield.md          |  6 +-
 .../field_type_reference/userfield.md         |  6 +-
 .../field_types/field_type_search.md          | 18 ++++--
 .../field_types/field_type_storage.md         | 64 ++++++++-----------
 .../field_types/form_and_template.md          | 12 ++--
 .../field_types/type_and_value.md             | 46 +++++++++----
 .../file_management/file_management.md        | 13 ++--
 .../forms/create_custom_form_field.md         |  3 +-
 .../forms/create_form_attribute.md            |  7 +-
 .../forms/customize_email_notifications.md    |  2 +-
 docs/content_management/forms/form_api.md     |  6 +-
 .../forms/form_builder_guide.md               | 36 +++++------
 .../forms/work_with_forms.md                  | 11 ++--
 .../images/add_image_asset_from_dam.md        |  4 +-
 .../images/configure_image_editor.md          | 15 ++---
 .../pages/create_custom_page_block.md         | 12 ++--
 .../pages/ibexa_connect_scenario_block.md     | 19 +++---
 .../pages/page_block_attributes.md            |  2 +-
 .../pages/page_block_validators.md            |  3 +-
 docs/content_management/pages/page_blocks.md  | 11 ++--
 .../pages/react_app_block.md                  |  8 +--
 .../rich_text/create_custom_richtext_block.md | 16 ++---
 .../rich_text/extend_online_editor.md         | 51 ++++++---------
 .../rich_text/online_editor_guide.md          | 28 ++++----
 docs/content_management/taxonomy/taxonomy.md  |  4 +-
 .../1_get_a_starter_website.md                |  4 +-
 58 files changed, 320 insertions(+), 312 deletions(-)

diff --git a/docs/content_management/content_relations.md b/docs/content_management/content_relations.md
index 29ec913759..830206bd68 100644
--- a/docs/content_management/content_relations.md
+++ b/docs/content_management/content_relations.md
@@ -16,7 +16,7 @@ Instead of using a fixed set of image attributes, the images are stored as separ
 In the system you can find different types of Relations.
 Content can have Relations on item or on field level.
 
-*Relations at Field level* are created using one of two special field types: Content relation (single) and Content relations (multiple).
+*Relations at field level* are created using one of two special field types: Content relation (single) and Content relations (multiple).
 These fields allow you to select one or more other content items in the field value, which are linked to these fields.
 
 *Relations at content item level* can be of three different types:
diff --git a/docs/content_management/data_migration/create_data_migration_step.md b/docs/content_management/data_migration/create_data_migration_step.md
index 793e297714..70499cea71 100644
--- a/docs/content_management/data_migration/create_data_migration_step.md
+++ b/docs/content_management/data_migration/create_data_migration_step.md
@@ -12,8 +12,7 @@ To create a custom migration step, you need:
 - A step normalizer, to convert YAML definition into your step class.
 - A step executor, to handle the step.
 
-The following example shows how to create a step that replaces all `ezstring` Fields
-that have an old company name with "New Company Name".
+The following example shows how to create a step that replaces all `ezstring` fields that have an old company name with "New Company Name".
 
 ## Create step class
 
diff --git a/docs/content_management/data_migration/data_migration_actions.md b/docs/content_management/data_migration/data_migration_actions.md
index cd0bd9b800..3f833cc21b 100644
--- a/docs/content_management/data_migration/data_migration_actions.md
+++ b/docs/content_management/data_migration/data_migration_actions.md
@@ -42,7 +42,7 @@ When executed, this migration:
 - Finds content type using its identifier (`article`)
 - Assigns content type Group "Media"
 - Removes it from content type Group "Content"
-- Removes the `short_title` Field
+- Removes the `short_title` field
 - Removes its existing drafts, if any.
 
 ## Available migration actions
@@ -180,4 +180,4 @@ mode: Update
 
 !!! note
 
-    In the `unassign_role_user_group` action, the ID is Role assignment ID from the `ezuser_role` table.
+    In the `unassign_role_user_group` action, the ID is role assignment ID from the `ezuser_role` table.
diff --git a/docs/content_management/data_migration/importing_data.md b/docs/content_management/data_migration/importing_data.md
index 40330abca9..c9825e8993 100644
--- a/docs/content_management/data_migration/importing_data.md
+++ b/docs/content_management/data_migration/importing_data.md
@@ -117,7 +117,7 @@ Then, you can use `faker()` in expressions, for example:
 [[= include_file('code_samples/data_migration/examples/repeatable_step.yaml', 16, 19) =]]
 ```
 
-This step generates Field values with fake personal names.
+This step generates field values with fake personal names.
 
 ### Expression syntax
 
@@ -465,7 +465,7 @@ If the content type associated with the tags is changed, the configuration shoul
     If there are multiple taxonomies, the `taxonomy` field is then necessary here (line 21).
 
 
-You can use the following example to assign tags to a Content (content type Article has an additional Field):
+You can use the following example to assign tags to a Content (content type Article has an additional field):
 
 ``` yaml
 [[= include_file('code_samples/data_migration/examples/assign_tag.yaml') =]]
diff --git a/docs/content_management/field_types/field_type_reference/contentqueryfield.md b/docs/content_management/field_types/field_type_reference/contentqueryfield.md
index b7ef3d27d2..6d5da60186 100644
--- a/docs/content_management/field_types/field_type_reference/contentqueryfield.md
+++ b/docs/content_management/field_types/field_type_reference/contentqueryfield.md
@@ -6,7 +6,6 @@ This field type maps an executable repository query to a field.
 |-----------|---------------|----------------|
 | `Content query` | `ezcontentquery`   | `string`        |
 
-The Content query field type is available via the Query field type Bundle
-provided by the [fieldtype-query](https://github.com/ibexa/fieldtype-query) package.
+The Content query field type is available via the Query field type Bundle provided by the [fieldtype-query](https://github.com/ibexa/fieldtype-query) package.
 
 For information about the field type's usage, see [Content queries](content_queries.md#content-query-field).
diff --git a/docs/content_management/field_types/field_type_reference/countryfield.md b/docs/content_management/field_types/field_type_reference/countryfield.md
index d44bbf1247..93d7e219a8 100644
--- a/docs/content_management/field_types/field_type_reference/countryfield.md
+++ b/docs/content_management/field_types/field_type_reference/countryfield.md
@@ -46,14 +46,15 @@ $settings = [
 
 ### Hash format
 
-The format used for serialization is simpler than the full format. It's also available when setting value on the content field, by setting the value to an array instead of the Value object. Example of that shown below:
+The format used for serialization is simpler than the full format.
+It's also available when setting value on the content field, by setting the value to an array instead of the value object. Example of that shown below:
 
 ``` php
 // Value object content example
 $content->fields["countries"] = [ "JP", "NO" ];
 ```
 
-The format used by the toHash method is the Alpha2 value, however the input is capable of accepting either Name, Alpha2 or Alpha3 value as shown below in the Value object section.
+The format used by the toHash method is the Alpha2 value, however the input is capable of accepting either Name, Alpha2, or Alpha3 value as shown below in the value object section.
 
 ### Value object
 
@@ -79,7 +80,8 @@ $value->countries = [
 
 ##### Constructor
 
-The `Country\Value` constructor initializes a new Value object with the value provided. It expects an array as input.
+The `Country\Value` constructor initializes a new value object with the value provided.
+It expects an array as input.
 
 ``` php
 // Constructor example
diff --git a/docs/content_management/field_types/field_type_reference/dateandtimefield.md b/docs/content_management/field_types/field_type_reference/dateandtimefield.md
index fe493746bc..6b30bd1780 100644
--- a/docs/content_management/field_types/field_type_reference/dateandtimefield.md
+++ b/docs/content_management/field_types/field_type_reference/dateandtimefield.md
@@ -32,7 +32,7 @@ The Value class of this field type contains the following properties:
 
 ##### Constructor
 
-The constructor for this value object initializes a new Value object with the value provided. It accepts an instance of PHP's built-in `\DateTime` class.
+The constructor for this value object initializes a new value object with the value provided. It accepts an instance of PHP's built-in `\DateTime` class.
 
 ##### String representation
 
diff --git a/docs/content_management/field_types/field_type_reference/datefield.md b/docs/content_management/field_types/field_type_reference/datefield.md
index 30bf32ab5e..6fb985c6a6 100644
--- a/docs/content_management/field_types/field_type_reference/datefield.md
+++ b/docs/content_management/field_types/field_type_reference/datefield.md
@@ -49,7 +49,8 @@ Example: `Wednesday 22 May 2016`
 
 ##### Constructor
 
-The constructor for this value object initializes a new Value object with the value provided. It accepts an instance of [PHP's built-in `\DateTime` class](https://www.php.net/manual/en/datetime.construct.php).
+The constructor for this value object initializes a new value object with the value provided.
+It accepts an instance of [PHP's built-in `\DateTime` class](https://www.php.net/manual/en/datetime.construct.php).
 
 ### Hash format
 
diff --git a/docs/content_management/field_types/field_type_reference/emailaddressfield.md b/docs/content_management/field_types/field_type_reference/emailaddressfield.md
index 4554ee5975..bf1389e23b 100644
--- a/docs/content_management/field_types/field_type_reference/emailaddressfield.md
+++ b/docs/content_management/field_types/field_type_reference/emailaddressfield.md
@@ -32,7 +32,8 @@ $emailaddressValue->email = "someuser@example.com";
 
 ##### Constructor
 
-The `EmailAddress\Value` constructor initializes a new Value object with the value provided. It accepts a string as input.
+The `EmailAddress\Value` constructor initializes a new value object with the value provided.
+It accepts a string as input.
 
 ``` php
 // Constructor example
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
index 9c222a5e1a..a9b11eb2c6 100644
--- 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
@@ -8,15 +8,17 @@ page_type: reference
 A field type is the underlying building block of the content model.
 It consists of two entities: field value and field definition.
 Field value is determined by values entered into the content field.
-Field definition is provided by the content type, and holds any user defined rules used by field type to determine how a field Value is validated, stored, retrieved, formatted and so on.
+Field definition is provided by the content type, and holds any user defined rules used by field type to determine how a field value is, for example, validated, stored, retrieved, or formatted.
 
-[[= product_name =]] comes with a collection of field types that can be used to build powerful and complex content structures. In addition, it's possible to extend the system by creating custom types for special needs.
+[[= product_name =]] comes with a collection of field types that can be used to build powerful and complex content structures.
+In addition, it's possible to extend the system by creating custom types for special needs.
 
 !!! tip
 
     For general field type documentation, see [field type](field_types.md).
 
-Custom field types have to be programmed in PHP. However, the built-in field types are usually sufficient enough for typical scenarios. The following table gives an overview of the supported field types that come with [[= product_name =]].
+Custom field types have to be programmed in PHP. However, the built-in field types are usually sufficient enough for typical scenarios.
+The following table gives an overview of the supported field types that come with [[= product_name =]].
 
 
 ## Available field types
@@ -63,8 +65,6 @@ Custom field types have to be programmed in PHP. However, the built-in field ty
 
 <a id="1-note-on-legacy-search-engine"></a>**^[1]^ Note on Legacy Search Engine**
 
-Legacy Search/Storage Engine index is limited to 255 characters in database design,
-so formatted and unformatted text blocks only index the first part.
-In case of multiple selection field types like Keyword, Selection, Country, etc.,
-only the first choices are indexed. they're indexed only as a text blob separated by string separator.
+Legacy Search/Storage Engine index is limited to 255 characters in database design, so formatted and unformatted text blocks only index the first part.
+In case of multiple selection field types like, for example, Keyword, Selection, or Country, only the first choices are indexed. they're indexed only as a text blob separated by string separator.
 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_reference/floatfield.md b/docs/content_management/field_types/field_type_reference/floatfield.md
index 8bc9378a0a..e544384a7b 100644
--- a/docs/content_management/field_types/field_type_reference/floatfield.md
+++ b/docs/content_management/field_types/field_type_reference/floatfield.md
@@ -40,7 +40,8 @@ $float->value = 284.773
 
 ##### Constructor
 
-The `Float\Value` constructor initializes a new Value object with the value provided. It expects a numeric value with or without decimals.
+The `Float\Value` constructor initializes a new value object with the value provided.
+It expects a numeric value with or without decimals.
 
 ``` php
 // Constructor example
diff --git a/docs/content_management/field_types/field_type_reference/imageassetfield.md b/docs/content_management/field_types/field_type_reference/imageassetfield.md
index 95489e175d..a81e3d7714 100644
--- a/docs/content_management/field_types/field_type_reference/imageassetfield.md
+++ b/docs/content_management/field_types/field_type_reference/imageassetfield.md
@@ -1,6 +1,7 @@
 # ImageAsset field type
 
-ImageAsset field type enables storing images in independent content items of a generic Image content type, in the media library. It makes them reusable across system.
+ImageAsset field type enables storing images in independent content items of a generic Image content type, in the media library.
+It makes them reusable across system.
 
 ### Input expectations
 
@@ -33,7 +34,8 @@ $imageAssetValue->alternativeText = "Picture of an apple.";
 
 ##### Constructor
 
-The `ImageAsset\Value` constructor initializes a new value object with the value provided. It expects an ID of a content item representing asset and the alternative text.
+The `ImageAsset\Value` constructor initializes a new value object with the value provided.
+It expects an ID of a content item representing asset and the alternative text.
 
 ``` php
 // Constructor example
@@ -75,12 +77,13 @@ ibexa:
 
 ## Customizing ImageAsset field type rendering
 
-Internally the Image Asset Type is rendered via subrequest (similar to other relation types). Rendering customization is possible by configuring view type `asset_image`:
+Internally the Image Asset Type is rendered via subrequest (similar to other relation types).
+Rendering customization is possible by configuring view type `asset_image`:
 
 ```php
 ibexa:
     system:
-       default:           
+       default:
             content_view:
                 asset_image:
                     default:
diff --git a/docs/content_management/field_types/field_type_reference/imagefield.md b/docs/content_management/field_types/field_type_reference/imagefield.md
index b8b386e7cb..5565528546 100644
--- a/docs/content_management/field_types/field_type_reference/imagefield.md
+++ b/docs/content_management/field_types/field_type_reference/imagefield.md
@@ -6,7 +6,7 @@ The Image field type allows you to store an image file.
 |---------|---------------|
 | `Image` | `ezimage`     |
 
-A **variation service** handles the conversion of the original image into different formats and sizes through a set of preconfigured named variations: large, small, medium, black and white thumbnail, etc.
+A **variation service** handles the conversion of the original image into different formats and sizes through a set of preconfigured named variations, for example, large, small, medium, or black and white thumbnail.
 
 ## PHP API field type
 
@@ -46,7 +46,7 @@ Using the variation Service, variations of the original image can be obtained. t
 |----------------|----------|----------|------------|
 | `width`*       | int      | `null`    | The variation's width in pixels. For more details see Caution note below.|
 | `height`*      | int      | `null`    | The variation's height in pixels. For more details see Caution note below.|
-| `name`         | string   | `medium` | The variation's identifier, name of the image alias.|
+| `name`         | string   | `medium` | The variation's identifier, name of the image variation.|
 | `info`         | mixed    |n/a| Extra information about the image, depending on the image type, such as EXIF data. If there is no information, the `info` value is `null`.|
 | `fileSize`     | int      |`31010` |Size (in byte) of current variation.|
 | `mimeType`     | string   |`image/png`|The MIME type.|
@@ -114,7 +114,8 @@ The variation's properties can be used to generate the required output:
 
 ### With the REST API
 
-Image Fields within REST are exposed by the `application/vnd.ibexa.api.Content` media-type. An Image field looks like this:
+Image Fields within REST are exposed by the `application/vnd.ibexa.api.Content` media-type.
+An Image field looks like this:
 
 ``` xml
 <field>
@@ -140,7 +141,9 @@ Image Fields within REST are exposed by the `application/vnd.ibexa.api.Content`
 </field>
 ```
 
-Children of the `fieldValue` node list the general properties of the field's original image (`fileSize`, `fileName`, `inputUri`, etc.), and its variations. For each variation, a URI is provided. Requested through REST, this resource generates the variation if it doesn't exist yet, and list the variation details:
+Children of the `fieldValue` node list the general properties of the field's original image (`fileSize`, `fileName`, `inputUri`, etc.), and its variations.
+For each variation, a URI is provided.
+Requested through REST, this resource generates the variation if it doesn't exist yet, and list the variation details:
 
 ``` xml
 <ContentImageVariation media-type="application/vnd.ibexa.api.ContentImageVariation+xml" href="/api/ibexa/v2/content/binary/images/240-1480/variations/tiny">
@@ -156,7 +159,8 @@ Children of the `fieldValue` node list the general properties of the field's ori
 
 #### Getting an image variation
 
-The variation service, `ibexa.field_type.ezimage.variation_service`, can be used to generate/get variations for a field. It expects a VersionInfo, the Image field, and the variation name as a string (`large`, `medium`, etc.):
+The variation service, `ibexa.field_type.ezimage.variation_service`, can be used to generate/get variations for a field.
+It expects a VersionInfo, the Image field, and the variation name as a string (`large`, `medium`, and more.):
 
 ``` php
 $variation = $imageVariationHandler->getVariation(
@@ -170,7 +174,8 @@ echo $variation->uri;
 
 ### From PHP
 
-As for any field type, there are several ways to input content to a field. For an Image, the quickest is to call `setField()` on the ContentStruct:
+As for any field type, there are several ways to input content to a field.
+For an Image, the quickest is to call `setField()` on the ContentStruct:
 
 ``` php
 $createStruct = $contentService->newContentCreateStruct(
@@ -181,7 +186,8 @@ $createStruct = $contentService->newContentCreateStruct(
 $createStruct->setField( 'image', '/tmp/image.png' );
 ```
 
-To customize the Image's alternative texts, you must first get an `Image\Value` object, and set this property. For that, you can use the `Image\Value::fromString()` method that accepts the path to a local file:
+To customize the Image's alternative texts, you must first get an `Image\Value` object, and set this property.
+For that, you can use the `Image\Value::fromString()` method that accepts the path to a local file:
 
 ``` php
 $createStruct = $contentService->newContentCreateStruct(
@@ -211,7 +217,9 @@ $createStruct->setField( 'image', $imageValue );
 
 ### From REST
 
-The REST API expects field values to be provided in a hash-like structure. Those keys are identical to those expected by the `Image\Value` constructor: `fileName`, `alternativeText`. In addition, image data can be provided using the `data` property, with the image's content encoded as base64.
+The REST API expects field values to be provided in a hash-like structure.
+Those keys are identical to those expected by the `Image\Value` constructor: `fileName`, `alternativeText`.
+In addition, image data can be provided using the `data` property, with the image's content encoded as base64.
 
 #### Creating an Image field
 
@@ -238,7 +246,9 @@ The REST API expects field values to be provided in a hash-like structure. Those
 
 ### Updating an Image field
 
-Updating an Image field requires that you re-send existing data. This can be done by re-using the field obtained via REST, **removing the variations key**, and updating `alternativeText`, `fileName` or `data`. If you don't want to change the image itself, don't provide the `data` key.
+Updating an Image field requires that you re-send existing data.
+This can be done by re-using the field obtained via REST, **removing the variations key**, and updating `alternativeText`, `fileName` or `data`.
+If you don't want to change the image itself, don't provide the `data` key.
 
 ``` xml
 <?xml version="1.0" encoding="UTF-8"?>
@@ -281,7 +291,7 @@ Images are stored in `web/var/ezdemo_site/storage/images/0/8/4/1/1480-1-eng-GB`
 
 Using the field ID digits in reverse order as the folder structure maximizes sharding of files through multiple folders on the filesystem.
 
-Within this folder, images are named like the uploaded file, suffixed with an underscore and the variation name:
+Within this folder, images are named like the uploaded file, suffixed with an underscore, and the variation name:
 
 - `MyImage.png`
 - `MyImage_large.png`
diff --git a/docs/content_management/field_types/field_type_reference/integerfield.md b/docs/content_management/field_types/field_type_reference/integerfield.md
index 4e59346f36..11f1357ecd 100644
--- a/docs/content_management/field_types/field_type_reference/integerfield.md
+++ b/docs/content_management/field_types/field_type_reference/integerfield.md
@@ -31,7 +31,8 @@ $integer->value = 8
 
 ##### Constructor
 
-The `Integer\Value` constructor initializes a new Value object with the value provided. It expects a numeric, integer value.
+The `Integer\Value` constructor initializes a new value object with the value provided.
+It expects a numeric, integer value.
 
 ``` php
 // Constructor example
diff --git a/docs/content_management/field_types/field_type_reference/isbnfield.md b/docs/content_management/field_types/field_type_reference/isbnfield.md
index 85f3f32998..98e9a23ad7 100644
--- a/docs/content_management/field_types/field_type_reference/isbnfield.md
+++ b/docs/content_management/field_types/field_type_reference/isbnfield.md
@@ -24,11 +24,13 @@ An ISBN's string representation is the `$isbn` property's value, as a string.
 
 ##### Constructor
 
-The constructor for this value object initializes a new Value object with the value provided. It accepts a string as argument and sets it to the `isbn` attribute.
+The constructor for this value object initializes a new value object with the value provided.
+It accepts a string as argument and sets it to the `isbn` attribute.
 
 ### Validation
 
-The input passed into this field type is subject of ISBN validation depending on the field settings in its FieldDefinition stored in the content type. An example of this field setting is shown below and controls if input is validated as ISBN-13 or ISBN-10:
+The input passed into this field type is subject of ISBN validation depending on the field settings in its FieldDefinition stored in the content type.
+An example of this field setting is shown below and controls if input is validated as ISBN-13 or ISBN-10:
 
 ``` php
 Array
diff --git a/docs/content_management/field_types/field_type_reference/keywordfield.md b/docs/content_management/field_types/field_type_reference/keywordfield.md
index 2d324acbf3..5e2d67bd69 100644
--- a/docs/content_management/field_types/field_type_reference/keywordfield.md
+++ b/docs/content_management/field_types/field_type_reference/keywordfield.md
@@ -39,7 +39,7 @@ $keyword->value = [ "php", "css3", "html5", "Ibexa Platform" ];
 
 #### Constructor
 
-The `Keyword\Value` constructor initializes a new Value object with the value provided.
+The `Keyword\Value` constructor initializes a new value object with the value provided.
 
 It expects a list of keywords, either comma-separated in a string or as an array of strings.
 
diff --git a/docs/content_management/field_types/field_type_reference/maplocationfield.md b/docs/content_management/field_types/field_type_reference/maplocationfield.md
index 72345b9f4c..b7cf7b8c18 100644
--- a/docs/content_management/field_types/field_type_reference/maplocationfield.md
+++ b/docs/content_management/field_types/field_type_reference/maplocationfield.md
@@ -33,7 +33,8 @@ The Value class of this field type contains the following properties:
 
 ##### Constructor
 
-The `MapLocation\Value` constructor initializes a new Value object with values provided as hash. Accepted keys are `latitude` (`float`), `longitude` (`float`), `address` (`string`).
+The `MapLocation\Value` constructor initializes a new value object with values provided as hash.
+Accepted keys are `latitude` (`float`), `longitude` (`float`), `address` (`string`).
 
 ``` php
 // Constructor example
@@ -50,7 +51,7 @@ $MapLocationValue = new MapLocation\Value(
 
 ## Template rendering
 
-The template called by [the `ibexa_render_field()` Twig function](field_twig_functions.md#ibexa_render_field) while rendering a Map Location field accepts the following parameters:
+The template called by [the `ibexa_render_field()` Twig function](field_twig_functions.md#ibexa_render_field) while rendering a Map location field accepts the following parameters:
 
 |Parameter|Type|Default|Description|
 |------|------|------|------|
@@ -70,5 +71,4 @@ Example:
 
 !!! note
 
-    The option to automatically get user coordinates through the "Locate me" button
-    is only available when the back office is served through the `https://` protocol.
+    The option to automatically get user coordinates through the "Locate me" button is only available when the back office is served through the `https://` protocol.
diff --git a/docs/content_management/field_types/field_type_reference/matrixfield.md b/docs/content_management/field_types/field_type_reference/matrixfield.md
index 927046cb2e..b3a91bfedb 100644
--- a/docs/content_management/field_types/field_type_reference/matrixfield.md
+++ b/docs/content_management/field_types/field_type_reference/matrixfield.md
@@ -6,8 +6,7 @@ This field represents and handles a table of rows and columns of data.
 |----------|---------------|----------------|
 | `Matrix` | `ezmatrix`    | `array`        |
 
-The Matrix field type is available via the Matrix Bundle
-provided by the [ibexa/fieldtype-matrix](https://github.com/ibexa/fieldtype-matrix) package.
+The Matrix field type is available via the Matrix Bundle provided by the [ibexa/fieldtype-matrix](https://github.com/ibexa/fieldtype-matrix) package.
 
 ## PHP API field type
 
@@ -39,7 +38,9 @@ new FieldType\Value([
 
 The minimum number of rows is set on content type level for each field.
 
-Validation checks for empty rows. A row is considered empty if it contains only empty cells (or cells containing only spaces). Empty rows are removed.
+Validation checks for empty rows.
+A row is considered empty if it contains only empty cells (or cells containing only spaces).
+Empty rows are removed.
 
 If, after removing empty rows, the number of rows doesn't fulfill the configured `Minimum number of rows`, the field doesn't validate.
 
@@ -55,7 +56,7 @@ new FieldType\Value([
 
 ## GraphQL field type operations
 
-To get a field of the Matrix field type with GraphQL, you need to specify a Content ID, a content type, and a field type.
+To get a field of the Matrix field type with GraphQL, you need to specify a content ID, a content type, and a field type.
 
 The types that are returned are named after the Type and the field:
 
@@ -106,7 +107,8 @@ The Type returned for the Matrix field exposes columns defined in the field defi
 
 ### Query for the field type and field definition's details
 
-With this query you can inspect details of specific content type. In case of a Matrix field, you can ask for the list of columns, their names and identifiers.
+With this query you can inspect details of specific content type.
+In case of a Matrix field, you can ask for the list of columns, their names, and identifiers.
 
 ```
 {
diff --git a/docs/content_management/field_types/field_type_reference/measurementfield.md b/docs/content_management/field_types/field_type_reference/measurementfield.md
index 2ae2a15d0a..6b34a5a50c 100644
--- a/docs/content_management/field_types/field_type_reference/measurementfield.md
+++ b/docs/content_management/field_types/field_type_reference/measurementfield.md
@@ -1,8 +1,7 @@
 # Measurement field type
 
 The Measurement field type represents measurement information. 
-It stores the unit of measure, and either a single measurement value, 
-or a pair of values that defines a range.
+It stores the unit of measure, and either a single measurement value, or a pair of values that defines a range.
 
 | Name          | Internal name       | Expected input type                                |
 |---------------|---------------------|----------------------------------------------------|
@@ -19,8 +18,7 @@ The service contains the following API endpoints:
 - `buildSimpleValue` that is used to handle a single value
 - `buildRangeValue` that is used to handle a range
 
-Assuming that the service exists as `$measurementService`, the expected input 
-examples are as follows:
+Assuming that the service exists as `$measurementService`, the expected input examples are as follows:
 
 | Type                                                    | Example                                                             |
 |---------------------------------------------------------|---------------------------------------------------------------------|
@@ -39,8 +37,7 @@ The Value class of this field type contains the following properties:
 
 ##### Constructor
 
-The `Measurement\Value` constructor for this value object initializes a new value 
-object with the value provided. 
+The `Measurement\Value` constructor for this value object initializes a new value object with the value provided. 
 As its first argument it accepts an object of `Ibexa\Contracts\Measurement\Value\ValueInterface` type.
 
 Depending on the selected input type, the object resembles the following examples:
@@ -78,13 +75,11 @@ $measurementValue = new Measurement\Value(
 
 ### Validation
 
-The Measurement field type validates measurement types and units passed within 
-the value object against a list of the ones that the system supports, which can 
-be found in the `vendor/ibexa/measurement/src/bundle/Resources/config/builtin_units.yaml` file.
+The Measurement field type validates measurement types and units passed within the value object against a list of the ones that the system supports, which can be found in the `vendor/ibexa/measurement/src/bundle/Resources/config/builtin_units.yaml` file.
 
 ### Modify and add Measurement types and units
 
-You can extend the default list of Measurement types and units by modifying the existing entries or adding new ones. 
+You can extend the default list of Measurement types and units by modifying the existing entries or adding new ones.
 To do this, you modify the YAML configuration.
 
 To override an existing designation of the unit of measure by changing the symbol that corresponds to a nautical unit of speed, and to add a rotational speed unit, add the following lines to your [YAML configuration](configuration.md#configuration-files):
@@ -121,12 +116,11 @@ ibexa:
                         - my_unit
 ```
 
-The configuration also requires that exactly one unit needs
-to be marked as `is_base_unit` as in highlighted line above.
+The configuration also requires that exactly one unit needs to be marked as `is_base_unit` as in highlighted line above.
 
 !!! note
 
-    To be available for selection in the back office, each new Measurement type or unit must be enabled for the  back office SiteAccess.
+    To be available for selection in the back office, each new Measurement type or unit must be enabled for the back office SiteAccess.
 
 Next, you need to define how the new unit should be converted under the `ibexa.system.<scope>.ibexa_measurement` [configuration key](configuration.md#configuration-files):
 
diff --git a/docs/content_management/field_types/field_type_reference/nullfield.md b/docs/content_management/field_types/field_type_reference/nullfield.md
index b3d3b6521c..eb00b59224 100644
--- a/docs/content_management/field_types/field_type_reference/nullfield.md
+++ b/docs/content_management/field_types/field_type_reference/nullfield.md
@@ -8,14 +8,16 @@ This field type is used as fallback for migration scenarios, and for testing pur
 
 ## Description
 
-The Null field type serves as an aid when migrating from eZ Publish Platform and earlier legacy versions. It's a dummy for legacy field types that aren't implemented in [[= product_name =]].
+The Null field type serves as an aid when migrating from eZ Publish Platform and earlier legacy versions.
+It's a dummy for legacy field types that aren't implemented in [[= product_name =]].
 
 Null field type accepts anything provided as a value and is usually combined with:
 
 - NullConverter: Makes it not store anything to the legacy storage engine (database), nor it reads any data.
 - Unindexed: Indexable class making sure nothing is indexed to configured search engine.
 
-This field type doesn't have its own fixed internal name. Its identifier is instead configured as needed by passing it as an argument to the constructor.
+This field type doesn't have its own fixed internal name.
+Its identifier is instead configured as needed by passing it as an argument to the constructor.
 
 ### Example for usage of Null field type
 
diff --git a/docs/content_management/field_types/field_type_reference/pagefield.md b/docs/content_management/field_types/field_type_reference/pagefield.md
index ce45c39c30..84cddf5a4e 100644
--- a/docs/content_management/field_types/field_type_reference/pagefield.md
+++ b/docs/content_management/field_types/field_type_reference/pagefield.md
@@ -4,9 +4,10 @@ edition: experience
 
 # Page field type
 
-Page field type represents a Page with a layout consisting of multiple zones. Each zone can in turn contain blocks.
+Page field type represents a page with a layout consisting of multiple zones.
+Each zone can in turn contain blocks.
 
-Page field type is only used in the Page content type that is included in [[= product_name_exp =]].
+Page field type is only used in the page content type that is included in [[= product_name_exp =]].
 
 | Name           | Internal name   | Expected input  |
 |----------------|-----------------|-----------------|
@@ -14,27 +15,29 @@ Page field type is only used in the Page content type that is included in [[= pr
 
 !!! caution "Page Builder"
 
-    If you create content type with both `ezlandingpage` and `ezuser` field types,
-    you aren't redirected to Page Builder after selecting `Edit` or `Create`.
-    This is caused by `ezuser` field type which requires separate handling. You're redirected to the standard back office edit or create mode.
+    If you create content type with both `ezlandingpage` and `ezuser` field types, you aren't redirected to Page Builder after selecting `Edit` or `Create`.
+    This is caused by `ezuser` field type which requires separate handling.
+    You're redirected to the standard back office edit or create mode.
 
 ## Layout and zones
 
-Layout defines how a Page is divided into zones.
+Layout defines how a page is divided into zones.
 
-The placement of zones is defined in a template which is a part of the layout configuration. You can modify the template to define your own zone layout.
+The placement of zones is defined in a template which is a part of the layout configuration.
+You can modify the template to define your own zone layout.
 
-For information on how to create and configure new blocks for the Page, see [Page layouts](render_page.md#render-a-layout).
+For information on how to create and configure new blocks for the page, see [Page layouts](render_page.md#render-a-layout).
 
 ## Blocks
 
-For information on how to create and configure new blocks for the Page, see [Create custom Page block](create_custom_page_block.md).
+For information on how to create and configure new blocks for the page, see [Create custom Page block](create_custom_page_block.md).
 
-## Rendering Pages
+## Rendering pages
 
 Page rendering takes place while editing or viewing.
 
-When rendering a Page, its zones are passed to the layout as a `zones` array with a `blocks` array each. You can access them using twig (for example, `{{ zones[0].id }}` ).
+When rendering a page, its zones are passed to the layout as a `zones` array with a `blocks` array each.
+You can access them using twig (for example, `{{ zones[0].id }}` ).
 
 Each div that's a zone should have the `data-ibexa-zone-id` attribute with zone ID as a value for a zone container.
 
diff --git a/docs/content_management/field_types/field_type_reference/relationfield.md b/docs/content_management/field_types/field_type_reference/relationfield.md
index 41bdcab5a9..be684274cb 100644
--- a/docs/content_management/field_types/field_type_reference/relationfield.md
+++ b/docs/content_management/field_types/field_type_reference/relationfield.md
@@ -33,7 +33,7 @@ $relation->destinationContentId = $contentInfo->id;
 
 ##### Constructor
 
-The `Relation\Value` constructor initializes a new Value object with the value provided. It expects a mixed value.
+The `Relation\Value` constructor initializes a new value object with the value provided. It expects a mixed value.
 
 ``` php
 // Constructor example
diff --git a/docs/content_management/field_types/field_type_reference/relationlistfield.md b/docs/content_management/field_types/field_type_reference/relationlistfield.md
index c9f0948e38..15ae595379 100644
--- a/docs/content_management/field_types/field_type_reference/relationlistfield.md
+++ b/docs/content_management/field_types/field_type_reference/relationlistfield.md
@@ -38,7 +38,8 @@ $relationList->destinationContentId = [
 
 ##### Constructor
 
-The `RelationList\Value` constructor initializes a new Value object with the value provided. It expects a mixed array as value.
+The `RelationList\Value` constructor initializes a new value object with the value provided.
+It expects a mixed array as value.
 
 ``` php
 //Constructor example
diff --git a/docs/content_management/field_types/field_type_reference/richtextfield.md b/docs/content_management/field_types/field_type_reference/richtextfield.md
index 24fa3c86d6..c4c5f6e8a1 100644
--- a/docs/content_management/field_types/field_type_reference/richtextfield.md
+++ b/docs/content_management/field_types/field_type_reference/richtextfield.md
@@ -64,11 +64,9 @@ The XHTML5 format is used by the Online Editor.
 
 !!! caution
 
-    The custom DocBook format described below is subject to change
-    and isn't covered by backwards compatibility promise.
+    The custom DocBook format described below is subject to change and isn't covered by backwards compatibility promise.
 
-You can use the [[= product_name_base =]] flavor of the DocBook format in PHP API and in REST API requests
-by providing the DocBook content as a string.
+You can use the [[= product_name_base =]] flavor of the DocBook format in PHP API and in REST API requests by providing the DocBook content as a string.
 
 The following example shows how to pass DocBook content to a [create struct](creating_content.md#creating-content-item-draft):
 
@@ -109,7 +107,7 @@ The RichText format enriches [DocBook](https://docbook.org/) with the following
 - `section` - main element of a RichText field
 - `ezembed` - holds embedded images
 - `ezembedinline` - holds embedded content items
-- `eztemplate` - holds custom tags, including built-in custom tags for embedded Facebook, Twitter and YouTube content
+- `eztemplate` - holds custom tags, including built-in custom tags for embedded Facebook, Twitter, and YouTube content
 - `eztemplateinline` - holds inline custom tags
 - `ezconfig` - contains configuration for custom tags and other elements
 - `ezvalue` - contains values for other elements, such as `ezconfig` or `ezembed`
diff --git a/docs/content_management/field_types/field_type_reference/selectionfield.md b/docs/content_management/field_types/field_type_reference/selectionfield.md
index be0133db59..bff58da6ab 100644
--- a/docs/content_management/field_types/field_type_reference/selectionfield.md
+++ b/docs/content_management/field_types/field_type_reference/selectionfield.md
@@ -53,7 +53,7 @@ Example: `"1,2,24,42"`
 
 ### Hash format
 
-Hash format of this field type is the same as Value object's `selection` property.
+Hash format of this field type is the same as value object's `selection` property.
 
 ``` php
 // Example of value in hash format
@@ -64,7 +64,8 @@ $hash = [ 1, 2 ];
 ### Validation
 
 This field type validates the input, verifying if all selected options exist in the field definition and checks if multiple selections are allowed in the field definition.
-If any of these validations fail, a `ValidationError` is thrown, specifying the error message. When option validation fails, a list with the invalid options is also presented.
+If any of these validations fail, a `ValidationError` is thrown, specifying the error message.
+When option validation fails, a list with the invalid options is also presented.
 
 ### Settings
 
diff --git a/docs/content_management/field_types/field_type_reference/sesexternaldata.md b/docs/content_management/field_types/field_type_reference/sesexternaldata.md
index c8d2f9c22d..e5465c373d 100644
--- a/docs/content_management/field_types/field_type_reference/sesexternaldata.md
+++ b/docs/content_management/field_types/field_type_reference/sesexternaldata.md
@@ -13,7 +13,7 @@ The data is stored in the `ses_externaldata` table with the following structure:
 
 ## Storing data in `ses_externaldata`
 
-Data that is stored in the `ses_externaldata` table must be either a simple datatype: int, float, bool or a field type.
+Data that is stored in the `ses_externaldata` table must be either a simple datatype: int, float, bool, or a field type.
 
 Field type data is stored in the database in serialized form by using the `toHash()` method.
 Simple data types (int, float, bool) are stored in serialized form.
diff --git a/docs/content_management/field_types/field_type_reference/sesselection.md b/docs/content_management/field_types/field_type_reference/sesselection.md
index 56a21e8fd5..b978a19e71 100644
--- a/docs/content_management/field_types/field_type_reference/sesselection.md
+++ b/docs/content_management/field_types/field_type_reference/sesselection.md
@@ -1,9 +1,8 @@
 # SesSelection
 
-This field type stores a single selection choice. 
+This field type stores a single selection choice.
 
-The SesSelection field type is configured in a YAML file,
-unlike the [Selection field type](selectionfield.md).
+The SesSelection field type is configured in a YAML file, unlike the [Selection field type](selectionfield.md).
 This way, you can set up SiteAccess-specific selection field types.
 
 The field type must be configured per attribute:
@@ -18,6 +17,6 @@ ibexa.commerce.site_access.config.core.default.sesselection.news_type:
         culture: culture
 ```
 
-The `translation_context` key, which identifies the context used for translating the labels, is optional. 
+The `translation_context` key, which identifies the context used for translating the labels, is optional.
 
 To add a SesSelection field to a content type, make sure the field's identifier is the same as the configuration key (in the example above, `news_type`).
diff --git a/docs/content_management/field_types/field_type_reference/taxonomyentryassignmentfield.md b/docs/content_management/field_types/field_type_reference/taxonomyentryassignmentfield.md
index 4e2234d08f..d7e96e85fe 100644
--- a/docs/content_management/field_types/field_type_reference/taxonomyentryassignmentfield.md
+++ b/docs/content_management/field_types/field_type_reference/taxonomyentryassignmentfield.md
@@ -1,8 +1,8 @@
 # TaxonomyEntryAssignment field type
 
-`TaxonomyEntryAssignment` field is used to integrate content with the Taxonomy module. 
-It allows you to select tags or categories and assign them to content. 
-This field type assigns tags to the content in the data action, so then you can use `TaxonomyService` on this content item. 
+`TaxonomyEntryAssignment` field is used to integrate content with the Taxonomy module.
+It allows you to select tags or categories and assign them to content.
+This field type assigns tags to the content in the data action, so then you can use `TaxonomyService` on this content item.
 
 !!! caution "Duplicate taxonomy fields"
 
@@ -33,7 +33,7 @@ new \Ibexa\Taxonomy\FieldType\TaxonomyEntryAssignment\Value(
         $taxonomyEntry2,
         // ...
     ],
-    'tags', 
+    'tags',
 );
 ```
 
diff --git a/docs/content_management/field_types/field_type_reference/taxonomyentryfield.md b/docs/content_management/field_types/field_type_reference/taxonomyentryfield.md
index f28def6546..911ae9cff5 100644
--- a/docs/content_management/field_types/field_type_reference/taxonomyentryfield.md
+++ b/docs/content_management/field_types/field_type_reference/taxonomyentryfield.md
@@ -1,6 +1,6 @@
 # TaxonomyEntry field type
 
-`TaxonomyEntry` is a general purpose field type that can store only one taxonomy entry (for example, tag or product category). 
+`TaxonomyEntry` is a general purpose field type that can store only one taxonomy entry (for example, tag or product category).
 It's used as a parent for a tag or category.
 
 | Name           | Internal name         | Expected input |
diff --git a/docs/content_management/field_types/field_type_reference/textblockfield.md b/docs/content_management/field_types/field_type_reference/textblockfield.md
index 7cfdf43ceb..7c1ed868d3 100644
--- a/docs/content_management/field_types/field_type_reference/textblockfield.md
+++ b/docs/content_management/field_types/field_type_reference/textblockfield.md
@@ -30,7 +30,8 @@ A TextBlock's string representation is the `$text` property's value, as a string
 
 ##### Constructor
 
-The constructor for this Value object initializes a new Value object with the value provided. It accepts a string as argument and imports it to the `$text` attribute.
+The constructor for this value object initializes a new value object with the value provided.
+It accepts a string as argument and imports it to the `$text` attribute.
 
 ### Validation
 
diff --git a/docs/content_management/field_types/field_type_reference/textlinefield.md b/docs/content_management/field_types/field_type_reference/textlinefield.md
index 84dba9b9bd..01332239c9 100644
--- a/docs/content_management/field_types/field_type_reference/textlinefield.md
+++ b/docs/content_management/field_types/field_type_reference/textlinefield.md
@@ -1,6 +1,7 @@
 # TextLine field type
 
-This field type makes possible to store and retrieve a single line of unformatted text. It's capable of handling up to 255 characters.
+This field type makes possible to store and retrieve a single line of unformatted text.
+It's capable of handling up to 255 characters.
 
 | Name       | Internal name | Expected input type |
 |------------|---------------|---------------------|
@@ -24,11 +25,14 @@ A TextLine's string representation is the `$text` property's value, as a string.
 
 ##### Constructor
 
-The constructor for this Value object ]initializes a new Value object with the value provided. It accepts a string as argument and imports it to the `$text` attribute.
+The constructor for this value object ]initializes a new value object with the value provided.
+It accepts a string as argument and imports it to the `$text` attribute.
 
 ### Validation
 
-The input passed into this field type is subject to validation by the `StringLengthValidator`. The length of the string provided must be between the minimum length defined in `minStringLength` and the maximum defined in `maxStringLength`. The default value for both properties is 0, which means that the validation is disabled by default.
+The input passed into this field type is subject to validation by the `StringLengthValidator`.
+The length of the string provided must be between the minimum length defined in `minStringLength` and the maximum defined in `maxStringLength`.
+The default value for both properties is 0, which means that the validation is disabled by default.
 To set the validation properties, the `validateValidatorConfiguration()` method needs to be inspected, which receives an array with `minStringLength` and `maxStringLength` like in the following representation:
 
 ```
diff --git a/docs/content_management/field_types/field_type_reference/timefield.md b/docs/content_management/field_types/field_type_reference/timefield.md
index f3f829abb7..370d836f7a 100644
--- a/docs/content_management/field_types/field_type_reference/timefield.md
+++ b/docs/content_management/field_types/field_type_reference/timefield.md
@@ -36,7 +36,8 @@ The Value class of this field type contains the following properties:
 
 ##### Constructor
 
-The constructor for this Value object initializes a new Value object with the value provided. It accepts an integer representing the number of seconds since the beginning of the day.
+The constructor for this value object initializes a new value object with the value provided.
+It accepts an integer representing the number of seconds since the beginning of the day.
 
 ##### String representation
 
diff --git a/docs/content_management/field_types/field_type_reference/urlfield.md b/docs/content_management/field_types/field_type_reference/urlfield.md
index ff887f83c7..b9ead6f12c 100644
--- a/docs/content_management/field_types/field_type_reference/urlfield.md
+++ b/docs/content_management/field_types/field_type_reference/urlfield.md
@@ -1,6 +1,7 @@
 # URL field type
 
-This field type makes it possible to store and retrieve a URL. It's formed by the combination of a link and the respective text.
+This field type makes it possible to store and retrieve a URL.
+It's formed by the combination of a link and the respective text.
 
 | Name  | Internal name | Expected input |
 |-------|---------------|----------------|
@@ -35,7 +36,8 @@ $url->text = "Ibexa";
 
 ##### Constructor
 
-The `Url\Value` constructor initializes a new Value object with the provided value. It expects two comma-separated strings, corresponding to the link and text.
+The `Url\Value` constructor initializes a new value object with the provided value.
+It expects two comma-separated strings, corresponding to the link and text.
 
 ``` php
 // Constructor example
diff --git a/docs/content_management/field_types/field_type_reference/userfield.md b/docs/content_management/field_types/field_type_reference/userfield.md
index 9bc4741ce4..5c4f315ea8 100644
--- a/docs/content_management/field_types/field_type_reference/userfield.md
+++ b/docs/content_management/field_types/field_type_reference/userfield.md
@@ -30,9 +30,11 @@ This field type validates and stores information about a user.
 
 !!! caution
 
-    Old password hash types like MD5 have numerical hash type value from 1 to 5. These types were deprecated in v1.13 and removed in v3.0.
+    Old password hash types like MD5 have numerical hash type value from 1 to 5.
+    These types were deprecated in v1.13 and removed in v3.0.
     Between v1.13 and v3.0 it was possible to update hashes automatically when users logged in.
-    Since v3.0, login is only possible with hash type 6 or larger. Automatic updates of older types on login aren't possible anymore.
+    Since v3.0, login is only possible with hash type 6 or larger.
+    Automatic updates of older types on login aren't possible anymore.
     A mass migration of all hashes has never been possible, because this would require knowing the passwords, which only users themselves do.
     Users who still have an old, unsupported password hash type can request a new, valid password using the "Forgot password" feature.
 
diff --git a/docs/content_management/field_types/field_type_search.md b/docs/content_management/field_types/field_type_search.md
index ac6ba501e3..038a9a5581 100644
--- a/docs/content_management/field_types/field_type_search.md
+++ b/docs/content_management/field_types/field_type_search.md
@@ -30,15 +30,20 @@ This example from the `Url` field type shows that the field type always returns
 
 ### `getDefaultMatchField()`
 
-This method retrieves the name of the default field to be used for matching. As field types can index multiple fields (see [MapLocation](maplocationfield.md) field type's implementation of this interface), this method is used to define the default field for matching. The default field is typically used by the [`Field` Search Criterion](field_criterion.md).
+This method retrieves the name of the default field to be used for matching.
+As field types can index multiple fields (see [MapLocation](maplocationfield.md) field type's implementation of this interface), this method is used to define the default field for matching.
+Default field is typically used by the [`Field` Search Criterion](field_criterion.md).
 
 ### `getDefaultSortField()`
 
-This method gets name of the default field to be used for sorting. As field types can index multiple fields (see [MapLocation](maplocationfield.md) field type's implementation of this interface), this method is used to define default field for sorting. Default field is typically used by the [`Field` Sort Clause](field_sort_clause.md).
+This method gets name of the default field to be used for sorting.
+As field types can index multiple fields (see [MapLocation](maplocationfield.md) field type's implementation of this interface), this method is used to define default field for sorting.
+Default field is typically used by the [`Field` Sort Clause](field_sort_clause.md).
 
 ## Register `Indexable` implementations
 
-Implement `Ibexa\Contracts\Core\FieldType\Indexable` as an extra service and register this Service using the `ibexa.field_type.indexable` tag. Example from [`indexable_fieldtypes.yaml`](https://github.com/ibexa/core/blob/main/src/lib/Resources/settings/indexable_fieldtypes.yml):
+Implement `Ibexa\Contracts\Core\FieldType\Indexable` as an extra service and register this Service using the `ibexa.field_type.indexable` tag.
+Example from [`indexable_fieldtypes.yaml`](https://github.com/ibexa/core/blob/main/src/lib/Resources/settings/indexable_fieldtypes.yml):
 
 ``` yaml
 Ibexa\Core\FieldType\Keyword\SearchField:
@@ -61,7 +66,9 @@ The search field values returned by the `getIndexData` method are simple value o
 
 ## Search field types
 
-There are many available search field types which are handled by search backend configuration. When using them, there is no need to adapt, for example, the Solr configuration in any way. You can always use custom field types, but these might require re-configuration of the search backend. For Solr this would mean adapting the `schema.xml` file.
+There are many available search field types which are handled by search backend configuration.
+When using them, there is no need to adapt, for example, the Solr configuration in any way.
+You can always use custom field types, but these might require re-configuration of the search backend. For Solr this would mean adapting the `schema.xml` file.
 
 The default available search field types that can be found in the `Ibexa\Contracts\Core\Search\FieldType` namespace are:
 
@@ -89,7 +96,8 @@ The default available search field types that can be found in the `Ibexa\Contrac
 As mentioned before, if you use the standard type definitions, there is no need to configure the search backend in any way.
 The field definitions are handled using `dynamicField` definitions in Solr, for example.
 
-If you want to configure the handling of your field, you can always add a special field definition to the Solr `schema.xml`. For fields, the field type names used by the Solr search backend look like this: `<content_type_identifier>/<field_identifier>/<search_field_name>_<type>`.
+If you want to configure the handling of your field, you can always add a special field definition to the Solr `schema.xml`.
+For fields, the field type names used by the Solr search backend look like this: `<content_type_identifier>/<field_identifier>/<search_field_name>_<type>`.
 You can define custom `dynamicField` definitions to match, for example, on your custom `_<type>` definition.
 
 You could also define a custom field definition for certain fields, like for the name field in an article:
diff --git a/docs/content_management/field_types/field_type_storage.md b/docs/content_management/field_types/field_type_storage.md
index f0d3a68772..e776b98e8d 100644
--- a/docs/content_management/field_types/field_type_storage.md
+++ b/docs/content_management/field_types/field_type_storage.md
@@ -1,5 +1,5 @@
 ---
-description: To be able to store the data saved to a Field, you must configure storage conversion for the field type.
+description: To be able to store the data saved to a field, you must configure storage conversion for the field type.
 ---
 
 # Field type storage
@@ -50,7 +50,8 @@ This means that using this storage engine requires a conversion.
 Converters map a field's semantic values to the fields described above, for both settings (validation and configuration) and value.
 
 The conversion takes place through the `Ibexa\Core\Persistence\Legacy\Content\FieldValue\Converter` interface,
-which you must implement in your field type. The interface contains the following methods:
+which you must implement in your field type.
+The interface contains the following methods:
 
 |Method|Description|
 |------|-----------|
@@ -88,33 +89,30 @@ The tag has the following attribute:
 ## Storing data externally
 
 A field type may store arbitrary data in external data sources.
-External storage can be, for example, a web service, a file in the file system, another database
-or even the [[= product_name =]] database itself (in form of a non-standard table).
+External storage can be, for example, a web service, a file in the file system, another database or even the [[= product_name =]] database itself (in form of a non-standard table).
 
-To store data in external storage, the field type interacts with the Persistence SPI
-through the `Ibexa\Contracts\Core\FieldType\FieldStorage` interface.
+To store data in external storage, the field type interacts with the Persistence SPI through the `Ibexa\Contracts\Core\FieldType\FieldStorage` interface.
 
-Accessing the internal storage of a content item that includes a field of the field type
-calls one of the following methods to also access the external data:
+Accessing the internal storage of a content item that includes a field of the field type calls one of the following methods to also access the external data:
 
 |Method|Description|
 |------|-----------|
 |`hasFieldData()`|Returns whether the field type stores external data at all.|
-|`storeFieldData()`|Called right before a Field of the field type is stored. The method stores `$externalData`. It returns `true` if the call manipulated internal data of the given field, so that it's updated in the internal database.|
+|`storeFieldData()`|Called right before a field of the field type is stored. The method stores `$externalData`. It returns `true` if the call manipulated internal data of the given field, so that it's updated in the internal database.|
 |`getFieldData()`|Called after a field has been restored from the database to restore `$externalData`.|
 |`deleteFieldData()`|Must delete external data for the given field, if exists.|
 |`getIndexData()`|Returns the actual index data for the provided `Ibexa\Contracts\Core\Persistence\Content\Field`. For more information, see [search service](field_type_search.md#search-field-values).|
 
 Each of the above methods (except `hasFieldData`) receives a `$context` array with information on the underlying storage and the environment.
-To retrieve and store data in the [[= product_name =]] data storage,
-but outside of the normal structures (for example, a custom table in an SQL database),
-use [Gateway-based storage](#gateway-based-storage) with properly injected Doctrine Connection.
+To retrieve and store data in the [[= product_name =]] data storage, but outside of the normal structures (for example, a custom table in an SQL database), use [Gateway-based storage](#gateway-based-storage) with properly injected Doctrine Connection.
 
-The field type must take care on its own for being compliant with different data sources and that third parties can extend the data source support easily.
+The field type must take care on its own for being compliant with different data sources and that third parties can extend the data source support.
 
 ### Gateway-based storage
 
-To allow the usage of a field type that uses external data with different data storages, it's recommended to implement a gateway infrastructure and a registry for the gateways. To make this easier, the Core implementation of field types provides corresponding interfaces and base classes. They can also be used for custom field types.
+To allow the usage of a field type that uses external data with different data storages, it's recommended to implement a gateway infrastructure and a registry for the gateways.
+To make this easier, the Core implementation of field types provides corresponding interfaces and base classes.
+They can also be used for custom field types.
 
 The interface `Ibexa\Contracts\Core\FieldType\StorageGateway` is implemented by gateways, to be handled correctly by the registry. It has one method:
 
@@ -173,7 +171,8 @@ services:
 `ibexa.api.storage_engine.legacy.connection` is of type `Doctrine\DBAL\Connection`. If your gateway still uses an implementation of `eZ\Publish\Core\Persistence\Database\DatabaseHandler` (`eZ\Publish\Core\Persistence\Doctrine\ConnectionHandler`), instead of the `ibexa.api.storage_engine.legacy.connection`, you can pass the `ibexa.api.storage_engine.legacy.dbhandler` service.
 
 
-Also there can be several gateways per field type (one per storage engine). In this case it's recommended to either create base implementation which each gateway can inherit or create interface which each gateway must implement and reference it instead of specific implementation when type-hinting method arguments.
+Also there can be several gateways per field type (one per storage engine).
+In this case it's recommended to either create base implementation which each gateway can inherit or create interface which each gateway must implement and reference it instead of specific implementation when type-hinting method arguments.
 
 !!! tip
 
@@ -181,30 +180,23 @@ Also there can be several gateways per field type (one per storage engine). In t
 
 ## Storing field type settings externally
 
-Just like in the case of data, storing [field type settings](type_and_value.md#field-type-settings) 
-in content item tables may prove insufficient. 
-It's not a problem if your setting specifies, for example, just the allowed number of characters 
-in a text field. 
-However, the field type may represent a more complex object, for example, it may 
-consist of two or more other fields, such as the name, SKU and price, and there 
-can be a set of default values instead of just one. 
+Just like in the case of data, storing [field type settings](type_and_value.md#field-type-settings) in content item tables may prove insufficient.
+It's not a problem if your setting specifies, for example, the allowed number of characters in a text field.
+However, the field type may represent a more complex object, for example, it may consist of two or more other fields, such as the name, SKU, and price, and there can be a set of default values instead of just one.
 Once you add validation rules for these field values, then it becomes an issue.
-    
-You can overcome this obstacle: 
-When you create a new field type, you can move field type settings 
-to external storage.
-    
+
+You can overcome this obstacle:
+When you create a new field type, you can move field type settings to external storage.
+
 !!! note
-    
-    Another benefit of an external storage is that there can be database relations to 
-    other objects/entities, and the database itself can maintain the integrity of data.
-    
-First, create a class that implements the 
-`Ibexa\Contracts\Core\FieldType\FieldConstraintsStorage` interface.
-    
-Then, register the External Storage as a service and tag it with `ibexa.field_type.external_constraints_storage`. 
+
+    Another benefit of an external storage is that there can be database relations to other objects/entities, and the database itself can maintain the integrity of data.
+
+First, create a class that implements the `Ibexa\Contracts\Core\FieldType\FieldConstraintsStorage` interface.
+
+Then, register the External Storage as a service and tag it with `ibexa.field_type.external_constraints_storage`.
 Make sure that the alias you use matches the identifier of the new field type:
-    
+
 ``` yaml
 services:
     App\FieldType\Example\ExternalStorage:
diff --git a/docs/content_management/field_types/form_and_template.md b/docs/content_management/field_types/form_and_template.md
index cfb15e8841..cefa299827 100644
--- a/docs/content_management/field_types/form_and_template.md
+++ b/docs/content_management/field_types/form_and_template.md
@@ -134,12 +134,10 @@ By convention, your block must be named `<fieldTypeIdentifier>_field`.
 
 !!! tip
 
-    Template blocks for built-in field types are available in
-    [`Core/Resources/views/content_fields.html.twig`](https://github.com/ibexa/core/blob/main/src/bundle/Core/Resources/views/content_fields.html.twig).
+    Template blocks for built-in field types are available in [`Core/Resources/views/content_fields.html.twig`](https://github.com/ibexa/core/blob/main/src/bundle/Core/Resources/views/content_fields.html.twig).
 
     This template is also exposed as a part of Standard Design, so you can override it with the [design engine](design_engine.md).
-    To do so, place the template `themes/standard/content_fields.html.twig` in your `Resources/views`
-    (assuming `ibexa_standard_design.override_kernel_templates` is set to true).
+    To do so, place the template `themes/standard/content_fields.html.twig` in your `Resources/views` (assuming `ibexa_standard_design.override_kernel_templates` is set to true).
 
 ### Template variables
 
@@ -148,9 +146,9 @@ The block can receive the following variables:
 | Name | Type | Description |
 |------|------|-------------|
 | `field` | `Ibexa\Contracts\Core\Repository\Values\Content\Field` | The field to display |
-| `contentInfo` | `Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo` | The ContentInfo of the content item the Field belongs to |
-| `versionInfo` | `Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo` | The VersionInfo of the content item the Field belongs to |
-| `fieldSettings` | array | Settings of the Field (depends on the field type) |
+| `contentInfo` | `Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo` | The ContentInfo of the content item the field belongs to |
+| `versionInfo` | `Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo` | The VersionInfo of the content item the field belongs to |
+| `fieldSettings` | array | Settings of the field (depends on the field type) |
 | `parameters` | hash | Options passed to `ibexa_render_field()` under the `'parameters'` key |
 | `attr` | hash | The attributes to add the generate the HTML markup, passed to ibexa_render_field()` under the `'attr'` key. <br> Contains at least a class entry, containing <fieldtypeidentifier>-field |
 
diff --git a/docs/content_management/field_types/type_and_value.md b/docs/content_management/field_types/type_and_value.md
index 7210c0d178..4e85cd0feb 100644
--- a/docs/content_management/field_types/type_and_value.md
+++ b/docs/content_management/field_types/type_and_value.md
@@ -33,27 +33,37 @@ By convention it should be prefixed by a unique vendor shortcut (for example, `i
 
 #### `getSettingsSchema()`
 
-This method retrieves via public PHP API a schema for the field type settings. A typical setting would be, for example, default value. The settings structure defined by this schema is stored in the `FieldDefinition`. Since it's not possible to define a generic format for such a schema, the field type is free to return any serializable data structure from this method.
+This method retrieves via public PHP API a schema for the field type settings.
+A typical setting would be, for example, default value.
+The settings structure defined by this schema is stored in the `FieldDefinition`.
+Since it's not possible to define a generic format for such a schema, the field type is free to return any serializable data structure from this method.
 
 #### `getValidatorConfigurationSchema()`
 
-In addition to normal settings, the field type should provide schema settings for its validation process. The schema describes what kind of validation can be performed by the field type and which settings the user can specify to these validation methods. For example, the `ezstring` type can validate minimum and maximum length of the string. It therefore provides a schema to indicate to the user that they might specify the corresponding restrictions, when creating a `FieldDefinition` with this type. The schema doesn't underlie any regulations, except for that it must be serializable.
+In addition to normal settings, the field type should provide schema settings for its validation process.
+The schema describes what kind of validation can be performed by the field type and which settings the user can specify to these validation methods.
+For example, the `ezstring` type can validate minimum and maximum length of the string.
+It therefore provides a schema to indicate to the user that they might specify the corresponding restrictions, when creating a `FieldDefinition` with this type.
+The schema doesn't underlie any regulations, except for that it must be serializable.
 
 #### `validateFieldSettings()`
 
-The type is asked to validate the settings (provided by the user) before the public PHP API stores those settings for the field type in a `FieldDefinition`. As a result, the field type must return if the given settings comply to the schema defined by `getSettingsSchema()`.
+The type is asked to validate the settings (provided by the user) before the public PHP API stores those settings for the field type in a `FieldDefinition`.
+As a result, the field type must return if the given settings comply to the schema defined by `getSettingsSchema()`.
 
 #### `validateValidatorConfiguration()`
 
 As in `validateFieldSettings()`, this method verifies that the given validator configuration complies to the schema provided by `getValidatorConfigurationSchema()`.
 
-It's important to know that the schema definitions of the field type can be both of arbitrary and serializable format. It's highly recommended to use a simple hash structure.
+It's important to know that the schema definitions of the field type can be both of arbitrary and serializable format.
+It's highly recommended to use a simple hash structure.
 
 !!! note
 
     Since it's not possible to enforce a schema format, the code using a specific field type must basically know all field types it deals with.
 
-This also applies to all user interfaces and the REST API, which therefore must provide extension points to register handling code for custom field type. These extensions aren't defined yet.
+This also applies to all user interfaces and the REST API, which therefore must provide extension points to register handling code for custom field type.
+These extensions aren't defined yet.
 
 ### Field type name
 
@@ -62,13 +72,17 @@ To generate content item name or URL alias the field type name must be a part of
 
 ## Value handling
 
-A field type needs to deal with the custom value format provided by it. In order for the public PHP API to work properly, it delegates working with such custom field values to the corresponding field type. The `Ibexa\Core\FieldType\FieldType` interface therefore provides the following methods:
+A field type needs to deal with the custom value format provided by it.
+In order for the public PHP API to work properly, it delegates working with such custom field values to the corresponding field type.
+The `Ibexa\Core\FieldType\FieldType` interface therefore provides the following methods:
 
 #### `acceptValue()`
 
-This method is responsible for accepting and converting user input for the field. It checks the input structure by accepting, building, and returning a different structure holding the data.
+This method is responsible for accepting and converting user input for the field.
+It checks the input structure by accepting, building, and returning a different structure holding the data.
 
-For example: a user provides an HTTP link as a string, `acceptValue()` converts the link to a URL field type value object. Unlike the `FieldType\Value` constructor, it's possible to make this method aware of multiple input types (object or primitive).
+For example: a user provides an HTTP link as a string, `acceptValue()` converts the link to a URL field type value object.
+Unlike the `FieldType\Value` constructor, it's possible to make this method aware of multiple input types (object or primitive).
 
 !!! note
 
@@ -76,7 +90,8 @@ For example: a user provides an HTTP link as a string, `acceptValue()` converts
 
 #### `getEmptyValue()`
 
-The field type can specify that the user may define a default value for the `Field` of the type through settings. If no default value is provided, the field type is asked for an "empty value" as the final fallback.
+The field type can specify that the user may define a default value for the `Field` of the type through settings.
+If no default value is provided, the field type is asked for an "empty value" as the final fallback.
 
 The value chain for filling a specific field of the field type is as follows:
 
@@ -91,7 +106,9 @@ It's based on the field type settings and validator configuration and stored in
 
 ### Serialization
 
-When [REST API](rest_api_usage.md) is used, conversion needs to be done for field type values, settings, and validator configurations. These are converted to and from a simple hash format that can be encoded in REST payload. As conversion needs to be done both when transmitting and receiving data through REST, field type implements the following pairs of methods:
+When [REST API](rest_api_usage.md) is used, conversion needs to be done for field type values, settings, and validator configurations.
+These are converted to and from a simple hash format that can be encoded in REST payload.
+As conversion needs to be done both when transmitting and receiving data through REST, field type implements the following pairs of methods:
 
 |Method|Description|
 |------|-----------|
@@ -118,7 +135,8 @@ services:
 
 #### `parent`
 
-As described in the [Symfony service container documentation]([[= symfony_doc =]]/components/dependency_injection/parentservices.html), the `parent` config key indicates that you want your service to inherit from the parent's dependencies, including constructor arguments and method calls. This helps avoiding repetition in your field type configuration and keeps consistency between all field types.
+As described in the [Symfony service container documentation]([[= symfony_doc =]]/components/dependency_injection/parentservices.html), the `parent` config key indicates that you want your service to inherit from the parent's dependencies, including constructor arguments and method calls.
+This helps avoiding repetition in your field type configuration and keeps consistency between all field types.
 If you need to inject other services into your Type class, skip using the `parent` config key.
 
 #### `tags`
@@ -171,7 +189,8 @@ The settings are mapped into Symfony forms via the [FormMapper](form_and_templat
 
 ## Extensibility points
 
-Some field types require additional processing, for example a field type storing a binary file, or one having more complex settings or validator configuration. For this purpose specific implementations of an abstract class `Ibexa\Contracts\Rest\FieldTypeProcessor` are used.
+Some field types require additional processing, for example a field type storing a binary file, or one having more complex settings, or validator configuration.
+For this purpose specific implementations of an abstract class `Ibexa\Contracts\Rest\FieldTypeProcessor` are used.
 
 This class provides the following methods:
 
@@ -184,4 +203,5 @@ This class provides the following methods:
 |`preProcessValidatorConfigurationHash()`|Performs manipulations on a received validator configuration hash, so that it conforms to the format expected by the `validatorConfigurationFromHash()` method described above.|
 |`postProcessValidatorConfigurationHash()`|Performs manipulations on a outgoing validator configuration hash, previously generated by the `validatorConfigurationToHash()` method described above.|
 
-Base implementations of these methods simply return the given hash, so you can implement only the methods your field type requires. Some built-in field types already implement processors and you're encouraged to take a look at them.
+Base implementations of these methods return the given hash, so you can implement only the methods your field type requires.
+Some built-in field types already implement processors and you're encouraged to take a look at them.
diff --git a/docs/content_management/file_management/file_management.md b/docs/content_management/file_management/file_management.md
index 8da985d99b..bedce65245 100644
--- a/docs/content_management/file_management/file_management.md
+++ b/docs/content_management/file_management/file_management.md
@@ -36,7 +36,7 @@ ibexa:
                 binarydata_handler: nfs
 ```
 
-The adapter is the *driver* used by Flysystem v2 to read/write files. Adapters are declared using `oneup_flysystem`. 
+The adapter is the *driver* used by Flysystem v2 to read/write files. Adapters are declared using `oneup_flysystem`.
 Metadata and binary data handlers are configured under `ibexa_io`. See below the configuration for the default handlers. It declares a metadata handler and a binary data handler, both labeled `default`. Both handlers are of type `flysystem`, and use the same Flysystem v2 adapter, labeled `default` as well.
 
 ``` yaml
@@ -81,8 +81,7 @@ Default values:
 
 !!! note
 
-    As SiteAccess configuration Flysystem's v2 native Local NFS adapter isn't supported, the following
-    configuration should be used:
+    As SiteAccess configuration Flysystem's v2 native Local NFS adapter isn't supported, the following configuration should be used:
 
     ``` yaml
     oneup_flysystem:
@@ -95,14 +94,16 @@ Default values:
 
 ### Native Flysystem v2 handler
 
-[[= product_name =]] uses it as the default way to read and write content in form of binary files. Flysystem v2 can use the `local` filesystem, but is also able to read/write to `sftp`, `zip` or cloud filesystems (`azure`, `rackspace`, `S3`).
+[[= product_name =]] uses it as the default way to read and write content in form of binary files.
+Flysystem v2 can use the `local` filesystem, but is also able to read/write to `sftp`, `zip` or cloud filesystems (`azure`, `rackspace`, `S3`).
 [league/flysystem](https://flysystem.thephpleague.com/docs/) (along with [FlysystemBundle](https://github.com/1up-lab/OneupFlysystemBundle/)) is an abstract file handling library.
 
 #### Handler options
 
 ##### Adapter
 
-To be able to rely on dynamic SiteAccess-aware paths, you need to use Ibexa custom `nfs_adapter`. A basic configuration might look like the following:
+To be able to rely on dynamic SiteAccess-aware paths, you need to use [[= product_name_base =]] custom `nfs_adapter`.
+A basic configuration might look like the following:
 
 ``` yaml
 oneup_flysystem:
@@ -112,7 +113,7 @@ oneup_flysystem:
                 service: ibexa.io.nfs.adapter.site_access_aware
 ```
 
-To learn how to configure other adapters, see the [bundle's online documentation](https://github.com/1up-lab/OneupFlysystemBundle/blob/main/doc/index.md#step3-configure-your-filesystems). 
+To learn how to configure other adapters, see the [bundle's online documentation](https://github.com/1up-lab/OneupFlysystemBundle/blob/main/doc/index.md#step3-configure-your-filesystems).
 
 !!! note
 
diff --git a/docs/content_management/forms/create_custom_form_field.md b/docs/content_management/forms/create_custom_form_field.md
index a8939659e5..4bb999ab2c 100644
--- a/docs/content_management/forms/create_custom_form_field.md
+++ b/docs/content_management/forms/create_custom_form_field.md
@@ -10,8 +10,7 @@ Define new form fields in configuration.
 
 ## Configure Form field
 
-For example, to create a Country Form field in the "Custom form fields" category,
-provide the following configuration under the `ibexa_form_builder.fields` [configuration key](configuration.md#configuration-files):
+For example, to create a Country Form field in the "Custom form fields" category, provide the following configuration under the `ibexa_form_builder.fields` [configuration key](configuration.md#configuration-files):
 
 ``` yaml
 [[= include_file('code_samples/forms/custom_form_field/config/packages/form_builder.yaml') =]]
diff --git a/docs/content_management/forms/create_form_attribute.md b/docs/content_management/forms/create_form_attribute.md
index eecc92d055..c4d7bc506b 100644
--- a/docs/content_management/forms/create_form_attribute.md
+++ b/docs/content_management/forms/create_form_attribute.md
@@ -1,9 +1,9 @@
 ---
-description: Create Form Builder Form attribute. 
+description: Create Form Builder Form attribute.
 edition: experience
 ---
 
-# Create Form Builder Form attribute 
+# Create Form Builder Form attribute
 
 You can create a Form attribute for new Form fields or existing ones.
 To do it, you have to define a new Form attribute in the configuration.
@@ -63,7 +63,8 @@ twig:
 
 ## Add scripts
 
-Now you need to enable the Rich Text editor. Provide the required script in a new `assets/js/formbuilder-richtext-checkbox.js` file:
+Now you need to enable the Rich Text editor.
+Provide the required script in a new `assets/js/formbuilder-richtext-checkbox.js` file:
 
 ``` js
 [[= include_file('code_samples/forms/custom_form_attribute/assets/js/formbuilder-richtext-checkbox.js') =]]
diff --git a/docs/content_management/forms/customize_email_notifications.md b/docs/content_management/forms/customize_email_notifications.md
index 3d9b93eaa7..1ad41532f5 100644
--- a/docs/content_management/forms/customize_email_notifications.md
+++ b/docs/content_management/forms/customize_email_notifications.md
@@ -20,7 +20,7 @@ Each of them is rendered independently and consists of three sets of parameters.
 |---------|----|-----------|
 |`content`|`Ibexa\Contracts\Core\Repository\Values\Content\Content`|Name of the form, its content type|
 |`form`|`Ibexa\Contracts\FormBuilder\FieldType\Model\Form`|Definition of the form|
-|`data`|`Ibexa\Contracts\FormBuilder\FieldType\Model\FormSubmission`|Sent data|  
+|`data`|`Ibexa\Contracts\FormBuilder\FieldType\Model\FormSubmission`|Sent data|
 
 ## Configure sender details
 
diff --git a/docs/content_management/forms/form_api.md b/docs/content_management/forms/form_api.md
index 3c2f2428e8..c0c9930445 100644
--- a/docs/content_management/forms/form_api.md
+++ b/docs/content_management/forms/form_api.md
@@ -11,15 +11,13 @@ To manage form submissions created in the [Form Builder](form_builder_guide.md),
 
 ### Getting form submissions
 
-To get existing form submissions, use `FormSubmissionServiceInterface::loadByContent()`
-(which takes a `ContentInfo` object as parameter), or `FormSubmissionServiceInterface::loadById()`.
+To get existing form submissions, use `FormSubmissionServiceInterface::loadByContent()` (which takes a `ContentInfo` object as parameter), or `FormSubmissionServiceInterface::loadById()`.
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/FormSubmissionCommand.php', 54, 55) =]]
 ```
 
-Through this object, you can get information about submissions, such as their total number,
-and submission contents.
+Through this object, you can get information about submissions, such as their total number, and submission contents.
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/FormSubmissionCommand.php', 55, 66) =]]
diff --git a/docs/content_management/forms/form_builder_guide.md b/docs/content_management/forms/form_builder_guide.md
index 03e7488740..14cf27838f 100644
--- a/docs/content_management/forms/form_builder_guide.md
+++ b/docs/content_management/forms/form_builder_guide.md
@@ -9,8 +9,8 @@ edition: experience
 
 Form Builder is a tool that lets you build forms consisting of different fields.
 
-By adding forms on the website, you can increase its functionality and improve user experience. Use Form Builder to create various forms, such as survey,
-questionnaire, sign-up form, using basic form fields available in the Form Builder. 
+By adding forms on the website, you can increase its functionality and improve user experience.
+Use Form Builder to create various forms, such as survey, questionnaire, sign-up form, using basic form fields available in the Form Builder.
 You can also manage your forms and review the results gathered from the website users.
 
 ## Availability
@@ -60,21 +60,21 @@ The available basic form fields are:
 
 ### Create a form
 
-Editors can use the created form anywhere on the website. 
-Forms can be used in page blocks, embedded in the online editor or even used as a field relation. 
+Editors can use the created form anywhere on the website.
+Forms can be used in page blocks, embedded in the online editor or even used as a field relation.
 The same form can be placed at multiple locations on the website.
 
 To learn more, see [Work with forms]([[= user_doc =]]/content_management/work_with_forms/).
 
 ### Forms management
 
-[Form](work_with_forms.md) is one of available [content items]([[= user_doc =]]/content_management/content_items/) that you can find in the platform. 
-You can work with it as with other regular items: create new one, edit existing one, move, etc.
+[Form](work_with_forms.md) is one of available [content items]([[= user_doc =]]/content_management/content_items/) that you can find in the platform.
+You can work with it as with other regular items, for example, create new one, edit existing one, or move.
 
 You can manage all the existing forms. To do it, in a selected place of the content tree find your form and click on it.
-In this window you can see all the information about your form, view submissions, create versions, etc.
+In this window you can see all the information about your form, view submissions, create versions, and more
 
-Using the buttons in the right corner, you can also edit, move, copy, hide or send your form to the trash.
+Using the buttons in the right corner, you can also edit, move, copy, hide, or send your form to the trash.
 
 ![Forms management](img/forms_management.png)
 
@@ -82,17 +82,17 @@ Using the buttons in the right corner, you can also edit, move, copy, hide or se
 
 To manage form submissions created in the Form Builder, use `FormSubmissionServiceInterface`.
 You can get existing form submission and create or delete one.
-Detailed instruction of getting, creating and deleting form submissions, you can find in Ibexa Developer Documentation in [Form API page](form_api.md).
+Detailed instruction of getting, creating and deleting form submissions, you can find in [[= product_name_base =]] Developer Documentation in [Form API page](form_api.md).
 
 ### Extend Form Builder
 
-You can extend the Form Builder by adding new Form fields or modifying existing ones. 
-To create new form fields, you need to [define them in configuration](create_custom_form_field.md). 
+You can extend the Form Builder by adding new Form fields or modifying existing ones.
+To create new form fields, you need to [define them in configuration](create_custom_form_field.md).
 Fields or fields attributes [can be modified](create_custom_form_field.md#modify-existing-form-fields) by subscribing `ibexa.form_builder.field.<FIELD_ID>` or `ibexa.form_builder.field.<FIELD_ID>.<ATTRIBUTE_ID>` events.
 
 ### Create new Form attribute
 
-Each Form has available attributes, for example, string, text, location, etc.
+Each Form has available attributes, for example, string, text, or location.
 You can also [create a Form attribute](create_form_attribute.md) for new Form fields or existing ones.
 
 To do it, you have to:
@@ -121,21 +121,21 @@ The **Download submissions** button enables you to download all the submissions
 
 ### General overview
 
-With Form Builder you're allowed to build an unlimited number of forms. 
-These forms can be used anywhere on the website and are ready to start collecting information. 
-Form Builder interface is simple, which makes the creation of forms fast and intuitive.
+With Form Builder you're allowed to build an unlimited number of forms.
+These forms can be used anywhere on the website and are ready to start collecting information.
+Form Builder interface is plain, which makes the creation of forms fast and intuitive.
 
 ### Forms management
 
-Forms can be managed simply and effectively: you can copy them, move, organize into folders, create versions and delete if necessary. 
+Forms can be managed simply and effectively: you can copy them, move, organize into folders, create versions, and delete if necessary.
 Each field can be configured so that the form collects the exact details that you need.
 
 ### Custom Form fields
 
-With Form Builder you can use existing Form fields, but also you can extend it by adding new or modifying existing ones. 
+With Form Builder you can use existing Form fields, but also you can extend it by adding new or modifying existing ones.
 This allows you to create forms that fit your needs.
 
 ### Analytic tool
 
-All the submissions can are visible in **Submissions** tab. 
+All the submissions can are visible in **Submissions** tab.
 You can download them as a .CSV file for additional analysis.
\ No newline at end of file
diff --git a/docs/content_management/forms/work_with_forms.md b/docs/content_management/forms/work_with_forms.md
index aa873ccc63..b75c1c0cf4 100644
--- a/docs/content_management/forms/work_with_forms.md
+++ b/docs/content_management/forms/work_with_forms.md
@@ -9,8 +9,7 @@ You can build forms consisting of different fields in the Form Builder.
 
 !!! tip
 
-    To learn how to get, create, and delete form submissions by using the PHP API,
-    see [Form API](form_api.md).
+    To learn how to get, create, and delete form submissions by using the PHP API, see [Form API](form_api.md).
 
 [[% include 'snippets/forms_caution.md' %]]
 
@@ -32,8 +31,7 @@ gregwar_captcha:
     reload: true
 ```
 
-The example configuration above resizes the Captcha image (line 3), changes the error message (line 4),
-and enables the user to reload the code (line 5).
+The example configuration above resizes the Captcha image (line 3), changes the error message (line 4), and enables the user to reload the code (line 5).
 
 ![Custom captcha field](extending_form_builder_captcha_result.png)
 
@@ -47,14 +45,13 @@ For information about available options, see [Gregwar/CaptchaBundle's documentat
 ## Form submission purging
 
 You can purge all submissions of a given form. 
-To do this, run the following command, where `form-id` stands for Content ID 
-of the form for which you want to purge data:
+To do this, run the following command, where `form-id` stands for Content ID of the form for which you want to purge data:
 
 ```bash
 php bin/console ibexa:form-builder:purge-form-submissions [options] [--] <form-id>
 ```
 
-The following table lists some of the available options and their meaning: 
+The following table lists some of the available options and their meaning:
 
 | Switch | Option | Description |
 |--------------|------------|------------|
diff --git a/docs/content_management/images/add_image_asset_from_dam.md b/docs/content_management/images/add_image_asset_from_dam.md
index 87c4246d56..fe5d114ee5 100644
--- a/docs/content_management/images/add_image_asset_from_dam.md
+++ b/docs/content_management/images/add_image_asset_from_dam.md
@@ -26,7 +26,7 @@ To add the Unsplash connector to your system add the `ibexa/connector-unsplash`
 
 ## Add Image Asset in Page Builder [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
-To add Image Assets directly in the Page Builder, you can do it by using the Embed block. 
+To add Image Assets directly in the Page Builder, you can do it by using the Embed block.
 The example below shows how to add images from [Unsplash](https://unsplash.com/).
 
 First, in `templates/themes/standard/embed/`, create a custom template `dam.html.twig`:
@@ -64,7 +64,7 @@ In your [configuration file](configuration.md#configuration-files) add the follo
 ``` yaml
 dam_unsplash:
     application_id: <your_application_access_key>
-    utm_source: <your_utm_source_name>  
+    utm_source: <your_utm_source_name> 
     variations:
        770px:
             fm: jpg
diff --git a/docs/content_management/images/configure_image_editor.md b/docs/content_management/images/configure_image_editor.md
index 22930ab734..a7386fbd7c 100644
--- a/docs/content_management/images/configure_image_editor.md
+++ b/docs/content_management/images/configure_image_editor.md
@@ -14,23 +14,20 @@ For more information, see [User Documentation]([[= user_doc =]]/editing_images/)
 
 !!! note
 
-    If you intend to modify images in formats other than JPEG in image editor,
-    consider [adding a library to optimize them](images.md#image-optimization).
+    If you intend to modify images in formats other than JPEG in image editor, consider [adding a library to optimize them](images.md#image-optimization).
 
 ## Configuration
 
 You can modify the default settings to change the appearance or behavior of the Image Editor.
-You can also expand the default set of parameters to create buttons that may be required by custom features
-that you add by extending the Image Editor, for example, to enable changes to the color palette of an image.
+You can also expand the default set of parameters to create buttons that may be required by custom features that you add by extending the Image Editor, for example, to enable changes to the color palette of an image.
 
-To do this, under the `ibexa.system.<scope>.image_editor` [configuration key](configuration.md#configuration-files)
-add a settings tree similar to the following example.
+To do this, under the `ibexa.system.<scope>.image_editor` [configuration key](configuration.md#configuration-files) add a settings tree similar to the following example.
 The settings tree can contain one or more action groups.
 You can control the order of actions within a group by setting the `priority` parameter.
 You can also toggle the visibility of actions within the user interface.
 Image Editor settings are [SiteAccess-aware](dynamic_configuration.md).
 
-The following example sets the aspect ratio values and label names for buttons used by the Crop feature. 
+The following example sets the aspect ratio values and label names for buttons used by the Crop feature.
 
 ``` yaml
 [[= include_file('code_samples/back_office/image_editor/config/packages/image_editor.yaml', 0, 36) =]]
@@ -50,9 +47,7 @@ The default quality is 0.92:
 ### Additional information
 
 Each image can be accompanied by additional information that isn't visible to the user.
-By default, additional information stores the coordinates of the [focal point]([[= user_doc =]]/editing_images/#focal-point),
-but you can use this extension point to pass various parameters of custom features
-that you add by extending the Image Editor.
+By default, additional information stores the coordinates of the [focal point]([[= user_doc =]]/editing_images/#focal-point), but you can use this extension point to pass various parameters of custom features that you add by extending the Image Editor.
 
 To modify the value of additional information programmatically, you can set a value of the `Image` field by using the PHP API, for example:
 
diff --git a/docs/content_management/pages/create_custom_page_block.md b/docs/content_management/pages/create_custom_page_block.md
index 6198b6b987..71dfe88e47 100644
--- a/docs/content_management/pages/create_custom_page_block.md
+++ b/docs/content_management/pages/create_custom_page_block.md
@@ -23,12 +23,10 @@ First, add the following [YAML configuration](configuration.md#configuration-fil
 `event` is the internal name for the block, and `name` indicates the name under which the block is available in the interface.
 You also set up the category in the Elements panel that the block appears in.
 In this case, it doesn't show with the rest of the built-in blocks, but in a separate "Custom" category.
-The thumbnail for the block can be one of the pre-existing icons, like in the example above,
-or you can use a custom SVG file.
+The thumbnail for the block can be one of the pre-existing icons, like in the example above, or you can use a custom SVG file.
 
-A block can have multiple attributes that you edit when adding it to a Page.
-In this example, you configure three attributes: name of the event, category it belongs to,
-and an event content item that you select and embed.
+A block can have multiple attributes that you edit when adding it to a page.
+In this example, you configure three attributes: name of the event, category it belongs to, and an event content item that you select and embed.
 
 For a list of all available attribute types, see [Page block attributes](page_block_attributes.md).
 
@@ -39,7 +37,7 @@ The `regexp` validator ensure that the final value looks like a content ID.
 
 ## Add block templates
 
-A block can have different templates that you select when adding it to a Page.
+A block can have different templates that you select when adding it to a page.
 
 To configure block templates, add them to block configuration:
 
@@ -90,7 +88,7 @@ document.getElementsByTagName('body')[0].addEventListener('ibexa-render-block-pr
 !!! note
 
     For the addition of your custom block's JS and CSS files, see [Assets](assets.md).
-    
+
     If you consider using React JavaScript library, see [React App block](react_app_block.md).
 
 ## Add pre-render event listener
diff --git a/docs/content_management/pages/ibexa_connect_scenario_block.md b/docs/content_management/pages/ibexa_connect_scenario_block.md
index 872e5ad8a5..999e3c9588 100644
--- a/docs/content_management/pages/ibexa_connect_scenario_block.md
+++ b/docs/content_management/pages/ibexa_connect_scenario_block.md
@@ -1,14 +1,14 @@
 ---
-description: Work with Ibexa Connect scenario block that retrieves and displays data from an Ibexa Connect webhook. 
+description: Work with Ibexa Connect scenario block that retrieves and displays data from an Ibexa Connect webhook.
 ---
 
 # [[= product_name_connect =]] scenario block
 
-[[= product_name_connect =]] scenario block retrieves and displays data from an [[= product_name_connect =]] webhook. 
+[[= product_name_connect =]] scenario block retrieves and displays data from an [[= product_name_connect =]] webhook.
 Scenario block is a regular [Page block](page_blocks.md) and can be configured on field definition level as any other block.
 
 !!! caution
-    
+
     When setting up your instance, ensure you have profiler enabled.
     To set up Page Builder in [[= product_name =]], follow the [Page and Form tutorial](page_and_form_tutorial.md).
 
@@ -24,11 +24,11 @@ First, in `config/packages/ibexa_connect.yaml` add the following configuration:
 [[= include_file('code_samples/page/ibexa_connect_scenario_block/config/packages/ibexa_connect.yaml') =]]
 ```
 
-For each block template you can set up additional settings, for example, label, type or parameters. 
+For each block template you can set up additional settings, for example, label, type or parameters.
 
 ### Define page layouts
 
-To preview your block in the frontend, define page layouts in `config/packages/views.yaml` directory. This file defines, which layouts are used to render Page Builder. 
+To preview your block in the frontend, define page layouts in `config/packages/views.yaml` directory. This file defines, which layouts are used to render Page Builder.
 
 ```yaml
 [[= include_file('code_samples/page/ibexa_connect_scenario_block/config/packages/views.yaml') =]]
@@ -52,19 +52,18 @@ At this point the [[= product_name_connect =]] scenario block is ready to be use
 ### Configure [[= product_name_connect =]] scenario block in Page Builder
 
 Now, you can configure [[= product_name_connect =]] scenario block in Page Builder.
-To do it, in your Page add [[= product_name_connect =]] block by dragging it from the menu to a drop zone and enter block settings. 
+To do it, in your Page add [[= product_name_connect =]] block by dragging it from the menu to a drop zone and enter block settings.
 
-- In the **Basic** tab in **Webhook link** field, provide a link to an [[= product_name_connect =]] webhook, 
-for example, `https://connect.ibexa.co/3/scenarios/688/edit`:
+- In the **Basic** tab in **Webhook link** field, provide a link to an [[= product_name_connect =]] webhook, for example, `https://connect.ibexa.co/3/scenarios/688/edit`:
 
 ![Ibexa Connect Basic tab](ibexa_connect_basic_tab.png)
 
-- In the **Design** tab, choose one of declared templates, in the following example, `company_customers` or `External clients`. 
+- In the **Design** tab, choose one of declared templates, in the following example, `company_customers` or `External clients`.
 To do it, extend drop-down list in the **View** field and choose one of the available options.
 
 ![Ibexa Connect Design tab](ibexa_connect_design_tab.png)
 
 Click **Submit** button to confirm.
-After submitting the block, Page refreshes and [[= product_name_connect =]] block displays data from provided [[= product_name_connect =]] webhook. 
+After submitting the block, page refreshes and [[= product_name_connect =]] block displays data from provided [[= product_name_connect =]] webhook.
 
 ![Ibexa Connect webhook preview](ibexa_connect_webhook_preview.png)
\ No newline at end of file
diff --git a/docs/content_management/pages/page_block_attributes.md b/docs/content_management/pages/page_block_attributes.md
index 77f0b152c6..bc2ef3eef3 100644
--- a/docs/content_management/pages/page_block_attributes.md
+++ b/docs/content_management/pages/page_block_attributes.md
@@ -131,7 +131,7 @@ Now, you can create a block containing your custom attribute:
 
 The `nested_attribute` attribute is used when you want to create a group of attributes.
 
-First, make sure you have configured the attributes you want to use in the group. 
+First, make sure you have configured the attributes you want to use in the group.
 
 Next, provide the configuration. See the example:
 
diff --git a/docs/content_management/pages/page_block_validators.md b/docs/content_management/pages/page_block_validators.md
index f5f28c3eb7..2622fa1e37 100644
--- a/docs/content_management/pages/page_block_validators.md
+++ b/docs/content_management/pages/page_block_validators.md
@@ -19,8 +19,7 @@ The following block validators are available:
     Don't use the `required` and `not_blank` validators for `richtext` attributes.
     Instead, use `not_blank_richtext`.
 
-For each validator you can provide a message that displays in the Page Builder
-when an attribute field doesn't fulfil the criteria.
+For each validator you can provide a message that displays in the Page Builder when an attribute field doesn't fulfill the criteria.
 
 Additionally, for some validators you can provide settings under the
 `ibexa_fieldtype_page.blocks.<block_name>.validators.regexp.options` [configuration key](configuration.md#configuration-files), for example:
diff --git a/docs/content_management/pages/page_blocks.md b/docs/content_management/pages/page_blocks.md
index 193c69e945..eaa9eb6764 100644
--- a/docs/content_management/pages/page_blocks.md
+++ b/docs/content_management/pages/page_blocks.md
@@ -8,11 +8,9 @@ Page blocks are configured in YAML files, under the `ibexa_fieldtype_page` key.
 Keep in mind that Page block configuration isn't SiteAccess-aware.
 
 [[= product_name =]] ships with a number of page blocks.
-For a list of all page blocks that are available out-of-the-box,
-see [Page block reference]([[= user_doc =]]/content_management/block_reference/).
+For a list of all page blocks that are available out-of-the-box, see [Page block reference]([[= user_doc =]]/content_management/block_reference/).
 
-For information on how to create and configure new layouts for the Page,
-see [Page layouts](render_page.md#render-a-layout).
+For information on how to create and configure new layouts for the Page, see [Page layouts](render_page.md#render-a-layout).
 
 [[% include 'snippets/page_block_cache_clear.md' %]]
 
@@ -88,8 +86,7 @@ The following example wraps all form fields for block attributes in an ordered l
 
 ## Block events
 
-To add functionalities to your block that go beyond the available attributes,
-you can use an event listener.
+To add functionalities to your block that go beyond the available attributes, you can use an event listener.
 
 You can listen to events related to block definition and block rendering.
 
@@ -116,7 +113,7 @@ You can use this parameter, for example, in block template:
 #### Exposing content relations from blocks
 
 Page blocks, for example Embed block or Collection block, can embed other content items.
-Publishing a Page with such blocks creates Relations to those content items.
+Publishing a page with such blocks creates Relations to those content items.
 
 When creating a custom block with embeds, you can ensure such Relations are created using the block Relation collection event.
 
diff --git a/docs/content_management/pages/react_app_block.md b/docs/content_management/pages/react_app_block.md
index 493009d200..2915b5d304 100644
--- a/docs/content_management/pages/react_app_block.md
+++ b/docs/content_management/pages/react_app_block.md
@@ -8,8 +8,7 @@ React App block allows an editor to embed a preconfigured React application into
 It's configured in YAML files, under the `ibexa_fieldtype_page` key.
 Page block configuration isn't SiteAccess-aware.
 
-Another element of React App Block is `\Ibexa\FieldTypePage\FieldType\Page\Block\Event\Listener\ReactBlock` Listener 
-which adds component and props variables.
+Another element of React App Block is `\Ibexa\FieldTypePage\FieldType\Page\Block\Event\Listener\ReactBlock` Listener  which adds component and props variables.
 
 It's common to all the blocks.
 
@@ -61,8 +60,7 @@ attributes:
       ...
 ```
 
-Apps that are registered this way must be configured and referenced in the 
-semantic configuration to be registered as blocks.
+Apps that are registered this way must be configured and referenced in the semantic configuration to be registered as blocks.
 
 Parameters passed as props must be converted so that they can be used as the configured type in the app.
 
@@ -87,7 +85,7 @@ In the following example, create `Calculator.jsx` file in `assets/page-builder/c
 Then, create a `Calculator.js` file in `assets/page-builder/react/blocks` directory.
 
 Files in this directory create a map of Components which then are imported to `react.blocks.js` file.
-As a result, the components are rendered on the page. 
+As a result, the components are rendered on the page.
 
 ``` js
 [[= include_file('code_samples/page/react_app_block/assets/page-builder/react/blocks/Calculator.js') =]]
diff --git a/docs/content_management/rich_text/create_custom_richtext_block.md b/docs/content_management/rich_text/create_custom_richtext_block.md
index b61ca8bd76..e97dc74759 100644
--- a/docs/content_management/rich_text/create_custom_richtext_block.md
+++ b/docs/content_management/rich_text/create_custom_richtext_block.md
@@ -5,16 +5,13 @@ edition: experience
 
 # Create custom RichText block
 
-A RichText block is a specific example of a [custom block](create_custom_page_block.md) that you can use when 
-you create a Page. 
-To create a custom block, you must define the block's layout, provide templates, add a subscriber 
-and register the subscriber as a service.
+A RichText block is a specific example of a [custom block](create_custom_page_block.md) that you can use when you create a page. 
+To create a custom block, you must define the block's layout, provide templates, add a subscriber, and register the subscriber as a service.
 
-Follow the procedure below to create a RichText Page block.
+Follow the procedure below to create a RichText page block.
 
 First, provide the block configuration under the `ibexa_page_fieldtype.blocks` [configuration key](configuration.md#configuration-files). 
-The following code defines a new block, its view and configuration 
-templates.
+The following code defines a new block, its view and configuration templates.
 It also sets the attribute type to `richtext` (line 15):
 
 ``` yaml hl_lines="3 15"
@@ -37,8 +34,7 @@ Lines 41-51 handle the conversion of content into an XML string:
 [[= include_file('code_samples/back_office/online_editor/src/event/subscriber/RichTextBlockSubscriber.php') =]]
 ```
 
-Now you can create [templates](templates.md) that are used 
-for displaying and configuring your block.
+Now you can create [templates](templates.md) that are used for displaying and configuring your block.
 
 Create the view template in `templates/themes/<your-theme>/blocks/my_block/richtext.html.twig`.
 Line 2 is responsible for rendering the content from XML to HTML5:
@@ -70,7 +66,7 @@ services:
 ```
 
 
-You have successfully created a custom RichText block. 
+You have successfully created a custom RichText block.
 You can now add your block in the **Site** tab.
 
 ![RichText block](extending_richtext_block.png)
diff --git a/docs/content_management/rich_text/extend_online_editor.md b/docs/content_management/rich_text/extend_online_editor.md
index 4ec598a2aa..d82fca3d06 100644
--- a/docs/content_management/rich_text/extend_online_editor.md
+++ b/docs/content_management/rich_text/extend_online_editor.md
@@ -4,16 +4,13 @@ description: Add custom tags, styles and data attributes to enrich the functiona
 
 # Extend Online Editor
 
-[[= product_name =]] users edit the contents of RichText fields, for example, 
-in the Content box of a Page, by using the Online Editor.
+[[= product_name =]] users edit the contents of RichText fields, for example,  in the Content box of a Page, by using the Online Editor.
 
-You can extend the Online Editor by adding custom tags and styles, defining custom 
-data attributes, re-arranging existing buttons, grouping buttons into custom toolbar, 
+You can extend the Online Editor by adding custom tags and styles, defining custom data attributes, re-arranging existing buttons, grouping buttons into custom toolbar, 
 and creating [custom buttons](https://ckeditor.com/docs/ckeditor4/latest/guide/widget_sdk_tutorial_1.html#widget-toolbar-button) and [custom plugins](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_plugins.html).
 
 Online Editor is based on the CKEditor5.
-Refer to [CKEditor5 documentation](https://ckeditor.com/docs/ckeditor5/latest/index.html) to learn 
-how you can extend the Online Editor with even more elements.
+Refer to [CKEditor5 documentation](https://ckeditor.com/docs/ckeditor5/latest/index.html) to learn how you can extend the Online Editor with even more elements.
 
 For more information about extending the back office, see [Extend back office](back_office.md).
 
@@ -130,8 +127,7 @@ Add labels for the tag by providing translations in `translations/custom_tags.en
 
 ![Adding an explanation to an Acronym custom tag](oe_custom_tag_add_acronym.png)
 
-In the template file `acronym.html.twig` provide the explanation as attribute value
-to the title of the `abbr` tag:
+In the template file `acronym.html.twig` provide the explanation as attribute value to the title of the `abbr` tag:
 
 ``` html+twig
 <abbr title="{{ params.explanation }}">{{ content }}</abbr>
@@ -187,7 +183,7 @@ The template files for the front end could look as follows:
 <div {% if id is defined %}id="{{ id }}"{% endif %} class="{% if align is defined %}align-{{ align }}{% endif %} ezstyle-{{ name }}">{% apply spaceless %}{{ content|raw }}{% endapply %}</div>
 ```
 
-Templates for Content View in the back office would be `templates/themes/admin/field_type/ezrichtext/custom_styles/highlighted_word.html.twig` and `templates/themes/admin/field_type/ezrichtext/custom_styles/highlighted_block.html.twig` respectively (assuming that the back office SiteAccess uses the default `admin` theme).
+Templates for Content View in the back office would be `templates/themes/admin/field_type/ezrichtext/custom_styles/highlighted_word.html.twig` and `templates/themes/admin/field_type/ezrichtext/custom_styles/highlighted_block.html.twig` (assuming that the back office SiteAccess uses the default `admin` theme).
 
 ### Use cases
 
@@ -266,8 +262,7 @@ ezrichtext.custom_styles.highlight.label: 'Highlight'
 
 ## Configure custom data attributes and classes
 
-You can add custom data attributes and CSS classes to the following elements 
-in the Online Editor:
+You can add custom data attributes and CSS classes to the following elements in the Online Editor:
 
 - `embedInline`
 - `embed`
@@ -307,25 +302,21 @@ in the Online Editor:
 You configure custom data attributes under the `fieldtypes.ibexa_fieldtype_richtext.attributes` key.
 The configuration is SiteAccess-aware.
 
-A custom data attribute can belong to one of the following types: `choice`, 
-`boolean`, `string`, or `number`.
+A custom data attribute can belong to one of the following types: `choice`, `boolean`, `string`, or `number`.
 You can also set each attribute to be `required` and set its `default_value`.
 
 For the `choice` type, you must provide an array of available `choices`.
 By adding `multiple`, you can decide whether more than one option can be selected.
 It's set to `false` by default.
 
-Use the example below to add two data attributes, `custom_attribute` and 
-`another_attribute` to the Heading element in the `admin_group` SiteAccess:
+Use the example below to add two data attributes, `custom_attribute` and `another_attribute` to the Heading element in the `admin_group` SiteAccess:
 
 ``` yaml
 [[= include_file('code_samples/back_office/online_editor/config/packages/custom_data_attributes.yaml') =]]
 ```
 
-The configuration outputs `data-ezattribute-<attribute_name>="<value>"` in the 
-corresponding HTML element.
-Here, the resulting values are `data-ezattribute-custom-attribute="false"` and 
-`data-ezattribute-another-attribute="attr1,attr2"`.
+The configuration outputs `data-ezattribute-<attribute_name>="<value>"` in the corresponding HTML element.
+Here, the resulting values are `data-ezattribute-custom-attribute="false"` and `data-ezattribute-another-attribute="attr1,attr2"`.
 
 ### Custom CSS classes
 
@@ -344,9 +335,7 @@ Use the example below to add a class choice to the Paragraph element in the `adm
  
 !!! note "Label translations"
 
-    If there are many custom attributes, to provide label translations for these 
-    attributes, you can use the `ez_online_editor_attributes` translation extractor 
-    to get a full list of all custom attributes for all elements in all scopes.
+    If there are many custom attributes, to provide label translations for these attributes, you can use the `ez_online_editor_attributes` translation extractor to get a full list of all custom attributes for all elements in all scopes.
 
     For example:
 
@@ -359,8 +348,7 @@ Use the example below to add a class choice to the Paragraph element in the `adm
 
 #### Note box
 
-You can create a custom class that enables you to place a paragraph element in 
-a note box:
+You can create a custom class that enables you to place a paragraph element in a note box:
 
 ![Example of a note box custom style](oe_custom_style_note_box.png)
 
@@ -369,8 +357,7 @@ a note box:
 
 ```
 
-With this class you can choose one of the following classes for each paragraph 
-element: `regular`, `tip_box`, or `warning_box`.
+With this class you can choose one of the following classes for each paragraph element: `regular`, `tip_box`, or `warning_box`.
 You can then style the class by using CSS.
 
 ![Selecting a custom style for a paragraph](oe_custom_class_note_box_select.png)
@@ -381,23 +368,23 @@ You can then style the class by using CSS.
 
 ## Rearrange buttons
 
-You can modify the order and visibility of buttons that are available in the 
-Online Editor toolbar through configuration:
+You can modify the order and visibility of buttons that are available in the Online Editor toolbar through configuration:
 
 ``` yaml
 [[= include_file('code_samples/back_office/online_editor/config/packages/custom_buttons.yaml') =]]
 ```
 
-For each button you can set `priority`, which defines the order of buttons in 
-the toolbar.
+For each button you can set `priority`, which defines the order of buttons in the toolbar.
 
 For a full list of standard buttons, see the RichText module's [configuration file](https://github.com/ibexa/fieldtype-richtext/blob/main/src/bundle/Resources/config/prepend/ezpublish.yaml)
 
 ## Add CKEditor plugins
 
-Regular CKEditor plugins can be added to the Online Editor. This procedure is illustrated with the addition of the [Special characters plugin](https://ckeditor.com/docs/ckeditor5/latest/features/special-characters.html).
+Regular CKEditor plugins can be added to the Online Editor.
+This procedure is illustrated with the addition of the [Special characters plugin](https://ckeditor.com/docs/ckeditor5/latest/features/special-characters.html).
 
-A CKEditor plugin is installed locally by using `yarn add ` or `npm install`, and is deployed by committing the `yarn.lock` file. A local installation looks like:
+A CKEditor plugin is installed locally by using `yarn add ` or `npm install`, and is deployed by committing the `yarn.lock` file.
+A local installation looks like:
 
 ```bash
 yarn add @ckeditor/ckeditor5-special-characters
diff --git a/docs/content_management/rich_text/online_editor_guide.md b/docs/content_management/rich_text/online_editor_guide.md
index ff5ecdc735..a2bca69a1c 100644
--- a/docs/content_management/rich_text/online_editor_guide.md
+++ b/docs/content_management/rich_text/online_editor_guide.md
@@ -18,8 +18,7 @@ Online Editor is available in all supported [[= product_name =]] versions and ed
 ## How to get started
 
 Online Editor is the default editing interface for all RichText fields. 
-To start using it, create any content item with a RichText field 
-(for example, using the built-in Article content type) and edit this field.
+To start using it, create any content item with a RichText field (for example, using the built-in Article content type) and edit this field.
 
 ## Capabilities
 
@@ -30,8 +29,7 @@ It also allows embedding other content from the repository, but also from Facebo
 
 #### Links
 
-All links added to a RichText field by using the link element are listed
-and can be managed in the [Link manager](url_management.md).
+All links added to a RichText field by using the link element are listed and can be managed in the [Link manager](url_management.md).
 
 #### Distraction free mode
 
@@ -43,8 +41,7 @@ For more information, see [Distraction free mode]([[= user_doc =]]/content_manag
 
 ### Custom tags
 
-Custom tags are customizable RichText elements for which you can specify attributes 
-and render them with custom templates.
+Custom tags are customizable RichText elements for which you can specify attributes and render them with custom templates.
 
 Custom tags can be created by means of specifying two things only:
 
@@ -59,7 +56,8 @@ See [Extend Online Editor](extend_online_editor.md#configure-custom-tags) for a
 
 Custom styles allow specifying custom predefined templates for specific RichText elements.
 
-Custom styles differ from custom tags in that they don't have attributes configured. A custom style requires YAML configuration that points to a template used to render an elements with this style.
+Custom styles differ from custom tags in that they don't have attributes configured.
+A custom style requires YAML configuration that points to a template used to render an elements with this style.
 
 See [Extend Online Editor](extend_online_editor.md#configure-custom-styles) for a full example.
 
@@ -83,8 +81,7 @@ Because Online Editor is based on CKEditor 5, you can use CKEditor's capabilitie
 
 ### Familiar editing tools
 
-Online editor offers rich text editing tools familiar to most editors and contributors, 
-which allows quick adoption to the editorial flow.
+Online editor offers rich text editing tools familiar to most editors and contributors, which allows quick adoption to the editorial flow.
 
 ![Familiar editing tools](img/familiar_editing_tools.png)
 
@@ -94,8 +91,7 @@ The editor's toolbars can be customized and reorganized to for the specific proj
 
 The range of available text elements can be extended by offering custom elements and custom formatting options.
 
-Custom formatting options can be offered either as custom CSS classes that editors can add to specific elements, 
-or as custom styles which can have their own templates.
+Custom formatting options can be offered either as custom CSS classes that editors can add to specific elements, or as custom styles which can have their own templates.
 
 More extensive customization is available via custom tags:
 
@@ -106,8 +102,8 @@ More extensive customization is available via custom tags:
 
 ### Customizable Call to action buttons
 
-Online Editor extensibility offers a simple way to create custom elements such as Call to action (CTA) buttons. 
-Creating a CTA custom tag lets you use a template to construct a button element. 
+Online Editor extensibility offers a simple way to create custom elements such as Call to action (CTA) buttons.
+Creating a CTA custom tag lets you use a template to construct a button element.
 Then, you can add a link attribute to provide target for the button, and a style attribute with different presets to style its look.
 
 ![Call to action buttons](img/call_to_action_buttons.png)
@@ -116,6 +112,6 @@ Refer to [Extend Online Editor](extend_online_editor.md#link-tag) for a similar
 
 ### Embed external resources
 
-Custom tags allow embedding content from external resources inside RichText fields. 
-The built-in elements offer embedding of Twitter or Facebook posts, but you can extend the capability by embedding other resources. 
-These can be, for example, 3D product or real estate viewers.
\ No newline at end of file
+Custom tags allow embedding content from external resources inside RichText fields.
+The built-in elements offer embedding of Twitter or Facebook posts, but you can extend the capability by embedding other resources.
+These can be, for example, 3D product, or real estate viewers.
\ No newline at end of file
diff --git a/docs/content_management/taxonomy/taxonomy.md b/docs/content_management/taxonomy/taxonomy.md
index 816fe2d20a..f6bedd439d 100644
--- a/docs/content_management/taxonomy/taxonomy.md
+++ b/docs/content_management/taxonomy/taxonomy.md
@@ -4,7 +4,7 @@ description: A taxonomy uses tags to categorize and organize content
 
 # Taxonomy
 
-Taxonomies (**Tags**) allow you to organize content to make it easy for your site users to browse and to deliver content appropriate for them. 
+Taxonomies (**Tags**) allow you to organize content to make it easy for your site users to browse and to deliver content appropriate for them.
 Taxonomies are classifications of logical relationships between content.
 In [[= product_name =]] you can create many taxonomies, each with many tags. The platform mechanism enables creating any entities with a tree structure and assign them to a content item.
 
@@ -20,7 +20,7 @@ The associated content type is `tag`.
 * `ibexa_taxonomies` - section responsible for taxonomy structure where you can [configure other taxonomies](#customize-taxonomy-structure)
 * `ibexa_taxonomies.tags.parent_location_remote_id` - Remote ID for Location where new content items representing tags are created
 * `ibexa_taxonomies.tags.content_type` - Content type identifier which stands for the tags
-* `ibexa_taxonomies.tags.field_mappings` - field types map of a content type which taxonomy receives information about the tag from. 
+* `ibexa_taxonomies.tags.field_mappings` - field types map of a content type which taxonomy receives information about the tag from.
 
 Three fields are available: `identifier`, `parent` and `name`.
 The identifiers correspond to field names defined in the content type. The `name` field is used to automatically generate an identifier.
diff --git a/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md b/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md
index 0588ab73da..ffc3272c64 100644
--- a/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md
+++ b/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md
@@ -112,12 +112,12 @@ Now return to the back office and create some content for your website.
 
 First, you can hide unneeded content items from the project root.
 
-Go to **Content structure** and select "Ibexa Digital Experience Platform".
+Go to **Content structure** and select "[[= product_name_base =]] Digital Experience Platform".
 In the **Sub-items** tab, select all the current sub-items and click the **Hide** icon:
 
 ![Hiding content items you don't need](enterprise_tut_hide_content.png)
 
-Next, under "Ibexa Digital Experience Platform", create three Folders.
+Next, under "[[= product_name_base =]] Digital Experience Platform", create three Folders.
 Call them 'All Articles', 'Dog Breed Catalog' and 'All Tips'.
 Remember that you can **Save and close** them, but you should use the **Publish** button.
 

From e36918666e5ee69551c9e9ecd0b21f45e76ad59b Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 12:37:46 +0200
Subject: [PATCH 56/77] Fixes - 'section'

---
 docs/api/rest_api/rest_api_usage/rest_requests.md           | 2 +-
 docs/content_management/content_management_guide.md         | 6 +++---
 docs/content_management/content_model.md                    | 6 +++---
 .../data_migration/data_migration_actions.md                | 2 +-
 docs/content_management/locations.md                        | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/api/rest_api/rest_api_usage/rest_requests.md b/docs/api/rest_api/rest_api_usage/rest_requests.md
index 9ddd3a20e5..a51843fb93 100644
--- a/docs/api/rest_api/rest_api_usage/rest_requests.md
+++ b/docs/api/rest_api/rest_api_usage/rest_requests.md
@@ -193,7 +193,7 @@ The root node is `<ViewInput>` and it has two mandatory children: `<identifier>`
 
 You can add `version=1.1` to the `Content-Type` header to support the distinction between `ContentQuery` and `LocationQuery` instead of `Query` which implicitly looks only for content items.
 
-The following examples search for `article` and `news` typed content items everywhere or for content items of all types directly under Location `123`. All those content items must be in the `standard` Section.
+The following examples search for `article` and `news` typed content items everywhere or for content items of all types directly under Location `123`. All those content items must be in the `standard` section.
 
 === "XML"
 
diff --git a/docs/content_management/content_management_guide.md b/docs/content_management/content_management_guide.md
index 17957e1354..24f7255327 100644
--- a/docs/content_management/content_management_guide.md
+++ b/docs/content_management/content_management_guide.md
@@ -187,10 +187,10 @@ There are, however, mechanisms to control access to content with even more conve
 ### Sections
 
 You can divide your content tree into nominal parts to better organize it.
-Once you have defined sections, for example, Media or Forms, and assigned them to content items, you can decide which roles have access to which Section of the tree.
+Once you have defined sections, for example, Media or Forms, and assigned them to content items, you can decide which roles have access to which section of the tree.
 
 The setting is inherited, which means that a child content item inherits a value of this setting from its parent.
-Changing a Section setting doesn't result in moving a content item to a different location within a content tree.
+Changing a section setting doesn't result in moving a content item to a different location within a content tree.
 
 ![Members of the Media Section](img/sections.png)
 
@@ -241,7 +241,7 @@ Again, this isn't part of content management, but at this point you can [publish
 **5\. Organize content**
 
 Organize the content of your website by copying or moving content items, [controlling Locations and URL addresses]([[= user_doc =]]/content_management/content_organization/manage_locations_urls/).
-Then work with Tags, Sections and Object States to [classify]([[= user_doc =]]/content_management/content_organization/classify_content/#sections) it.
+Then work with Tags, sections and Object States to [classify]([[= user_doc =]]/content_management/content_organization/classify_content/#sections) it.
 
 ## Benefits
 
diff --git a/docs/content_management/content_model.md b/docs/content_management/content_model.md
index 62b6b37fa5..13a2a94718 100644
--- a/docs/content_management/content_model.md
+++ b/docs/content_management/content_model.md
@@ -38,9 +38,9 @@ The name is in the main language of the content item.
 
     `name` is always searchable, even if the field(s) used to generate it aren't.
 
-**`sectionId`** - the unique number of the Section to which the content item belongs.
-New content items are placed in the Standard Section by default.
-This behavior can be changed, but content must always belong to some Section.
+**`sectionId`** - the unique number of the section to which the content item belongs.
+New content items are placed in the Standard section by default.
+This behavior can be changed, but content must always belong to some section.
 
 For more information, see [Sections](sections.md).
 
diff --git a/docs/content_management/data_migration/data_migration_actions.md b/docs/content_management/data_migration/data_migration_actions.md
index 3f833cc21b..44db9c5791 100644
--- a/docs/content_management/data_migration/data_migration_actions.md
+++ b/docs/content_management/data_migration/data_migration_actions.md
@@ -1,5 +1,5 @@
 ---
-description: Data migration actions enable you to run special operations while executing data migrations, such as assigning roles, Sections, Objects states, and so on.
+description: Data migration actions enable you to run special operations while executing data migrations, such as assigning roles, sections, Objects states, and so on.
 page_type: reference
 ---
 
diff --git a/docs/content_management/locations.md b/docs/content_management/locations.md
index c22e7a54bd..bef313869d 100644
--- a/docs/content_management/locations.md
+++ b/docs/content_management/locations.md
@@ -99,7 +99,7 @@ When the Location of a content item is hidden, the system doesn't display it on
     it'sn't permission-based, and **doesn't restrict access to content**. Hidden content can be read through other means, like the REST API.
 
     If you need to restrict access to a given content item, you could create a role that grants read access for a given [**Section**](sections.md) or
-    [**Object State**](object_states.md), and set a different Section or Object State for the given Content.
+    [**Object State**](object_states.md), and set a different section or Object State for the given content.
     Or use other permission-based [**Limitations**](limitations.md).
 
 If a content item is hidden, it's invisible in all its Locations.

From 9b5d49228134a7450e8e60f2ac61a1a876372d99 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 12:57:47 +0200
Subject: [PATCH 57/77] Fixes - 'location'

---
 .../admin_panel/roles_admin_panel.md          |   2 +-
 .../back_office/back_office_configuration.md  |   4 +-
 .../back_office/browser/browser.md            |   6 +-
 .../back_office/content_tree.md               |   4 +-
 .../back_office/multifile_upload.md           |   8 +-
 .../back_office/subitems_list.md              |  18 +--
 .../configuration/repository_configuration.md |   2 +-
 .../creating_new_rest_resource.md             |   2 +-
 .../rest_api/rest_api_usage/rest_requests.md  |  10 +-
 .../rest_api/rest_api_usage/rest_responses.md |   2 +-
 .../content_api/browsing_content.md           |   3 +-
 .../content_api/managing_content.md           |   2 +-
 .../content_management_api/bookmark_api.md    |   2 +-
 .../content_management_guide.md               |   8 +-
 docs/content_management/content_model.md      |   2 +-
 docs/content_management/content_relations.md  |   4 +-
 .../field_type_reference/pagefield.md         |   2 +-
 .../field_types/field_type_search.md          |   2 +-
 .../field_types/field_types.md                |   4 +-
 .../forms/create_custom_form_field.md         |   2 +-
 .../forms/work_with_forms.md                  |   4 +-
 docs/content_management/locations.md          | 118 +++++++++---------
 docs/content_management/taxonomy/taxonomy.md  |   4 +-
 .../url_management/url_management.md          |   4 +-
 .../user_generated_content.md                 |   4 +-
 docs/content_management/workflow/workflow.md  |   2 +-
 .../cache/http_cache/content_aware_cache.md   |  18 +--
 .../request_lifecycle.md                      |   2 +-
 docs/multisite/multisite_configuration.md     |   6 +-
 docs/multisite/set_up_campaign_siteaccess.md  |   2 +-
 docs/permissions/custom_policies.md           |   2 +-
 docs/permissions/limitation_reference.md      |   6 +-
 docs/permissions/limitations.md               |   2 +-
 docs/permissions/permission_overview.md       |   2 +-
 docs/permissions/permission_use_cases.md      |  12 +-
 docs/permissions/policies.md                  |   6 +-
 docs/pim/pim_configuration.md                 |   2 +-
 .../criteria_reference/ancestor_criterion.md  |   2 +-
 .../criteria_reference/depth_criterion.md     |   2 +-
 .../ismainlocation_criterion.md               |   4 +-
 .../parentlocationid_criterion.md             |   2 +-
 .../parentlocationremoteId_criterion.md       |   2 +-
 .../criteria_reference/priority_criterion.md  |   3 +-
 .../search_criteria_reference.md              |   6 +-
 .../criteria_reference/sibling_criterion.md   |   7 +-
 .../criteria_reference/subtree_criterion.md   |   2 +-
 .../visibility_criterion.md                   |   2 +-
 .../create_custom_aggregation.md              |   4 +-
 .../create_custom_sort_clause.md              |   2 +-
 .../index_custom_elasticsearch_data.md        |   4 +-
 .../solr_document_field_mappers.md            |   2 +-
 docs/search/search_api.md                     |  18 +--
 .../search_criteria_and_sort_clauses.md       |   2 +-
 .../depth_sort_clause.md                      |   2 +-
 .../sort_clause_reference/id_sort_clause.md   |   2 +-
 .../ismainlocation_sort_clause.md             |   4 +-
 .../sort_clause_reference/path_sort_clause.md |   2 +-
 .../priority_sort_clause.md                   |   2 +-
 .../sort_clause_reference.md                  |   6 +-
 .../visibility_sort_clause.md                 |   2 +-
 60 files changed, 182 insertions(+), 187 deletions(-)

diff --git a/docs/administration/admin_panel/roles_admin_panel.md b/docs/administration/admin_panel/roles_admin_panel.md
index cbc6d06f1c..c1b2362555 100644
--- a/docs/administration/admin_panel/roles_admin_panel.md
+++ b/docs/administration/admin_panel/roles_admin_panel.md
@@ -23,7 +23,7 @@ See [example use case](permission_use_cases.md#restrict-editing-to-part-of-the-t
 !!! note
 
     Limitation specifies what a user can do, not what they can't do.
-    A `Location` limitation, for example, gives the user access to content with a specific Location, not prohibits it.
+    A `Location` limitation, for example, gives the user access to content with a specific location, not prohibits it.
 
     For more information, see [Limitation reference](limitation_reference.md).
 
diff --git a/docs/administration/back_office/back_office_configuration.md b/docs/administration/back_office/back_office_configuration.md
index 68d58c32f4..b155e72f24 100644
--- a/docs/administration/back_office/back_office_configuration.md
+++ b/docs/administration/back_office/back_office_configuration.md
@@ -47,9 +47,9 @@ The default value is `100`. You can set it to `-1` for no limit, or to `0` to co
 
 You can copy subtree from CLI using the command: `bin/console ibexa:copy-subtree <sourceLocationId> <targetLocationId>`.
 
-## Default Locations
+## Default locations
 
-Default Location IDs for [Content structure, Media and Users](locations.md#top-level-locations) in the menu are configured using the `ibexa.system.<scope>.location_ids` [configuration key](configuration.md#configuration-files):
+Default location IDs for [content structure, Media, and users](locations.md#top-level-locations) in the menu are configured using the `ibexa.system.<scope>.location_ids` [configuration key](configuration.md#configuration-files):
 
 ``` yaml
 ibexa:
diff --git a/docs/administration/back_office/browser/browser.md b/docs/administration/back_office/browser/browser.md
index a0da7896d4..1addc5b3d8 100644
--- a/docs/administration/back_office/browser/browser.md
+++ b/docs/administration/back_office/browser/browser.md
@@ -56,10 +56,10 @@ There you can set the following properties:
 
 |YML</br>React props|Values|Required|Definition|
 |-------------------|------|--------|----------|
-|multiple</br>`multiple`|true</br>false|no|The possibility to choose multiple Locations.|
+|multiple</br>`multiple`|true</br>false|no|The possibility to choose multiple locations.|
 |multiple_items_limit</br>`multipleItemsLimit`|number|no|Maximum number of items with configuration `multiple: true`.|
-|root_location_id</br>`rootLocationId`|number|no|UDW displays Locations only below this content tree element.|
-|starting_location_id</br>`startingLocationId`|number|no|This Location is displayed as a starting Location in UDW.|
+|root_location_id</br>`rootLocationId`|number|no|UDW displays locations only below this content tree element.|
+|starting_location_id</br>`startingLocationId`|number|no|This location is displayed as a starting location in UDW.|
 |containers_only</br>`containersOnly`|true</br>false|no|When set to `true` only containers can be selected.|
 |allowed_content_types</br>`allowedContentTypes`|null</br>[]</br>[`contentTypeIdentifier`]|yes|List of allowed content types:</br>`null` – all content types are allowed,</br>`[]` – empty table, no content types are allowed.|
 |active_sort_clause</br>`activeSortClause`|DatePublished</br>ContentName|no|Sort Clause by which children in the content tree is sorted.|
diff --git a/docs/administration/back_office/content_tree.md b/docs/administration/back_office/content_tree.md
index 71d0e76f36..0a71fa9f9b 100644
--- a/docs/administration/back_office/content_tree.md
+++ b/docs/administration/back_office/content_tree.md
@@ -10,8 +10,8 @@ With this configuration you can:
 - decide how many content items are displayed in the tree
 - set maximum depth of expanded tree
 - hide content types
-- set a tree root Location
-- override content tree's root for specific Locations
+- set a tree root location
+- override content tree's root for specific locations
 
 ```yaml
 ibexa:
diff --git a/docs/administration/back_office/multifile_upload.md b/docs/administration/back_office/multifile_upload.md
index 29fe248a7b..d95d61043d 100644
--- a/docs/administration/back_office/multifile_upload.md
+++ b/docs/administration/back_office/multifile_upload.md
@@ -103,14 +103,14 @@ All of the following properties must be used, otherwise the multi-file upload do
             - **contentTypeIdentifier** _{String}_ - content type identifier
             - **contentFieldIdentifier** _{String}_ - field identifier
             - **nameFieldIdentifier** _{String}_ - name field identifier
-        - **locationMappings** _{Array}_ - list of file type to content type mappings based on a Location identifier
+        - **locationMappings** _{Array}_ - list of file type to content type mappings based on a location identifier
         - **maxFileSize** {Number} - maximum file size allowed for uploading. It's a number of bytes
     - **token** _{String}_ - CSRF token
     - **siteaccess** _{String}_ - SiteAccess identifier
-- **parentInfo** _{Object}_ - parent Location meta information:
+- **parentInfo** _{Object}_ - parent location meta information:
     - **contentTypeIdentifier** _{String}_ - content type identifier
     - **contentTypeId** _{Number}_ - content type ID
-    - **locationPath** _{String}_ - Location path string
+    - **locationPath** _{String}_ - location path string
     - **language** _{String}_ - language code identifier
 
 ### Optional properties
@@ -119,7 +119,7 @@ Optionally, the multi-file upload module can take a following list of properties
 
 - **checkCanUpload** _{Function}_ - checks whether am uploaded file can be uploaded. The callback takes four params:
     - **file** _{File}_ - file object
-    - **parentInfo** _{Object}_ - parent Location meta information
+    - **parentInfo** _{Object}_ - parent location meta information
     - **config** _{Object}_ - Multi-file Upload module config
     - **callbacks** _{Object}_ - error callbacks list: **fileTypeNotAllowedCallback** and **fileSizeNotAllowedCallback**
 - **createFileStruct** _{Function}_ - a function that creates a _ContentCreate_ struct. The function takes two params:
diff --git a/docs/administration/back_office/subitems_list.md b/docs/administration/back_office/subitems_list.md
index 42378c734d..209f1493d0 100644
--- a/docs/administration/back_office/subitems_list.md
+++ b/docs/administration/back_office/subitems_list.md
@@ -5,7 +5,7 @@ description: Inject a sub-items list into your back office customizations.
 # Sub-items list
 
 The Sub-items List module is meant to be used as a part of the editorial interface of [[= product_name =]].
-It provides an interface for listing the sub-items of any Location.
+It provides an interface for listing the sub-items of any location.
 
 !!! caution
 
@@ -54,7 +54,7 @@ All of them are listed below.
 
 Without all the following properties the Sub-items module cannot work.
 
-- **parentLocationId** _{Number}_ - parent Location ID
+- **parentLocationId** _{Number}_ - parent location ID
 - **restInfo** _{Object}_ - backend config object:
     - **token** _{String}_ - CSRF token
     - **siteaccess** _{String}_ - SiteAccess identifier
@@ -70,28 +70,28 @@ Optionally, Sub-items module can take a following list of props:
     - **callback** _{Function}_ - a callback invoked when content info is loaded
 - **loadContentTypes** _{Function}_ - loads content types. Takes one param:
     - **callback** _{Function}_ - callback invoked when content types are loaded
-- **loadLocation** _{Function}_ - loads Location. Takes four params:
+- **loadLocation** _{Function}_ - loads location. Takes four params:
     - **restInfo** _{Object}_ - REST info params:
         - **token** _{String}_ - the user token
         - **siteaccess** _{String}_ - the current SiteAccess
     - **queryConfig** _{Object}_ - query config:
-        - **locationId** _{Number}_ - Location ID
+        - **locationId** _{Number}_ - location ID
         - **limit** _{Number}_ - content item limit
         - **offset** _{Number}_ - items offset
         - **sortClauses** _{Object}_ - the Sort Clauses, for example, {LocationPriority: 'ascending'}
-    - **callback** _{Function}_ - callback invoked when Location is loaded
-- **updateLocationPriority** - updates item Location priority. Takes two params:
+    - **callback** _{Function}_ - callback invoked when location is loaded
+- **updateLocationPriority** - updates item location priority. Takes two params:
     - **params** _{Object}_ - parameters hash containing:
         - **priority** _{Number}_ - priority value
-        - **location** _{String}_ - REST Location ID
+        - **location** _{String}_ - REST location ID
         - **token** _{String}_ - CSRF token
         - **siteaccess** _{String}_ - SiteAccess identifier
-    - **callback** _{Function}_ - callback invoked when Location priority is updated
+    - **callback** _{Function}_ - callback invoked when location priority is updated
 - **activeView** _{String}_ - active list view identifier
 - **extraActions** _{Array}_ - list of extra actions. Each action is an object containing:
     - **component** _{Element}_ - React component class
     - **attrs** _{Object}_ - additional component properties
-- **items** _{Array}_ - list of Location's sub-items
+- **items** _{Array}_ - list of location's sub-items
 - **limit** _{Number}_ - items limit count
 - **offset** _{Number}_ - items limit offset
 - **labels** _{Object}_ - list of module labels, see [sub.items.module.js](https://github.com/ibexa/admin-ui/blob/main/src/bundle/ui-dev/src/modules/sub-items/sub.items.module.js) for details. Contains definitions for sub components:
diff --git a/docs/administration/configuration/repository_configuration.md b/docs/administration/configuration/repository_configuration.md
index c620fb07c2..0f6d9e16bc 100644
--- a/docs/administration/configuration/repository_configuration.md
+++ b/docs/administration/configuration/repository_configuration.md
@@ -249,7 +249,7 @@ When viewing such content in the back office you're able to see, for example, th
 
 ## Top-level Locations
 
-You can change the default path for top-level Locations such as content or media in the back office, for example:
+You can change the default path for top-level locations such as content or media in the back office, for example:
 
 ```yaml
 ibexa:
diff --git a/docs/api/rest_api/extending_rest_api/creating_new_rest_resource.md b/docs/api/rest_api/extending_rest_api/creating_new_rest_resource.md
index d3de11e7f1..d057cb05ad 100644
--- a/docs/api/rest_api/extending_rest_api/creating_new_rest_resource.md
+++ b/docs/api/rest_api/extending_rest_api/creating_new_rest_resource.md
@@ -64,7 +64,7 @@ A REST controller should:
 [[= include_file('code_samples/api/rest_api/src/Rest/Controller/DefaultController.php') =]]
 ```
 
-If the returned value was depending on a Location, it could have been wrapped in a `CachedValue` to be cached by the reverse proxy (like Varnish) for future calls.
+If the returned value was depending on a location, it could have been wrapped in a `CachedValue` to be cached by the reverse proxy (like Varnish) for future calls.
 
 `CachedValue` is used in the following way:
 
diff --git a/docs/api/rest_api/rest_api_usage/rest_requests.md b/docs/api/rest_api/rest_api_usage/rest_requests.md
index a51843fb93..f112f159ac 100644
--- a/docs/api/rest_api/rest_api_usage/rest_requests.md
+++ b/docs/api/rest_api/rest_api_usage/rest_requests.md
@@ -29,7 +29,7 @@ For method action details per resource, see the [REST API reference](../rest_api
 | [PATCH](https://datatracker.ietf.org/doc/html/rfc5789)               | Custom   | Update an item         | No   |
 | COPY                                                                 | Custom   | Duplicate an item      | No   |
 | [MOVE](https://datatracker.ietf.org/doc/html/rfc2518)                | Custom   | Move an item           | No   |
-| SWAP                                                                 | Custom   | Swap two Locations     | No   |
+| SWAP                                                                 | Custom   | Swap two locations     | No   |
 | PUBLISH                                                              | Custom   | Publish an item        | No   |
 | [DELETE](https://datatracker.ietf.org/doc/html/rfc2616#section-9.7)  | Standard | Remove an item         | No   |
 
@@ -103,7 +103,7 @@ Accept: application/vnd.ibexa.api.Root+json
 X-Siteaccess: restapi
 ```
 
-One of the principles of REST is that the same resource (such as content item, Location, content type) should be unique.
+One of the principles of REST is that the same resource (such as content item, location, content type) should be unique.
 It allows caching your REST API using a reverse proxy such as Varnish.
 If the same resource is available in multiple locations, cache purging is noticeably more complex.
 This is why SiteAccess matching with REST isn't enabled at URL level (or domain).
@@ -128,7 +128,7 @@ A response indicates `href`s to related resources and their media types.
 ### Destination
 
 The `Destination` request header is the request counterpart of the `Location` response header.
-It's used for a `COPY`, `MOVE` or `SWAP` operation to indicate where the resource should be moved, copied to or swapped with by using the ID of the parent or target Location.
+It's used for a `COPY`, `MOVE` or `SWAP` operation to indicate where the resource should be moved, copied to or swapped with by using the ID of the parent or target location.
 
 Examples of such requests are:
 
@@ -153,7 +153,7 @@ One example is the [creation of an authentication session](rest_api_authenticati
 
 When creating a content item, a special payload is needed if the content type has some [Image](imagefield.md) or [BinaryFile](binaryfilefield.md) fields as files need to be attached. See the example of a [script uploading images](#creating-content-with-binary-attachments) below.
 
-When searching for content items (or Locations), the query grammar is also particular. See the [Search section](#search-views) below.
+When searching for content items (or locations), the query grammar is also particular. See the [Search section](#search-views) below.
 
 ### Creating content with binary attachments
 
@@ -193,7 +193,7 @@ The root node is `<ViewInput>` and it has two mandatory children: `<identifier>`
 
 You can add `version=1.1` to the `Content-Type` header to support the distinction between `ContentQuery` and `LocationQuery` instead of `Query` which implicitly looks only for content items.
 
-The following examples search for `article` and `news` typed content items everywhere or for content items of all types directly under Location `123`. All those content items must be in the `standard` section.
+The following examples search for `article` and `news` typed content items everywhere or for content items of all types directly under location `123`. All those content items must be in the `standard` section.
 
 === "XML"
 
diff --git a/docs/api/rest_api/rest_api_usage/rest_responses.md b/docs/api/rest_api/rest_api_usage/rest_responses.md
index a2268f239e..e475ea1eb2 100644
--- a/docs/api/rest_api/rest_api_usage/rest_responses.md
+++ b/docs/api/rest_api/rest_api_usage/rest_responses.md
@@ -25,7 +25,7 @@ For code details per resource, see the [REST API reference](../rest_api_referenc
 | `409` | Conflict               | The request is in conflict with another part of the repository (for example, trying to create a new item with an identifier already used).                                                                                                                  |
 | `415` | Unsupported Media Type | The request payload media type doesn't match the media type specified in the request header.                                                                                                                                                                |
 | `500` | Internal Server Error  | The server encountered an unexpected condition, usually an exception, which prevents it from fulfilling the request, like database down, permissions or configuration error.                                                                                |
-| `501` | Not Implemented        | Returned when the requested method hasn't yet been implemented. For [[= product_name =]], most of Users, User groups, content items, Locations and content types have been implemented. Some of their methods, and other features, may return a 501. |
+| `501` | Not Implemented        | Returned when the requested method hasn't yet been implemented. For [[= product_name =]], most of users, user groups, content items, locations and content types have been implemented. Some of their methods, and other features, may return a 501. |
 
 ## Response headers
 
diff --git a/docs/content_management/content_api/browsing_content.md b/docs/content_management/content_api/browsing_content.md
index a765b32b25..ad1c9a14b0 100644
--- a/docs/content_management/content_api/browsing_content.md
+++ b/docs/content_management/content_api/browsing_content.md
@@ -209,8 +209,7 @@ When dealing with location objects (and Trash objects), you can get access to co
 In Twig this can also be accessed by `location.content`.
 This is a lazy property.
 It triggers loading of content when first used.
-In case of bulk of locations coming from Search or Location Service,
-the content is also loaded in bulk for the whole location result set.
+In case of bulk of locations coming from Search or location Service, the content is also loaded in bulk for the whole location result set.
 
 ## Comparing content versions
 
diff --git a/docs/content_management/content_api/managing_content.md b/docs/content_management/content_api/managing_content.md
index 52a095a084..e83634a487 100644
--- a/docs/content_management/content_api/managing_content.md
+++ b/docs/content_management/content_api/managing_content.md
@@ -6,7 +6,7 @@ description: PHP API enables managing content Locations, content types, content
 
 ## Locations
 
-You can manage [Locations](locations.md) that hold content using [`LocationService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-LocationService.html).
+You can manage [locations](locations.md) that hold content using [`LocationService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-LocationService.html).
 
 !!! tip "Location REST API"
 
diff --git a/docs/content_management/content_management_api/bookmark_api.md b/docs/content_management/content_management_api/bookmark_api.md
index 8f177a8db0..b9c7ef8382 100644
--- a/docs/content_management/content_management_api/bookmark_api.md
+++ b/docs/content_management/content_management_api/bookmark_api.md
@@ -22,7 +22,7 @@ You can add a bookmark to a content item by providing its Location object to the
 [[= include_file('code_samples/api/public_php_api/src/Command/BookmarkCommand.php', 37, 40) =]]
 ```
 
-You can remove a bookmark from a Location with [`BookmarkService::deleteBookmark`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-BookmarkService.html#method_deleteBookmark):
+You can remove a bookmark from a location with [`BookmarkService::deleteBookmark`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-BookmarkService.html#method_deleteBookmark):
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/BookmarkCommand.php', 52, 53) =]]
diff --git a/docs/content_management/content_management_guide.md b/docs/content_management/content_management_guide.md
index 24f7255327..09e2ed592e 100644
--- a/docs/content_management/content_management_guide.md
+++ b/docs/content_management/content_management_guide.md
@@ -113,8 +113,8 @@ You can use these characteristics in combination with system features to create
 
 #### Locations
 
-When a content item is created and published, it's assigned a place in the content tree, designated by a Location ID.
-A single content item can have more than one Location ID, which means that the same content can be found on different branches of the tree.
+When a content item is created and published, it's assigned a place in the content tree, designated by a location ID.
+A single content item can have more than one location ID, which means that the same content can be found on different branches of the tree.
 However, a single location can have only one content item assigned to it.
 
 ![Locations](img/locations.png)
@@ -146,7 +146,7 @@ Editors can compare different translations of the same content items with the Co
 
 A [relation](content_relations.md) can exist between any two content items in the content tree.
 For example, blog posts featured in the website's main page are in a relation with the page that they're embedded in.
-Or, instead of direct attachments, an article can use images that are separate content items outside the article and are referenced through a relation.
+Or, instead of direct attachments, an article can use images that are separate content items outside the article, and are referenced through a relation.
 
 ## Content arrangement
 
@@ -155,7 +155,7 @@ These operations, like in your computer’s file system, can apply both to indiv
 
 ![Content organization operations](img/content_arrangement.png)
 
-Content items can be hidden when necessary, for example, until a certain event, like a Holiday Sale or Board announcement comes. Hidden content items aren't visible to website visitors and are greyed out in the content tree.
+Content items can be hidden when necessary, for example, until a certain event, like a Holiday Sale, or Board announcement comes. Hidden content items aren't visible to website visitors and are greyed out in the content tree.
 
 ![Hidden content item](img/hidden_content_item.png)
 
diff --git a/docs/content_management/content_model.md b/docs/content_management/content_model.md
index 13a2a94718..4c71a9b6af 100644
--- a/docs/content_management/content_model.md
+++ b/docs/content_management/content_model.md
@@ -68,7 +68,7 @@ It's recommended to either let this value be generated by the Public PHP API as
 **`mainLanguageCode`** - the main language code of the content item.
 If the `alwaysAvailable` flag is set to true, the content item is shown in this language when the requested language doesn't exist.
 
-**`mainLocationId`** - identifier of the content item's main [Location](locations.md).
+**`mainLocationId`** - identifier of the content item's main [location](locations.md).
 
 **`status`** - status of the content item. It can have three statuses: 0 – *draft*, 1 – *published* and 2 – *archived*.
 When an item is created, its status is set to *draft*. After publishing the status changes to *published*.
diff --git a/docs/content_management/content_relations.md b/docs/content_management/content_relations.md
index 830206bd68..3ec699cf89 100644
--- a/docs/content_management/content_relations.md
+++ b/docs/content_management/content_relations.md
@@ -4,7 +4,7 @@ description: Content Relations control links between different content items, ei
 
 # Content Relations
 
-Content items are located in a tree structure through the Locations they're placed in.
+Content items are located in a tree structure through the locations they're placed in.
 However, content items themselves can also be related to one another.
 
 ![Content Relations](content_management_relations.png "Content Relations")
@@ -23,7 +23,7 @@ These fields allow you to select one or more other content items in the field va
 
 - *Common Relations* are created between two content items using the public PHP API.
 - *RichText linked Relations* are created using a field of the RichText type.
-When an internal link (a link to another Location or content item) is placed in a RichText field,
+When an internal link (a link to another location or content item) is placed in a RichText field,
 the system automatically creates a Relation.
 The Relation is automatically removed from the system when the link is removed from the content item.
 - *RichText embedded Relations* also use a RichText field.
diff --git a/docs/content_management/field_types/field_type_reference/pagefield.md b/docs/content_management/field_types/field_type_reference/pagefield.md
index 84cddf5a4e..fa67799a68 100644
--- a/docs/content_management/field_types/field_type_reference/pagefield.md
+++ b/docs/content_management/field_types/field_type_reference/pagefield.md
@@ -47,7 +47,7 @@ The `renderAction` has the following parameters:
 
 |Parameter|Description|
 |---------|-----------|
-|`locationId`|ID of the Location of the content item which can be accessed by `contentInfo.id`|
+|`locationId`|ID of the location of the content item which can be accessed by `contentInfo.id`|
 |`blockId`|ID of the block which you want to render.|
 |`versionNo`|Version number of the content item to render.|
 |`languageCode`|Language code of the content item to render.|
diff --git a/docs/content_management/field_types/field_type_search.md b/docs/content_management/field_types/field_type_search.md
index 038a9a5581..b477762c4b 100644
--- a/docs/content_management/field_types/field_type_search.md
+++ b/docs/content_management/field_types/field_type_search.md
@@ -80,7 +80,7 @@ The default available search field types that can be found in the `Ibexa\Contrac
 |`DocumentField`|Document field|
 |`FloatField`|Field for floating point numbers.|
 |`FullTextField`|Represents full text searchable value of the field which can be indexed by the legacy search engine. Some full text fields are stored as an array of strings.|
-|`GeoLocationField`|Field used for Geo Location.|
+|`GeoLocationField`|Field used for Geo location.|
 |`IdentifierField`|Field used for IDs. Basically acts like the string field, but it's not queried by fulltext searches|
 |`IntegerField`|Field for integer numbers.|
 |`MultipleBooleanField`|Multiple boolean values.|
diff --git a/docs/content_management/field_types/field_types.md b/docs/content_management/field_types/field_types.md
index 57dbc063a2..cc31c38d03 100644
--- a/docs/content_management/field_types/field_types.md
+++ b/docs/content_management/field_types/field_types.md
@@ -54,8 +54,8 @@ The following sequence diagrams visualize the process of creating and publishing
 
 !!! note "indexLocation()"
 
-    For **Solr** Locations are indexed during Content indexing.
-    For **Legacy/SQL** indexing isn't required as Location data already exists in a database.
+    For **Solr** locations are indexed during Content indexing.
+    For **Legacy/SQL** indexing isn't required as location data already exists in a database.
 
 ![Publish content sequence](publish_content_sequence.png)
 
diff --git a/docs/content_management/forms/create_custom_form_field.md b/docs/content_management/forms/create_custom_form_field.md
index 4bb999ab2c..3f7d7129a9 100644
--- a/docs/content_management/forms/create_custom_form_field.md
+++ b/docs/content_management/forms/create_custom_form_field.md
@@ -27,7 +27,7 @@ Available attribute types are:
 |`multiple`|Multiple choice|
 |`select`|Dropdown|
 |`checkbox`|Checkbox|
-|`location`|Content Location|
+|`location`|Content location|
 |`radio`|Radio button|
 |`action`|Button|
 |`choices`|List of available options|
diff --git a/docs/content_management/forms/work_with_forms.md b/docs/content_management/forms/work_with_forms.md
index b75c1c0cf4..245b1bdea7 100644
--- a/docs/content_management/forms/work_with_forms.md
+++ b/docs/content_management/forms/work_with_forms.md
@@ -63,7 +63,7 @@ The following table lists some of the available options and their meaning:
 ## Form-uploaded files
 
 You can use Forms to enable the user to upload files.
-The default Location for files uploaded in this way is `/Media/Files/Form Uploads`.
+The default location for files uploaded in this way is `/Media/Files/Form Uploads`.
 You can change it with the following configuration:
 
 ``` yaml
@@ -74,4 +74,4 @@ ibexa:
                 upload_location_id: 54
 ```
 
-This applies only if no specific Location is defined in the Form itself.
+This applies only if no specific location is defined in the Form itself.
diff --git a/docs/content_management/locations.md b/docs/content_management/locations.md
index bef313869d..1f1704936a 100644
--- a/docs/content_management/locations.md
+++ b/docs/content_management/locations.md
@@ -4,84 +4,84 @@ description: Locations hold published content items and can be used to control v
 
 # Locations
 
-When a new content item is published, it's automatically placed in a new Location.
+When a new content item is published, it's automatically placed in a new location.
 
-All Locations form a tree which is the basic way of organizing content in the system.
-Every published content item has a Location and, as a consequence, also a place in this tree.
+All locations form a tree which is the basic way of organizing content in the system.
+Every published content item has a location and, as a consequence, also a place in this tree.
 
 ![Content tree - locations](content_management_tree_locations.png "Content tree - locations")
 
-A content item receives a Location only once it has been published.
-This means that a new unpublished draft doesn't have a Location yet.
+A content item receives a location only once it has been published.
+This means that a new unpublished draft doesn't have a location yet.
 You can find drats in the **Drafts** tab in the **Content** menu.
 
 ![Drafts](content_management_drafts.png "Drafts")
 
-A content item can have more than one Location. It's then present in two or more places in the tree.
+A content item can have more than one location. It's then present in two or more places in the tree.
 For example, an article can be at the same time under "Local news" and "Sports news".
-Even in such a case, one of these places is always the main Location.
+Even in such a case, one of these places is always the main location.
 
-You can change the main Location in the back office in the **Locations** tab,
+You can change the main location in the back office in the **Locations** tab,
 or [through the API](managing_content.md#changing-the-main-location).
 
 ![Locations](content_management_locations.png "Locations")
 
-## Top level Locations
+## Top level locations
 
-The content tree is hierarchical. It has an empty root Location at the top and a structure of dependent Locations below it.
-Every Location (aside from the root) has one parent Location and can have any number of children.
+The content tree is hierarchical. It has an empty root location at the top and a structure of dependent locations below it.
+Every location (aside from the root) has one parent location and can have any number of children.
 
-Top level Locations are direct children of the root of the tree.
-The root has Location ID 1, isn't related to any content items and should not be used directly.
+Top level locations are direct children of the root of the tree.
+The root has location ID 1, isn't related to any content items and should not be used directly.
 
-Under this root there are preset top level Locations in each installation which cannot be deleted.
+Under this root there are preset top level locations in each installation which cannot be deleted.
 
 ### Content
 
-The top level Location for the actual contents of a site
+The top level location for the actual contents of a site
 can be viewed by selecting the **Content structure** tab in the Content mode interface.
 
 ![Content structure](content_management_tree.png "Content structure")
 
 This part of the tree is typically used for organizing folders, articles, information pages, etc.
-The default ID number of this Location is 2, but it can be [modified via configuration](repository_configuration.md#top-level-locations).
+The default ID number of this location is 2, but it can be [modified via configuration](repository_configuration.md#top-level-locations).
 It contains a Folder content item.
 
 ### Media
 
-**Media** is the top level Location which stores and organizes information
+**Media** is the top level location which stores and organizes information
 that is frequently used by content items located below the **Content** node.
 
 ![Media](content_management_media.png "Media")
 
 It usually contains images, animations, documents and other files.
-The default ID number of the **Media** Location is 43, but it can be [modified via configuration](repository_configuration.md#top-level-locations).
+The default ID number of the **Media** location is 43, but it can be [modified via configuration](repository_configuration.md#top-level-locations).
 It contains a Folder content item.
 
 ### Users
 
-**Users** is the top level Location that contains the built-in system for managing user accounts.
+**Users** is the top level location that contains the built-in system for managing user accounts.
 
 ![Users in Admin panel](admin_panel_users.png "Users in Admin panel")
 
 A user is simply a content item of the user account content type.
-The users are organized within user group content items below this Location.
+The users are organized within user group content items below this location.
 
-In other words, the **Users** Location contains the actual users and user groups,
+In other words, the **Users** location contains the actual users and user groups,
 which can be viewed by selecting the **Users** tab in the **Admin** Panel.
 
-The default ID number of the **Users** Location is 5.
+The default ID number of the **Users** location is 5.
 It contains user group content items.
 
 ### Forms [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
-**Forms** is the top level Location that is intended for Forms created using the [Form Builder](https://doc.ibexa.co/projects/userguide/en/latest/content_management/work_with_forms/#create-forms).
+**Forms** is the top level location that is intended for Forms created using the [Form Builder](https://doc.ibexa.co/projects/userguide/en/latest/content_management/work_with_forms/#create-forms).
 
 ![Forms](content_management_forms.png "Forms")
 
-### Other top level Locations
+### Other top level locations
 
-You should not add any more content directly below Location 1, but instead store any content under one of those top-level Locations.
+You should not add any more content directly below location 1, but instead store any content under one of those top-level locations.
 
 ## Location visibility
 
@@ -90,7 +90,7 @@ Location visibility allows you to control which parts of the content tree are av
 ![Location visibility](content_management_visibility.png "Location visibility")
 
 Once a content item is published, it cannot be un-published.
-When the Location of a content item is hidden, the system doesn't display it on the website.
+When the location of a content item is hidden, the system doesn't display it on the website.
 
 !!! caution "Visibility and permissions"
 
@@ -102,69 +102,67 @@ When the Location of a content item is hidden, the system doesn't display it on
     [**Object State**](object_states.md), and set a different section or Object State for the given content.
     Or use other permission-based [**Limitations**](limitations.md).
 
-If a content item is hidden, it's invisible in all its Locations.
-If a Location is hidden, all of its descendants in the tree are hidden as well.
+If a content item is hidden, it's invisible in all its locations.
+If a location is hidden, all of its descendants in the tree are hidden as well.
 This means that there are three different visibility statuses:
 
 - Visible
 - Hidden
 - Hidden by superior
 
-All Locations and content items are visible by default.
-If a Location is made invisible manually, its status is set to Hidden.
-All Locations under it change status to Hidden by superior.
-A content item is Hidden by superior only in Locations in which it has a parent Location with the Hidden status.
+All locations and content items are visible by default.
+If a location is made invisible manually, its status is set to Hidden.
+All locations under it change status to Hidden by superior.
+A content item is Hidden by superior only in locations in which it has a parent location with the Hidden status.
 
 In the following example, the **Content item 1** is Hidden by superior in the **Location A** while still visible in the **Location B**.
 
 ![Visibility in two locations](locations_visibility.png)
 
-From the visitor's perspective a Location behaves the same whether its status is Hidden or Hidden by superior –
-it's unavailable on the front page.
+From the visitor's perspective a location behaves the same whether its status is Hidden or Hidden by superior – it's unavailable on the front page.
 
-The difference is that a Location Hidden by superior cannot be revealed separately from their parent(s).
-It only becomes visible once all of its parent Locations are made visible again.
+The difference is that a location Hidden by superior cannot be revealed separately from their parent(s).
+It only becomes visible once all of its parent Llcations are made visible again.
 
 A Hidden by superior status doesn't override a Hidden status.
-This means that if a Location is Hidden manually and later one of its ancestors is hidden as well,
-the first Location's status doesn't change – it remains Hidden (not Hidden by superior).
-If the ancestor Location is made visible again, the first Location still remains hidden.
+This means that if a location is Hidden manually and later one of its ancestors is hidden as well, the first location's status doesn't change – it remains Hidden (not Hidden by superior).
+If the ancestor location is made visible again, the first location still remains hidden.
 
 The way visibility works can be illustrated using the following scenarios:
 
-#### Hiding a visible Location
+#### Hiding a visible location
 
-![Hiding a visible Location](node_visibility_hide.png)
+![Hiding a visible location](node_visibility_hide.png)
 
-When you hide a Location that was visible before, it gets the status Hidden.
-Its child Locations are Hidden by superior.
-The visibility status of child Locations that were already Hidden or Hidden by superior doesn't change.
+When you hide a location that was visible before, it gets the status Hidden.
+Its child locations are Hidden by superior.
+The visibility status of child locations that were already Hidden or Hidden by superior doesn't change.
 
-#### Hiding a Location which is Hidden by superior
+#### Hiding a location which is Hidden by superior
 
-![Hiding a Location which is Hidden by superior](node_visibility_hide_invisible.png)
+![Hiding a location which is Hidden by superior](node_visibility_hide_invisible.png)
 
-When you explicitly hide a Location which was Hidden by superior, it gets the status Hidden.
-Since the underlying Locations are already either Hidden or Hidden by superior, their visibility status doesn't changed.
+When you explicitly hide a location which was Hidden by superior, it gets the status Hidden.
+Since the underlying locations are already either Hidden or Hidden by superior, their visibility status doesn't changed.
 
-#### Revealing a Location with a visible ancestor
+#### Revealing a location with a visible ancestor
 
-![Revealing a Location with a visible ancestor](node_visibility_unhide1.png)
+![Revealing a location with a visible ancestor](node_visibility_unhide1.png)
 
-When you reveal a Location which has a visible ancestor, this Location and its children become visible.
-However, child Locations that were explicitly hidden by a user keep their Hidden status
+When you reveal a location which has a visible ancestor, this location and its children become visible.
+However, child locations that were explicitly hidden by a user keep their Hidden status
 (and their children remain Hidden by superior).
 
-#### Revealing a Location with a Hidden ancestor
+#### Revealing a location with a Hidden ancestor
 
-![Revealing a Location with a Hidden ancestor](node_visibility_unhide2.png)
+![Revealing a location with a Hidden ancestor](node_visibility_unhide2.png)
 
-When you reveal a Location that has a Hidden ancestor, it **doesn't** become Visible itself.
+When you reveal a location that has a Hidden ancestor, it **doesn't** become Visible itself.
 Because it still has invisible ancestors, its status changes to Hidden by superior.
 
 !!! tip "In short"
 
-    A Location can only be Visible when all of its ancestors are Visible as well.
+    A location can only be Visible when all of its ancestors are Visible as well.
 
 ### Visibility mechanics
 
@@ -175,10 +173,10 @@ Together, the flags represent the three visibility statuses:
 
 |Hidden flag|Invisible flag|Status|
 |------|------|------|
-|-|-|The Location is visible.|
-|1|1|The Location is invisible and it was hidden by a user (Hidden).|
-|-|1|The Location is invisible and it was hidden by the system because its ancestor is hidden/invisible (Hidden by superior).|
+|-|-|The location is visible.|
+|1|1|The location is invisible and it was hidden by a user (Hidden).|
+|-|1|The location is invisible and it was hidden by the system because its ancestor is hidden/invisible (Hidden by superior).|
 
 !!! note
 
-    Displaying visible or hidden Locations in governed by the [`Visibility` Search Criterion](visibility_criterion.md)
+    Displaying visible or hidden locations in governed by the [`Visibility` Search Criterion](visibility_criterion.md)
diff --git a/docs/content_management/taxonomy/taxonomy.md b/docs/content_management/taxonomy/taxonomy.md
index f6bedd439d..1f97a36ac0 100644
--- a/docs/content_management/taxonomy/taxonomy.md
+++ b/docs/content_management/taxonomy/taxonomy.md
@@ -18,7 +18,7 @@ The associated content type is `tag`.
 ## Configuration keys
 
 * `ibexa_taxonomies` - section responsible for taxonomy structure where you can [configure other taxonomies](#customize-taxonomy-structure)
-* `ibexa_taxonomies.tags.parent_location_remote_id` - Remote ID for Location where new content items representing tags are created
+* `ibexa_taxonomies.tags.parent_location_remote_id` - Remote ID for location where new content items representing tags are created
 * `ibexa_taxonomies.tags.content_type` - Content type identifier which stands for the tags
 * `ibexa_taxonomies.tags.field_mappings` - field types map of a content type which taxonomy receives information about the tag from.
 
@@ -38,7 +38,7 @@ Next, under the `ibexa_taxonomy.taxonomies` [key](configuration.md#configuration
 [[= include_file('code_samples/taxonomy/config/packages/ibexa_taxonomy.yaml', 9, 17) =]]
 ```
 
-Replace `<content_categories_remote_id>` with the new container's Location remote ID.
+Replace `<content_categories_remote_id>` with the new container's location remote ID.
 
 Translate the configuration identifier in the `ibexa_taxonomy` domain by, for example, creating a `translations/ibexa_taxonomy.en.yaml` file containing the following:
 ```yaml
diff --git a/docs/content_management/url_management/url_management.md b/docs/content_management/url_management/url_management.md
index fdff33342a..d4ec06e4d0 100644
--- a/docs/content_management/url_management/url_management.md
+++ b/docs/content_management/url_management/url_management.md
@@ -211,8 +211,8 @@ bin/console ibexa:urls:regenerate-aliases
 
 You can also extend the command with the following parameters:
 
-- `--iteration-count` — Defines how many Locations are processed at once to reduce memory usage
-- `--location-id` — Regenerates URL addresses for specific Locations only, for example, `ibexa:urls:regenerate-aliases --location-id=1 --location-id=2`
+- `--iteration-count` — Defines how many locations are processed at once to reduce memory usage
+- `--location-id` — Regenerates URL addresses for specific locations only, for example, `ibexa:urls:regenerate-aliases --location-id=1 --location-id=2`
 
 ## URL wildcards
 
diff --git a/docs/content_management/user_generated_content.md b/docs/content_management/user_generated_content.md
index f9e59d6bb2..3c89a41754 100644
--- a/docs/content_management/user_generated_content.md
+++ b/docs/content_management/user_generated_content.md
@@ -22,9 +22,9 @@ The `/content/edit/nodraft` route shows a content item creation form for a given
 |-------------------------|-----------|----------------------------------------------------------------------------|
 | `contentTypeIdentifier` | `string`  | The identifier of the content type to create. Example: `folder`, `article` |
 | `languageCode`          | `string`  | Language code the content item must be created in. Example: `eng-GB`       |
-| `parentLocationId`      | `integer` | ID of the Location the content item must be created in. Example: `2`       |
+| `parentLocationId`      | `integer` | ID of the location the content item must be created in. Example: `2`       |
 
-This means that `/content/create/nodraft/folder/eng-GB/2` enables you to create a Folder in English as a child of Location with ID 2.
+This means that `/content/create/nodraft/folder/eng-GB/2` enables you to create a Folder in English as a child of location with ID 2.
 
 A limited subset of field types is supported:
 
diff --git a/docs/content_management/workflow/workflow.md b/docs/content_management/workflow/workflow.md
index c61b953de2..7abe85c4b6 100644
--- a/docs/content_management/workflow/workflow.md
+++ b/docs/content_management/workflow/workflow.md
@@ -68,7 +68,7 @@ or be `reverse` to a different transition (line 9).
 
 When moving a content item through a transition, the user can select a reviewer.
 Assigning a reviewer is mandatory if you set `reviewers.required` to `true` for this transition.
-You can restrict who can review the content item by setting `reviewers.user_group` to a Location ID of the user group.
+You can restrict who can review the content item by setting `reviewers.user_group` to a location ID of the user group.
 
 To be able to search for users for review, the user must have the content/read Policy without any Limitation,
 or with a Limitation that allows reading users.
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
index 9dbcead81d..14c2966bf0 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
@@ -23,14 +23,14 @@ For example, the system tags every article response, and when the article conten
 
 Current content tags (and when the system purges on them):
 
-- Content: `c<content-id>` - Purged on all smaller or larger changes to content (including its metadata, fields and Locations).
+- Content: `c<content-id>` - Purged on all smaller or larger changes to content (including its metadata, fields and locations).
 - Content version: `cv<content-id>` - Purged when any version of Content is changed (for example, a draft is created or removed).
 - Content type: `ct<content-type-id>` - Used when the content type changes, affecting content of its type.
-- Location: `l<location-id>` - Used for clearing all cache relevant for a given Location.
-- Parent Location: `pl<[parent-]location-id>` - Used for clearing all children of a Location (`pl<location-id>`), or all siblings (`pl<parent-location-id>`).
+- Location: `l<location-id>` - Used for clearing all cache relevant for a given location.
+- Parent Location: `pl<[parent-]location-id>` - Used for clearing all children of a location (`pl<location-id>`), or all siblings (`pl<parent-location-id>`).
 - Path: `p<location-id>` - For operations that change the tree itself, like move, remove, etc.
 - Relation: `r<content-id>` - Only purged on when content updates are severe enough to also affect reverse relations.
-- Relation location: `rl<location-id>` - Same as relation, but by Location ID.
+- Relation location: `rl<location-id>` - Same as relation, but by location ID.
 
 !!! note "Automatic repository prefixing of cache tags"
 
@@ -110,7 +110,7 @@ Cache-Control: public, max-age=86400
 xkey: ez-all c1 ct1 l2 pl1 p1 p2
 ```
 
-If the given content has several Locations, you can see several `l<location-id>` and `p<location-id>` tags in the response.
+If the given content has several locations, you can see several `l<location-id>` and `p<location-id>` tags in the response.
 
 !!! note "How response tagging for ContentView is done internally"
 
@@ -195,7 +195,7 @@ See [Tagging from code](https://foshttpcachebundle.readthedocs.io/en/latest/feat
 4\. Use deprecated `X-Location-Id` header.
 
 For custom or built-in controllers (for example, REST) still using `X-Location-Id`, `XLocationIdResponseSubscriber` handles translating this header to tags.
-It supports singular and comma-separated Location ID value(s):
+It supports singular and comma-separated location ID value(s):
 
 ```php
 /** @var \Symfony\Component\HttpFoundation\Response $response */
@@ -273,13 +273,13 @@ In the event when a new version of `Child` is published, the following keys are
 
 - `c55`, because Content `[Child]` was changed
 - `r55`, because cache for any object that has a relation to Content `[Child]` should be purged
-- `l22`, because Location `[Child]` has changed ( that would be location holding content-id=55)
+- `l22`, because location `[Child]` has changed ( that would be location holding content-id=55)
 - `pl22`, because cache for children of `[Child]` should be purged
 - `rl22`, because cache for any object that has a relation to Location `[Child]` should be purged
 - `l20`, because cache for parent of `[Child]` should be purged
 - `pl20`, because cache for siblings of `[Child]` should be purged
 
-In summary, HTTP Cache for any location representing `[Child]`, any Content that relates to the Content `[Child]`, the location for `[Child]`, any children of `[Child]`, any Location that relates to the Location `[Child]`, location for `[Parent1]`, any children on `[Parent1]`.
+In summary, HTTP Cache for any location representing `[Child]`, any Content that relates to the Content `[Child]`, the location for `[Child]`, any children of `[Child]`, any location that relates to the location `[Child]`, location for `[Parent1]`, any children on `[Parent1]`.
 Effectively, in this example HTTP cache for `[Parent1]` and `[Child]` is cleared.
 
 
@@ -329,7 +329,7 @@ $purgeClient->purgeAll();
 
 ### Purging from command line
 
-Example for purging by Location and by content ID:
+Example for purging by location and by content ID:
 
 ```bash
 bin/console fos:httpcache:invalidate:tag l44 c33
diff --git a/docs/infrastructure_and_maintenance/request_lifecycle.md b/docs/infrastructure_and_maintenance/request_lifecycle.md
index fffdce2bf3..debf0a5820 100644
--- a/docs/infrastructure_and_maintenance/request_lifecycle.md
+++ b/docs/infrastructure_and_maintenance/request_lifecycle.md
@@ -110,7 +110,7 @@ If a wildcard matches, the request's `semanticPathinfo` is updated and the route
 
 `UrlAliasRouter` (`Ibexa\Bundle\Core\Routing\UrlAliasRouter`):
 This router uses the `UrlAliasService` to associate the `semanticPathinfo` to a location.
-If it finds a Location, the request receives the attributes **`locationId`** and **`contentId`**, **`viewType`** is set to `full`, and the **`_controller`** is set to `ibexa_content:viewAction` for now.
+If it finds a location, the request receives the attributes **`locationId`** and **`contentId`**, **`viewType`** is set to `full`, and the **`_controller`** is set to `ibexa_content:viewAction` for now.
 
 The `locale_listener` (priority 16) sets the request's **`_locale`** attribute.
 
diff --git a/docs/multisite/multisite_configuration.md b/docs/multisite/multisite_configuration.md
index addae360f4..fbce616759 100644
--- a/docs/multisite/multisite_configuration.md
+++ b/docs/multisite/multisite_configuration.md
@@ -173,7 +173,7 @@ Instead, switch between SiteAccesses using the SiteAccess bar above the page.
 ## Location tree
 
 You can restrict SiteAccesses to different parts of the content tree.
-When you do it, only the selected Location and its descendants are reachable from this SiteAccess.
+When you do it, only the selected location and its descendants are reachable from this SiteAccess.
 
 Configure this under the `ibexa.systems.<scope>.content.tree_root` [configuration key](configuration.md#configuration-files), for example:
 
@@ -188,9 +188,9 @@ ibexa:
             index_page: /EventFrontPage
 ```
 
-- `location_id` defines the Location ID of the content root for the SiteAccess.
+- `location_id` defines the location ID of the content root for the SiteAccess.
 - `excluded_uri_prefixes` defines which URIs ignore the root limit set using `location_id`.
-In the example above, the Media and Images folders are accessible using their own URI, even though they're outside the Location provided in `content.tree_root.location_id`.
+In the example above, the Media and Images folders are accessible using their own URI, even though they're outside the location provided in `content.tree_root.location_id`.
 - `index_page` is the page shown when you access the root index `/`.
 
 !!! note
diff --git a/docs/multisite/set_up_campaign_siteaccess.md b/docs/multisite/set_up_campaign_siteaccess.md
index e75a00d5ed..83030c9056 100644
--- a/docs/multisite/set_up_campaign_siteaccess.md
+++ b/docs/multisite/set_up_campaign_siteaccess.md
@@ -63,6 +63,6 @@ ibexa:
                     excluded_uri_prefixes: [ /media/images/logos ]
 ```
 
-Now, when you use the `campaign` SiteAccess, you can reach `<your site>/campaign/Media/Images/Logos`, despite the fact that it's not a sub-item of the "Campaign" Location.
+Now, when you use the `campaign` SiteAccess, you can reach `<your site>/campaign/Media/Images/Logos`, despite the fact that it's not a sub-item of the "Campaign" location.
 
 As a next step, you can configure different [designs](design_engine.md) for the two SiteAccesses.
diff --git a/docs/permissions/custom_policies.md b/docs/permissions/custom_policies.md
index fe98afe1e7..25481d977b 100644
--- a/docs/permissions/custom_policies.md
+++ b/docs/permissions/custom_policies.md
@@ -201,7 +201,7 @@ Next, register the service with the `ibexa.admin_ui.limitation.mapper.form` tag
 Some abstract limitation type form mapper classes are provided to help implementing common complex limitations.
 
 - `MultipleSelectionBasedMapper` is a mapper used to build forms for limitations based on a checkbox list, where multiple items can be chosen. For example, it's used to build forms for [Content Type Limitation](limitation_reference.md#content-type-limitation), [Language Limitation](limitation_reference.md#language-limitation) or [Section Limitation](limitation_reference.md#section-limitation).
-- `UDWBasedMapper` is used to build a limitation form where a Content/Location must be selected. For example, it's used by the [Subtree Limitation](limitation_reference.md#subtree-limitation) form.
+- `UDWBasedMapper` is used to build a limitation form where a content/location must be selected. For example, it's used by the [Subtree Limitation](limitation_reference.md#subtree-limitation) form.
 
 #### Value mapper
 
diff --git a/docs/permissions/limitation_reference.md b/docs/permissions/limitation_reference.md
index c731bebd58..433a48af1f 100644
--- a/docs/permissions/limitation_reference.md
+++ b/docs/permissions/limitation_reference.md
@@ -74,13 +74,13 @@ The Content Type Group (`UserGroup`) limitation specifies that only users with a
 
 ## Content type Group of Parent limitation
 
-The Content Type Group of Parent (`ParentUserGroupLimitation`) limitation specifies that only Users with at least one common *direct* user group with the owner of the parent Location of a content item get a certain access right, used by `content/create` permission.
+The Content Type Group of Parent (`ParentUserGroupLimitation`) limitation specifies that only Users with at least one common *direct* user group with the owner of the parent location of a content item get a certain access right, used by `content/create` permission.
 
 ### Possible values
 
 |Value|UI value|Description|
 |------|------|------|
-|`1`|"self"|Only a user who has at least one common *direct* user group with owner of the parent Location gets access|
+|`1`|"self"|Only a user who has at least one common *direct* user group with owner of the parent location gets access|
 
 ## Content type limitation
 
@@ -136,7 +136,7 @@ A user with this limitation is allowed to:
 
 ## Location limitation
 
-A Location (`Location`) limitation specifies whether the user has access to content with a specific location, in case of `content/create` the parent location is evaluated.
+A location (`Location`) limitation specifies whether the user has access to content with a specific location, in case of `content/create` the parent location is evaluated.
 
 ### Possible values
 
diff --git a/docs/permissions/limitations.md b/docs/permissions/limitations.md
index 80ec9c0c92..effe7375ee 100644
--- a/docs/permissions/limitations.md
+++ b/docs/permissions/limitations.md
@@ -15,7 +15,7 @@ Limitations consist of two parts:
 - `LimitationType`
 
 Certain limitations also serve as role limitations, which means they can be used to limit the rights of a role assignment.
-Currently, this covers [Subtree of Location](limitation_reference.md#subtree-limitation), [Section](limitation_reference.md#section-limitation) and [Personalization access](limitation_reference.md#personalization-access-limitation) limitations.
+Currently, this covers [subtree of location](limitation_reference.md#subtree-limitation), [Section](limitation_reference.md#section-limitation) and [Personalization access](limitation_reference.md#personalization-access-limitation) limitations.
 
 `Limitation` represents the value, while `LimitationType` deals with the business logic surrounding how it actually works and is enforced.
 `LimitationTypes` have two modes of operation in regard to permission logic (see [`Ibexa\Contracts\Core\Limitation`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Limitation-Type.html) interface for more info):
diff --git a/docs/permissions/permission_overview.md b/docs/permissions/permission_overview.md
index 8149907b24..23a91bd5fd 100644
--- a/docs/permissions/permission_overview.md
+++ b/docs/permissions/permission_overview.md
@@ -73,7 +73,7 @@ You can also use the permission resolver (`Ibexa\Core\Repository\Permission\Perm
 The `canUser()` method checks if the user can perform a given action with the selected object.
 
 For example: `canUser('content', 'edit', $content, [$location] );`
-checks the `content/edit` permission for the provided content item at the provided Location.
+checks the `content/edit` permission for the provided content item at the provided location.
 
 ### Blocking access to controller action
 
diff --git a/docs/permissions/permission_use_cases.md b/docs/permissions/permission_use_cases.md
index e826007f0f..f4568af201 100644
--- a/docs/permissions/permission_use_cases.md
+++ b/docs/permissions/permission_use_cases.md
@@ -43,8 +43,8 @@ This also lets the user copy and move content, and add new locations to a conten
 
 To move a content item or a subtree to another location, the user must have the following policies:
 
-- `content/read` - on the source Location
-- `content/create` - on the target Location
+- `content/read` - on the source location
+- `content/create` - on the target location
 
 ## Remove content
 
@@ -74,7 +74,7 @@ Section doesn't have to belong to the same subtree of location in the content st
 
 ### Location limitation
 
-If you add a `Location` limitation and point to the same location, the user is able to publish content directly under the selected Location, but not anywhere deeper in its subtree of location.
+If you add a `Location` limitation and point to the same location, the user is able to publish content directly under the selected location, but not anywhere deeper in its subtree of location.
 
 ### Subtree of location limitation
 
@@ -106,7 +106,7 @@ The vegetarian editors should now see the following content tree:
 ![Limited subtree file structure](subtree_usability_notes_2.png)
 
 When a policy has more than one limitation, all of them have to apply, or the policy doesn't work.
-For example, a `Location` limitation on Location `1/2` and `Subtree of Location` limitation on `1/2/55` cannot work together, because no location can satisfy both those requirements at the same time.
+For example, a `Location` limitation on location `1/2` and `Subtree of Location` limitation on `1/2/55` cannot work together, because no location can satisfy both those requirements at the same time.
 To combine more than one limitation with the *or* relation, not *and*, you can split your policy in two, each with one of these limitations.
 
 ## Manage locations
@@ -117,7 +117,7 @@ To allow the user to remove a location, grant them the following policies:
 - `content/remove`
 - `content/manage_locations`
 
-Hiding and revealing Location requires one more policy: `content/hide`.
+Hiding and revealing location requires one more policy: `content/hide`.
 
 ## Editorial workflows
 
@@ -144,7 +144,7 @@ To enable upload, you need you set the following permissions:
 
 You can control what content items can be uploaded and where by using imitations on the `content/create` and `content/publish` policies.
 
-A Location limitation limits the uploading to a specific location in the tree.
+A location limitation limits the uploading to a specific location in the tree.
 A content type limitation controls the content types that are allowed.
 For example, you can set the location limitation on a **Pictures** Folder, and add a content type limitation that only allows content items of type **Image**.
 This ensures that only files of type `image` can be uploaded, and only to the **Pictures** Folder.
diff --git a/docs/permissions/policies.md b/docs/permissions/policies.md
index c1ae558086..dbacbb3c57 100644
--- a/docs/permissions/policies.md
+++ b/docs/permissions/policies.md
@@ -188,12 +188,12 @@ Each role you assign to user or user group consists of policies which define, wh
 |                        | <nobr>`create`</nobr>             | create new content. Note: even without this policy the user is able to enter edit mode, but cannot finalize work with the content item. | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Language](limitation_reference.md#language-limitation)</br>[Owner of Parent](limitation_reference.md#owner-of-parent-limitation)</br>[Content type Group of Parent](limitation_reference.md#content-type-group-of-parent-limitation)</br>[Content type of Parent](limitation_reference.md#content-type-of-parent-limitation)</br>[Parent Depth](limitation_reference.md#parent-depth-limitation)</br>[Field Group](limitation_reference.md#field-group-limitation)</br>[Change Owner](limitation_reference.md#change-owner-limitation)             |
 |                        | <nobr>`diff`</nobr>               | unused                                                                                                                                  |
 |                        | <nobr>`edit`</nobr>               | edit existing content                                                                                                                   | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Content type Group](limitation_reference.md#content-type-group-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Language](limitation_reference.md#language-limitation)</br>[Object State](limitation_reference.md#object-state-limitation)</br>[Workflow Stage](limitation_reference.md#workflow-stage-limitation)</br>[Field Group](limitation_reference.md#field-group-limitation)</br>[Version Lock](limitation_reference.md#version-lock-limitation)</br>[Change Owner](limitation_reference.md#change-owner-limitation) |
-|                        | <nobr>`hide`</nobr>               | hide and reveal content Locations                                                                                                       | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Content type Group](limitation_reference.md#content-type-group-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Language](limitation_reference.md#language-limitation)                                                                                                                                                                                                                                                                                                                                                       |
-|                        | <nobr>`manage_locations`</nobr>   | remove Locations and send content to Trash                                                                                              | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Object State](limitation_reference.md#object-state-limitation)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+|                        | <nobr>`hide`</nobr>               | hide and reveal content locations                                                                                                       | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Content type Group](limitation_reference.md#content-type-group-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Language](limitation_reference.md#language-limitation)                                                                                                                                                                                                                                                                                                                                                       |
+|                        | <nobr>`manage_locations`</nobr>   | remove locations and send content to Trash                                                                                              | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Object State](limitation_reference.md#object-state-limitation)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
 |                        | <nobr>`pendinglist`</nobr>        | unused                                                                                                                                  |
 |                        | <nobr>`publish`</nobr>            | publish content. Without this Policy, the User can only save drafts or send them for review (in [[= product_name_exp =]])               | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Content type Group](limitation_reference.md#content-type-group-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Language](limitation_reference.md#language-limitation)</br>[Object State](limitation_reference.md#object-state-limitation)</br>[Workflow Stage](limitation_reference.md#workflow-stage-limitation)                                                                                                                                                                                                           |
 |                        | <nobr>`read`</nobr>               | view the content both in front and back end                                                                                             | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Content type Group](limitation_reference.md#content-type-group-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Object State](limitation_reference.md#object-state-limitation)                                                                                                                                                                                                                                                                                                                                               |
-|                        | <nobr>`remove`</nobr>             | remove Locations and send content to Trash                                                                                              | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Object State](limitation_reference.md#object-state-limitation)</br>[Language](limitation_reference.md#language-limitation)                                                                                                                                                                                                                                                                                                                                                                   |
+|                        | <nobr>`remove`</nobr>             | remove locations and send content to Trash                                                                                              | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Object State](limitation_reference.md#object-state-limitation)</br>[Language](limitation_reference.md#language-limitation)                                                                                                                                                                                                                                                                                                                                                                   |
 |                        | <nobr>`restore`</nobr>            | restore content from Trash                                                                                                              |
 |                        | <nobr>`reverserelatedlist`</nobr> | see all content that a content item relates to (even when the User isn't allowed to view it as an individual content items)            | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
 |                        | <nobr>`translate`</nobr>          | unused                                                                                                                                  | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Language](limitation_reference.md#language-limitation)                                                                                                                                                                                                                                                                                                                                                                                                                                       |
diff --git a/docs/pim/pim_configuration.md b/docs/pim/pim_configuration.md
index 1196e223f3..e2c1884587 100644
--- a/docs/pim/pim_configuration.md
+++ b/docs/pim/pim_configuration.md
@@ -36,7 +36,7 @@ The `local` type is the built-in type of catalog based on the repository.
 
 Under `options.product_type_group_identifier` you can define the identifier of the content type Group used for storing products.
 
-`root_location_remote_id` indicates the remote ID of the Location where products are stored.
+`root_location_remote_id` indicates the remote ID of the location where products are stored.
 
 ## VAT rates
 
diff --git a/docs/search/criteria_reference/ancestor_criterion.md b/docs/search/criteria_reference/ancestor_criterion.md
index 77ca54efe1..be9a335097 100644
--- a/docs/search/criteria_reference/ancestor_criterion.md
+++ b/docs/search/criteria_reference/ancestor_criterion.md
@@ -9,7 +9,7 @@ The [`Ancestor` Search Criterion](../../api/php_api/php_api_reference/classes/Ib
 
 ## Arguments
 
-- `value` - array of Location pathStrings
+- `value` - array of location pathStrings
 
 ## Example
 
diff --git a/docs/search/criteria_reference/depth_criterion.md b/docs/search/criteria_reference/depth_criterion.md
index 361fa42340..9ef14253ae 100644
--- a/docs/search/criteria_reference/depth_criterion.md
+++ b/docs/search/criteria_reference/depth_criterion.md
@@ -12,7 +12,7 @@ This Criterion is available only for Location Search.
 ## Arguments
 
 - `operator` - Operator constant (IN, EQ, GT, GTE, LT, LTE, BETWEEN)
-- `value` - int(s) representing the Location depth(s)
+- `value` - int(s) representing the location depth(s)
 
 The `value` argument requires:
 
diff --git a/docs/search/criteria_reference/ismainlocation_criterion.md b/docs/search/criteria_reference/ismainlocation_criterion.md
index 6fbe794c1b..48e4190f58 100644
--- a/docs/search/criteria_reference/ismainlocation_criterion.md
+++ b/docs/search/criteria_reference/ismainlocation_criterion.md
@@ -5,14 +5,14 @@ edition: commerce
 
 # IsMainLocation Criterion
 
-The [`IsMainLocation` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-LanguageCode.html) searches for locations based on whether they're the main Location of a content item or not.
+The [`IsMainLocation` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-LanguageCode.html) searches for locations based on whether they're the main location of a content item or not.
 
 This Criterion is available only for Location Search.
 
 ## Arguments
 
 - `value` - `IsMainLocation::MAIN` (0) or `IsMainLocation::NOT_MAIN` (1),
-representing whether to search for a main or not main Location
+representing whether to search for a main or not main location
 
 ## Example
 
diff --git a/docs/search/criteria_reference/parentlocationid_criterion.md b/docs/search/criteria_reference/parentlocationid_criterion.md
index 020c78bd21..69e146459a 100644
--- a/docs/search/criteria_reference/parentlocationid_criterion.md
+++ b/docs/search/criteria_reference/parentlocationid_criterion.md
@@ -10,7 +10,7 @@ searches for content based on the Location ID of its parent.
 
 ## Arguments
 
-- `value` - int(s) representing the parent Location IDs
+- `value` - int(s) representing the parent location IDs
 
 ## Example
 
diff --git a/docs/search/criteria_reference/parentlocationremoteId_criterion.md b/docs/search/criteria_reference/parentlocationremoteId_criterion.md
index 33ed7dd9e7..34097afe01 100644
--- a/docs/search/criteria_reference/parentlocationremoteId_criterion.md
+++ b/docs/search/criteria_reference/parentlocationremoteId_criterion.md
@@ -9,7 +9,7 @@ The `ParentLocationRemoteId` Search Criterion searches for content based on the
 
 ## Arguments
 
-- `value` - int(s) representing the parent Location remote IDs
+- `value` - int(s) representing the parent location remote IDs
 
 
 ### REST API
diff --git a/docs/search/criteria_reference/priority_criterion.md b/docs/search/criteria_reference/priority_criterion.md
index 436ef4503f..03d6efeef4 100644
--- a/docs/search/criteria_reference/priority_criterion.md
+++ b/docs/search/criteria_reference/priority_criterion.md
@@ -5,8 +5,7 @@ edition: commerce
 
 # Priority Criterion
 
-The [`Location\Priority` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-Location-Priority.html)
-searches for Locations based on their priority.
+The [`Location\Priority` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-Location-Priority.html) searches for locations based on their priority.
 
 This Criterion is available only for Location Search.
 
diff --git a/docs/search/criteria_reference/search_criteria_reference.md b/docs/search/criteria_reference/search_criteria_reference.md
index 9ddf49edc6..b765ae3688 100644
--- a/docs/search/criteria_reference/search_criteria_reference.md
+++ b/docs/search/criteria_reference/search_criteria_reference.md
@@ -1,5 +1,5 @@
 ---
-description: Search Criteria help define and fine-tune search queries for content and Locations.
+description: Search Criteria help define and fine-tune search queries for content and locations.
 ---
 
 # Search Criteria reference
@@ -22,7 +22,7 @@ Due to this storage limitation, searching content using the Country field type o
 
 |Search Criterion|Search based on|Content Search |Location Search |Filtering |
 |-----|-----|-----|-----|-----|
-|[Ancestor](ancestor_criterion.md)|Whether the content item is an ancestor of the provided Location|&#10004; |&#10004; |&#10004; |
+|[Ancestor](ancestor_criterion.md)|Whether the content item is an ancestor of the provided location|&#10004; |&#10004; |&#10004; |
 |[ContentId](contentid_criterion.md)|Content item's ID|&#10004; |&#10004; |&#10004; |
 |[ContentName](contentname_criterion.md)|Content item's name|&#10004; |&#10004; |&#10004; |
 |[ContentTypeGroupId](contenttypegroupid_criterion.md)|ID of the content item's content type group|&#10004; |&#10004; |&#10004; |
@@ -43,7 +43,7 @@ Due to this storage limitation, searching content using the Country field type o
 |[ImageWidth](imagewidth_criterion.md)|Image width in pixels|&#10004;|&#10004;||
 |[IsCurrencyEnabledCriterion](iscurrencyenabled_criterion.md)|Whether a specified currency is enabled in the system| | | |
 |[IsFieldEmpty](isfieldempty_criterion.md)|Whether a specified field of a content item is empty or not|&#10004; |&#10004; | |
-|[IsMainLocation](ismainlocation_criterion.md)|Whether a Location is the main Location of a content item| |&#10004; |&#10004; |
+|[IsMainLocation](ismainlocation_criterion.md)|Whether a location is the main location of a content item| |&#10004; |&#10004; |
 |[IsProductBased](isproductbased_criterion.md)|Whether content represents a product|&#10004; |&#10004; |&#10004; |
 |[IsUserBased](isuserbased_criterion.md)|Whether content represents a User account|&#10004; |&#10004; |&#10004; |
 |[IsUserEnabled](isuserenabled_criterion.md)|Whether a User account is enabled|&#10004; |&#10004; |&#10004; |
diff --git a/docs/search/criteria_reference/sibling_criterion.md b/docs/search/criteria_reference/sibling_criterion.md
index db9961cbac..54afd6ed70 100644
--- a/docs/search/criteria_reference/sibling_criterion.md
+++ b/docs/search/criteria_reference/sibling_criterion.md
@@ -9,8 +9,8 @@ The [`Sibling` Search Criterion](../../api/php_api/php_api_reference/classes/Ibe
 
 ## Arguments
 
-- `locationId` - int representing the Location ID
-- `parentLocationId` - int representing the parent Location ID
+- `locationId` - int representing the location ID
+- `parentLocationId` - int representing the parent location ID
 
 ## Example
 
@@ -20,8 +20,7 @@ The [`Sibling` Search Criterion](../../api/php_api/php_api_reference/classes/Ibe
 $query->query = new Criterion\Sibling(59, 2);
 ```
 
-You can also use the named constructor `Criterion\Sibling::fromLocation`
-and provide it with the Location object:
+You can also use the named constructor `Criterion\Sibling::fromLocation` and provide it with the location object:
 
 ``` php
 $location = $locationService->loadLocation(59);
diff --git a/docs/search/criteria_reference/subtree_criterion.md b/docs/search/criteria_reference/subtree_criterion.md
index dcd89e9b79..e934460a78 100644
--- a/docs/search/criteria_reference/subtree_criterion.md
+++ b/docs/search/criteria_reference/subtree_criterion.md
@@ -5,7 +5,7 @@ edition: commerce
 
 # Subtree Criterion
 
-The [`Subtree` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-Subtree.html) searches for content based on its Location ID subtree path.
+The [`Subtree` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-Subtree.html) searches for content based on its location ID subtree path.
 It returns the content item and all the content items below it in the subtree.
 
 ## Arguments
diff --git a/docs/search/criteria_reference/visibility_criterion.md b/docs/search/criteria_reference/visibility_criterion.md
index aa6f74d39d..c7dcabbbe4 100644
--- a/docs/search/criteria_reference/visibility_criterion.md
+++ b/docs/search/criteria_reference/visibility_criterion.md
@@ -11,7 +11,7 @@ This Criterion takes into account both hiding content and hiding locations.
 
 When used with Content Search, the Criterion takes into account all assigned locations.
 This means that hidden content is returned if it has at least one visible location.
-Use location Search to avoid this.
+Use Location Search to avoid this.
 
 ## Arguments
 
diff --git a/docs/search/extensibility/create_custom_aggregation.md b/docs/search/extensibility/create_custom_aggregation.md
index 815b29cb92..59120b6786 100644
--- a/docs/search/extensibility/create_custom_aggregation.md
+++ b/docs/search/extensibility/create_custom_aggregation.md
@@ -5,7 +5,7 @@ description: Create custom Aggregation to use with Solr and Elasticsearch search
 # Create custom Aggregation
 
 To create a custom Aggregation, create an aggregation class.
-In the following example, an aggregation groups the location query results by the Location priority:
+In the following example, an aggregation groups the location query results by the location priority:
 
 === "Solr"
 
@@ -35,7 +35,7 @@ An aggregation must implement the `Ibexa\Contracts\Core\Repository\Values\Conten
 An aggregation can also implement one of the following interfaces:
 
 - `Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\FieldAggregation`, based on content field
-- `Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\LocationAggregation`, based on content Location
+- `Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\LocationAggregation`, based on content location
 - `Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\RawAggregation`, based on details of the index structure
 
 !!! note "Aggregation definition"
diff --git a/docs/search/extensibility/create_custom_sort_clause.md b/docs/search/extensibility/create_custom_sort_clause.md
index 43de9bad0f..a372b43872 100644
--- a/docs/search/extensibility/create_custom_sort_clause.md
+++ b/docs/search/extensibility/create_custom_sort_clause.md
@@ -52,7 +52,7 @@ Then, add a `ScoreVisitor` class that implements `SortClauseVisitor`:
 
 Finally, register the visitor as a service.
 
-Sort Clauses can be valid for both content and location search.
+Sort Clauses can be valid for both content and Location search.
 To choose the search type, use either `content` or `location` in the tag when registering the visitor as a service:
 
 === "Solr"
diff --git a/docs/search/extensibility/index_custom_elasticsearch_data.md b/docs/search/extensibility/index_custom_elasticsearch_data.md
index 5bfdced07b..053f4c84e0 100644
--- 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](elastic_search_overview.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:
@@ -16,7 +16,7 @@ These events are called when the index is created for the content and location d
 
 You can pass the event to a subscriber which gives you access to the document that you can modify.
 
-In the following example, when an index in created for a content or a Location document, the event subscriber adds a `custom_field` of the type `StringField` to the index:
+In the following example, when an index in created for a content or a location document, the event subscriber adds a `custom_field` of the type `StringField` to the index:
 
 ``` php hl_lines="19 20 21"
 <?php
diff --git a/docs/search/extensibility/solr_document_field_mappers.md b/docs/search/extensibility/solr_document_field_mappers.md
index 8c42f79e8c..2038b421d1 100644
--- a/docs/search/extensibility/solr_document_field_mappers.md
+++ b/docs/search/extensibility/solr_document_field_mappers.md
@@ -7,7 +7,7 @@ description: Use document field mappers to add additional data in Solr search en
 You can use document field mappers to index additional data in the search engine.
 
 The additional data can come from external sources (for example, the [Personalization service](personalization.md)), or from internal ones.
-An example of indexing internal data is indexing data through the Location hierarchy: from the parent location to the child location, or indexing child data on the parent location.
+An example of indexing internal data is indexing data through the location hierarchy: from the parent location to the child location, or indexing child data on the parent location.
 You can use this to find the content with full-text search, or to simplify a search in a complicated data model.
 
 To do this effectively, you must understand how the data is indexed with the Solr search engine.
diff --git a/docs/search/search_api.md b/docs/search/search_api.md
index d5fa6e46ac..f5c2a949a1 100644
--- a/docs/search/search_api.md
+++ b/docs/search/search_api.md
@@ -1,5 +1,5 @@
 ---
-description: You can search for content, Locations and products by using the PHP API. Fine-tune the search with Search Criteria, Sort Clauses and Aggregations.
+description: You can search for content, locations and products by using the PHP API. Fine-tune the search with Search Criteria, Sort Clauses and Aggregations.
 ---
 
 # Search API
@@ -122,7 +122,7 @@ For example, the following command lists all content items under the specified p
 [[= include_file('code_samples/api/public_php_api/src/Command/FilterCommand.php', 32, 52) =]]
 ```
 
-The same Filter can be applied to find Locations instead of content items, for example:
+The same Filter can be applied to find locations instead of content items, for example:
 
 ``` php hl_lines="17"
 // ...
@@ -150,7 +150,7 @@ You can use the following methods of the Filter:
 - `sliceBy` - set limit and offset for pagination
 - `reset` - remove all Criteria, Sort Clauses, and pagination settings
 
-The following example filters for Folder content items under the parent Location 2, sorts them by publication date and returns 10 results, starting from the third one:
+The following example filters for Folder content items under the parent location 2, sorts them by publication date and returns 10 results, starting from the third one:
 
 ``` php
 $filter = new Filter();
@@ -177,7 +177,7 @@ $filter
 ## Searching in a controller
 
 You can use the `SearchService` or repository filtering in a controller, as long as you provide the required parameters.
-For example, in the code below, `locationId` is provided to list all children of a Location by using the `SearchService`.
+For example, in the code below, `locationId` is provided to list all children of a location by using the `SearchService`.
 
 ``` php hl_lines="22-24"
 // ...
@@ -220,10 +220,10 @@ For more information and examples, see [PagerFanta documentation](https://www.ba
 |------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | [`ContentSearchAdapter`](https://github.com/ibexa/core/blob/main/src/lib/Pagination/Pagerfanta/ContentSearchAdapter.php)                             | Makes a search against passed Query and returns [`Content`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Content.html) objects.                                                                  |
 | [`ContentSearchHitAdapter`](https://github.com/ibexa/core/blob/main/src/lib/Pagination/Pagerfanta/ContentSearchHitAdapter.php)                       | Makes a search against passed Query and returns [`SearchHit`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Search-SearchHit.html) objects instead.                                               |
-| [`LocationSearchAdapter`](https://github.com/ibexa/core/blob/main/src/lib/Pagination/Pagerfanta/LocationSearchAdapter.php)                           | Makes a Location search against passed Query and returns [`Location`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Location.html) objects.                                                       |
-| [`LocationSearchHitAdapter`](https://github.com/ibexa/core/blob/main/src/lib/Pagination/Pagerfanta/LocationSearchHitAdapter.php)                     | Makes a Location search against passed Query and  returns [`SearchHit`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Search-SearchHit.html) objects instead.                                     |
+| [`LocationSearchAdapter`](https://github.com/ibexa/core/blob/main/src/lib/Pagination/Pagerfanta/LocationSearchAdapter.php)                           | Makes a location search against passed Query and returns [`Location`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Location.html) objects.                                                       |
+| [`LocationSearchHitAdapter`](https://github.com/ibexa/core/blob/main/src/lib/Pagination/Pagerfanta/LocationSearchHitAdapter.php)                     | Makes a location search against passed Query and  returns [`SearchHit`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Search-SearchHit.html) objects instead.                                     |
 | [`ContentFilteringAdapter`](https://github.com/ibexa/core/blob/main/src/lib/Pagination/Pagerfanta/ContentFilteringAdapter.php)                       | Applies a Content filter and returns a [`ContentList`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-ContentList.html) object.                                                                    |
-| [`LocationFilteringAdapter`](https://github.com/ibexa/core/blob/main/src/lib/Pagination/Pagerfanta/LocationFilteringAdapter.php)                     | Applies a Location filter and returns a [`LocationList`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-LocationList.html) object.                                                                 |
+| [`LocationFilteringAdapter`](https://github.com/ibexa/core/blob/main/src/lib/Pagination/Pagerfanta/LocationFilteringAdapter.php)                     | Applies a location filter and returns a [`LocationList`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-LocationList.html) object.                                                                 |
 | [`AttributeDefinitionListAdapter`](https://github.com/ibexa/product-catalog/blob/main/src/lib/Pagerfanta/Adapter/AttributeDefinitionListAdapter.php) | Makes a search for product attributes and returns an [`AttributeDefinitionListInterface`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-ProductCatalog-Values-AttributeDefinition-AttributeDefinitionListInterface.html) object. |
 | [`AttributeGroupListAdapter`](https://github.com/ibexa/product-catalog/blob/main/src/lib/Pagerfanta/Adapter/AttributeGroupListAdapter.php)           | Makes a search for product attribute groups and returns an [`AttributeGroupListInterface`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-ProductCatalog-Values-AttributeGroup-AttributeGroupListInterface.html) object.          |
 | [`CurrencyListAdapter`](https://github.com/ibexa/product-catalog/blob/main/src/lib/Pagerfanta/Adapter/CurrencyListAdapter.php)                       | Makes a search for currencies and returns a [`CurrencyListInterface`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-ProductCatalog-Values-Currency-CurrencyListInterface.html) object.                                           |
@@ -262,7 +262,7 @@ that doesn't belong to the provided Section:
 Criteria are independent of one another.
 This can lead to unexpected behavior, for instance because content can have multiple locations.
 
-For example, a content item has two Locations: visible Location A and hidden Location B.
+For example, a content item has two locations: visible location A and hidden location B.
 You perform the following query:
 
 ``` php
@@ -277,7 +277,7 @@ The query searches for location B using the [`LocationId` Criterion](locationid_
 Even though the location B is hidden, the query finds the content because both conditions are satisfied:
 
 - the content item has location B
-- the content item is visible (it has the visible Location A)
+- the content item is visible (it has the visible location A)
 
 
 ## Sorting results
diff --git a/docs/search/search_criteria_and_sort_clauses.md b/docs/search/search_criteria_and_sort_clauses.md
index 952d41f5f6..ce19059c73 100644
--- a/docs/search/search_criteria_and_sort_clauses.md
+++ b/docs/search/search_criteria_and_sort_clauses.md
@@ -44,7 +44,7 @@ Each type has dedicated methods in the Search Service:
 | Location       | `findLocations()`        |
 
 All Criteria and Sort Clauses are accepted with Location Search, but not all of them can be used with Content Search.
-The reason for this is that while one Location always has exactly one content item, one content item can have multiple locations.
+The reason for this is that while one location always has exactly one content item, one content item can have multiple locations.
 In this context some Criteria and Sort Clauses would produce ambiguous queries that would not be accepted by Content Search.
 
 Content Search explicitly refuses to accept Criteria and Sort Clauses implementing these abstract classes:
diff --git a/docs/search/sort_clause_reference/depth_sort_clause.md b/docs/search/sort_clause_reference/depth_sort_clause.md
index e8e2765811..d10f40a866 100644
--- a/docs/search/sort_clause_reference/depth_sort_clause.md
+++ b/docs/search/sort_clause_reference/depth_sort_clause.md
@@ -4,7 +4,7 @@ description: Depth Sort Clause
 
 # Depth Sort Clause
 
-The [`Location\Depth` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-Depth.html) sorts search results by the depth of the Location in the content tree.
+The [`Location\Depth` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-Depth.html) sorts search results by the depth of the location in the content tree.
 
 ## Arguments
 
diff --git a/docs/search/sort_clause_reference/id_sort_clause.md b/docs/search/sort_clause_reference/id_sort_clause.md
index 1bdf574be8..af8a556a12 100644
--- a/docs/search/sort_clause_reference/id_sort_clause.md
+++ b/docs/search/sort_clause_reference/id_sort_clause.md
@@ -4,7 +4,7 @@ description: Id Sort Clause
 
 # Id Sort Clause
 
-The [`Location\Id` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-Id.html) sorts search results by the ID of the Location.
+The [`Location\Id` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-Id.html) sorts search results by the ID of the location.
 
 ## Arguments
 
diff --git a/docs/search/sort_clause_reference/ismainlocation_sort_clause.md b/docs/search/sort_clause_reference/ismainlocation_sort_clause.md
index f471a648aa..309f6fb850 100644
--- a/docs/search/sort_clause_reference/ismainlocation_sort_clause.md
+++ b/docs/search/sort_clause_reference/ismainlocation_sort_clause.md
@@ -4,9 +4,9 @@ description: IsMainLocation Sort Clause
 
 # IsMainLocation Sort Clause
 
-The [`Location\IsMainLocation` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-IsMainLocation.html) sorts search results by whether their Location is the main Location of the content item.
+The [`Location\IsMainLocation` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-IsMainLocation.html) sorts search results by whether their location is the main location of the content item.
 
-Locations that aren't main Locations are ranked as lower values (for example, with ascending order they are returned first).
+Locations that aren't main locations are ranked as lower values (for example, with ascending order they are returned first).
 
 ## Arguments
 
diff --git a/docs/search/sort_clause_reference/path_sort_clause.md b/docs/search/sort_clause_reference/path_sort_clause.md
index 20a5d23dda..14128b287f 100644
--- a/docs/search/sort_clause_reference/path_sort_clause.md
+++ b/docs/search/sort_clause_reference/path_sort_clause.md
@@ -4,7 +4,7 @@ description: Path Sort Clause
 
 # Path Sort Clause
 
-The [`Location\Path` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-Path.html) sorts search results by the pathString of the Location.
+The [`Location\Path` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-Path.html) sorts search results by the pathString of the location.
 
 !!! note
 
diff --git a/docs/search/sort_clause_reference/priority_sort_clause.md b/docs/search/sort_clause_reference/priority_sort_clause.md
index 02712dd10b..49bf7cba0c 100644
--- a/docs/search/sort_clause_reference/priority_sort_clause.md
+++ b/docs/search/sort_clause_reference/priority_sort_clause.md
@@ -4,7 +4,7 @@ description: Priority Sort Clause
 
 # Priority Sort Clause
 
-The [`Location\Priority` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-Priority.html) sorts search results by the priority of the Location.
+The [`Location\Priority` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-Priority.html) sorts search results by the priority of the location.
 
 ## Arguments
 
diff --git a/docs/search/sort_clause_reference/sort_clause_reference.md b/docs/search/sort_clause_reference/sort_clause_reference.md
index 3b17725741..b2851a0604 100644
--- a/docs/search/sort_clause_reference/sort_clause_reference.md
+++ b/docs/search/sort_clause_reference/sort_clause_reference.md
@@ -1,5 +1,5 @@
 ---
-description: Sort Clauses help fine-tune sorting order when searching for content and Locations.
+description: Sort Clauses help fine-tune sorting order when searching for content and locations.
 page_type: reference
 ---
 
@@ -27,7 +27,7 @@ All Sort Clauses can take the following optional argument:
 | [Depth](depth_sort_clause.md)                                 | Location depth in the content tree                                                          |                | &#10004;        | &#10004;  |
 | [Field](field_sort_clause.md)                                 | Content of one of content item's fields                                                     | &#10004;       | &#10004;        |           |
 | [Id](id_sort_clause.md)                                       | Location ID                                                                                 |                | &#10004;        | &#10004;  |
-| [IsMainLocation](ismainlocation_sort_clause.md)               | Whether a Location is the main Location of a content item                                   |                | &#10004;        |           |
+| [IsMainLocation](ismainlocation_sort_clause.md)               | Whether a location is the main location of a content item                                   |                | &#10004;        |           |
 | [MapLocationDistance](maplocationdistance_sort_clause.md)     | Distance between the location contained in a MapLocation field and the provided coordinates | &#10004;       | &#10004;        |           |
 | [Path](path_sort_clause.md)                                   | PathString of the Location                                                                  |                | &#10004;        | &#10004;  |
 | [Priority](priority_sort_clause.md)                           | Location priority                                                                           |                | &#10004;        | &#10004;  |
@@ -35,4 +35,4 @@ All Sort Clauses can take the following optional argument:
 | [Score](score_sort_clause.md)                                 | Score of the search result                                                                  | &#10004;       | &#10004;        |           |
 | [SectionIdentifier](sectionidentifier_sort_clause.md)         | ID of the Section content is assigned to                                                    | &#10004;       | &#10004;        | &#10004;  |
 | [SectionName](sectionname_sort_clause.md)                     | Name of the Section content is assigned to                                                  | &#10004;       | &#10004;        | &#10004;  |
-| [Visibility](visibility_sort_clause.md)                       | Whether the Location is visible or not                                                      |                | &#10004;        | &#10004;  |
+| [Visibility](visibility_sort_clause.md)                       | Whether the location is visible or not                                                      |                | &#10004;        | &#10004;  |
diff --git a/docs/search/sort_clause_reference/visibility_sort_clause.md b/docs/search/sort_clause_reference/visibility_sort_clause.md
index fc0f57bf48..7cb2d568e5 100644
--- a/docs/search/sort_clause_reference/visibility_sort_clause.md
+++ b/docs/search/sort_clause_reference/visibility_sort_clause.md
@@ -4,7 +4,7 @@ description: Visibility Sort Clause
 
 # Visibility Sort Clause
 
-The [`Location\Visibility` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-Visibility.html) sorts search results by whether the Location is visible or not.
+The [`Location\Visibility` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-Visibility.html) sorts search results by whether the location is visible or not.
 
 Locations that aren't visible are ranked as higher values (for example, with ascending order they're returned last).
 

From 318f1256aa89affa280c00a73e9b06c3e85f4876 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 13:15:31 +0200
Subject: [PATCH 58/77] Fixes - 'subtree'

---
 docs/permissions/limitation_reference.md                      | 4 ++--
 docs/permissions/permission_use_cases.md                      | 2 +-
 .../beginner_tutorial/8_enable_account_registration.md        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/permissions/limitation_reference.md b/docs/permissions/limitation_reference.md
index 433a48af1f..65eee20305 100644
--- a/docs/permissions/limitation_reference.md
+++ b/docs/permissions/limitation_reference.md
@@ -295,7 +295,7 @@ The Shipment Owner (`ShipmentOwner`) limitation specifies whether the user can m
 
 ## Subtree limitation
 
-The Subtree (`Subtree`) limitation specifies whether the user has access to content within a specific Subtree of location, in case of `content/create` the parent Subtree of location is evaluated.
+The subtree (`Subtree`) limitation specifies whether the user has access to content within a specific subtree of location, in case of `content/create` the parent subtree of location is evaluated.
 
 This limitation can be used as a role limitation.
 
@@ -307,7 +307,7 @@ This limitation can be used as a role limitation.
 
 ### Usage notes
 
-For more information on how to restrict user's access to part of the Subtree, see [the example in the Admin management section](permission_use_cases.md#restrict-editing-to-part-of-the-tree).
+For more information on how to restrict user's access to part of the subtree, see [the example in the Admin management section](permission_use_cases.md#restrict-editing-to-part-of-the-tree).
 
 ## Version Lock limitation
 
diff --git a/docs/permissions/permission_use_cases.md b/docs/permissions/permission_use_cases.md
index f4568af201..e9ee65977d 100644
--- a/docs/permissions/permission_use_cases.md
+++ b/docs/permissions/permission_use_cases.md
@@ -82,7 +82,7 @@ To limit the user's access to a subtree, use the `Subtree of Location` limitatio
 You do it by creating two new roles for a user group:
 
  1. Role with a `Subtree` limitation for the User
- 1. Role with a `Location` limitation for the Subtree
+ 1. Role with a `Location` limitation for the subtree
 
 Follow the example below to learn how to do that.
 
diff --git a/docs/tutorials/beginner_tutorial/8_enable_account_registration.md b/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
index 6d5d32d343..6d371c1362 100644
--- a/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
+++ b/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
@@ -199,8 +199,8 @@ Now add the following policies to the Contributors role.
 - User/Password
 - Content/Read
 - Content/Versionread
-- Content/Create with limitations: content type limited to Ride and Landmark content types and Subtree to the `Member Rides`
-- Content/Publish with limitations: content type limited to Ride and Landmark content types and Subtree to the `Member Rides`
+- Content/Create with limitations: content type limited to Ride and Landmark content types and subtree to the `Member Rides`
+- Content/Publish with limitations: content type limited to Ride and Landmark content types and subtree to the `Member Rides`
 - Content/Edit with limitation: Owner limited to `Self`
 - Section/View
 - Content/Reverserelatedlist

From 66d16509d540738f15811b51d923a5765082147f Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 13:18:06 +0200
Subject: [PATCH 59/77] Fixes - 'value object'

---
 .../field_types/field_type_reference/addressfield.md            | 2 +-
 .../field_types/field_type_reference/authorfield.md             | 2 +-
 .../field_types/field_type_reference/binaryfilefield.md         | 2 +-
 .../field_types/field_type_reference/emailaddressfield.md       | 2 +-
 .../field_types/field_type_reference/matrixfield.md             | 2 +-
 .../field_types/field_type_reference/mediafield.md              | 2 +-
 .../field_types/field_type_reference/relationlistfield.md       | 2 +-
 .../field_types/field_type_reference/userfield.md               | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/content_management/field_types/field_type_reference/addressfield.md b/docs/content_management/field_types/field_type_reference/addressfield.md
index a9d82c4622..acac7e3618 100644
--- a/docs/content_management/field_types/field_type_reference/addressfield.md
+++ b/docs/content_management/field_types/field_type_reference/addressfield.md
@@ -38,7 +38,7 @@ new FieldType\Value(
 
 This field type validates whether `Country` and `Name` fields have been filled out.
 
-### Value Object
+### Value object
 
 #### Properties
 
diff --git a/docs/content_management/field_types/field_type_reference/authorfield.md b/docs/content_management/field_types/field_type_reference/authorfield.md
index 17403c3b64..d3097aea82 100644
--- a/docs/content_management/field_types/field_type_reference/authorfield.md
+++ b/docs/content_management/field_types/field_type_reference/authorfield.md
@@ -8,7 +8,7 @@ This field type allows the storage and retrieval of one or more authors. For eac
 
 ## PHP API field type
 
-### Value Object
+### Value object
 
 ##### Properties
 
diff --git a/docs/content_management/field_types/field_type_reference/binaryfilefield.md b/docs/content_management/field_types/field_type_reference/binaryfilefield.md
index 54a912a262..f577f9900f 100644
--- a/docs/content_management/field_types/field_type_reference/binaryfilefield.md
+++ b/docs/content_management/field_types/field_type_reference/binaryfilefield.md
@@ -10,7 +10,7 @@ It's capable of handling virtually any file type and is typically used for stori
 
 ## PHP API field type
 
-### Value Object
+### Value object
 
 #### Properties
 
diff --git a/docs/content_management/field_types/field_type_reference/emailaddressfield.md b/docs/content_management/field_types/field_type_reference/emailaddressfield.md
index bf1389e23b..a23a84885f 100644
--- a/docs/content_management/field_types/field_type_reference/emailaddressfield.md
+++ b/docs/content_management/field_types/field_type_reference/emailaddressfield.md
@@ -46,7 +46,7 @@ $emailaddressValue = new Type\Value( "someuser@example.com" );
 
 ##### String representation
 
-String representation of the field type's Value object is the email address contained in it.
+String representation of the field type's value object is the email address contained in it.
 
 Example: `someuser@example.com`
 
diff --git a/docs/content_management/field_types/field_type_reference/matrixfield.md b/docs/content_management/field_types/field_type_reference/matrixfield.md
index b3a91bfedb..a4c32f6401 100644
--- a/docs/content_management/field_types/field_type_reference/matrixfield.md
+++ b/docs/content_management/field_types/field_type_reference/matrixfield.md
@@ -26,7 +26,7 @@ new FieldType\Value([
 ]);
 ```
 
-### Value Object
+### Value object
 
 `Ibexa\FieldTypeMatrix\FieldType\Value` offers the following properties:
 
diff --git a/docs/content_management/field_types/field_type_reference/mediafield.md b/docs/content_management/field_types/field_type_reference/mediafield.md
index 0fc60a416a..26e220ccbd 100644
--- a/docs/content_management/field_types/field_type_reference/mediafield.md
+++ b/docs/content_management/field_types/field_type_reference/mediafield.md
@@ -23,7 +23,7 @@ It's capable of handling the following types of files:
 | Type | Description | Example|
 |------|-------------|--------|
 | `string` | Path to the media file.| `/Users/jane/butterflies.mp4`     |
-| `Ibexa\Core\FieldType\Media\Value` | Media field type Value Object with path to the media file as the value of `id` property. | See below. |
+| `Ibexa\Core\FieldType\Media\Value` | Media field type value object with path to the media file as the value of `id` property. | See below. |
 
 ### Value object
 
diff --git a/docs/content_management/field_types/field_type_reference/relationlistfield.md b/docs/content_management/field_types/field_type_reference/relationlistfield.md
index 15ae595379..86ef67f760 100644
--- a/docs/content_management/field_types/field_type_reference/relationlistfield.md
+++ b/docs/content_management/field_types/field_type_reference/relationlistfield.md
@@ -15,7 +15,7 @@ This field type makes it possible to store and retrieve values of a relation to
 |`int|string`|ID of the related content item|`42`|
 |`array`|An array of related Content IDs|`[ 24, 42 ]`|
 |`Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo`|ContentInfo instance of the related Content|n/a|
-|`Ibexa\Core\FieldType\RelationList\Value`|RelationList field type Value Object|See below.|
+|`Ibexa\Core\FieldType\RelationList\Value`|RelationList field type value object|See below.|
 
 ### Value Object
 
diff --git a/docs/content_management/field_types/field_type_reference/userfield.md b/docs/content_management/field_types/field_type_reference/userfield.md
index 5c4f315ea8..e1ffad6c99 100644
--- a/docs/content_management/field_types/field_type_reference/userfield.md
+++ b/docs/content_management/field_types/field_type_reference/userfield.md
@@ -8,7 +8,7 @@ This field type validates and stores information about a user.
 
 ## PHP API field type
 
-### Value Object
+### Value object
 
 |Property|Type|Description|Example|
 |------|------|------|------|

From 0530436f42fd63418dd5136b982a4951e64c16d7 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 13:18:58 +0200
Subject: [PATCH 60/77] Fixes - 'search criteria'

---
 docs/release_notes/ibexa_dxp_v4.1.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/release_notes/ibexa_dxp_v4.1.md b/docs/release_notes/ibexa_dxp_v4.1.md
index 51572ecb30..e807afe0bd 100644
--- a/docs/release_notes/ibexa_dxp_v4.1.md
+++ b/docs/release_notes/ibexa_dxp_v4.1.md
@@ -15,7 +15,7 @@ description: Ibexa DXP v4.1 enhances the PIM capabilities, adds a Measurement fi
 
 ### Product catalog enhancements
 
-With this release, product catalog brings new PHP APIs, productivity boost from new product search criteria and sort classes, advanced filtering in REST endpoints, auto-generated identifiers, product list sorting, and more.
+With this release, product catalog brings new PHP APIs, productivity boost from new product Search Criteria and Sort classes, advanced filtering in REST endpoints, auto-generated identifiers, product list sorting, and more.
 
 You can now use [advanced filtering on products, product types, attributes, and others in REST endpoints](https://doc.ibexa.co/en/latest/api/rest_api_reference/rest_api_reference.html#product-catalog-filter-currencies).
 
@@ -25,7 +25,7 @@ based on the current context (for example, selected locale).
 A new Color attribute enables adding a product attribute that uses the color picker to select a precise color.
 
 The product catalog is now fully integrated with the transactional system integration, enabling a full purchasing process.
-  
+
 ### Measurement field type and attribute
 
 With the new Measurement field type users can now add a Measurement Field, with different pre-built units, to content:

From fb4797e08596feda9a64672588b827f6bea000c6 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 13:23:32 +0200
Subject: [PATCH 61/77] Fixes - 'product'

---
 docs/search/criteria_reference/productcode_criterion.md      | 2 +-
 docs/search/criteria_reference/producttype_criterion.md      | 2 +-
 docs/search/sort_clause_reference/productcode_sort_clause.md | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/search/criteria_reference/productcode_criterion.md b/docs/search/criteria_reference/productcode_criterion.md
index 3dd564fdf5..0bed42298f 100644
--- a/docs/search/criteria_reference/productcode_criterion.md
+++ b/docs/search/criteria_reference/productcode_criterion.md
@@ -9,7 +9,7 @@ The `ProductCode` Search Criterion searches for products by their codes.
 
 ## Arguments
 
-- `productCode` - array of strings representing the Product codes(s)
+- `productCode` - array of strings representing the product codes(s)
 
 ## Example
 
diff --git a/docs/search/criteria_reference/producttype_criterion.md b/docs/search/criteria_reference/producttype_criterion.md
index d0e76ed464..58707daffb 100644
--- a/docs/search/criteria_reference/producttype_criterion.md
+++ b/docs/search/criteria_reference/producttype_criterion.md
@@ -9,7 +9,7 @@ The `ProductType` Search Criterion searches for products by their codes.
 
 ## Arguments
 
-- `productType` - array of strings representing the Product type(s)
+- `productType` - array of strings representing the product type(s)
 
 ## Example
 
diff --git a/docs/search/sort_clause_reference/productcode_sort_clause.md b/docs/search/sort_clause_reference/productcode_sort_clause.md
index 4eabf93258..4eed6ce992 100644
--- a/docs/search/sort_clause_reference/productcode_sort_clause.md
+++ b/docs/search/sort_clause_reference/productcode_sort_clause.md
@@ -4,7 +4,7 @@ description: ProductCode Sort Clause
 
 # ProductCode Sort Clause
 
-The `ProductCode` Sort Clause sorts search results by the Product code.
+The `ProductCode` Sort Clause sorts search results by the product code.
 
 ## Arguments
 

From 74e997efbc161901a47d8016347e2f00eac9d362 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 13:26:00 +0200
Subject: [PATCH 62/77] Fixes - 'sort clauses'

---
 docs/release_notes/ez_platform_v1.7.0_lts.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/release_notes/ez_platform_v1.7.0_lts.md b/docs/release_notes/ez_platform_v1.7.0_lts.md
index 83ee966f74..272c9257a0 100644
--- a/docs/release_notes/ez_platform_v1.7.0_lts.md
+++ b/docs/release_notes/ez_platform_v1.7.0_lts.md
@@ -53,7 +53,7 @@ Community members are more than welcome to contribute to the translation process
     -    QueryType's now support using alias when being used as service so you can define several services with same  QueryType class ([EZP-26628](http://jira.ez.no/browse/EZP-26628))
         -    Example: Generic location child QueryType being reused several times for specific services for article or blog post listings 
 -   API:
-    -   New method:` Location->getSortClauses()` to get sort clauses based on what kind of sorting has been set on the Location ([EZP-26528](http://jira.ez.no/browse/EZP-26528))
+    -   New method:` Location->getSortClauses()` to get Sort Clauses based on what kind of sorting has been set on the Location ([EZP-26528](http://jira.ez.no/browse/EZP-26528))
     -   Add Content Version archives limit by configuration & enforce on publish ([EZP-23281](http://jira.ez.no/browse/EZP-23281))
 -   Debug:
     -   ez-support-tools:dump-info command now able to dump system info in several formats, and default is now json ([EZP-26549](http://jira.ez.no/browse/EZP-26549))

From 66da5a5e099b5879ef13b2d669283e1c90210283 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 13:27:09 +0200
Subject: [PATCH 63/77] Fixes - 'elasticsearch'

---
 docs/getting_started/requirements.md                          | 4 ++--
 docs/release_notes/ez_platform_v3.0.md                        | 4 ++--
 docs/release_notes/ez_platform_v3.0_deprecations.md           | 4 ++--
 .../search_engines/elastic_search/configure_elastic_search.md | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/getting_started/requirements.md b/docs/getting_started/requirements.md
index f787218e46..09273a391d 100644
--- a/docs/getting_started/requirements.md
+++ b/docs/getting_started/requirements.md
@@ -496,8 +496,8 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
     - Platform.sh provides Redis support for versions 2.8, 3.0 and 3.2. eZ Platform supports Redis version 3.2 or higher.
     As a result, Redis is supported by eZ Platform Cloud versions 3.2.
-    - Platform.sh provides Elastic Search service (different versions supported).
-    Elastic Search isn't supported for use as search engine for eZ Platform.
+    - Platform.sh provides Elasticsearch service (different versions supported).
+    Elasticsearch isn't supported for use as search engine for eZ Platform.
 
     Features or services supported by eZ Platform but not covered by Platform.sh may be possible by means of a [custom integration](#custom-integrations).
 
diff --git a/docs/release_notes/ez_platform_v3.0.md b/docs/release_notes/ez_platform_v3.0.md
index 7af5ea752f..09613ef091 100644
--- a/docs/release_notes/ez_platform_v3.0.md
+++ b/docs/release_notes/ez_platform_v3.0.md
@@ -279,9 +279,9 @@ The deprecated `ezprice` and `ezpage` field types have been removed.
 Nameable field type interface has been removed and replaced by `eZ\Publish\SPI\FieldType\FieldType::getName`.
 For a full list of changes on field types, see [Backwards compatibility doc](https://doc.ibexa.co/en/latest/releases/ez_platform_v3.0_deprecations/#field-types).
 
-### Elastic Search
+### Elasticsearch
 
-Elastic Search support has been dropped.
+Elasticsearch support has been dropped.
 
 ### REST server
 
diff --git a/docs/release_notes/ez_platform_v3.0_deprecations.md b/docs/release_notes/ez_platform_v3.0_deprecations.md
index a362cb5e43..2b2cf965f5 100644
--- a/docs/release_notes/ez_platform_v3.0_deprecations.md
+++ b/docs/release_notes/ez_platform_v3.0_deprecations.md
@@ -487,9 +487,9 @@ Use:
 - `viewAction` instead of `viewLocation`
 - `embedAction` instead of `embedLocation`
 
-### Elastic Search
+### Elasticsearch
 
-Experimental, deprecated and unsupported code for Elastic Search 1.4.2 has been dropped from kernel,
+Experimental, deprecated and unsupported code for Elasticsearch 1.4.2 has been dropped from kernel,
 to be replaced with a dedicated bundle for the latest Elastic version in the future.
 
 ### Field types
diff --git a/docs/search/search_engines/elastic_search/configure_elastic_search.md b/docs/search/search_engines/elastic_search/configure_elastic_search.md
index 4b888e127b..b420dd8758 100644
--- a/docs/search/search_engines/elastic_search/configure_elastic_search.md
+++ b/docs/search/search_engines/elastic_search/configure_elastic_search.md
@@ -487,7 +487,7 @@ For more information about specifying the pattern for your language, see [Define
 
 #### Create config for language specific analyzer
 
-For information about configuring an analyzer for each specific language, see [Elastic Search documentation](https://www.elastic.co/guide/en/elasticsearch/reference/7.17/analysis-lang-analyzer.html).
+For information about configuring an analyzer for each specific language, see [Elasticsearch documentation](https://www.elastic.co/guide/en/elasticsearch/reference/7.17/analysis-lang-analyzer.html).
 
 An adoption of the [English analyzer](https://www.elastic.co/guide/en/elasticsearch/reference/7.17/analysis-lang-analyzer.html#english-analyzer) in [[= product_name =]] configuration looks like this:
 

From f2ff5d640b0e2c1044d089f882bc931a6c02785a Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 13:28:01 +0200
Subject: [PATCH 64/77] Fix 'storefront'

---
 docs/administration/project_organization/bundles.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/administration/project_organization/bundles.md b/docs/administration/project_organization/bundles.md
index 7c8986ca5a..afde87bc12 100644
--- a/docs/administration/project_organization/bundles.md
+++ b/docs/administration/project_organization/bundles.md
@@ -123,7 +123,7 @@ To remove a bundle (either one you created yourself, or an out-of-the-box one th
 |ibexa/experience|Metapackage for Symfony Flex-based [[= product_name =]] Experience installation|
 |ibexa/cart|Main store functionalities|
 |ibexa/checkout|Store checkout functionality|
-|ibexa/storefront|A store front starting kit|
+|ibexa/storefront|A storefront starting kit|
 |ibexa/order-management|Order management|
 |ibexa/payment|Payment handling|
 |ibexa/shipping|Shipping handling|

From a7c3cb92cb3bfb32e270cc5348b8e9e61d39768a Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 13:41:10 +0200
Subject: [PATCH 65/77] Fixes - 'etc.'

---
 docs/administration/admin_panel/languages_admin_panel.md  | 2 +-
 docs/administration/admin_panel/roles_admin_panel.md      | 2 +-
 docs/administration/content_organization/content_types.md | 2 +-
 docs/administration/project_organization/architecture.md  | 2 +-
 .../project_organization/project_organization.md          | 2 +-
 docs/api/php_api/php_api.md                               | 2 +-
 docs/api/rest_api/rest_api_authentication.md              | 2 +-
 docs/commerce/payment/payum_integration.md                | 2 +-
 docs/content_management/content_management_guide.md       | 8 ++++----
 docs/content_management/content_model.md                  | 4 ++--
 .../field_types/field_type_reference/binaryfilefield.md   | 3 ++-
 .../field_types/field_type_reference/imagefield.md        | 2 +-
 docs/content_management/field_types/field_types.md        | 2 +-
 docs/content_management/field_types/type_and_value.md     | 2 +-
 .../file_management/file_url_handling.md                  | 2 +-
 docs/content_management/locations.md                      | 2 +-
 docs/getting_started/install_ibexa_dxp.md                 | 3 +--
 docs/ibexa_products/ibexa_headless.md                     | 2 +-
 .../cache/http_cache/content_aware_cache.md               | 2 +-
 .../cache/http_cache/context_aware_cache.md               | 2 +-
 .../cache/http_cache/fastly.md                            | 2 +-
 .../cache/persistence_cache.md                            | 2 +-
 .../clustering/clustering_with_ddev.md                    | 2 +-
 docs/infrastructure_and_maintenance/performance.md        | 2 +-
 .../security/security_checklist.md                        | 2 +-
 docs/multisite/languages/languages.md                     | 2 +-
 docs/permissions/permission_use_cases.md                  | 2 +-
 docs/personalization/enable_personalization.md            | 2 +-
 docs/personalization/legacy_recommendation_api.md         | 4 ++--
 docs/release_notes/ez_platform_v1.8.0.md                  | 2 +-
 docs/release_notes/ez_platform_v2.5.md                    | 2 +-
 docs/release_notes/ez_platform_v3.0_deprecations.md       | 6 ++----
 docs/resources/release_process_and_roadmap.md             | 2 +-
 docs/search/criteria_reference/order_search_criteria.md   | 2 +-
 docs/search/criteria_reference/product_search_criteria.md | 2 +-
 .../elastic_search/configure_elastic_search.md            | 2 +-
 docs/snippets/update/merge_composer.md                    | 2 +-
 .../generic_field_type/4_introduce_a_template.md          | 2 +-
 .../migrating_from_ez_publish_platform.md                 | 4 ++--
 docs/users/user_authentication.md                         | 2 +-
 40 files changed, 48 insertions(+), 50 deletions(-)

diff --git a/docs/administration/admin_panel/languages_admin_panel.md b/docs/administration/admin_panel/languages_admin_panel.md
index 0d2c226e72..fd6842bf40 100644
--- a/docs/administration/admin_panel/languages_admin_panel.md
+++ b/docs/administration/admin_panel/languages_admin_panel.md
@@ -8,7 +8,7 @@ description: Ibexa DXP offers the ability to create multiple translations of you
 Which version is shown to a visitor depends on the way your installation is set up.
 You can add a new language version for the website in the [Admin Panel](admin_panel.md) in the **Languages** tab.
 
-Every new language must have a name and a language code, written in the `xxx-XX` format, for example `eng-GB` etc.
+Every new language must have a name and a language code, written in the `xxx-XX` format, for example `eng-GB`.
 
 ![Languages](admin_panel_languages.png "Languages")
 
diff --git a/docs/administration/admin_panel/roles_admin_panel.md b/docs/administration/admin_panel/roles_admin_panel.md
index c1b2362555..cf26343d98 100644
--- a/docs/administration/admin_panel/roles_admin_panel.md
+++ b/docs/administration/admin_panel/roles_admin_panel.md
@@ -36,7 +36,7 @@ Every user or user group can have multiple roles.
 A user can also belong to many groups, for example, Administrators, Editors, Subscribers.
 
 Best practice is to avoid assigning roles to users directly.
-Model your content (content types, sections, locations etc.) in a way that can be accessed by generic roles.
+Model your content (for example, content types, sections, or locations) in a way that can be accessed by generic roles.
 That way system is be more secure and easier to manage.
 This approach also improves performance.
 Role assignments and policies are taken into account during search/load queries.
diff --git a/docs/administration/content_organization/content_types.md b/docs/administration/content_organization/content_types.md
index 90bf47672f..f804c1e6d1 100644
--- a/docs/administration/content_organization/content_types.md
+++ b/docs/administration/content_organization/content_types.md
@@ -32,7 +32,7 @@ It can consist of letters, digits, spaces, and special characters (it's mandator
 
     Even if your content type defines a field intended as a name for the content item (for example, a title of an article or product name), don't confuse it with this Name, which is a piece of metadata, not a field.
 
-**Identifier** – an identifier for internal use in configuration files, templates, PHP code, etc.
+**Identifier** – an identifier for internal use in configuration, for example, files, templates, or PHP code.
 It must be unique, can only contain lowercase letters, digits, and underscores (it's mandatory and the maximum length is 50 characters).
 
 **Description** – a detailed description of the content type (optional).
diff --git a/docs/administration/project_organization/architecture.md b/docs/administration/project_organization/architecture.md
index 6e95964a6d..340ecd5d45 100644
--- a/docs/administration/project_organization/architecture.md
+++ b/docs/administration/project_organization/architecture.md
@@ -24,7 +24,7 @@ The architecture of [[= product_name =]] is layered and uses clearly defined API
 | [GraphQL](graphql.md)                               | GraphQL for [[= product_name =]] exposes the domain model using the Repository, based on content type groups, content types and field definitions.                                             |
 | [Public PHP API](php_api.md)                        | Public PHP API exposes the Repository which enables you to create, read, update, manage and delete all objects available in [[= product_name =]].                                              |
 | Business Logic                                      | The business logic is defined in the kernel. This business logic is exposed to applications via an API. It is used to organize development of the user interface layer.                        |
-| SPI                                                 | Service Provider Interface which defines contracts for implementing various parts of the system, including persistence layer (`SPI\Persistence`), custom field types, custom limitations, etc. |
+| SPI                                                 | Service Provider Interface which defines contracts for implementing various parts of the system, including persistence layer (`SPI\Persistence`), custom field types, custom limitations, and more. |
 | [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](legacy_search_overview.md)     | Legacy search engine is SQL-based and uses Doctrine's database connection.                                                                                                                     |
diff --git a/docs/administration/project_organization/project_organization.md b/docs/administration/project_organization/project_organization.md
index 465f4af88f..fd1f35f989 100644
--- a/docs/administration/project_organization/project_organization.md
+++ b/docs/administration/project_organization/project_organization.md
@@ -10,7 +10,7 @@ You can see an example of organizing a project in the [companion repository](htt
 
 ## PHP code
 
-The project's PHP code (controllers, event listeners, etc.) should be placed in the `src` folder.
+The project's PHP code (for example, controllers or event listeners) should be placed in the `src` folder.
 
 Reusable libraries should be packaged so that they can be managed using Composer.
 
diff --git a/docs/api/php_api/php_api.md b/docs/api/php_api/php_api.md
index af237b935f..bd9a1ff333 100644
--- a/docs/api/php_api/php_api.md
+++ b/docs/api/php_api/php_api.md
@@ -48,7 +48,7 @@ You can access the PHP API by injecting relevant services into your code:
 
 - By using [auto-wiring]([[=symfony_doc=]]/service_container/autowiring.html), and the service classname in the `Ibexa\Contracts` namespace (see `bin/console debug:autowiring | grep Ibexa.Contracts`).
 - By using [service parameters]([[=symfony_doc=]]/service_container.html#service-parameters), and service aliases (see `bin/console debug:autowiring | grep ibexa.api`).
-- By using the repository's `get[ServiceName]()` methods: [`Repository::getContentService()`](php_api_reference/classes/Ibexa-Contracts-Core-Repository-Repository.html#method_getContentService), [`getUserService()`](php_api_reference/classes/Ibexa-Contracts-Core-Repository-Repository.html#method_getUserService), etc.
+- By using the repository's `get[ServiceName]()` methods, for example, [`Repository::getContentService()`](php_api_reference/classes/Ibexa-Contracts-Core-Repository-Repository.html#method_getContentService), or [`getUserService()`](php_api_reference/classes/Ibexa-Contracts-Core-Repository-Repository.html#method_getUserService).
   (Prefer injecting several Repository's dedicated services instead of the whole Repository if the Repository itself isn't needed.)
 
 !!! caution
diff --git a/docs/api/rest_api/rest_api_authentication.md b/docs/api/rest_api/rest_api_authentication.md
index 216beb7965..170322fd42 100644
--- a/docs/api/rest_api/rest_api_authentication.md
+++ b/docs/api/rest_api/rest_api_authentication.md
@@ -232,7 +232,7 @@ If an unsafe request is missing the CSRF token, or the token has incorrect value
 The purpose of CSRF protection is to prevent users from accidentally running harmful operations by being tricked into executing an HTTP(S) request against a web applications they're logged into.
 In browsers this action is blocked by lack of CSRF token.
 
-However, if you develop a rich client application (JavaScript, JAVA, iOS, Android, etc.), that is:
+However, if you develop a rich client application (for example, JavaScript, JAVA, iOS, or Android), that is:
 
 - Registering itself as a protocol handler:
     - Exposes unsafe methods in any way
diff --git a/docs/commerce/payment/payum_integration.md b/docs/commerce/payment/payum_integration.md
index d3b942cd48..07eeb2c09e 100644
--- a/docs/commerce/payment/payum_integration.md
+++ b/docs/commerce/payment/payum_integration.md
@@ -28,7 +28,7 @@ payum:
 
 In [[= product_name =]], the default payment workflow has certain places, such as `pending`, `failed`, `paid`, or `cancelled`, and their corresponding transitions.
 
-However, for your application to use other transitions and places, for example, `authorized`, `notified`, `refunded` etc., and to present them in the user interface, you need to:
+However, for your application to use other transitions and places, for example, `authorized`, `notified`, or `refunded`, and to present them in the user interface, you need to:
 
 - override the default payment workflow
 - create a custom workflow and enable it by using semantic configuration
diff --git a/docs/content_management/content_management_guide.md b/docs/content_management/content_management_guide.md
index 09e2ed592e..bd73fcc097 100644
--- a/docs/content_management/content_management_guide.md
+++ b/docs/content_management/content_management_guide.md
@@ -25,7 +25,7 @@ Content management capabilities are available in all [[= product_name =]] editio
 - articles or posts
 - products
 - forms
-- media (images, videos, etc.)
+- media (for example, images or videos)
 - user accounts
 
 You can set up content structure, define the templates to be filled with content, and assign different areas of the structure to your editors.
@@ -57,7 +57,7 @@ For technical details, see [a Content model](content_model.md#content-model).
 ### Field types
 
 [Field types](field_types.md) are the smallest elements of the content model’s structure.
-[[= product_name =]] comes with many built-in field types that cover most common needs, for example, Text line, RichText, Integer, Measurement, Map location, etc.
+[[= product_name =]] comes with many built-in field types that cover most common needs, for example, Text line, RichText, Integer, Measurement, or Map location.
 
 Their role is to:
 
@@ -90,10 +90,10 @@ Content types define what fields are available in the content item.
 ### Content items
 
 Content items are pieces of content, such as, for example, products, articles, blog posts, or media.
-In [[= product_name =]], everything is a content item — not only pages, articles or products, but also all media (images, videos, etc.) or even user accounts.
+In [[= product_name =]], everything is a content item — not only pages, articles or products, but also all media (for example, images or videos) or even user accounts.
 
 Each content item, apart from its name and identifier, contains a composition of fields, which differs depending on the type of content.
-For example, articles might have a title, an author, a body, and an image, while products may have a name, category, price, size, color, etc.
+For example, articles might have for example, a title, an author, a body, and an image, while products may have, for example, a name, category, price, size, or color.
 
 ### Forms
 
diff --git a/docs/content_management/content_model.md b/docs/content_management/content_model.md
index 4c71a9b6af..5b5bed4aa8 100644
--- a/docs/content_management/content_model.md
+++ b/docs/content_management/content_model.md
@@ -7,7 +7,7 @@ description: Ibexa DXP's content model relies on content items that are instance
 ## Content model overview
 
 The content structure in [[= product_name =]] is based on content items.
-A content item represents a single piece of content: an article, a blog post, an image, a product, etc.
+A content item represents a single piece of content, for example, an article, a blog post, an image, or a product.
 Each content item is an instance of a content type.
 
 !!! tip
@@ -97,7 +97,7 @@ Aside from the field type, the field definition in a content type provides the f
 
 **Name** – a user-friendly name that describes the field. This name is used in the interface, but not internally by the system. It can consist of letters, digits, spaces, and special characters (the maximum length is 255 characters). If no name is provided, a unique one is automatically generated.
 
-**Identifier** – an identifier for internal use in configuration files, templates, PHP code, etc. It can only contain lowercase letters, digits and underscores (the maximum length is 50 characters). This identifier is also used in name patterns for the content type.
+**Identifier** – an identifier for internal use, for example, in configuration files, templates, or PHP code. It can only contain lowercase letters, digits and underscores (the maximum length is 50 characters). This identifier is also used in name patterns for the content type.
 
 **Description** – a detailed description of the field.
 
diff --git a/docs/content_management/field_types/field_type_reference/binaryfilefield.md b/docs/content_management/field_types/field_type_reference/binaryfilefield.md
index f577f9900f..974717146d 100644
--- a/docs/content_management/field_types/field_type_reference/binaryfilefield.md
+++ b/docs/content_management/field_types/field_type_reference/binaryfilefield.md
@@ -2,7 +2,8 @@
 
 This field type represents and handles a single binary file. It also counts the number of times the file has been downloaded from the `content/download` module.
 
-It's capable of handling virtually any file type and is typically used for storing legacy document types such as PDF files, Word documents, spreadsheets, etc. The maximum allowed file size is determined by the "Max file size" class attribute edit parameter and the `upload_max_filesize` directive in the main PHP configuration file (`php.ini`).
+It's capable of handling virtually any file type and is typically used for storing legacy document types, for example, PDF files, Word documents, or spreadsheets.
+The maximum allowed file size is determined by the "Max file size" class attribute edit parameter and the `upload_max_filesize` directive in the main PHP configuration file (`php.ini`).
 
 | Name         | Internal name  | Expected input | Output  |
 |--------------|----------------|----------------|---------|
diff --git a/docs/content_management/field_types/field_type_reference/imagefield.md b/docs/content_management/field_types/field_type_reference/imagefield.md
index 5565528546..a6dac2cfb2 100644
--- a/docs/content_management/field_types/field_type_reference/imagefield.md
+++ b/docs/content_management/field_types/field_type_reference/imagefield.md
@@ -141,7 +141,7 @@ An Image field looks like this:
 </field>
 ```
 
-Children of the `fieldValue` node list the general properties of the field's original image (`fileSize`, `fileName`, `inputUri`, etc.), and its variations.
+Children of the `fieldValue` node list the general properties of the field's original image (for example, `fileSize`, `fileName`, or `inputUri`), and its variations.
 For each variation, a URI is provided.
 Requested through REST, this resource generates the variation if it doesn't exist yet, and list the variation details:
 
diff --git a/docs/content_management/field_types/field_types.md b/docs/content_management/field_types/field_types.md
index cc31c38d03..08706cfa90 100644
--- a/docs/content_management/field_types/field_types.md
+++ b/docs/content_management/field_types/field_types.md
@@ -5,7 +5,7 @@ description: Field types define the fields that a content item is built of.
 # Field types
 
 Field types are the smallest building blocks of content.
-[[= product_name =]] comes with many [built-in field types](field_type_reference.md#available-field-types) that cover most common needs, for example, Text line, Email address, Author list, Content relation, Map location, Float, etc.
+[[= product_name =]] comes with many [built-in field types](field_type_reference.md#available-field-types) that cover most common needs, for example, Text line, Email address, Author list, Content relation, Map location, or Float.
 
 Field types are responsible for:
 
diff --git a/docs/content_management/field_types/type_and_value.md b/docs/content_management/field_types/type_and_value.md
index 4e85cd0feb..9b71d0dd08 100644
--- a/docs/content_management/field_types/type_and_value.md
+++ b/docs/content_management/field_types/type_and_value.md
@@ -4,7 +4,7 @@ description: The basis of all field types are their Type and Value classes, cont
 
 # Type and Value
 
-A field type must contain a Type class which contains the logic of the field type: validating data, transforming from various formats, describing the validators, etc.
+A field type must contain a Type class which contains the logic of the field type, for example, validating data, transforming from various formats, or describing the validators.
 A Type class must implement `Ibexa\Core\FieldType\FieldType` ("field type interface").
 All native field types also extend the `Ibexa\Core\FieldType\FieldType` abstract class that implements this interface and provides implementation facilities through a set of abstract methods of its own.
 
diff --git a/docs/content_management/file_management/file_url_handling.md b/docs/content_management/file_management/file_url_handling.md
index 6f868461ca..6683fd9052 100644
--- a/docs/content_management/file_management/file_url_handling.md
+++ b/docs/content_management/file_management/file_url_handling.md
@@ -64,6 +64,6 @@ Two implementations are provided: `Prefix`, and `AbsolutePrefix`. They both add
 Three URL decorator services are introduced:
 
 - `Ibexa\Core\IO\UrlDecorator\AbsolutePrefix` used by the binary data handlers to decorate all URIs sent out by the API. Uses `AbsolutePrefix`.
-- `Ibexa\Core\IO\UrlDecorator\Prefix` used through the `UrlRedecorator` by various legacy elements (converter, storage gateway, etc.) to generate its internal storage format for URIs. Uses a `Prefix`, not an `AbsolutePrefix`, meaning that no leading `/` is added.
+- `Ibexa\Core\IO\UrlDecorator\Prefix` used through the `UrlRedecorator` by various legacy elements (for example, converter or storage gateway) to generate its internal storage format for URIs. Uses a `Prefix`, not an `AbsolutePrefix`, meaning that no leading `/` is added.
 
 In addition, a URL redecorator service, `Ibexa\Core\IO\UrlDecorator\Prefix`, uses both previously mentioned decorators to convert URIs between what is used on the new stack, and what format legacy expects (relative URLs from the project root).
diff --git a/docs/content_management/locations.md b/docs/content_management/locations.md
index 1f1704936a..8d11073d40 100644
--- a/docs/content_management/locations.md
+++ b/docs/content_management/locations.md
@@ -43,7 +43,7 @@ can be viewed by selecting the **Content structure** tab in the Content mode int
 
 ![Content structure](content_management_tree.png "Content structure")
 
-This part of the tree is typically used for organizing folders, articles, information pages, etc.
+This part of the tree is typically used, for example, for organizing folders, articles, or information pages.
 The default ID number of this location is 2, but it can be [modified via configuration](repository_configuration.md#top-level-locations).
 It contains a Folder content item.
 
diff --git a/docs/getting_started/install_ibexa_dxp.md b/docs/getting_started/install_ibexa_dxp.md
index 0fa8686167..9fc4724fd3 100644
--- a/docs/getting_started/install_ibexa_dxp.md
+++ b/docs/getting_started/install_ibexa_dxp.md
@@ -162,8 +162,7 @@ To use Composer to instantly create a project in the current folder with all the
 
 !!! tip
 
-    You can set [different version constraints](https://getcomposer.org/doc/articles/versions.md):
-    specific tag (`3.3.2`), version range (`~3.3.2`), stability (`^3.3@rc`), etc.:
+    You can set [different version constraints](https://getcomposer.org/doc/articles/versions.md), for example, specific tag (`3.3.2`), version range (`~3.3.2`), or stability (`^3.3@rc`):
 
     ``` bash
     composer create-project ibexa/experience-skeleton:3.3.2 .
diff --git a/docs/ibexa_products/ibexa_headless.md b/docs/ibexa_products/ibexa_headless.md
index e4e29b433c..465ca06747 100644
--- a/docs/ibexa_products/ibexa_headless.md
+++ b/docs/ibexa_products/ibexa_headless.md
@@ -28,7 +28,7 @@ You can [contact us](https://www.ibexa.co/about-ibexa/contact-us) or [contact on
 
 You access with any web browser from any platform to a rich back office, the main place to
 
-- define users and their rights (customers, subscribers, editors, etc.),
+- define users and their rights (for example, customers, subscribers, or editors),
 - organize content (content types, fields, tree, tags, languages, and more),
 - edit content in a collaborative workplace with versions and workflows.
 
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
index 14c2966bf0..a6e631e48c 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
@@ -28,7 +28,7 @@ Current content tags (and when the system purges on them):
 - Content type: `ct<content-type-id>` - Used when the content type changes, affecting content of its type.
 - Location: `l<location-id>` - Used for clearing all cache relevant for a given location.
 - Parent Location: `pl<[parent-]location-id>` - Used for clearing all children of a location (`pl<location-id>`), or all siblings (`pl<parent-location-id>`).
-- Path: `p<location-id>` - For operations that change the tree itself, like move, remove, etc.
+- Path: `p<location-id>` - For operations that change the tree itself, for example, move or remove.
 - Relation: `r<content-id>` - Only purged on when content updates are severe enough to also affect reverse relations.
 - Relation location: `rl<location-id>` - Same as relation, but by location ID.
 
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
index 9ba1f297ae..7f7133a4c7 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
@@ -102,7 +102,7 @@ This method doesn't consume memory in Varnish.
 It can optionally be cached with custom logic: Symfony Cache on server side and/or with client side caching techniques.
 This should be done as Ajax/JS lookup to avoid the uncached request that slows down the whole delivery of Vanish if it's done as ESI.
 
-This solution requires more effort depending on project requirements (traffic load, etc.).
+This solution requires more effort depending on project requirements (for example, traffic load).
 
 3\. Custom vary by logic, for example, `X-User-Preference-Hash` inspired by `X-Context-User-Hash`:
 
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md b/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md
index 6792fa9314..308c328abf 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md
@@ -235,7 +235,7 @@ KlUh0J1fnw1JY1aEQ0up    8        Re-Enable shielding on restart  false    1iJWIf
 
 ### Get details of installed snippets
 
-Use the `vcl snippet list` command with the `--verbose` option to get information such as: priority, which subroutine it's attached to (`vcl_recv`, `vcl_fetch` etc.) and the code itself.
+Use the `vcl snippet list` command with the `--verbose` option to get information such as: priority, which subroutine it's attached to (for example, `vcl_recv` or `vcl_fetch`) and the code itself.
 
 ``` bash
 fastly vcl snippet list --version=active -v
diff --git a/docs/infrastructure_and_maintenance/cache/persistence_cache.md b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
index bfd06f53d9..f8d289a6af 100644
--- a/docs/infrastructure_and_maintenance/cache/persistence_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
@@ -12,7 +12,7 @@ Persistence cache can best be described as an implementation of `SPI\Persistence
 
 As shown in the illustration, this is done in the exact same way as the event layer is a custom implementation of `API\Repository` decorating the main repository.
 In the case of Persistence Cache, instead of sending events on calls passed on to the decorated implementation, most of the load calls are cached, and calls that perform changes purge the affected caches.
-Cache handlers *(Memcached, Redis, Filesystem, etc.)* can be configured using Symfony configuration.
+Cache handlers *(for example, Memcached, Redis, or Filesystem)* can be configured using Symfony configuration.
 For details on how to reuse this Cache service in your own custom code, see below.
 
 ## Transparent cache
diff --git a/docs/infrastructure_and_maintenance/clustering/clustering_with_ddev.md b/docs/infrastructure_and_maintenance/clustering/clustering_with_ddev.md
index 0582a20d22..006489bfac 100644
--- a/docs/infrastructure_and_maintenance/clustering/clustering_with_ddev.md
+++ b/docs/infrastructure_and_maintenance/clustering/clustering_with_ddev.md
@@ -117,7 +117,7 @@ ddev php bin/console cache:clear
 
 You can now check whether Redis works.
 
-For example, the `ddev redis-cli MONITOR` command returns outputs such as `"SETEX" "ezp:`, `"MGET" "ezp:`, `"SETEX" "PHPREDIS_SESSION:`, `"GET" "PHPREDIS_SESSION:`, etc. while navigating into the website, in particular the back office.
+For example, the `ddev redis-cli MONITOR` command returns outputs, for example, `"SETEX" "ezp:`, `"MGET" "ezp:`, `"SETEX" "PHPREDIS_SESSION:`, or `"GET" "PHPREDIS_SESSION:`, while navigating into the website, in particular the back office.
 
 See [Redis commands](https://redis.io/commands/) for more details such as information about the [`MONITOR`](https://redis.io/commands/monitor/) command used in the previous example.
 
diff --git a/docs/infrastructure_and_maintenance/performance.md b/docs/infrastructure_and_maintenance/performance.md
index 40bf170dc4..d997074ae6 100644
--- a/docs/infrastructure_and_maintenance/performance.md
+++ b/docs/infrastructure_and_maintenance/performance.md
@@ -39,7 +39,7 @@ In production setups:
 
 ### VM
 
-- Avoid shared filesystems for code (Docker for Mac/Win, VirtualBox/*, Vagrant, etc.), because they typically slow down the application 10x or more, compared to native Linux filesystem.
+- Avoid shared filesystems for code (for example, Docker for Mac/Win, VirtualBox/*, or Vagrant), because they typically slow down the application 10x or more, compared to native Linux filesystem.
 - VM in itself also adds 10-30% of overhead. However when it comes to production, for example, AWS vs barebones, it also comes down to cost and convenience factors.
 
 ### Web server
diff --git a/docs/infrastructure_and_maintenance/security/security_checklist.md b/docs/infrastructure_and_maintenance/security/security_checklist.md
index ca5c95c569..5fe4828f90 100644
--- a/docs/infrastructure_and_maintenance/security/security_checklist.md
+++ b/docs/infrastructure_and_maintenance/security/security_checklist.md
@@ -209,7 +209,7 @@ Once you have properly configured secure user roles and permissions, to avoid ex
 - Avoid exposing servers on the open internet when not strictly required.
 - Ensure any servers, services, ports and virtual hosts that were opened for testing purposes are shut down before going live.
 - Ensure file system permissions are set up in such a way that the web server or PHP user can't access files they shouldn't be able to read.
-- Secure the database with a good password, keys, firewall, etc.
+- Secure the database with a good password, keys, firewall.
 Optionally, ensure that the database user used by the web app only has permissions to do the operations needed by [[= product_name =]].
 The Data Definition Language (DDL) commands (create, alter, drop, truncate, comment) are only needed for installing and upgrading [[= product_name =]], and not for running it.
 Not granting these rights to web app users reduces the damage that can result from a security breach.
diff --git a/docs/multisite/languages/languages.md b/docs/multisite/languages/languages.md
index ea55e57af1..24b23443c0 100644
--- a/docs/multisite/languages/languages.md
+++ b/docs/multisite/languages/languages.md
@@ -126,7 +126,7 @@ A locale *conversion map* example [can be found in `ibexa/core`, in `locale.yaml
 
 ### More complex translation setup
 
-There are some cases where your SiteAccesses share settings (repository, content settings, etc.), but you don't want all of them to share the same `translation_siteaccesses` setting.
+There are some cases where your SiteAccesses share settings (for example, repository or content settings), but you don't want all of them to share the same `translation_siteaccesses` setting.
 This can be for example the case when you use separate SiteAccesses for mobile versions of a website.
 
 The solution is defining new groups:
diff --git a/docs/permissions/permission_use_cases.md b/docs/permissions/permission_use_cases.md
index e9ee65977d..9cace5c96f 100644
--- a/docs/permissions/permission_use_cases.md
+++ b/docs/permissions/permission_use_cases.md
@@ -22,7 +22,7 @@ These policies are necessary for all other cases below that require access to th
 
 You can use this option together with [[= product_name_exp =]]'s content review options.
 Users assigned with these policies can create content, but cannot publish it.
-To publish, they must send the content for review to another User with proper permissions (for example, senior editor, proofreader, etc.).
+To publish, they must send the content for review to another User with proper permissions (for example, senior editor or proofreader).
 
 - `content/create`
 - `content/edit`
diff --git a/docs/personalization/enable_personalization.md b/docs/personalization/enable_personalization.md
index 4ff3d08e14..3a6efaca23 100644
--- a/docs/personalization/enable_personalization.md
+++ b/docs/personalization/enable_personalization.md
@@ -49,7 +49,7 @@ For more information about integrating the Personalization service, see [Develop
 
 ### Set up item type tracking
 
-For the recommendations to be calculated, apart from visitor events (CLICK, BUY, etc.), the Personalization server must receive a list of item types that are tracked.
+For the recommendations to be calculated, apart from visitor events (for example, CLICK or BUY), the Personalization server must receive a list of item types that are tracked.
 
 You define item types to be tracked in [configuration files](configuration.md#configuration-files).
 The content is then initially exported by a script.
diff --git a/docs/personalization/legacy_recommendation_api.md b/docs/personalization/legacy_recommendation_api.md
index 9625bd28ca..0791c33d31 100644
--- a/docs/personalization/legacy_recommendation_api.md
+++ b/docs/personalization/legacy_recommendation_api.md
@@ -28,7 +28,7 @@ Before recommendation can be fetched from the recommendation controller, a suffi
 Recommendations are retrieved from the Personalization server with RESTful requests by using the GET method.
 The result is a list of item IDs that can be used to call the underlying CMS or shop system, to retrieve the necessary information for the rendering process.
 
-To allow the customer to retrieve different types of recommendations based on different methods (for example, Collaborative Filtering, Content Based, Stereotype, etc.) the Recommendation System uses scenario IDs relating to a predefined set of configurations inside the system.
+To allow the customer to retrieve different types of recommendations based on different methods (for example, Collaborative Filtering, Content Based, or Stereotype) the Recommendation System uses scenario IDs relating to a predefined set of configurations inside the system.
 These configurations are a combination of methods and filters that should be applied including possible fallbacks if the requested methods don't deliver a result.
 
 A recommendation request looks like this:
@@ -140,7 +140,7 @@ The Following HTTP response codes are used by the recommendation controller.
 |400 Bad Request</br>414 Request-URI Too Long|The request is wrongly formatted. See response body for more information.|
 |401 Unauthorized|Not valid authentication credentials.|
 |403 Forbidden|Access denied.|
-|404 Not Found|The requested element was not found. It can be customer ID (a.k.a. mandator ID), model ID, scenario ID etc.|
+|404 Not Found|The requested element was not found. It can be, for example, customer ID (a.k.a. mandator ID), model ID, or scenario ID.|
 |409 Conflict|The combination of used models and the recommendation request parameters doesn't allow to provide recommendations. This could be, for example, if personalized recommendations are requested for a user who has no history at all.|
 |500 Internal Server Error|Unspecified error. Please inform support if you get this error repeatedly.|
 
diff --git a/docs/release_notes/ez_platform_v1.8.0.md b/docs/release_notes/ez_platform_v1.8.0.md
index d98504e5a1..64403cb8cd 100644
--- a/docs/release_notes/ez_platform_v1.8.0.md
+++ b/docs/release_notes/ez_platform_v1.8.0.md
@@ -30,7 +30,7 @@ If you're looking for the Long Term Support (LTS) release, see[ https://ezplatf
 #### Under the Hood
 
 -   New opt-in approach to HttpCache to improve usability and performance by means of:
-    -   Cache multi-tagging: allowing you to tag pages with a path, location, type, parent, etc. so the repository can clear cache in a more targeted, accurate, and flexible way, getting rid of any "clear all" situations on complex operations.
+    -   Cache multi-tagging: allowing you to tag pages with, for example, path, location, type, or parent, so the repository can clear cache in a more targeted, accurate, and flexible way, getting rid of any "clear all" situations on complex operations.
     -   For Varnish this uses [xkey](https://github.com/varnish/varnish-modules/blob/master/docs/vmod_xkey.rst) instead of BAN, enabling greater performance by allowing you to control grace time.
     -   This also places HttpCache in a separate repo, allowing it to grow independently: see <https://github.com/ezsystems/ezplatform-http-cache>
 -   New `content/publish` policy to be able to configure `content/edit` rights independently from publish rights
diff --git a/docs/release_notes/ez_platform_v2.5.md b/docs/release_notes/ez_platform_v2.5.md
index 361093094f..a969d31a66 100644
--- a/docs/release_notes/ez_platform_v2.5.md
+++ b/docs/release_notes/ez_platform_v2.5.md
@@ -64,7 +64,7 @@ bin/console ezplatform:migrate:legacy_matrix
 ### User bundle
 
 The new [ezplatform-user](https://github.com/ezsystems/ezplatform-user) bundle now centralizes
-all features related to user management, such as user accounts, registering, changing passwords, etc.
+all features related to user management, such as user accounts, registering, or changing passwords.
 
 !!! dxp
 
diff --git a/docs/release_notes/ez_platform_v3.0_deprecations.md b/docs/release_notes/ez_platform_v3.0_deprecations.md
index 2b2cf965f5..22e582f0ec 100644
--- a/docs/release_notes/ez_platform_v3.0_deprecations.md
+++ b/docs/release_notes/ez_platform_v3.0_deprecations.md
@@ -285,8 +285,7 @@ For the full list of UDW configuration keys and their descriptions, see [UDW con
 
 ### Online Editor
 
-All Online Editor front-end code and assets (such as JS, CSS, fonts, etc.)
-have been moved from `ezplatform-admin-ui` to `ezplatform-richtext`.
+All Online Editor front-end code and assets (such as JS, CSS, or fonts) have been moved from `ezplatform-admin-ui` to `ezplatform-richtext`.
 
 ### Adding new tabs in the back office
 
@@ -861,8 +860,7 @@ The following Webpack Encore entries have been changed:
 - `ezplatform-admin-ui-alloyeditor-css` replaced by `ezplatform-richtext-onlineeditor-css`
 - `ezplatform-admin-ui-alloyeditor-js` replaced by `ezplatform-richtext-onlineeditor-js`
 
-All Online Editor front-end code and assets (such as JS, CSS, fonts, etc.)
-have been moved from `ezplatform-admin-ui` to `ezplatform-richtext`.
+All Online Editor front-end code and assets (such as JS, CSS, or fonts) have been moved from `ezplatform-admin-ui` to `ezplatform-richtext`.
 
 #### Custom button configuration
 
diff --git a/docs/resources/release_process_and_roadmap.md b/docs/resources/release_process_and_roadmap.md
index dfa9e2a517..57fd189ae8 100644
--- a/docs/resources/release_process_and_roadmap.md
+++ b/docs/resources/release_process_and_roadmap.md
@@ -32,7 +32,7 @@ The version number of [[= product_name =]] and all its internal components follo
 
 - Changes to X indicate breaking changes. They usually concern mostly internal things, but developers should check in our change logs if they need to adjust their code to continue using the API or features. If there are larger breaks, this is announced well in advance of the upcoming release.
 - Y represents new features and functionalities.
-- Z represents patches, bug fixes, smaller improvements, etc.
+- Z represents patches, bug fixes, or smaller improvements.
 
 Distribution files of [[= product_name_base =]] three editions are as follows:
 
diff --git a/docs/search/criteria_reference/order_search_criteria.md b/docs/search/criteria_reference/order_search_criteria.md
index de34b3339a..7ec7153def 100644
--- a/docs/search/criteria_reference/order_search_criteria.md
+++ b/docs/search/criteria_reference/order_search_criteria.md
@@ -7,7 +7,7 @@ edition: commerce
 
 Order Search Criteria are only supported by [Order Search (`OrderService::findOrders`)](order_management_api.md#get-multiple-orders).
 
-With these Criteria you can filter orders by their order identifier, order creation date, order status, customer name, customer status, etc.
+With these Criteria you can filter orders, for example, by their order identifier, order creation date, order status, customer name, or customer status.
 
 ## Order Search Criteria
 
diff --git a/docs/search/criteria_reference/product_search_criteria.md b/docs/search/criteria_reference/product_search_criteria.md
index ecfc0469a1..daeec325d9 100644
--- a/docs/search/criteria_reference/product_search_criteria.md
+++ b/docs/search/criteria_reference/product_search_criteria.md
@@ -7,7 +7,7 @@ page_type: reference
 
 Product Search Criteria are only supported by [Product Search (`ProductServiceInterface::findProduct`)](product_api.md#products).
 
-Search Criterion let you filter product by specific attributes, for example: color, availability, price etc.
+Search Criterion let you filter product by specific attributes, for example, color, availability, or price.
 
 ## Product Search Criteria
 
diff --git a/docs/search/search_engines/elastic_search/configure_elastic_search.md b/docs/search/search_engines/elastic_search/configure_elastic_search.md
index b420dd8758..133ece726c 100644
--- a/docs/search/search_engines/elastic_search/configure_elastic_search.md
+++ b/docs/search/search_engines/elastic_search/configure_elastic_search.md
@@ -216,7 +216,7 @@ ibexa_elasticsearch:
 ### API key authentication
 
 If your Elasticsearch cluster is protected by API keys, you must provide the key and secret in authentication configuration to connect [[= product_name =]] with the cluster.
-With API key authentication you can define different authorization levels, such as [`create_index`, `index`, etc.](https://www.elastic.co/guide/en/elasticsearch/reference/7.x/security-privileges.html#privileges-list-indices).
+With API key authentication you can define different authorization levels, such as [`create_index` or `index`](https://www.elastic.co/guide/en/elasticsearch/reference/7.x/security-privileges.html#privileges-list-indices).
 Such approach proves useful if the cluster is available to the public.
 
 For more information, see [Create API key](https://www.elastic.co/guide/en/elasticsearch/reference/7.x/security-api-create-api-key.html).
diff --git a/docs/snippets/update/merge_composer.md b/docs/snippets/update/merge_composer.md
index bd5c429ef3..72afd5f08e 100644
--- a/docs/snippets/update/merge_composer.md
+++ b/docs/snippets/update/merge_composer.md
@@ -48,7 +48,7 @@ When finished, run `git add composer.json` and commit.
 
 ### C. Fix other conflicts
 
-Depending on the local changes you have done, you may get other conflicts on configuration files, kernel, etc.
+Depending on the local changes you have done, you may get other conflicts, for example, on configuration files or kernel.
 
 For each change, edit the file, identify the conflicting changes, and resolve the conflict.
 Run `git add <conflicting-file>` to add the changes.
diff --git a/docs/tutorials/generic_field_type/4_introduce_a_template.md b/docs/tutorials/generic_field_type/4_introduce_a_template.md
index b429e4ef3c..3314935335 100644
--- a/docs/tutorials/generic_field_type/4_introduce_a_template.md
+++ b/docs/tutorials/generic_field_type/4_introduce_a_template.md
@@ -9,7 +9,7 @@ description: Learn how to add a template for rendering the custom field on the s
 To display data from the field type, you need to create and register a template for it.
 Each field type template receives a set of variables that can be used to achieve the desired goal.
 In this case the most important variable is the `field`, an instance of `Ibexa\Contracts\Core\Repository\Values\Content\Field`.
-In addition to its own metadata (`id`, `fieldDefIdentifier`, etc.), it exposes the field Value through the `value` property.
+In addition to its own metadata (for example, `id` or `fieldDefIdentifier`), it exposes the field Value through the `value` property.
 
 Remember that field type templates can be overridden to tweak what is displayed and how.
 
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
index 360af4f6b7..290d30a2cb 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
@@ -416,7 +416,7 @@ The conversion tool also complains about IDs which contain invalid characters.
 
 In `ezxmltext` you may have links which refer to other objects by their remote ID. This isn't supported in `richtext`, so the conversion tool must look up such remote IDs and replace them with the `object_id` or `node_id`. If the conversion tool cannot find the object by its remote id, it issues a warning about it.
 
-In older eZ Publish databases you may also have invalid links due to lack of reference to a target (no `href`, `url_id`, etc.):
+In older eZ Publish databases you may also have invalid links due to lack of reference to a target (for example, no `href` or `url_id`):
 
 ```
     <link>some text</link>
@@ -529,7 +529,7 @@ In case of URLs with extended UTF-encoded names, the workaround must make use of
 
 To move your legacy Page field / eZ Flow configuration to eZ Platform Enterprise Edition you can use a script that aids in the migration process.
 
-The script automatically migrates only data – to move custom views, layouts, blocks etc., you have to provide their business logic again.
+The script automatically migrates only data – to move, for example, custom views, layouts, or blocks, you have to provide their business logic again.
 
 !!! caution
 
diff --git a/docs/users/user_authentication.md b/docs/users/user_authentication.md
index 554ad27c94..b1d98e9558 100644
--- a/docs/users/user_authentication.md
+++ b/docs/users/user_authentication.md
@@ -7,7 +7,7 @@ description: Customize user authentication.
 ## Authenticate user with multiple user providers
 
 Symfony provides native support for [multiple user providers]([[= symfony_doc =]]/security/multiple_user_providers.html).
-This makes it easier to integrate any kind of login handlers, including SSO and existing third party bundles (for example, [FR3DLdapBundle](https://github.com/Maks3w/FR3DLdapBundle), [HWIOauthBundle](https://github.com/hwi/HWIOAuthBundle), [FOSUserBundle](https://github.com/FriendsOfSymfony/FOSUserBundle), [BeSimpleSsoAuthBundle](https://github.com/BeSimple/BeSimpleSsoAuthBundle), etc.).
+This makes it easier to integrate any kind of login handlers, including SSO and existing third party bundles (for example, [FR3DLdapBundle](https://github.com/Maks3w/FR3DLdapBundle), [HWIOauthBundle](https://github.com/hwi/HWIOAuthBundle), [FOSUserBundle](https://github.com/FriendsOfSymfony/FOSUserBundle), or [BeSimpleSsoAuthBundle](https://github.com/BeSimple/BeSimpleSsoAuthBundle)).
 
 However, to be able to use *external* user providers with [[= product_name =]], a valid Platform user needs to be injected into the repository.
 This is mainly for the kernel to be able to manage content-related permissions (but not limited to this).

From 45a74b3660ae8b48ff39e78d471607740f63e74c Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 13:44:02 +0200
Subject: [PATCH 66/77] Fixes - 'policies'

---
 docs/release_notes/ez_platform_v2.5.md                          | 2 +-
 docs/update_and_migration/from_4.5/update_from_4.5.md           | 2 +-
 .../migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/release_notes/ez_platform_v2.5.md b/docs/release_notes/ez_platform_v2.5.md
index a969d31a66..e6718e466a 100644
--- a/docs/release_notes/ez_platform_v2.5.md
+++ b/docs/release_notes/ez_platform_v2.5.md
@@ -129,7 +129,7 @@ This release introduced several back office improvements to facilitate editorial
 
 ### Permissions
 
-#### Content/Create policy for users
+#### `Content/Create` policy for users
 
 You can now define a 'Content/Create' policy for a user or a user group.
 It enables or disables (if not set) the **Create** button in your dashboard.
diff --git a/docs/update_and_migration/from_4.5/update_from_4.5.md b/docs/update_and_migration/from_4.5/update_from_4.5.md
index 6ca6ac795e..de3740af09 100644
--- a/docs/update_and_migration/from_4.5/update_from_4.5.md
+++ b/docs/update_and_migration/from_4.5/update_from_4.5.md
@@ -392,7 +392,7 @@ ibexa:
 
 #### Recent activity [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
-You must add the "Activity Log / Read" policy (`activity_log/read`) to every role that has access to the back office, at least with the "Only own log" limitation.
+You must add the `Activity Log / Read` policy (`activity_log/read`) to every role that has access to the back office, at least with the "Only own log" limitation.
 This policy is mandatory to display the "Recent activity" block in [dashboards](#dashboard-migration), and the "Recent activity" block in [user profiles](#user-profile).
 
 The following migration example allows users with the `Editor` role to access their own activity log:
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
index 290d30a2cb..466a2a2ee4 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
@@ -115,7 +115,7 @@ To move over your own custom configurations, follow the conventions below and ma
 
 !!! note "Make sure to adapt SiteAccess names"
 
-    In the default configurations in **ezplatform.yaml** you can find existing SiteAccesses like `site`, and depending on installation perhaps a few others, all under a site group called `site\_group`. Make sure to change those to what you had in **ezpublish.yaml** to avoid issues with having to log in to your website, given user/login policy rules need to be updated if you change names of SiteAccess as part of the upgrade.
+    In the default configurations in **ezplatform.yaml** you can find existing SiteAccesses like `site`, and depending on installation perhaps a few others, all under a site group called `site\_group`. Make sure to change those to what you had in **ezpublish.yaml** to avoid issues with having to log in to your website, given `user/login` policy rules need to be updated if you change names of SiteAccess as part of the upgrade.
 
 #### 2.3.1 Image aliases
 

From 7f8e4c8a10329c266b1afac383ff0258b6084fa3 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 13:56:45 +0200
Subject: [PATCH 67/77] Fixes

---
 .../admin_panel/segments_admin_panel.md       |  2 +-
 .../administration/back_office/back_office.md |  2 +-
 .../configuration/configuration.md            |  2 +-
 .../content_organization/object_states.md     | 12 +++++-----
 .../project_organization/architecture.md      |  4 ++--
 .../project_organization/bundles.md           |  2 +-
 docs/api/graphql/graphql.md                   |  2 +-
 .../transactional_emails.md                   |  2 +-
 .../content_api/browsing_content.md           |  6 ++---
 .../content_api/managing_content.md           |  2 +-
 docs/content_management/content_management.md |  2 +-
 .../object_state_api.md                       | 22 +++++++++----------
 .../content_management_guide.md               |  2 +-
 .../data_migration/data_migration_actions.md  |  8 +++----
 .../customize_field_type_metadata.md          |  3 +--
 docs/content_management/locations.md          |  2 +-
 docs/customer_management/cp_page_builder.md   | 16 +++++++-------
 .../security/security_checklist.md            |  2 +-
 .../siteaccess_aware_configuration.md         |  2 +-
 docs/permissions/limitation_reference.md      |  4 ++--
 docs/permissions/permission_overview.md       |  2 +-
 docs/permissions/permission_use_cases.md      |  2 +-
 docs/permissions/policies.md                  |  4 ++--
 docs/pim/enable_purchasing_products.md        |  2 +-
 docs/release_notes/ez_platform_v1.9.0.md      |  2 +-
 docs/release_notes/ez_platform_v2.1.0.md      |  2 +-
 docs/release_notes/ez_platform_v2.5.md        |  2 +-
 docs/release_notes/ez_platform_v3.0.md        |  2 +-
 docs/release_notes/ibexa_dxp_v3.2.md          |  2 +-
 docs/release_notes/ibexa_dxp_v4.2.md          |  6 ++---
 docs/release_notes/ibexa_dxp_v4.5.md          |  2 +-
 .../objectstateterm_aggregation.md            |  4 ++--
 .../objectstateid_criterion.md                |  4 ++--
 .../objectstateidentifier_criterion.md        |  6 ++---
 .../search_criteria_reference.md              |  4 ++--
 .../ismainlocation_sort_clause.md             |  2 +-
 .../migrating_from_ez_publish_platform.md     |  2 +-
 37 files changed, 73 insertions(+), 76 deletions(-)

diff --git a/docs/administration/admin_panel/segments_admin_panel.md b/docs/administration/admin_panel/segments_admin_panel.md
index 36e43aaa00..1333b85123 100644
--- a/docs/administration/admin_panel/segments_admin_panel.md
+++ b/docs/administration/admin_panel/segments_admin_panel.md
@@ -10,7 +10,7 @@ They're used out of the box in the Targeting and Dynamic targeting blocks in the
 
 You can collect segments in segment groups:
 
-![Segment Groups](admin_panel_segment_groups.png)
+![Segment groups](admin_panel_segment_groups.png)
 
 Each segment group can contain segments that you can target content for.
 
diff --git a/docs/administration/back_office/back_office.md b/docs/administration/back_office/back_office.md
index 79e6b0d730..5fa96badb3 100644
--- a/docs/administration/back_office/back_office.md
+++ b/docs/administration/back_office/back_office.md
@@ -1,5 +1,5 @@
 ---
-description: Back office holds the administrator and editor interface and allows creating, publishing and managing content, users, settings and so on.
+description: Back office holds the administrator and editor interface and allows creating, publishing and managing content, users, settings, and more.
 page_type: landing_page
 ---
 
diff --git a/docs/administration/configuration/configuration.md b/docs/administration/configuration/configuration.md
index 9aa24dbbeb..abd6c88fdf 100644
--- a/docs/administration/configuration/configuration.md
+++ b/docs/administration/configuration/configuration.md
@@ -5,7 +5,7 @@ description: In Ibexa DXP you store and manage configuration in project files, t
 # Configuration
 
 [[= product_name =]] configuration is delivered using a number of dedicated configuration files.
-It contains everything from selecting the content Repository to SiteAccesses to language settings.
+It contains everything from selecting the content repository to SiteAccesses to language settings.
 
 ### Configuration format
 
diff --git a/docs/administration/content_organization/object_states.md b/docs/administration/content_organization/object_states.md
index 4ca61ef2ce..9851c6473c 100644
--- a/docs/administration/content_organization/object_states.md
+++ b/docs/administration/content_organization/object_states.md
@@ -2,22 +2,22 @@
 description: Object states are user-defined states that can be assigned to content items.
 ---
 
-# Object States
+# Object states
 
 Object states are user-defined states that can be assigned to content items.
 they're contained in groups.
 
-![Object State group](admin_panel_object_state_groups.png "Object State group")
+![Object State group](admin_panel_object_state_groups.png "Object state group")
 
 If a state group contains any states, each content item is automatically assigned a state from this group.
 
 You can assign states to content in the back office in the content item's **Technical details** tab.
 
-![Assigning an Object state to a content item](assigning_an_object_state.png "Assigning an Object state to a content item")
+![Assigning an object state to a content item](assigning_an_object_state.png "Assigning an object state to a content item")
 
-By default, [[= product_name =]] contains one Object state group: **Lock**, with states **Locked** and **Not locked**.
+By default, [[= product_name =]] contains one object state group: **Lock**, with states **Locked** and **Not locked**.
 
-![**Lock** Object state](object_state_lock.png "Lock Object state")
+![**Lock** Object state](object_state_lock.png "Lock object state")
 
-Object states can be used in conjunction with [permissions](permission_overview.md), in particular with the [Object State limitation](limitation_reference.md#object-state-limitation).
+Object states can be used in conjunction with [permissions](permission_overview.md), in particular with the [object state limitation](limitation_reference.md#object-state-limitation).
 Their specific use cases depend on your needs and the setup of your permission system.
\ No newline at end of file
diff --git a/docs/administration/project_organization/architecture.md b/docs/administration/project_organization/architecture.md
index 340ecd5d45..78e0ab64a2 100644
--- a/docs/administration/project_organization/architecture.md
+++ b/docs/administration/project_organization/architecture.md
@@ -21,8 +21,8 @@ The architecture of [[= product_name =]] is layered and uses clearly defined API
 | [Controllers](controllers.md)                       | Controllers created by you to read information from a Request object, create and return a Response objects.                                                                                    |
 | [Twig templates](twig_function_reference.md)        | Set of custom and built-in Twig templates. User interfaces are developed with the Twig template engine and query the public PHP API directly.                                                  |
 | [REST API v2](rest_api_usage.md)                    | The REST API v2 enables you to interact with an [[= product_name =]] installation using the HTTP protocol, following a REST interaction model.                                                 |
-| [GraphQL](graphql.md)                               | GraphQL for [[= product_name =]] exposes the domain model using the Repository, based on content type groups, content types and field definitions.                                             |
-| [Public PHP API](php_api.md)                        | Public PHP API exposes the Repository which enables you to create, read, update, manage and delete all objects available in [[= product_name =]].                                              |
+| [GraphQL](graphql.md)                               | GraphQL for [[= product_name =]] exposes the domain model using the repository, based on content type groups, content types and field definitions.                                             |
+| [Public PHP API](php_api.md)                        | Public PHP API exposes the repository which enables you to create, read, update, manage and delete all objects available in [[= product_name =]].                                              |
 | Business Logic                                      | The business logic is defined in the kernel. This business logic is exposed to applications via an API. It is used to organize development of the user interface layer.                        |
 | SPI                                                 | Service Provider Interface which defines contracts for implementing various parts of the system, including persistence layer (`SPI\Persistence`), custom field types, custom limitations, and more. |
 | [Persistence cache](persistence_cache.md)           | The implementation of SPI\Persistence that decorates the main backend implementation.                                                                                                          |
diff --git a/docs/administration/project_organization/bundles.md b/docs/administration/project_organization/bundles.md
index afde87bc12..dded0b5f27 100644
--- a/docs/administration/project_organization/bundles.md
+++ b/docs/administration/project_organization/bundles.md
@@ -80,7 +80,7 @@ To remove a bundle (either one you created yourself, or an out-of-the-box one th
 |ibexa/image-editor|[Image Editor](configure_image_editor.md)|
 |ibexa/installer|Provides the `ibexa:install` command|
 |ibexa/measurement|Measurement field type and measurement product catalog attribute|
-|ibexa/migrations|[Migration of Repository data](data_migration.md)|
+|ibexa/migrations|[Migration of repository data](data_migration.md)|
 |[ibexa/oauth2-client](oauth_client.md)|Authenticate user through a third-party OAuth 2 server, integration with [`knpuniversity/oauth2-client-bundle`](https://github.com/knpuniversity/oauth2-client-bundle)|
 |[ibexa/oauth2-server](oauth_server.md)|Allow resource access to OAuth 2 client|
 |ibexa/personalization|Functionality for personalized recommendations|
diff --git a/docs/api/graphql/graphql.md b/docs/api/graphql/graphql.md
index 1274a88e46..b3557da74a 100644
--- a/docs/api/graphql/graphql.md
+++ b/docs/api/graphql/graphql.md
@@ -51,7 +51,7 @@ You can also query content type and content type group information through the `
 
 The repository schema, accessed through `_repository`, exposes the [[= product_name =]] repository in a manner similar to the [Public PHP API](php_api.md).
 
-The `_repository` field also enables you to query, for example, Object states configured for the repository.
+The `_repository` field also enables you to query, for example, object states configured for the repository.
 
 ### Custom schemas
 
diff --git a/docs/commerce/transactional_emails/transactional_emails.md b/docs/commerce/transactional_emails/transactional_emails.md
index fc12a81e83..9e8b4bafc5 100644
--- a/docs/commerce/transactional_emails/transactional_emails.md
+++ b/docs/commerce/transactional_emails/transactional_emails.md
@@ -1,5 +1,5 @@
 ---
-description: With transactional emails you can notify end users about changes in the status of user registration, password recovery, orders, payments, shipments, and so on.
+description: With transactional emails you can notify end users about changes in the status of user registration, password recovery, orders, payments, shipments, and more.
 edition: commerce
 ---
 
diff --git a/docs/content_management/content_api/browsing_content.md b/docs/content_management/content_api/browsing_content.md
index ad1c9a14b0..3a673c2e2d 100644
--- a/docs/content_management/content_api/browsing_content.md
+++ b/docs/content_management/content_api/browsing_content.md
@@ -135,9 +135,9 @@ You can find the section to which a content item belongs through the [`getSectio
 
 ### Object states
 
-You can retrieve [Object states](object_states.md) of a content item using [`ObjectStateService::getContentState`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html#method_getContentState).
-You need to provide it with the Object state group.
-All Object state groups can be retrieved through [`loadObjectStateGroups`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html#method_loadObjectStateGroups).
+You can retrieve [object states](object_states.md) of a content item using [`ObjectStateService::getContentState`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html#method_getContentState).
+You need to provide it with the object state group.
+All object state groups can be retrieved through [`loadObjectStateGroups`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html#method_loadObjectStateGroups).
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/ViewContentMetaDataCommand.php', 114, 119) =]]
diff --git a/docs/content_management/content_api/managing_content.md b/docs/content_management/content_api/managing_content.md
index e83634a487..e7be659c7b 100644
--- a/docs/content_management/content_api/managing_content.md
+++ b/docs/content_management/content_api/managing_content.md
@@ -29,7 +29,7 @@ To add a new location to existing content you need to create a [`LocationCreateS
 `LocationCreateStruct` must receive the parent location ID.
 It sets the `parentLocationId` property of the new location.
 
-You can also provide other properties for the location, otherwise they are set to their defaults:
+You can also provide other properties for the location, otherwise they're set to their defaults:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/AddLocationToContentCommand.php', 52, 54) =]]
diff --git a/docs/content_management/content_management.md b/docs/content_management/content_management.md
index 70ed241b9e..1d4940e7ac 100644
--- a/docs/content_management/content_management.md
+++ b/docs/content_management/content_management.md
@@ -1,5 +1,5 @@
 ---
-description: Manage content in Ibexa DXP by learning about the content model, field types, pages, forms, workflows, and so on.
+description: Manage content in Ibexa DXP by learning about the content model, field types, pages, forms, workflows, and more.
 page_type: landing_page
 ---
 
diff --git a/docs/content_management/content_management_api/object_state_api.md b/docs/content_management/content_management_api/object_state_api.md
index c89b79ead7..9adc830692 100644
--- a/docs/content_management/content_management_api/object_state_api.md
+++ b/docs/content_management/content_management_api/object_state_api.md
@@ -1,29 +1,29 @@
 ---
-description: You can manage Object states via the PHP API, including creating Object states and state groups and assigning them to content items.
+description: You can manage object states via the PHP API, including creating object states and state groups and assigning them to content items.
 ---
 
 # Object state API
 
 [Object states](object_states.md) enable you to set a custom state to any content.
-States are grouped into Object state groups.
+States are grouped into object state groups.
 
 You can manage Object states by using the PHP API by using `ObjectStateService`.
 
 !!! tip "Object state REST API"
 
-    To learn how to manage Object states using the REST API, see [REST API reference](../../api/rest_api/rest_api_reference/rest_api_reference.html#managing-content-get-object-states-of-content-item).
+    To learn how to manage object states using the REST API, see [REST API reference](../../api/rest_api/rest_api_reference/rest_api_reference.html#managing-content-get-object-states-of-content-item).
 
-## Getting Object state information
+## Getting object state information
 
-You can use the [`ObjectStateService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html) to get information about Object state groups or Object states.
+You can use the [`ObjectStateService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html) to get information about object state groups or object states.
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/ObjectStateCommand.php', 48, 53) =]]
 ```
 
-## Creating Object states
+## Creating object states
 
-To create an Object state group and add Object states to it, you need to make use of the [`ObjectStateService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html):
+To create an object state group and add object states to it, you need to make use of the [`ObjectStateService`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html):
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/ObjectStateCommand.php', 57, 61) =]]
@@ -31,16 +31,16 @@ To create an Object state group and add Object states to it, you need to make us
 
 [`ObjectStateService::createObjectStateGroup`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html#method_createObjectStateGroup) takes as argument an [`ObjectStateGroupCreateStruct`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-ObjectState-ObjectStateGroupCreateStruct.html), in which you need to specify the identifier, default language and at least one name for the group.
 
-To create an Object state inside a group, use [`ObjectStateService::newObjectStateCreateStruct`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html#method_newObjectStateCreateStruct) and provide it with an `ObjectStateCreateStruct`:
+To create an object state inside a group, use [`ObjectStateService::newObjectStateCreateStruct`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html#method_newObjectStateCreateStruct) and provide it with an `ObjectStateCreateStruct`:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/ObjectStateCommand.php', 63, 67) =]]
 ```
 
-## Assigning Object state
+## Assigning object state
 
-To assign an Object state to a content item, use [`ObjectStateService::setContentState`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html#method_setContentState).
-Provide it with a `ContentInfo` object of the content item, the Object state group and the Object state:
+To assign an object state to a content item, use [`ObjectStateService::setContentState`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-ObjectStateService.html#method_setContentState).
+Provide it with a `ContentInfo` object of the content item, the object state group and the object state:
 
 ``` php
 [[= include_file('code_samples/api/public_php_api/src/Command/ObjectStateCommand.php', 77, 82) =]]
diff --git a/docs/content_management/content_management_guide.md b/docs/content_management/content_management_guide.md
index bd73fcc097..075b8e2e6e 100644
--- a/docs/content_management/content_management_guide.md
+++ b/docs/content_management/content_management_guide.md
@@ -241,7 +241,7 @@ Again, this isn't part of content management, but at this point you can [publish
 **5\. Organize content**
 
 Organize the content of your website by copying or moving content items, [controlling Locations and URL addresses]([[= user_doc =]]/content_management/content_organization/manage_locations_urls/).
-Then work with Tags, sections and Object States to [classify]([[= user_doc =]]/content_management/content_organization/classify_content/#sections) it.
+Then work with Tags, sections and object states to [classify]([[= user_doc =]]/content_management/content_organization/classify_content/#sections) it.
 
 ## Benefits
 
diff --git a/docs/content_management/data_migration/data_migration_actions.md b/docs/content_management/data_migration/data_migration_actions.md
index 44db9c5791..5b942e4510 100644
--- a/docs/content_management/data_migration/data_migration_actions.md
+++ b/docs/content_management/data_migration/data_migration_actions.md
@@ -1,5 +1,5 @@
 ---
-description: Data migration actions enable you to run special operations while executing data migrations, such as assigning roles, sections, Objects states, and so on.
+description: Data migration actions enable you to run special operations while executing data migrations, such as assigning roles, sections, Objects states, and more.
 page_type: reference
 ---
 
@@ -17,7 +17,7 @@ You can find which migration steps support actions in the table below:
 | `user_group`   |&#10004;|&#10004;||
 | `company`      |&#10004;|||
 
-Actions are optional operations that can be run after the main "body" of a migration has been executed (for example, content has been created / updated, Object state has been added).
+Actions are optional operations that can be run after the main "body" of a migration has been executed (for example, content has been created / updated, object state has been added).
 Their purpose is to allow additional operations to be performed as part of this particular migration.
 They're executed inside the same transaction, so in the event of failure they cause database rollback to occur.
 
@@ -40,8 +40,8 @@ For example, when updating a content type object, some fields might be removed:
 When executed, this migration:
 
 - Finds content type using its identifier (`article`)
-- Assigns content type Group "Media"
-- Removes it from content type Group "Content"
+- Assigns content type group "Media"
+- Removes it from content type group "Content"
 - Removes the `short_title` field
 - Removes its existing drafts, if any.
 
diff --git a/docs/content_management/field_types/customize_field_type_metadata.md b/docs/content_management/field_types/customize_field_type_metadata.md
index 9a8fdf2fde..88d9d8fc0e 100644
--- a/docs/content_management/field_types/customize_field_type_metadata.md
+++ b/docs/content_management/field_types/customize_field_type_metadata.md
@@ -4,8 +4,7 @@ description: You can customize which field type metadata should be disabled in t
 
 # Customize field type metadata
 
-When creating a content type definition, you add fields and configure their metadata,
-such as whether they're required, translatable, and so on.
+When creating a content type definition, you add fields and configure their metadata, for example, whether they're required or translatable.
 
 If needed, you can customize that some of those options are disabled in the back office for specific field types.
 To do this, add custom service definition for `ModifyFieldDefinitionsCollectionTypeExtension`.
diff --git a/docs/content_management/locations.md b/docs/content_management/locations.md
index 8d11073d40..4055180a2f 100644
--- a/docs/content_management/locations.md
+++ b/docs/content_management/locations.md
@@ -99,7 +99,7 @@ When the location of a content item is hidden, the system doesn't display it on
     it'sn't permission-based, and **doesn't restrict access to content**. Hidden content can be read through other means, like the REST API.
 
     If you need to restrict access to a given content item, you could create a role that grants read access for a given [**Section**](sections.md) or
-    [**Object State**](object_states.md), and set a different section or Object State for the given content.
+    [**Object State**](object_states.md), and set a different section or object state for the given content.
     Or use other permission-based [**Limitations**](limitations.md).
 
 If a content item is hidden, it's invisible in all its locations.
diff --git a/docs/customer_management/cp_page_builder.md b/docs/customer_management/cp_page_builder.md
index 8a1c0244e5..f2152934f4 100644
--- a/docs/customer_management/cp_page_builder.md
+++ b/docs/customer_management/cp_page_builder.md
@@ -155,17 +155,17 @@ ibexa:
 Now, you can go back to your Customer Portal's container.
 All landing pages that you create in it use Customer Portal template.
 
-### Assign portal to Customer Group
+### Assign portal to Customer group
 
-You can assign multiple Customer Portal containers or Pages to a specific Customer Group.
-First, you need to grant the following permissions to company members from the Customer Group:
+You can assign multiple Customer Portal containers or Pages to a specific Customer group.
+First, you need to grant the following permissions to company members from the Customer group:
 
 - `user/login` to `custom_portal` SiteAccess
 - `content/read` to selected Customer Portals
 
 ![Customer Portal permissions](img/cp_permissions.png)
 
-If members of the Customer Group don't have sufficient permissions for any Customer Portal assigned to them, they are redirected to the default Customer Portal view.
+If members of the Customer group don't have sufficient permissions for any Customer Portal assigned to them, they're redirected to the default Customer Portal view.
 
 !!! note
 
@@ -174,7 +174,7 @@ If members of the Customer Group don't have sufficient permissions for any Custo
 
 #### Build-in portal mapping
 
-Now, you need to assign your custom portals to Customer Groups.
+Now, you need to assign your custom portals to Customer groups.
 Add portal mapping configuration in `config/services.yaml`:
 
 ```yaml hl_lines="3 4"
@@ -187,12 +187,12 @@ parameters:
             - 6ce85480aeaeed59f7431a12b46bc869
 ```
 
-There, you can specify which Customer Portals should be available to which Customer Group by adding:
+There, you can specify which Customer Portals should be available to which Customer group by adding:
 
-- Customer Group identifier. You can find it in the **Summary** section of the Company.
+- Customer group identifier. You can find it in the **Summary** section of the Company.
 - Location remote ID of Customer Portal container or Customer Portal page. You can find it in the **Details** section.
 
-Portals are displayed to the Customer Group in order specified in the configuration based on company member's permissions.
+Portals are displayed to the Customer group in order specified in the configuration based on company member's permissions.
 
 #### Custom portal mapping
 
diff --git a/docs/infrastructure_and_maintenance/security/security_checklist.md b/docs/infrastructure_and_maintenance/security/security_checklist.md
index 5fe4828f90..c6d846ef89 100644
--- a/docs/infrastructure_and_maintenance/security/security_checklist.md
+++ b/docs/infrastructure_and_maintenance/security/security_checklist.md
@@ -175,7 +175,7 @@ You can choose to respect it or ignore it in your code.
 It'sn't permission-based, and doesn't restrict read access to content.
 Hidden content can be read through other means, like the REST API or GraphQL.
 
-If you need to restrict read access to a given content item, you could create a role that grants read access for a given [**Section**](https://doc.ibexa.co/en/latest/administration/content_organization/sections/) or [**Object State**](https://doc.ibexa.co/en/latest/administration/content_organization/object_states/), and set a different section or Object State for the given content.
+If you need to restrict read access to a given content item, you could create a role that grants read access for a given [**Section**](https://doc.ibexa.co/en/latest/administration/content_organization/sections/) or [**Object State**](https://doc.ibexa.co/en/latest/administration/content_organization/object_states/), and set a different section or object State for the given content.
 Or use other permission-based [**Limitations**](https://doc.ibexa.co/en/latest/permissions/limitations/).
 
 ### Minimize exposure
diff --git a/docs/multisite/siteaccess/siteaccess_aware_configuration.md b/docs/multisite/siteaccess/siteaccess_aware_configuration.md
index a49f721544..f26edadddc 100644
--- a/docs/multisite/siteaccess/siteaccess_aware_configuration.md
+++ b/docs/multisite/siteaccess/siteaccess_aware_configuration.md
@@ -22,7 +22,7 @@ For more information about the ConfigResolver, namespaces and scopes, see [confi
 
 !!! tip "Repository-aware configuration"
 
-    If you need to use different settings per Repository, not per SiteAccess, see [Repository-aware configuration](repository_configuration.md#repository-aware-configuration).
+    If you need to use different settings per repository, not per SiteAccess, see [Repository-aware configuration](repository_configuration.md#repository-aware-configuration).
 
 The example below assumes you're using an `Acme\ExampleBundle`.
 Remember to register the bundle by adding it to `config/bundles.php`:
diff --git a/docs/permissions/limitation_reference.md b/docs/permissions/limitation_reference.md
index 65eee20305..0517ebe5a4 100644
--- a/docs/permissions/limitation_reference.md
+++ b/docs/permissions/limitation_reference.md
@@ -158,7 +158,7 @@ In the `section/assign` policy you can combine this with section limitation to l
 
 ## New State limitation
 
-A New State (`NewObjectState`) limitation specifies whether the user has access to (assigning) a given Object state to content.
+A New State (`NewObjectState`) limitation specifies whether the user has access to (assigning) a given object state to content.
 
 In the `state/assign` policy you can combine this with State limitation to limit both from and to values.
 
@@ -170,7 +170,7 @@ In the `state/assign` policy you can combine this with State limitation to limit
 
 ## Object State limitation
 
-The Object State (`ObjectState`) limitation specifies whether the user has access to content with a specific Object state.
+The Object State (`ObjectState`) limitation specifies whether the user has access to content with a specific object state.
 
 ### Possible values
 
diff --git a/docs/permissions/permission_overview.md b/docs/permissions/permission_overview.md
index 23a91bd5fd..6a8b2f1dbe 100644
--- a/docs/permissions/permission_overview.md
+++ b/docs/permissions/permission_overview.md
@@ -56,7 +56,7 @@ public function performAccessCheck(): void
     - `valueObject` is the object you want to check for, for example `ContentInfo`.
     - `targets` are a table of value objects that are the target of the operation.
     For example, to check if content can be assigned to a Section, provide the Section as `targets`.
-    `targets` accept location, Object state and section objects.
+    `targets` accept location, object state and section objects.
 
 ### Checking user access
 
diff --git a/docs/permissions/permission_use_cases.md b/docs/permissions/permission_use_cases.md
index 9cace5c96f..d7de1f48f8 100644
--- a/docs/permissions/permission_use_cases.md
+++ b/docs/permissions/permission_use_cases.md
@@ -191,7 +191,7 @@ Additional policies are needed for each section of the Admin.
 
 ### Object states
 
-- `state/administrate` to view a list of Object states, add and edit them
+- `state/administrate` to view a list of object states, add and edit them
 - `state/assign` to assign Objects states to content
 
 ### Roles
diff --git a/docs/permissions/policies.md b/docs/permissions/policies.md
index dbacbb3c57..2bc83d88cd 100644
--- a/docs/permissions/policies.md
+++ b/docs/permissions/policies.md
@@ -224,8 +224,8 @@ Each role you assign to user or user group consists of policies which define, wh
 
 | Module               | Function                    | Effect                                | Possible limitations                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
 |----------------------|-----------------------------|---------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| <nobr>`state`</nobr> | <nobr>`assign`</nobr>       | assign Object states to content items | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Content type Group](limitation_reference.md#content-type-group-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Object State](limitation_reference.md#object-state-limitation)</br>[New State](limitation_reference.md#new-state-limitation) |
-|                      | <nobr>`administrate`</nobr> | view, add and edit Object states      |
+| <nobr>`state`</nobr> | <nobr>`assign`</nobr>       | assign object states to content items | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Content type Group](limitation_reference.md#content-type-group-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Object State](limitation_reference.md#object-state-limitation)</br>[New State](limitation_reference.md#new-state-limitation) |
+|                      | <nobr>`administrate`</nobr> | view, add and edit object states      |
 
 #### Taxonomy
 
diff --git a/docs/pim/enable_purchasing_products.md b/docs/pim/enable_purchasing_products.md
index 3abdbe3e24..e5f96c712a 100644
--- a/docs/pim/enable_purchasing_products.md
+++ b/docs/pim/enable_purchasing_products.md
@@ -13,7 +13,7 @@ To enable adding product to cart and purchasing from the catalog, the following
 
 !!! note "Configuring products in the UI"
 
-    After you configure the region, currency and VAT rates for regions in settings, the store manager must set up the remaining parameters in the UI, such as, [VAT rates per product type]([[= user_doc =]]/pim/create_product_types/#vat), descriptions, attributes, assets, [prices]([[= user_doc =]]/pim/manage_prices/) and [availability]([[= user_doc =]]/pim/manage_availability_and_stock/) per product, and so on.
+    After you configure the region, currency and VAT rates for regions in settings, the store manager must set up the remaining parameters in the UI, such as, [VAT rates per product type]([[= user_doc =]]/pim/create_product_types/#vat), descriptions, attributes, assets, [prices]([[= user_doc =]]/pim/manage_prices/), and [availability]([[= user_doc =]]/pim/manage_availability_and_stock/) per product.
 
     For more information, see [User Documentation]([[= user_doc =]]/pim/products/#product-completeness).
 
diff --git a/docs/release_notes/ez_platform_v1.9.0.md b/docs/release_notes/ez_platform_v1.9.0.md
index ddcfd175be..44e48763b0 100644
--- a/docs/release_notes/ez_platform_v1.9.0.md
+++ b/docs/release_notes/ez_platform_v1.9.0.md
@@ -14,7 +14,7 @@ If you're looking for the Long Term Support (LTS) release, see[ https://ezplatf
 
 #### Multifile upload
 
-You can now create collections of content quickly: upload multiple files in bulk and they are imported directly into the content repository. The files are automatically imported as content using the content type that matches their MIME type. Go to the content view, drag and drop or select multiple files in the sub-items area and you get direct access for further editing. As ever, this solution can be customized so that you create your own matching rules.
+You can now create collections of content quickly: upload multiple files in bulk and they're imported directly into the content repository. The files are automatically imported as content using the content type that matches their MIME type. Go to the content view, drag and drop or select multiple files in the sub-items area and you get direct access for further editing. As ever, this solution can be customized so that you create your own matching rules.
 
 ![](catsfromtheMET.gif)
 
diff --git a/docs/release_notes/ez_platform_v2.1.0.md b/docs/release_notes/ez_platform_v2.1.0.md
index 1f695598e0..63b35ba687 100644
--- a/docs/release_notes/ez_platform_v2.1.0.md
+++ b/docs/release_notes/ez_platform_v2.1.0.md
@@ -22,7 +22,7 @@ For more information, see [Custom tags](https://doc.ibexa.co/en/2.5/guide/extend
 
 Object states enable you to create sets of custom states and then assign them to Content.
 
-!["Lock" Object state](2.1_object_state_lock.png)
+!["Lock" object state](2.1_object_state_lock.png)
 
 Object states can be used in conjunction with [permissions](https://doc.ibexa.co/en/2.5/guide/limitation_reference/#state-limitation).
 
diff --git a/docs/release_notes/ez_platform_v2.5.md b/docs/release_notes/ez_platform_v2.5.md
index e6718e466a..7dbc90eaf3 100644
--- a/docs/release_notes/ez_platform_v2.5.md
+++ b/docs/release_notes/ez_platform_v2.5.md
@@ -122,7 +122,7 @@ This release introduced several back office improvements to facilitate editorial
 - [Icons for content types and the ability to define them](https://doc.ibexa.co/en/2.5/guide/extending/extending_back_office/#custom-content-type-icons)
 - Ability to collapse and expand content preview to have easier access to the Sub-items list
 - Responsive Sub-items table with selectable column layout
-- Simpler assigning of Object States to content
+- Simpler assigning of object states to content
 
 
 ![Back office improvements](2.5_back_office_improvements.png)
diff --git a/docs/release_notes/ez_platform_v3.0.md b/docs/release_notes/ez_platform_v3.0.md
index 09613ef091..842279568b 100644
--- a/docs/release_notes/ez_platform_v3.0.md
+++ b/docs/release_notes/ez_platform_v3.0.md
@@ -160,7 +160,7 @@ The following new Search Criteria have been added:
 |-----|-----|
 |[IsUserBased](https://doc.ibexa.co/en/latest/guide/search/criteria_reference/isuserbased_criterion)|Whether content represents a User account|
 |[IsUserEnabled](https://doc.ibexa.co/en/latest/guide/search/criteria_reference/isuserenabled_criterion)|Whether a User account is enabled|
-|[ObjectStateIdentifier](https://doc.ibexa.co/en/latest/guide/search/criteria_reference/objectstateidentifier_criterion)|Object State Identifier|
+|[ObjectStateIdentifier](https://doc.ibexa.co/en/latest/guide/search/criteria_reference/objectstateidentifier_criterion)|Object state Identifier|
 |[SectionId](https://doc.ibexa.co/en/latest/guide/search/criteria_reference/sectionid_criterion)|ID of the Section content is assigned to|
 |[SectionIdentifier](https://doc.ibexa.co/en/latest/guide/search/criteria_reference/sectionidentifier_criterion)|Identifier of the Section content is assigned to|
 |[UserEmail](https://doc.ibexa.co/en/latest/guide/search/criteria_reference/useremail_criterion)|Email address of a User account|
diff --git a/docs/release_notes/ibexa_dxp_v3.2.md b/docs/release_notes/ibexa_dxp_v3.2.md
index 640e3ec828..abb4a1e775 100644
--- a/docs/release_notes/ibexa_dxp_v3.2.md
+++ b/docs/release_notes/ibexa_dxp_v3.2.md
@@ -106,7 +106,7 @@ Then, refresh the view to see an updated list of content types.
 ### Object state API improvements
 
 You can now use `ObjectStateService::loadObjectStateByIdentifier()` and `ObjectStateService::loadObjectStateGroupByIdentifier()`
-to [get Object states and Object state groups](https://doc.ibexa.co/en/latest/api/public_php_api_managing_repository/#getting-object-state-information) in the PHP API.
+to [get object states and object state groups](https://doc.ibexa.co/en/latest/api/public_php_api_managing_repository/#getting-object-state-information) in the PHP API.
 
 ## Full changelog
 
diff --git a/docs/release_notes/ibexa_dxp_v4.2.md b/docs/release_notes/ibexa_dxp_v4.2.md
index bdeea89b01..f2b28bb3c2 100644
--- a/docs/release_notes/ibexa_dxp_v4.2.md
+++ b/docs/release_notes/ibexa_dxp_v4.2.md
@@ -79,10 +79,8 @@ Assets are grouped into collections based on attribute values
 
 ### Product completeness
 
-The new product completeness tab, in product view, lists all the parts of a product you can configure:
-attributes, assets, prices, availability, and so on.
-You can use it to get a quick overview of missing parts in the product configuration
-and to instantly move to the proper screen to fill the gaps.
+The new product completeness tab, in product view, lists all the parts of a product you can configure, for example, attributes, assets, prices, aor vailability.
+You can use it to get a quick overview of missing parts in the product configuration and to instantly move to the proper screen to fill the gaps.
 
 ![Product completeness tab](4.2_product_completeness.png)
 
diff --git a/docs/release_notes/ibexa_dxp_v4.5.md b/docs/release_notes/ibexa_dxp_v4.5.md
index cfe05563c3..55240fe4bf 100644
--- a/docs/release_notes/ibexa_dxp_v4.5.md
+++ b/docs/release_notes/ibexa_dxp_v4.5.md
@@ -25,7 +25,7 @@ You can use them to further enhance your e-commerce presence:
 - `ibexa/payment`
 - `ibexa/shipping`
 
-Modules can interact with each other, for example, to decrease stock as a result of a sale, or cancel shipments and payments when orders are cancelled, and so on.
+Modules can interact with each other, for example, to decrease stock as a result of a sale, or cancel shipments and payments when orders are cancelled.
 
 #### Order management
 
diff --git a/docs/search/aggregation_reference/objectstateterm_aggregation.md b/docs/search/aggregation_reference/objectstateterm_aggregation.md
index c1e3bb3854..b17f5ef873 100644
--- a/docs/search/aggregation_reference/objectstateterm_aggregation.md
+++ b/docs/search/aggregation_reference/objectstateterm_aggregation.md
@@ -4,12 +4,12 @@ description: ObjectStateTermAggregation
 
 # ObjectStateTermAggregation
 
-The [ObjectStateTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-ObjectStateTermAggregation.html) aggregates search results by the content item's Object state.
+The [ObjectStateTermAggregation](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-ObjectStateTermAggregation.html) aggregates search results by the content item's object state.
 
 ## Arguments
 
 - `name` - name of the Aggregation object
-- `objectStateGroupIdentifier` - string representing the identifier of the Object state group to aggregate results by
+- `objectStateGroupIdentifier` - string representing the identifier of the object state group to aggregate results by
 
 ## Example
 
diff --git a/docs/search/criteria_reference/objectstateid_criterion.md b/docs/search/criteria_reference/objectstateid_criterion.md
index ca04486f24..653477b0a5 100644
--- a/docs/search/criteria_reference/objectstateid_criterion.md
+++ b/docs/search/criteria_reference/objectstateid_criterion.md
@@ -5,11 +5,11 @@ edition: commerce
 
 # ObjectStateId Criterion
 
-The [`ObjectStateId` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-ObjectStateId.html) searches for content based on its Object State ID.
+The [`ObjectStateId` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-ObjectStateId.html) searches for content based on its object state ID.
 
 ## Arguments
 
-- `value` - int(s) representing the Object State ID(s)
+- `value` - int(s) representing the object state ID(s)
 
 ## Example
 
diff --git a/docs/search/criteria_reference/objectstateidentifier_criterion.md b/docs/search/criteria_reference/objectstateidentifier_criterion.md
index 51272bef34..5cd373f6a3 100644
--- a/docs/search/criteria_reference/objectstateidentifier_criterion.md
+++ b/docs/search/criteria_reference/objectstateidentifier_criterion.md
@@ -5,12 +5,12 @@ edition: commerce
 
 # ObjectStateIdentifier Criterion
 
-The [`ObjectStateIdentifier` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-ObjectStateId.html) searches for content based on its Object State identifier.
+The [`ObjectStateIdentifier` Search Criterion](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-ObjectStateId.html) searches for content based on its object state identifier.
 
 ## Arguments
 
-- `value` - string(s) representing the Object State identifier(s)
-- `target` (optional for PHP)  - string representing the Object State group
+- `value` - string(s) representing the object state identifier(s)
+- `target` (optional for PHP)  - string representing the object state group
 
 ## Example
 
diff --git a/docs/search/criteria_reference/search_criteria_reference.md b/docs/search/criteria_reference/search_criteria_reference.md
index b765ae3688..6cf8b6099a 100644
--- a/docs/search/criteria_reference/search_criteria_reference.md
+++ b/docs/search/criteria_reference/search_criteria_reference.md
@@ -53,8 +53,8 @@ Due to this storage limitation, searching content using the Country field type o
 |[MapLocationDistance](maplocationdistance_criterion.md)|Distance between the location contained in a MapLocation field and the provided coordinates|&#10004; |&#10004; | |
 |[MatchAll](matchall_criterion.md)|Returns all search results|&#10004; |&#10004; |&#10004; |
 |[MatchNone](matchnone_criterion.md)|Returns no search results|&#10004; |&#10004; |&#10004; |
-|[ObjectStateId](objectstateid_criterion.md)|Object State ID|&#10004; |&#10004; |&#10004; |
-|[ObjectStateIdentifier](objectstateidentifier_criterion.md)|Object State Identifier|&#10004; |&#10004; |&#10004; |
+|[ObjectStateId](objectstateid_criterion.md)|Object state ID|&#10004; |&#10004; |&#10004; |
+|[ObjectStateIdentifier](objectstateidentifier_criterion.md)|Object state Identifier|&#10004; |&#10004; |&#10004; |
 |[ParentLocationId](parentlocationid_criterion.md)|Location ID of a content item's parent|&#10004; |&#10004; |&#10004; |
 |[ParentLocationRemoteId](parentlocationremoteId_criterion.md)|Location remote ID of a content item's parent|&#10004; |&#10004; |
 |[Priority](priority_criterion.md)|Location priority| |&#10004; |&#10004; |
diff --git a/docs/search/sort_clause_reference/ismainlocation_sort_clause.md b/docs/search/sort_clause_reference/ismainlocation_sort_clause.md
index 309f6fb850..e30886acae 100644
--- a/docs/search/sort_clause_reference/ismainlocation_sort_clause.md
+++ b/docs/search/sort_clause_reference/ismainlocation_sort_clause.md
@@ -6,7 +6,7 @@ description: IsMainLocation Sort Clause
 
 The [`Location\IsMainLocation` Sort Clause](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-SortClause-Location-IsMainLocation.html) sorts search results by whether their location is the main location of the content item.
 
-Locations that aren't main locations are ranked as lower values (for example, with ascending order they are returned first).
+Locations that aren't main locations are ranked as lower values (for example, with ascending order they're returned first).
 
 ## Arguments
 
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
index 466a2a2ee4..ec40cb807c 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
@@ -594,7 +594,7 @@ new MigrationBundle\MigrationBundle()
 
 **7.** Clear cache again.
 
-At this point you can already view the initial effects of the migration, but they are still missing some of your custom content.
+At this point you can already view the initial effects of the migration, but they're still missing some of your custom content.
 
 The `MigrationBundle` generates placeholders for layouts in the form of frames with a data dump.
 

From d4b6fff19c234bc49b201d36dff2733221243112 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 14:00:54 +0200
Subject: [PATCH 68/77] Fixes

---
 docs/administration/dashboard/customize_dashboard.md      | 2 +-
 docs/content_management/content_management_guide.md       | 2 +-
 docs/release_notes/ibexa_dxp_v4.2.md                      | 2 +-
 docs/templating/render_content/render_content_in_php.md   | 2 +-
 docs/templating/render_content/render_page.md             | 8 ++++----
 .../page_and_form_tutorial/4_create_a_custom_block.md     | 2 +-
 .../migrating_from_ez_publish_platform.md                 | 8 ++++----
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/administration/dashboard/customize_dashboard.md b/docs/administration/dashboard/customize_dashboard.md
index b8fc6ee4e2..aa9aeb971e 100644
--- a/docs/administration/dashboard/customize_dashboard.md
+++ b/docs/administration/dashboard/customize_dashboard.md
@@ -36,4 +36,4 @@ For more information about available blocks, see [[[= product_name =]] User Docu
 
 In addition to existing blocks available in Dashboard Builder, you can also create custom blocks.
 
-To do it, follow the instruction on how to [create custom Page block](create_custom_page_block.md).
\ No newline at end of file
+To do it, follow the instruction on how to [create custom page block](create_custom_page_block.md).
\ No newline at end of file
diff --git a/docs/content_management/content_management_guide.md b/docs/content_management/content_management_guide.md
index 075b8e2e6e..a938d6d48f 100644
--- a/docs/content_management/content_management_guide.md
+++ b/docs/content_management/content_management_guide.md
@@ -74,7 +74,7 @@ For a complete list of available field types, see [field type reference](field_t
 
 Once you use a field type to design and build a content type definition, and define its settings, it becomes a field.
 
-Fields can be as simple as Name, based on a Text line field type, or as complex as Page, based on a landing page field type, with multiple options to set and choose from:
+Fields can be as simple as Name, based on a Text line field type, or as complex as page, based on a landing page field type, with multiple options to set and choose from:
 
 ![Landing page field settings](img/fields.png)
 
diff --git a/docs/release_notes/ibexa_dxp_v4.2.md b/docs/release_notes/ibexa_dxp_v4.2.md
index f2b28bb3c2..caf94b9968 100644
--- a/docs/release_notes/ibexa_dxp_v4.2.md
+++ b/docs/release_notes/ibexa_dxp_v4.2.md
@@ -248,7 +248,7 @@ Thanks to splitting SQL upgrade files into separate product editions, the produc
 
 ### Event layer for TaxonomyService
 
-Now, Events are sent while performing operations within Taxonomy, which considerably extends the Taxonomy feature.
+Now, events are sent while performing operations within Taxonomy, which considerably extends the Taxonomy feature.
 
 ### Protected segment groups
 
diff --git a/docs/templating/render_content/render_content_in_php.md b/docs/templating/render_content/render_content_in_php.md
index 6cd115bcdf..5d8b97563c 100644
--- a/docs/templating/render_content/render_content_in_php.md
+++ b/docs/templating/render_content/render_content_in_php.md
@@ -17,7 +17,7 @@ The following example is a command outputting the render of a content for a view
 It works only if the view doesn't refer to the HTTP request.
 It's compatible with the default installation views such as `line` or `embed`.
 To go further with this example, you could add some dedicated views not outputting HTML but, for example, plain text, [Symfony command styled text]([[= symfony_doc =]]/console/coloring.html) or Markdown.
-It doesn't work with a `full` view when the [Page layout](template_configuration.md#page-layout) uses `app.request`, such as the out-of-the-box template.
+It doesn't work with a `full` view when the [page layout](template_configuration.md#page-layout) uses `app.request`, such as the out-of-the-box template.
 
 Append to `config/services.yaml` the command as a service:
 
diff --git a/docs/templating/render_content/render_page.md b/docs/templating/render_content/render_page.md
index e1ed86f103..a8fb7c1570 100644
--- a/docs/templating/render_content/render_page.md
+++ b/docs/templating/render_content/render_page.md
@@ -1,20 +1,20 @@
 ---
-description: Prepare templates for Page layouts and render Page blocks.
+description: Prepare templates for page layouts and render page blocks.
 edition: experience
 ---
 
 # Render a page
 
-Page is a special content type that contains a [Page field](pagefield.md).
+Page is a special content type that contains a [page field](pagefield.md).
 
-A Page field is a layout composed of zones.
+A page field is a layout composed of zones.
 Each zone can contain multiple blocks.
 
 ## Render a layout
 
 ### Configure layout
 
-The default, built-in Page layout has only one zone.
+The default, built-in page layout has only one zone.
 You can create other layouts in configuration, under the `ibexa_fieldtype_page.layouts` key.
 
 To create a new layout called "Right sidebar", use the following [configuration](configuration.md#configuration-files):
diff --git a/docs/tutorials/page_and_form_tutorial/4_create_a_custom_block.md b/docs/tutorials/page_and_form_tutorial/4_create_a_custom_block.md
index 8647d1e1b7..9d45ab070a 100644
--- a/docs/tutorials/page_and_form_tutorial/4_create_a_custom_block.md
+++ b/docs/tutorials/page_and_form_tutorial/4_create_a_custom_block.md
@@ -1,5 +1,5 @@
 ---
-description: Try creating a custom Page block with specific logic.
+description: Try creating a custom page block with specific logic.
 edition: experience
 ---
 
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
index ec40cb807c..1a23f627a1 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
@@ -462,9 +462,9 @@ Below is a table of the tags that are currently supported, and their correspondi
 | `cssborder`   | Not supported |   Use `string` as workaround |
 
 
-#### 3.2.2 Migrate Page field to Page (eZ Enterprise only)
+#### 3.2.2 Migrate page field to page (eZ Enterprise only)
 
-**If** you use Page field (ezflow) and an eZ Enterprise subscription, and are ready to migrate your eZ Publish Flow content to the eZ Enterprise Page format, you can use a script to migrate your old Page content to new Page, to start using a pure eZ Enterprise setup.
+**If** you use page field (ezflow) and an eZ Enterprise subscription, and are ready to migrate your eZ Publish Flow content to the eZ Enterprise page format, you can use a script to migrate your old page content to new page, to start using a pure eZ Enterprise setup.
 
 For more information, see [Migrating legacy Page field (ezflow) to new Page (Enterprise)](#migrating-legacy-page-field-ezflow-to-new-page-enterprise).
 
@@ -525,9 +525,9 @@ In case of URLs with extended UTF-encoded names, the workaround must make use of
 ```
 
 
-## Migrating legacy Page field (ezflow) to new Page (Enterprise)
+## Migrating legacy page field (ezflow) to new page (Enterprise)
 
-To move your legacy Page field / eZ Flow configuration to eZ Platform Enterprise Edition you can use a script that aids in the migration process.
+To move your legacy page field / eZ Flow configuration to eZ Platform Enterprise Edition you can use a script that aids in the migration process.
 
 The script automatically migrates only data – to move, for example, custom views, layouts, or blocks, you have to provide their business logic again.
 

From 9bb7b01b498e53d55d9ad16bb5d15442f28bd3d7 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 14:06:31 +0200
Subject: [PATCH 69/77] Fixes

---
 docs/content_management/pages/create_custom_page_block.md   | 2 +-
 docs/content_management/pages/page_blocks.md                | 6 +++---
 docs/content_management/pages/page_builder_guide.md         | 2 +-
 docs/content_management/pages/react_app_block.md            | 6 +++---
 .../page_and_form_tutorial/4_create_a_custom_block.md       | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/content_management/pages/create_custom_page_block.md b/docs/content_management/pages/create_custom_page_block.md
index 71dfe88e47..fd619e8025 100644
--- a/docs/content_management/pages/create_custom_page_block.md
+++ b/docs/content_management/pages/create_custom_page_block.md
@@ -21,7 +21,7 @@ First, add the following [YAML configuration](configuration.md#configuration-fil
 ```
 
 `event` is the internal name for the block, and `name` indicates the name under which the block is available in the interface.
-You also set up the category in the Elements panel that the block appears in.
+You also set up the category in the **Page blocks** panel that the block appears in.
 In this case, it doesn't show with the rest of the built-in blocks, but in a separate "Custom" category.
 The thumbnail for the block can be one of the pre-existing icons, like in the example above, or you can use a custom SVG file.
 
diff --git a/docs/content_management/pages/page_blocks.md b/docs/content_management/pages/page_blocks.md
index eaa9eb6764..f5d60a985c 100644
--- a/docs/content_management/pages/page_blocks.md
+++ b/docs/content_management/pages/page_blocks.md
@@ -21,10 +21,10 @@ Each configured block has an identifier and the following settings:
 | Setting                  | Description                                                                                                                                                   |
 |--------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `name`                   | Name of the block used in the Page Builder interface.                                                                                                         |
-| `category`               | Category in the Page Builder elements menu that the block is shown in.                                                                                        |
-| `thumbnail`              | Thumbnail used in the Page Builder elements menu.                                                                                                             |
+| `category`               | Category in the Page Builder **Page blocks** menu that the block is shown in.                                                                                        |
+| `thumbnail`              | Thumbnail used in the Page Builder **Page blocks** menu.                                                                                                             |
 | `views`                  | Available [templates for the block](#block-templates).                                                                                                        |
-| `visible`                | (Optional) Toggles the block's visibility in the Page Builder elements menu. Remove the block from the layout before you publish another version of the page. |
+| `visible`                | (Optional) Toggles the block's visibility in the Page Builder **Page blocks** menu. Remove the block from the layout before you publish another version of the page. |
 | `configuration_template` | (Optional) Template for the block settings modal.                                                                                                             |
 | `attributes`             | (Optional) List of [block attributes](page_block_attributes.md).                                                                                              |
 
diff --git a/docs/content_management/pages/page_builder_guide.md b/docs/content_management/pages/page_builder_guide.md
index ed97a9c6c3..6c655ddf54 100644
--- a/docs/content_management/pages/page_builder_guide.md
+++ b/docs/content_management/pages/page_builder_guide.md
@@ -71,7 +71,7 @@ E. Buttons:
 |![Preview segments](page_builder_toolbar_preview_segment.png)|Access preview of the page for a given segment.|
 |![Timeline button](page_builder_toolbartimelinetoggler.png)|Access the timeline to preview how the page changes with time. You can also view the list of all upcoming scheduled events.|
 |![View toggler](page_builder_toolbar_devicestoggler.png)|Toggle through to see how the page is rendered on different devices.|
-|![Elements menu](page_builder_toolbarelements.png)|Move Page blocks / Structure view to the other side of the screen.|
+|![Page blocks menu](page_builder_toolbarelements.png)|Move Page blocks / Structure view to the other side of the screen.|
 |![Undo](page_builder_undo.png)|Undo latest change.|
 |![Redo](page_builder_redo.png)|Redo latest change.|
 
diff --git a/docs/content_management/pages/react_app_block.md b/docs/content_management/pages/react_app_block.md
index 2915b5d304..395e424056 100644
--- a/docs/content_management/pages/react_app_block.md
+++ b/docs/content_management/pages/react_app_block.md
@@ -27,10 +27,10 @@ Each configured React app block has an identifier and the following settings:
 | Setting      | Description                                                                                                                                                   |
 |--------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `name`       | Name of the block used in the Page Builder interface.                                                                                                         |
-| `category`   | Category in the Page Builder elements menu that the block is shown in.                                                                                        |
-| `thumbnail`  | Thumbnail used in the Page Builder elements menu.                                                                                                             |
+| `category`   | Category in the Page Builder **Page blocks** menu that the block is shown in.                                                                                        |
+| `thumbnail`  | Thumbnail used in the Page Builder **Page blocks** menu.                                                                                                             |
 | `component`  | React App Component name used in `assets/page-builder/react/blocks` directory.                                                                                |
-| `visible`    | (Optional) Toggles the block's visibility in the Page Builder elements menu. Remove the block from the layout before you publish another version of the page. |
+| `visible`    | (Optional) Toggles the block's visibility in the Page Builder **Page blocks** menu. Remove the block from the layout before you publish another version of the page. |
 | <nobr>`attributes`</nobr> | (Optional) List of [block attributes](page_block_attributes.md).                                                                                              |
 
 For example:
diff --git a/docs/tutorials/page_and_form_tutorial/4_create_a_custom_block.md b/docs/tutorials/page_and_form_tutorial/4_create_a_custom_block.md
index 9d45ab070a..f1fec5d63b 100644
--- a/docs/tutorials/page_and_form_tutorial/4_create_a_custom_block.md
+++ b/docs/tutorials/page_and_form_tutorial/4_create_a_custom_block.md
@@ -46,7 +46,7 @@ It's contained in `src/Event/RandomBlockListener.php`:
 At this point the new custom block is ready to be used.
 
 You're left with the last cosmetic changes.
-First, the new Block has a broken icon in the Elements menu in page mode.
+First, the new Block has a broken icon in the **Page blocks** menu in page mode.
 This is because you haven't provided this icon yet.
 If you look back to the YAML configuration, you can see the icon file defined as `random_block.svg` (line 4). Download [the provided file](https://github.com/ibexa/documentation-developer/blob/master/code_samples/tutorials/page_tutorial_starting_point/public/assets/images/blocks/random_block.svg) and place it in `public/assets/images/blocks`.
 
@@ -59,7 +59,7 @@ Finally, add some styling for the new block. Add the following to the end of the
 Run `yarn encore <dev|prod>` to regenerate assets.
 
 Go back to editing the Front page.
-Drag a Random Block from the Elements menu on the right to the page's side column.
+Drag a Random Block from the **Page blocks** menu on the right to the page's side column.
 Access the block's settings and choose the "All Tips" folder from the menu. Save and publish all the changes.
 
 Refresh the home page.

From 5a9984473ba91d09fe1f4891cac0202163569ed7 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 14:11:13 +0200
Subject: [PATCH 70/77] Fixes

---
 docs/content_management/pages/create_custom_page_block.md   | 2 +-
 docs/content_management/pages/page_blocks.md                | 6 +++---
 docs/content_management/pages/react_app_block.md            | 6 +++---
 docs/getting_started/install_with_ddev.md                   | 2 +-
 docs/ibexa_cloud/ddev_and_ibexa_cloud.md                    | 4 ++--
 .../cache/http_cache/reverse_proxy.md                       | 2 +-
 docs/infrastructure_and_maintenance/performance.md          | 2 +-
 .../page_and_form_tutorial/3_use_existing_blocks.md         | 2 +-
 .../page_and_form_tutorial/4_create_a_custom_block.md       | 6 +++---
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/docs/content_management/pages/create_custom_page_block.md b/docs/content_management/pages/create_custom_page_block.md
index fd619e8025..a711f74dbc 100644
--- a/docs/content_management/pages/create_custom_page_block.md
+++ b/docs/content_management/pages/create_custom_page_block.md
@@ -21,7 +21,7 @@ First, add the following [YAML configuration](configuration.md#configuration-fil
 ```
 
 `event` is the internal name for the block, and `name` indicates the name under which the block is available in the interface.
-You also set up the category in the **Page blocks** panel that the block appears in.
+You also set up the category in the **Page blocks** toolbox that the block appears in.
 In this case, it doesn't show with the rest of the built-in blocks, but in a separate "Custom" category.
 The thumbnail for the block can be one of the pre-existing icons, like in the example above, or you can use a custom SVG file.
 
diff --git a/docs/content_management/pages/page_blocks.md b/docs/content_management/pages/page_blocks.md
index f5d60a985c..ab94e0d3dc 100644
--- a/docs/content_management/pages/page_blocks.md
+++ b/docs/content_management/pages/page_blocks.md
@@ -21,10 +21,10 @@ Each configured block has an identifier and the following settings:
 | Setting                  | Description                                                                                                                                                   |
 |--------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `name`                   | Name of the block used in the Page Builder interface.                                                                                                         |
-| `category`               | Category in the Page Builder **Page blocks** menu that the block is shown in.                                                                                        |
-| `thumbnail`              | Thumbnail used in the Page Builder **Page blocks** menu.                                                                                                             |
+| `category`               | Category in the Page Builder **Page blocks** toolbox that the block is shown in.                                                                                        |
+| `thumbnail`              | Thumbnail used in the Page Builder **Page blocks** toolbox.                                                                                                             |
 | `views`                  | Available [templates for the block](#block-templates).                                                                                                        |
-| `visible`                | (Optional) Toggles the block's visibility in the Page Builder **Page blocks** menu. Remove the block from the layout before you publish another version of the page. |
+| `visible`                | (Optional) Toggles the block's visibility in the Page Builder **Page blocks** toolbox. Remove the block from the layout before you publish another version of the page. |
 | `configuration_template` | (Optional) Template for the block settings modal.                                                                                                             |
 | `attributes`             | (Optional) List of [block attributes](page_block_attributes.md).                                                                                              |
 
diff --git a/docs/content_management/pages/react_app_block.md b/docs/content_management/pages/react_app_block.md
index 395e424056..d3f869a851 100644
--- a/docs/content_management/pages/react_app_block.md
+++ b/docs/content_management/pages/react_app_block.md
@@ -27,10 +27,10 @@ Each configured React app block has an identifier and the following settings:
 | Setting      | Description                                                                                                                                                   |
 |--------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `name`       | Name of the block used in the Page Builder interface.                                                                                                         |
-| `category`   | Category in the Page Builder **Page blocks** menu that the block is shown in.                                                                                        |
-| `thumbnail`  | Thumbnail used in the Page Builder **Page blocks** menu.                                                                                                             |
+| `category`   | Category in the Page Builder **Page blocks** toolbox that the block is shown in.                                                                                        |
+| `thumbnail`  | Thumbnail used in the Page Builder **Page blocks** toolbox.                                                                                                             |
 | `component`  | React App Component name used in `assets/page-builder/react/blocks` directory.                                                                                |
-| `visible`    | (Optional) Toggles the block's visibility in the Page Builder **Page blocks** menu. Remove the block from the layout before you publish another version of the page. |
+| `visible`    | (Optional) Toggles the block's visibility in the Page Builder **Page blocks** toolbox. Remove the block from the layout before you publish another version of the page. |
 | <nobr>`attributes`</nobr> | (Optional) List of [block attributes](page_block_attributes.md).                                                                                              |
 
 For example:
diff --git a/docs/getting_started/install_with_ddev.md b/docs/getting_started/install_with_ddev.md
index dd3960c78b..b4d6d5c3cb 100644
--- a/docs/getting_started/install_with_ddev.md
+++ b/docs/getting_started/install_with_ddev.md
@@ -417,7 +417,7 @@ If the local project needs to answer to real production domains (for example, to
 
 You can use DDEV to locally simulate a production cluster.
 
-- See [clustering with DDEV](clustering_with_ddev.md) to add Elasticsearch, Solr, Redis, or Memcached to your DDEV installation.
+- See [Clustering with DDEV](clustering_with_ddev.md) to add Elasticsearch, Solr, Redis, or Memcached to your DDEV installation.
 - See [DDEV and [[= product_name_cloud =]]](ddev_and_ibexa_cloud.md) to locally run an [[= product_name =]] project by using DDEV.
 
 ## Stop or remove the project
diff --git a/docs/ibexa_cloud/ddev_and_ibexa_cloud.md b/docs/ibexa_cloud/ddev_and_ibexa_cloud.md
index c8ab6ffa2e..a78b4f56df 100644
--- a/docs/ibexa_cloud/ddev_and_ibexa_cloud.md
+++ b/docs/ibexa_cloud/ddev_and_ibexa_cloud.md
@@ -19,7 +19,7 @@ To configure the [`ddev/ddev-platformsh` add-on](https://github.com/ddev/ddev-pl
 
 The `ddev/ddev-platformsh` add-on configures the document root, the PHP version, the database, and the cache pool according to the [[= product_name_cloud =]] configuration.
 About the search engine, the add-on can configure Elasticsearch but can't configure Solr.
-If you use Solr on [[= product_name_cloud =]] and want to add it to your DDEV stack, see [clustering with DDEV and `ibexa/ddev-solr` add-on](clustering_with_ddev.md#solr).
+If you use Solr on [[= product_name_cloud =]] and want to add it to your DDEV stack, see [Clustering with DDEV and `ibexa/ddev-solr` add-on](clustering_with_ddev.md#solr).
 
 `COMPOSER_AUTH` from Platform.sh can't be used, because JSON commas are incorrectly interpreted by `--web-environment-add`, which sees them as multiple variable separators.
 But the variable must exist for Platform.sh `hooks` scripts to work.
@@ -103,4 +103,4 @@ ddev launch
 
 From there, services can be added to get closer to [[= product_name_cloud =]] Platform.sh architecture.
 `.platform/services.yaml` indicates the services used.
-For more information, see [clustering with DDEV](clustering_with_ddev.md).
+For more information, see [Clustering with DDEV](clustering_with_ddev.md).
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md b/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
index f16231a4b6..f446d35b26 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
@@ -40,7 +40,7 @@ Using a different proxy is highly recommended as they provide better performance
 
 !!! note
 
-    Use of Varnish or Fastly is a requirement for a [Clustering](clustering.md) setup, as Symfony Proxy doesn't support sharing cache between several application servers.
+    Use of Varnish or Fastly is a requirement for a [clustering](clustering.md) setup, as Symfony Proxy doesn't support sharing cache between several application servers.
 
 ## VCL base files
 
diff --git a/docs/infrastructure_and_maintenance/performance.md b/docs/infrastructure_and_maintenance/performance.md
index d997074ae6..8c1525503c 100644
--- a/docs/infrastructure_and_maintenance/performance.md
+++ b/docs/infrastructure_and_maintenance/performance.md
@@ -79,7 +79,7 @@ In production setups:
 - If you use Redis, make sure to tune it for in-memory cache usage. Its persistence feature isn't needed with cache and severely slows down execution time.
     - [For use with sessions](sessions.md#cluster-setup) however, persistence can be a good fit if you want sessions to survive service interruptions.
 
-For more information, see [Redis Clustering](persistence_cache.md#redis-clustering).
+For more information, see [Redis clustering](persistence_cache.md#redis-clustering).
 
 ### Search
 
diff --git a/docs/tutorials/page_and_form_tutorial/3_use_existing_blocks.md b/docs/tutorials/page_and_form_tutorial/3_use_existing_blocks.md
index 42f2640a35..bf388f8890 100644
--- a/docs/tutorials/page_and_form_tutorial/3_use_existing_blocks.md
+++ b/docs/tutorials/page_and_form_tutorial/3_use_existing_blocks.md
@@ -141,4 +141,4 @@ Content is shown when you move the slider to the point when it airs.
     If you try to add Content of any other type, you can see an error.
     This is because there is no `featured` view for content other than Articles defined at the moment.
 
-![Front Page after adding Featured Block](enterprise_tut_page_with_featured_articles.png "Front Page after adding Featured Block")
+![Front page after adding Featured Block](enterprise_tut_page_with_featured_articles.png "Front page after adding Featured Block")
diff --git a/docs/tutorials/page_and_form_tutorial/4_create_a_custom_block.md b/docs/tutorials/page_and_form_tutorial/4_create_a_custom_block.md
index f1fec5d63b..39fe60995a 100644
--- a/docs/tutorials/page_and_form_tutorial/4_create_a_custom_block.md
+++ b/docs/tutorials/page_and_form_tutorial/4_create_a_custom_block.md
@@ -46,7 +46,7 @@ It's contained in `src/Event/RandomBlockListener.php`:
 At this point the new custom block is ready to be used.
 
 You're left with the last cosmetic changes.
-First, the new Block has a broken icon in the **Page blocks** menu in page mode.
+First, the new Block has a broken icon in the **Page blocks** toolbox in page mode.
 This is because you haven't provided this icon yet.
 If you look back to the YAML configuration, you can see the icon file defined as `random_block.svg` (line 4). Download [the provided file](https://github.com/ibexa/documentation-developer/blob/master/code_samples/tutorials/page_tutorial_starting_point/public/assets/images/blocks/random_block.svg) and place it in `public/assets/images/blocks`.
 
@@ -58,8 +58,8 @@ Finally, add some styling for the new block. Add the following to the end of the
 
 Run `yarn encore <dev|prod>` to regenerate assets.
 
-Go back to editing the Front page.
-Drag a Random Block from the **Page blocks** menu on the right to the page's side column.
+Go back to editing the front page.
+Drag a Random Block from the **Page blocks** toolbox on the right to the page's side column.
 Access the block's settings and choose the "All Tips" folder from the menu. Save and publish all the changes.
 
 Refresh the home page.

From f8fe289e6e6a95e4d938b9d35c8bd2c143f35baf Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 14:17:43 +0200
Subject: [PATCH 71/77] Fixes

---
 .../field_types/field_type_reference/imagefield.md     |  2 +-
 docs/content_management/images/fastly_io.md            |  2 +-
 docs/getting_started/install_with_ddev.md              | 10 +++++-----
 .../cache/persistence_cache.md                         |  2 +-
 .../request_lifecycle.md                               |  2 +-
 docs/permissions/limitation_reference.md               |  2 +-
 .../2_prepare_the_landing_page.md                      |  2 +-
 .../from_1.x_2.x/update_db_to_2.5.md                   |  2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/content_management/field_types/field_type_reference/imagefield.md b/docs/content_management/field_types/field_type_reference/imagefield.md
index a6dac2cfb2..fa043f5bfe 100644
--- a/docs/content_management/field_types/field_type_reference/imagefield.md
+++ b/docs/content_management/field_types/field_type_reference/imagefield.md
@@ -38,7 +38,7 @@ The `value` property of an Image field returns an `Ibexa\Core\FieldType\Image\V
 
 This field type doesn't support settings.
 
-### Image Variations
+### Image variations
 
 Using the variation Service, variations of the original image can be obtained. they're `Ibexa\Contracts\Core\Variation\Values\ImageVariation` objects with the following properties:
 
diff --git a/docs/content_management/images/fastly_io.md b/docs/content_management/images/fastly_io.md
index 6240abda89..cd5b88efc5 100644
--- a/docs/content_management/images/fastly_io.md
+++ b/docs/content_management/images/fastly_io.md
@@ -139,5 +139,5 @@ ibexa:
 You can select defined image variations during content item creation in the image options.
 Variations can include different sizing options and other filters that are applied to the image.
 
-![Fastly Image Variations](img/fastly_variations.png)
+![Fastly image variations](img/fastly_variations.png)
 
diff --git a/docs/getting_started/install_with_ddev.md b/docs/getting_started/install_with_ddev.md
index b4d6d5c3cb..d0a5727de8 100644
--- a/docs/getting_started/install_with_ddev.md
+++ b/docs/getting_started/install_with_ddev.md
@@ -275,7 +275,7 @@ For example, you can append it to [[= product_name_base =]]'s FastCGI config:
 echo 'fastcgi_param HTTPS $fcgi_https;' >> .ddev/nginx_full/ibexa_params.d/ibexa_fastcgi_params
 ```
 
-### Switch to Apache and its Virtual Host
+### Switch to Apache and its virtual host
 
 To use Apache instead of the default Nginx, run the following command:
 
@@ -283,14 +283,14 @@ To use Apache instead of the default Nginx, run the following command:
 ddev config --webserver-type=apache-fpm
 ```
 
-[[= product_name =]] can't run on Apache without a dedicated Virtual Host.
+[[= product_name =]] can't run on Apache without a dedicated virtual host.
 
-To set the Apache Virtual Host, override `.ddev/apache/apache-site.conf` with [[= product_name =]]'s config.
+To set the Apache virtual host, override `.ddev/apache/apache-site.conf` with [[= product_name =]]'s config.
 You can do it manually or by using a script.
 
 #### Manual procedure
 
-Copy the Virtual Host template as the new Apache configuration:
+Copy the virtual host template as the new Apache configuration:
 
 ```bash
 cp vendor/ibexa/post-install/resources/templates/apache2/vhost.template .ddev/apache/apache-site.conf
@@ -336,7 +336,7 @@ ddev restart
 
 #### Scripted procedure
 
-Generate the Virtual Host with [`vhost.sh`](https://github.com/ibexa/docker/blob/main/scripts/vhost.sh):
+Generate the virtual host with [`vhost.sh`](https://github.com/ibexa/docker/blob/main/scripts/vhost.sh):
 
 ```bash
 curl -O https://raw.githubusercontent.com/ibexa/docker/main/scripts/vhost.sh
diff --git a/docs/infrastructure_and_maintenance/cache/persistence_cache.md b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
index f8d289a6af..d6f5ce6494 100644
--- a/docs/infrastructure_and_maintenance/cache/persistence_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
@@ -11,7 +11,7 @@ description: Persistence cache caches SPI\Persistence calls used in common page
 Persistence cache can best be described as an implementation of `SPI\Persistence` that decorates the main backend implementation, aka Storage Engine *(currently: "Legacy Storage Engine")*.
 
 As shown in the illustration, this is done in the exact same way as the event layer is a custom implementation of `API\Repository` decorating the main repository.
-In the case of Persistence Cache, instead of sending events on calls passed on to the decorated implementation, most of the load calls are cached, and calls that perform changes purge the affected caches.
+In the case of persistence cache, instead of sending events on calls passed on to the decorated implementation, most of the load calls are cached, and calls that perform changes purge the affected caches.
 Cache handlers *(for example, Memcached, Redis, or Filesystem)* can be configured using Symfony configuration.
 For details on how to reuse this Cache service in your own custom code, see below.
 
diff --git a/docs/infrastructure_and_maintenance/request_lifecycle.md b/docs/infrastructure_and_maintenance/request_lifecycle.md
index debf0a5820..42d3ac435f 100644
--- a/docs/infrastructure_and_maintenance/request_lifecycle.md
+++ b/docs/infrastructure_and_maintenance/request_lifecycle.md
@@ -11,7 +11,7 @@ When entering the server infrastructure, the HTTP request can be handled by seve
 
 For an overview of what happens on a reverse proxy like Varnish or Fastly, see [Context-aware HTTP cache / Request lifecycle](context_aware_cache.md#request-lifecycle).
 
-When arriving at a web server, the request is filtered by Apache Virtual Host, Nginx Server Blocks, or equivalent.
+When arriving at a web server, the request is filtered by Apache virtual host, Nginx Server Blocks, or equivalent.
 There, requests of static resources are separated from requests to PHP interpreter.
 
 As [[= product_name =]] is a Symfony application, the handling of requests starts like in Symfony (see [Symfony and HTTP Fundamentals](https://symfony.com/doc/current/introduction/http_fundamentals.html)).
diff --git a/docs/permissions/limitation_reference.md b/docs/permissions/limitation_reference.md
index 0517ebe5a4..40bcc538fa 100644
--- a/docs/permissions/limitation_reference.md
+++ b/docs/permissions/limitation_reference.md
@@ -64,7 +64,7 @@ The Change Owner (`ChangeOwner`) limitation specifies whether the user can chang
 
 ## Content type Group limitation
 
-The Content Type Group (`UserGroup`) limitation specifies that only users with at least one common *direct* user Group with the owner of content get the selected access right.
+The Content Type Group (`UserGroup`) limitation specifies that only users with at least one common *direct* user group with the owner of content get the selected access right.
 
 ### Possible values
 
diff --git a/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md b/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
index fa85db5381..3669cb24ab 100644
--- a/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
+++ b/docs/tutorials/page_and_form_tutorial/2_prepare_the_landing_page.md
@@ -71,7 +71,7 @@ Use the [supplied thumbnail file](https://github.com/ibexa/documentation-develop
 
 The `template` (line 8) points to the Twig file containing the template for this layout.
 
-#### Create Page template
+#### Create page template
 
 Configuration points to `sidebar.html.twig` as the template for the layout.
 The template defines what zones are available in the layout.
diff --git a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
index 4a21005431..bec0ff0a63 100644
--- a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
+++ b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
@@ -698,7 +698,7 @@ If you're updating your Enterprise installation, you need to add this Section ma
 To allow anonymous users to access Forms, you also need to add the `content/read` policy
 with the *Form* Section to the Anonymous User.
 
-#### Changes to Custom tags
+#### Changes to custom tags
 
 v2.4 changed the way of configuring custom tags. they're no longer configured under the `ezpublish` key,
 but one level higher in the YAML structure:

From a9bd8f1ebd5d914f47331664ba8d8511a9090996 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 17 Oct 2024 15:04:40 +0200
Subject: [PATCH 72/77] Links fixed (variables removed)

---
 docs/content_management/images/fastly_io.md                 | 2 +-
 docs/getting_started/install_ibexa_dxp.md                   | 2 +-
 docs/getting_started/install_with_ddev.md                   | 2 +-
 docs/ibexa_products/ibexa_commerce.md                       | 6 +++---
 docs/ibexa_products/ibexa_experience.md                     | 4 ++--
 .../clustering/clustering_with_ddev.md                      | 2 +-
 docs/resources/phpstorm_plugin.md                           | 2 +-
 docs/tutorials/beginner_tutorial/1_get_ready.md             | 2 +-
 .../1_implement_the_point2d_value_class.md                  | 2 +-
 .../page_and_form_tutorial/1_get_a_starter_website.md       | 2 +-
 docs/update_and_migration/from_4.3/update_from_4.3.md       | 2 +-
 .../from_4.3/update_from_4.3_old_commerce.md                | 2 +-
 12 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/docs/content_management/images/fastly_io.md b/docs/content_management/images/fastly_io.md
index cd5b88efc5..62d71add11 100644
--- a/docs/content_management/images/fastly_io.md
+++ b/docs/content_management/images/fastly_io.md
@@ -11,7 +11,7 @@ To be able to configure this feature, you need [Fastly IO subscription](https://
 
 ## Enable shielding
 
-To use Fastly Image Optimizer, you first need a [working setup of [[= product_name =]] and Fastly](reverse_proxy.md#using-varnish-or-fastly)
+To use Fastly Image Optimizer, you first need a [working setup of Ibexa DXP and Fastly](reverse_proxy.md#using-varnish-or-fastly)
 with shielding enabled.
 To enable shielding, follow the steps in [Fastly Developer Documentation](https://developer.fastly.com/learning/concepts/shielding/#enabling-and-disabling-shielding).
 Remember to choose a shield location from the **Shielding** menu, as described in [Fastly User Documentation](https://docs.fastly.com/en/guides/shielding#enabling-shielding).
diff --git a/docs/getting_started/install_ibexa_dxp.md b/docs/getting_started/install_ibexa_dxp.md
index 9fc4724fd3..9b8d0fc355 100644
--- a/docs/getting_started/install_ibexa_dxp.md
+++ b/docs/getting_started/install_ibexa_dxp.md
@@ -423,4 +423,4 @@ To make use of the [Link Manager](url_management.md#enabling-automatic-url-valid
 
 ## [[= product_name_cloud =]]
 
-If you want to host your application on [[= product_name_cloud =]], follow the [Install on [[= product_name_cloud =]]](install_on_ibexa_cloud.md) procedure.
+If you want to host your application on [[= product_name_cloud =]], follow the [Ibexa Cloud](install_on_ibexa_cloud.md) procedure.
diff --git a/docs/getting_started/install_with_ddev.md b/docs/getting_started/install_with_ddev.md
index d0a5727de8..ddfcf1c42a 100644
--- a/docs/getting_started/install_with_ddev.md
+++ b/docs/getting_started/install_with_ddev.md
@@ -418,7 +418,7 @@ If the local project needs to answer to real production domains (for example, to
 You can use DDEV to locally simulate a production cluster.
 
 - See [Clustering with DDEV](clustering_with_ddev.md) to add Elasticsearch, Solr, Redis, or Memcached to your DDEV installation.
-- See [DDEV and [[= product_name_cloud =]]](ddev_and_ibexa_cloud.md) to locally run an [[= product_name =]] project by using DDEV.
+- See [DDEV and Ibexa Cloud](ddev_and_ibexa_cloud.md) to locally run an [[= product_name =]] project by using DDEV.
 
 ## Stop or remove the project
 
diff --git a/docs/ibexa_products/ibexa_commerce.md b/docs/ibexa_products/ibexa_commerce.md
index 7479a4776f..ece5ffc11d 100644
--- a/docs/ibexa_products/ibexa_commerce.md
+++ b/docs/ibexa_products/ibexa_commerce.md
@@ -21,7 +21,7 @@ You can completely revamp your online stores and give your consumers exceptional
 
 To start using [[= product_name_com =]], you need to purchase a product license.
 
-For more information, see [[[= product_name_com =]] license pricing](https://www.ibexa.co/products/pricing?tab=3).
+For more information, see [Ibexa Commerce license pricing](https://www.ibexa.co/products/pricing?tab=3).
 You can also [contact us](https://www.ibexa.co/about-ibexa/contact-us) or [one of our partners](https://www.ibexa.co/partners).
 
 ## How it works
@@ -33,9 +33,9 @@ With an active license, you can start the [installation process](install_ibexa_d
 [[= product_name_com =]] is based on [Symfony]([[= symfony_doc =]]).
 With a help of documentation and trainings, any developer familiar with Symfony or even PHP alone can learn how to use available extension points and extend the platform.
 
-Version control systems and environment variables allow you to deploy your extensions and settings on several environments, such as [[[= product_name_cloud =]]](ibexa_cloud_guide.md).
+Version control systems and environment variables allow you to deploy your extensions and settings on several environments, such as [Ibexa Cloud](ibexa_cloud_guide.md).
 
-[[= product_name_com =]] is built on [[[= product_name_exp =]]](ibexa_experience.md) and includes all bundles, APIs, and features that come with both [Headless](ibexa_headless.md#core-features) and [Experience](ibexa_experience.md#core-features) editions.
+[[= product_name_com =]] is built on [Ibexa Experience](ibexa_experience.md) and includes all bundles, APIs, and features that come with both [Headless](ibexa_headless.md#core-features) and [Experience](ibexa_experience.md#core-features) editions.
 
 ## Capabilities and benefits
 
diff --git a/docs/ibexa_products/ibexa_experience.md b/docs/ibexa_products/ibexa_experience.md
index 856293bd28..bccade3d58 100644
--- a/docs/ibexa_products/ibexa_experience.md
+++ b/docs/ibexa_products/ibexa_experience.md
@@ -103,7 +103,7 @@ You can assign users to different recommendation groups and create advanced logi
 
 #### Customer Data Platform (CDP)
 
-[[[= product_name_cdp =]]](cdp_guide.md) is an add-on available for both Experience and [Commerce](ibexa_commerce.md) editions of [[= product_name =]].
+[Ibexa CDP](cdp_guide.md) is an add-on available for both Experience and [Commerce](ibexa_commerce.md) editions of [[= product_name =]].
 To use it, you must make arrangements with [[= product_name_base =]] to define the initial configuration.
 Once you activate [[= product_name_cdp =]], you can create complete customer profiles, including their interactions, behavior, and preferences.
 It helps you improve user engagement, conversion rates, and return on investment by segmenting your audience and delivering tailored campaigns and experiences.
@@ -115,7 +115,7 @@ This central data storage supports business growth with a scalable infrastructur
 
 #### [[= product_name_engage =]]
 
-Another add-on available for Experience and [Commerce](ibexa_commerce.md) edition is [[[= product_name_engage =]]](ibexa_engage.md).
+Another add-on available for Experience and [Commerce](ibexa_commerce.md) edition is [Ibexa Engage](ibexa_engage.md).
 To use it, you must make arrangements with [[= product_name_base =]] to define the initial configuration, and then get and set up a user account.
 [[= product_name_engage =]] is a data collection tool.
 It gives you the ability to use the [Qualifio](https://qualifio.com/) tools to engage your audiences. You can use Qualifio's existing templates and interactive elements, such as quizzes, pools, and forms, to create visually appealing, customized campaigns and collect important data.
diff --git a/docs/infrastructure_and_maintenance/clustering/clustering_with_ddev.md b/docs/infrastructure_and_maintenance/clustering/clustering_with_ddev.md
index 006489bfac..0f7ca0bf45 100644
--- a/docs/infrastructure_and_maintenance/clustering/clustering_with_ddev.md
+++ b/docs/infrastructure_and_maintenance/clustering/clustering_with_ddev.md
@@ -25,7 +25,7 @@ The `ddev config --php-version` option should set the same PHP version as the pr
 
    Discover more commands in [DDEV documentation](https://ddev.readthedocs.io/en/latest/users/usage/commands/).
 
-To run an [[= product_name_cloud =]] project locally, you may refer to [DDEV and [[= product_name_cloud =]]](ddev_and_ibexa_cloud.md) instead.
+To run an [[= product_name_cloud =]] project locally, you may refer to [DDEV and Ibexa Cloud](ddev_and_ibexa_cloud.md) instead.
 
 ## Install search engine
 
diff --git a/docs/resources/phpstorm_plugin.md b/docs/resources/phpstorm_plugin.md
index f10f0005db..8d570c3542 100644
--- a/docs/resources/phpstorm_plugin.md
+++ b/docs/resources/phpstorm_plugin.md
@@ -63,7 +63,7 @@ In project settings form you can choose:
 - Product edition: [[= product_name_oss =]], [[= product_name_content =]], [[= product_name_exp =]], [[= product_name_com =]]
 - Authentication token (for Content, Experience and Commerce editions)
 - Product version: Default (latest LTS version), Latest (fast track or LTS), Latest LTS and "Next 3.x" (unstable, based on the 3.x branch) and "Next 4.x" (unstable, based on the 4.x branch)
-- Generate [[[= product_name_cloud =]] configuration](install_on_ibexa_cloud.md)
+- Generate [Ibexa Cloud configuration](install_on_ibexa_cloud.md)
 - Composer settings
 
 ![Create a project](phpstorm_plugin_create_project.png)
diff --git a/docs/tutorials/beginner_tutorial/1_get_ready.md b/docs/tutorials/beginner_tutorial/1_get_ready.md
index a8e18d9d7c..cc906da90b 100644
--- a/docs/tutorials/beginner_tutorial/1_get_ready.md
+++ b/docs/tutorials/beginner_tutorial/1_get_ready.md
@@ -6,7 +6,7 @@ description: Start the tutorial by getting a clean installation of Ibexa DXP.
 
 To begin the tutorial, you need a clean installation of [[= product_name =]].
 
-Get it by following the [install [[= product_name =]]](install_ibexa_dxp.md) guide.
+Get it by following the [install Ibexa DXP](install_ibexa_dxp.md) guide.
 You need a web server, a relational database and PHP.
 
 The clean installation contains only a root content item which displays a welcome page.
diff --git a/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md b/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md
index 8dc44e0633..3c0c073af6 100644
--- a/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md
+++ b/docs/tutorials/generic_field_type/1_implement_the_point2d_value_class.md
@@ -7,7 +7,7 @@ description: Learn how to create a Value class that stores the value of the fiel
 ## Project installation
 
 To start the tutorial, you need to make a clean [[= product_name =]] installation.
-Follow the guide for your system to [install [[= product_name =]]](install_ibexa_dxp.md), [configure a server](requirements.md), and [start the web server](install_ibexa_dxp.md#use-phps-built-in-server).
+Follow the guide for your system to [install Ibexa DXP](install_ibexa_dxp.md), [configure a server](requirements.md), and [start the web server](install_ibexa_dxp.md#use-phps-built-in-server).
 Remember to install using the `dev` environment.
 
 Open your project with a clean installation and create the base directory for a new Point 2D field type in `src/FieldType/Point2D`.
diff --git a/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md b/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md
index ffc3272c64..75148baaec 100644
--- a/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md
+++ b/docs/tutorials/page_and_form_tutorial/1_get_a_starter_website.md
@@ -11,7 +11,7 @@ To set up the starter website, you need to follow these steps:
 
 To begin the tutorial, you need a clean installation of [[= product_name_exp =]].
 
-Get it by following the [Install [[= product_name =]]](install_ibexa_dxp.md) guide.
+Get it by following the [Install Ibexa DXP](install_ibexa_dxp.md) guide.
 
 ## Add content types
 
diff --git a/docs/update_and_migration/from_4.3/update_from_4.3.md b/docs/update_and_migration/from_4.3/update_from_4.3.md
index f86204efc7..a307d35f7d 100644
--- a/docs/update_and_migration/from_4.3/update_from_4.3.md
+++ b/docs/update_and_migration/from_4.3/update_from_4.3.md
@@ -8,7 +8,7 @@ This update procedure applies if you're using the newest v4.3 installation.
 
 This release deprecates all Commerce packages in[[= product_name =]]. They will be removed in v5.
 Until that time, they will be maintained by Ibexa with fixes, including security fixes, but they won't be further developed.
-Old packages are replaced by [the all-new [[= product_name_com =]] packages](ibexa_dxp_v4.4.md#all-new-ibexa-commerce-packages).
+Old packages are replaced by [the all-new Ibexa Commerce packages](ibexa_dxp_v4.4.md#all-new-ibexa-commerce-packages).
 
 For that reason, there are two update routes you can take.
 
diff --git a/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md b/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md
index 6aad2dfb49..b3e5d5a6d8 100644
--- a/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md
+++ b/docs/update_and_migration/from_4.3/update_from_4.3_old_commerce.md
@@ -8,7 +8,7 @@ This update procedure applies if you have a v4.3 installation, you use Commerce
 
 All commerce packages as of v4.4 are deprecated and will be removed in v5.
 Until that time, they will be maintained by Ibexa with fixes, including security fixes, but they won't be further developed.
-Old packages are replaced by [the all-new [[= product_name_com =]] packages](ibexa_dxp_v4.4.md#all-new-ibexa-commerce-packages).
+Old packages are replaced by [the all-new Ibexa Commerce packages](ibexa_dxp_v4.4.md#all-new-ibexa-commerce-packages).
 
 [[% include 'snippets/update/temporary_v4_conflicts.md' %]]
 

From ac5d231d945b0cc6df817835350d77aaba8e5124 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Mon, 25 Nov 2024 11:41:24 +0100
Subject: [PATCH 73/77] Fixes after review

---
 docs/administration/admin_panel/segments_admin_panel.md  | 2 +-
 docs/administration/back_office/content_tree.md          | 2 +-
 docs/administration/back_office/notifications.md         | 2 +-
 .../configuration/repository_configuration.md            | 2 +-
 .../administration/content_organization/object_states.md | 2 +-
 docs/administration/project_organization/bundles.md      | 4 ++--
 docs/api/api.md                                          | 2 +-
 docs/api/rest_api/rest_api_authentication.md             | 2 +-
 docs/cdp/cdp_activation/cdp_activation.md                | 2 +-
 docs/cdp/cdp_guide.md                                    | 2 +-
 docs/cdp/cdp_installation.md                             | 2 +-
 docs/commerce/checkout/customize_checkout.md             | 2 +-
 docs/commerce/storefront/extend_storefront.md            | 2 +-
 docs/content_management/content_management.md            | 2 +-
 docs/content_management/data_migration/data_migration.md | 2 +-
 docs/content_management/data_migration/exporting_data.md | 4 ++--
 .../field_types/field_type_reference/datefield.md        | 2 +-
 .../field_types/field_type_reference/imagefield.md       | 9 ++++++---
 .../field_types/field_type_reference/textlinefield.md    | 2 +-
 docs/content_management/field_types/field_type_search.md | 9 ++++++---
 .../content_management/field_types/field_type_storage.md | 2 +-
 docs/content_management/field_types/form_and_template.md | 2 +-
 docs/content_management/locations.md                     | 4 ++--
 docs/content_management/pages/pages.md                   | 2 +-
 docs/content_management/user_generated_content.md        | 2 +-
 docs/customer_management/customer_portal_guide.md        | 3 ++-
 docs/fonts/Work_Sans/OFL.txt                             | 2 +-
 docs/getting_started/first_steps.md                      | 4 ++--
 docs/getting_started/getting_started.md                  | 2 +-
 docs/getting_started/install_ibexa_dxp.md                | 6 +++---
 docs/getting_started/troubleshooting.md                  | 2 +-
 docs/ibexa_cloud/ibexa_cloud.md                          | 2 +-
 docs/ibexa_engage/ibexa_engage.md                        | 2 +-
 docs/ibexa_engage/install_ibexa_engage.md                | 5 +++--
 docs/ibexa_engage/integrate_ibexa_connect.md             | 2 +-
 docs/infrastructure_and_maintenance/cache/cache.md       | 2 +-
 .../cache/http_cache/fastly.md                           | 2 +-
 .../infrastructure_and_maintenance.md                    | 2 +-
 docs/infrastructure_and_maintenance/request_lifecycle.md | 2 +-
 .../security/reporting_issues.md                         | 8 ++++----
 .../security/security_checklist.md                       | 2 +-
 docs/multisite/multisite.md                              | 2 +-
 .../multisite/site_factory/site_factory_configuration.md | 2 +-
 docs/multisite/siteaccess/siteaccess.md                  | 2 +-
 docs/permissions/permission_use_cases.md                 | 2 +-
 docs/permissions/permissions.md                          | 2 +-
 docs/personalization/api_reference/api_reference.md      | 2 +-
 docs/personalization/personalization.md                  | 2 +-
 docs/pim/pim.md                                          | 2 +-
 docs/pim/product_api.md                                  | 2 +-
 docs/release_notes/ez_platform_v2.1.0.md                 | 2 +-
 docs/release_notes/ez_platform_v2.4.md                   | 4 ++--
 docs/release_notes/ibexa_dxp_v4.6.md                     | 2 +-
 docs/release_notes/release_notes.md                      | 2 +-
 docs/resources/phpstorm_plugin.md                        | 2 +-
 docs/resources/release_process_and_roadmap.md            | 6 +++---
 docs/resources/resources.md                              | 2 +-
 .../aggregation_reference/basepricestats_aggregation.md  | 3 ++-
 docs/search/criteria_reference/ancestor_criterion.md     | 1 -
 .../attributegroupidentifier_criterion.md                | 1 -
 .../search/criteria_reference/attributename_criterion.md | 1 -
 docs/search/criteria_reference/baseprice_criterion.md    | 1 -
 .../criteria_reference/catalogidentifier_criterion.md    | 1 -
 docs/search/criteria_reference/catalogname_criterion.md  | 1 -
 .../search/criteria_reference/catalogstatus_criterion.md | 1 -
 .../criteria_reference/checkboxattribute_criterion.md    | 1 -
 .../criteria_reference/colorattribute_criterion.md       | 1 -
 docs/search/criteria_reference/contentid_criterion.md    | 1 -
 docs/search/criteria_reference/contentname_criterion.md  | 1 -
 .../criteria_reference/contenttypegroupid_criterion.md   | 1 -
 .../search/criteria_reference/contenttypeid_criterion.md | 1 -
 .../contenttypeidentifier_criterion.md                   | 1 -
 docs/search/criteria_reference/createdat_criterion.md    | 1 -
 .../criteria_reference/createdatrange_criterion.md       | 1 -
 docs/search/criteria_reference/currencycode_criterion.md | 1 -
 .../criteria_reference/customergroupid_criterion.md      | 1 -
 docs/search/criteria_reference/customprice_criterion.md  | 1 -
 docs/search/criteria_reference/datemetadata_criterion.md | 1 -
 docs/search/criteria_reference/depth_criterion.md        | 1 -
 docs/search/criteria_reference/field_criterion.md        | 1 -
 .../search/criteria_reference/fieldrelation_criterion.md | 1 -
 .../criteria_reference/floatattribute_criterion.md       | 1 -
 .../criteria_reference/floatattributerange_criterion.md  | 1 -
 docs/search/criteria_reference/fulltext_criterion.md     | 1 -
 .../criteria_reference/integerattribute_criterion.md     | 1 -
 .../integerattributerange_criterion.md                   | 1 -
 .../criteria_reference/iscurrencyenabled_criterion.md    | 1 -
 docs/search/criteria_reference/isfieldempty_criterion.md | 1 -
 .../criteria_reference/ismainlocation_criterion.md       | 1 -
 .../criteria_reference/isproductbased_criterion.md       | 1 -
 docs/search/criteria_reference/isuserbased_criterion.md  | 1 -
 .../search/criteria_reference/isuserenabled_criterion.md | 1 -
 docs/search/criteria_reference/isvirtual_criterion.md    | 1 -
 docs/search/criteria_reference/languagecode_criterion.md | 1 -
 docs/search/criteria_reference/locationid_criterion.md   | 1 -
 .../criteria_reference/locationremoteid_criterion.md     | 1 -
 docs/search/criteria_reference/logicaland_criterion.md   | 1 -
 docs/search/criteria_reference/logicalnot_criterion.md   | 1 -
 docs/search/criteria_reference/logicalor_criterion.md    | 1 -
 .../criteria_reference/maplocationdistance_criterion.md  | 1 -
 docs/search/criteria_reference/matchall_criterion.md     | 1 -
 docs/search/criteria_reference/matchnone_criterion.md    | 1 -
 .../search/criteria_reference/objectstateid_criterion.md | 1 -
 .../objectstateidentifier_criterion.md                   | 1 -
 .../criteria_reference/parentlocationid_criterion.md     | 1 -
 .../parentlocationremoteId_criterion.md                  | 1 -
 docs/search/criteria_reference/priority_criterion.md     | 1 -
 .../criteria_reference/productavailability_criterion.md  | 1 -
 .../criteria_reference/productcategory_criterion.md      | 1 -
 docs/search/criteria_reference/productcode_criterion.md  | 1 -
 docs/search/criteria_reference/productname_criterion.md  | 1 -
 docs/search/criteria_reference/productstock_criterion.md | 1 -
 .../criteria_reference/productstockrange_criterion.md    | 1 -
 docs/search/criteria_reference/producttype_criterion.md  | 1 -
 .../rangemeasurementattributemaximum_criterion.md        | 1 -
 .../rangemeasurementattributeminimum_criterion.md        | 1 -
 docs/search/criteria_reference/remoteid_criterion.md     | 1 -
 docs/search/criteria_reference/sectionid_criterion.md    | 1 -
 .../criteria_reference/sectionidentifier_criterion.md    | 1 -
 .../criteria_reference/selectionattribute_criterion.md   | 1 -
 docs/search/criteria_reference/sibling_criterion.md      | 1 -
 .../simplemeasurementattribute_criterion.md              | 1 -
 docs/search/criteria_reference/subtree_criterion.md      | 1 -
 docs/search/criteria_reference/taxonomy_entry_id.md      | 1 -
 docs/search/criteria_reference/useremail_criterion.md    | 1 -
 docs/search/criteria_reference/userid_criterion.md       | 1 -
 docs/search/criteria_reference/userlogin_criterion.md    | 1 -
 docs/search/criteria_reference/usermetadata_criterion.md | 1 -
 docs/search/criteria_reference/visibility_criterion.md   | 1 -
 docs/search/search.md                                    | 2 +-
 .../legacy_search_engine/legacy_search_overview.md       | 3 ++-
 .../search_engines/solr_search_engine/install_solr.md    | 5 +++--
 .../sort_clause_reference/customprice_sort_clause.md     | 3 ++-
 docs/templating/embed_and_list_content/render_images.md  | 2 +-
 docs/templating/layout/add_login_form.md                 | 2 +-
 docs/templating/templating.md                            | 2 +-
 .../beginner_tutorial/2_create_the_content_model.md      | 3 ++-
 .../beginner_tutorial/8_enable_account_registration.md   | 2 +-
 docs/tutorials/tutorials.md                              | 2 +-
 .../from_1.x_2.x/update_db_to_2.5.md                     | 7 +++----
 docs/update_and_migration/from_3.3/to_4.0.md             | 2 +-
 docs/update_and_migration/from_4.3/update_from_4.3.md    | 2 +-
 142 files changed, 104 insertions(+), 163 deletions(-)

diff --git a/docs/administration/admin_panel/segments_admin_panel.md b/docs/administration/admin_panel/segments_admin_panel.md
index 1333b85123..a3debe34a8 100644
--- a/docs/administration/admin_panel/segments_admin_panel.md
+++ b/docs/administration/admin_panel/segments_admin_panel.md
@@ -5,7 +5,7 @@ edition: experience
 
 # Segments
 
-You can use segments to display specific content to specific [ussers](users.md).
+You can use segments to display specific content to specific [users](users.md).
 They're used out of the box in the Targeting and Dynamic targeting blocks in the page.
 
 You can collect segments in segment groups:
diff --git a/docs/administration/back_office/content_tree.md b/docs/administration/back_office/content_tree.md
index 0a71fa9f9b..ea4b10b332 100644
--- a/docs/administration/back_office/content_tree.md
+++ b/docs/administration/back_office/content_tree.md
@@ -19,7 +19,7 @@ ibexa:
         # any SiteAccess or SiteAccess group
         admin_group:
             content_tree_module:
-                # defines how many children is be shown after expanding parent
+                # defines how many children are shown after expanding parent
                 load_more_limit: 15
                 # users won't be able to load more children than that
                 children_load_max_limit: 200
diff --git a/docs/administration/back_office/notifications.md b/docs/administration/back_office/notifications.md
index 0a360391de..fdf5f0cc0c 100644
--- a/docs/administration/back_office/notifications.md
+++ b/docs/administration/back_office/notifications.md
@@ -12,7 +12,7 @@ It appears to whoever is doing a specific operation in the back office.
 ![Example of an info notification](notification2.png "Example of the notification bar")
 
 [Custom notifications](#create-custom-notifications) are sent to a specific user.
-They appears in their profile in the back office.
+They appear in their profile in the back office.
 
 ![Notification in profile](notification3.png)
 
diff --git a/docs/administration/configuration/repository_configuration.md b/docs/administration/configuration/repository_configuration.md
index 0f6d9e16bc..351aed162e 100644
--- a/docs/administration/configuration/repository_configuration.md
+++ b/docs/administration/configuration/repository_configuration.md
@@ -224,7 +224,7 @@ The command takes the following optional parameters:
 - `status` or `t` - status of versions to remove: `draft`, `archived` or `all`
 - `keep` or `k` - number of versions to keep
 - `user` or `u` - the User that the command is performed as. The user must have the `content/remove`, `content/read` and `content/versionread` policies. By default the `administrator` user is applied.
-- `excluded-content-types` - exclude versions of one or multiple content types from the cleanup procedure and separate multiple content types identifiers with the comma.
+- `excluded-content-types` - exclude versions of one or multiple content types from the cleanup procedure. Separate multiple content types identifiers with the comma.
 
 `ibexa:content:cleanup-versions --status <status name> --keep <number of versions> --user <user name> --excluded-content-types article,blog_post`
 
diff --git a/docs/administration/content_organization/object_states.md b/docs/administration/content_organization/object_states.md
index 9851c6473c..96b304f45e 100644
--- a/docs/administration/content_organization/object_states.md
+++ b/docs/administration/content_organization/object_states.md
@@ -5,7 +5,7 @@ description: Object states are user-defined states that can be assigned to conte
 # Object states
 
 Object states are user-defined states that can be assigned to content items.
-they're contained in groups.
+They're contained in groups.
 
 ![Object State group](admin_panel_object_state_groups.png "Object state group")
 
diff --git a/docs/administration/project_organization/bundles.md b/docs/administration/project_organization/bundles.md
index dded0b5f27..81106c4067 100644
--- a/docs/administration/project_organization/bundles.md
+++ b/docs/administration/project_organization/bundles.md
@@ -16,7 +16,7 @@ For example, for [[= product_name_headless =]], see the [JSON file on GitHub](ht
 !!! caution "Deprecated legacy Commerce bundles"
 
     As of [[= product_name =]] v4.4 all `ibexa/commerce` packages are deprecated.
-    they're gradually replaced by their revamped counterparts and removed completely from the product in version v5.0.
+    They're gradually replaced by their revamped counterparts and removed completely from the product in version v5.0.
 
 ## Working with bundles
 
@@ -72,7 +72,7 @@ To remove a bundle (either one you created yourself, or an out-of-the-box one th
 |ibexa/oss|Core packages|
 |ibexa/content-tree|content tree functionality|
 |ibexa/connect|[[[= product_name_connect =]]](https://doc.ibexa.co/projects/connect/en/latest/)|
-|ibexa/calendar|**Calendar** tab with a calendar widget|
+|ibexa/calendar|Calendar tab with a calendar widget|
 |ibexa/connector-dam|Connector for DAM (Digital Asset Management) systems|
 |ibexa/elasticsearch|Integration with Elasticsearch search engine|
 |ibexa/fastly|Fastly support for `http-cache`, for use on Platform.sh or standalone|
diff --git a/docs/api/api.md b/docs/api/api.md
index 6b0aa274b7..813a5edae7 100644
--- a/docs/api/api.md
+++ b/docs/api/api.md
@@ -10,5 +10,5 @@ page_type: landing_page
 [[= cards([
     "api/rest_api/rest_api_usage/rest_api_usage",
     "api/php_api/php_api",
-    "api/graphql/graphql"
+    "api/graphql/graphql",
 ], columns=3) =]]
diff --git a/docs/api/rest_api/rest_api_authentication.md b/docs/api/rest_api/rest_api_authentication.md
index d0c26b7d8c..5a1afdb95a 100644
--- a/docs/api/rest_api/rest_api_authentication.md
+++ b/docs/api/rest_api/rest_api_authentication.md
@@ -28,7 +28,7 @@ For other security related subjects, see:
 This authentication method requires a session cookie to be sent with each request.
 
 If you use this authentication method with a web browser, this session cookie is automatically available as soon as your visitor logs in.
-Add it as a cookie to your REST requests, and the user can be authenticated.
+Add it as a cookie to your REST requests to authenticate the user.
 
 Sessions are created to re-authenticate the user only (and perform authorization), not to hold session state in the service.
 Because of that, you can use this method as supporting AJAX-based applications even if it violates the principles of RESTful services.
diff --git a/docs/cdp/cdp_activation/cdp_activation.md b/docs/cdp/cdp_activation/cdp_activation.md
index 16027a89d7..c15223bb64 100644
--- a/docs/cdp/cdp_activation/cdp_activation.md
+++ b/docs/cdp/cdp_activation/cdp_activation.md
@@ -13,5 +13,5 @@ Activation includes configuration, data export and adding Client-side Tracking.
 [[= cards([
     "cdp/cdp_activation/cdp_configuration",
     "cdp/cdp_activation/cdp_data_export",
-    "cdp/cdp_activation/cdp_add_clientside_tracking"
+    "cdp/cdp_activation/cdp_add_clientside_tracking",
 ], columns=3) =]]
\ No newline at end of file
diff --git a/docs/cdp/cdp_guide.md b/docs/cdp/cdp_guide.md
index 8527f4ce38..3eec2cb5b0 100644
--- a/docs/cdp/cdp_guide.md
+++ b/docs/cdp/cdp_guide.md
@@ -97,7 +97,7 @@ For more information, see [CDP add client-side tracking](https://doc.ibexa.co/en
 In the Audience Builder, you can create audiences - groups of users that meet the assumed conditions.
 You can choose specific conditions: `did`, `did not`, or `have`.
 The conditions `did` and `did not` allow you to use events like buy, visit or add to a cart from online tracking.
-The  `have` conditions are tied to personal characteristics and can be used to track the sum of all buys or top-visited categories.
+The `have` conditions are tied to personal characteristics and can be used to track the sum of all buys or top-visited categories.
 
 You can also connect created audiences to the activations.
 
diff --git a/docs/cdp/cdp_installation.md b/docs/cdp/cdp_installation.md
index e49e9b1aa2..25cf4d2573 100644
--- a/docs/cdp/cdp_installation.md
+++ b/docs/cdp/cdp_installation.md
@@ -23,7 +23,7 @@ To download it run:
 composer require ibexa/cdp
 ```
 
-Flex installs and activate the package.
+Flex installs and activates the package.
 After an installation process is finished, go to `config/packages/security.yaml` and uncomment `ibexa_cdp` rule.
 
 ```yaml
diff --git a/docs/commerce/checkout/customize_checkout.md b/docs/commerce/checkout/customize_checkout.md
index 5c5e679b15..8f998c6573 100644
--- a/docs/commerce/checkout/customize_checkout.md
+++ b/docs/commerce/checkout/customize_checkout.md
@@ -20,7 +20,7 @@ Depending on your needs, the checkout process can be either complex or straightf
 For example, if the website is selling airline tickets, you may need several [additional steps](#add-checkout-step) with passengers defining their special needs.
 On the other side of the spectrum would be a store that sells books with personal pickup, where [one page checkout](#create-a-one-page-checkout) would be enough.
 
-Several factors can make checkout particularly flexible and customizable:
+Several factors make checkout particularly flexible and customizable:
 
 - it's based on Symfony workflow
 - it exposes a variety of APIs
diff --git a/docs/commerce/storefront/extend_storefront.md b/docs/commerce/storefront/extend_storefront.md
index d82b43a8fd..8b4ca37b6c 100644
--- a/docs/commerce/storefront/extend_storefront.md
+++ b/docs/commerce/storefront/extend_storefront.md
@@ -11,7 +11,7 @@ With the `ibexa\storefront` package come the following built-in menus:
 
 | Item   | Value     | Description |
 |------------|----------|---------|
-| [Breadcrumbs](#breadcrumbs-menu)| - | Renders breadcrumbs for content tree Root, Taxonomy Entry, product, user settings, and user settings group |
+| [Breadcrumbs](#breadcrumbs-menu)| - | Renders breadcrumbs for content tree root, Taxonomy Entry, product, user settings, and user settings group |
 | [Taxonomy](#taxonomy-menu)| - | It can render a menu for product categories or tags |
 | Currency| `currency_menu` | Renders a menu to change the active currency |
 | Language| `language_menu` | Renders a menu to change the active language |
diff --git a/docs/content_management/content_management.md b/docs/content_management/content_management.md
index 1d4940e7ac..d83dda3271 100644
--- a/docs/content_management/content_management.md
+++ b/docs/content_management/content_management.md
@@ -14,5 +14,5 @@ page_type: landing_page
     "content_management/forms/forms",
     "content_management/taxonomy/taxonomy",
     "content_management/workflow/workflow",
-    "content_management/data_migration/data_migration"
+    "content_management/data_migration/data_migration",
 ], columns=4) =]]
diff --git a/docs/content_management/data_migration/data_migration.md b/docs/content_management/data_migration/data_migration.md
index edc0c62786..d3230cc111 100644
--- a/docs/content_management/data_migration/data_migration.md
+++ b/docs/content_management/data_migration/data_migration.md
@@ -22,5 +22,5 @@ You can run data migrations either with a command, or with the [PHP API](data_mi
     "content_management/data_migration/importing_data",
     "content_management/data_migration/exporting_data",
     "content_management/data_migration/data_migration_actions",
-    "content_management/data_migration/managing_migrations"
+    "content_management/data_migration/managing_migrations",
 ]) =]]
diff --git a/docs/content_management/data_migration/exporting_data.md b/docs/content_management/data_migration/exporting_data.md
index 3a9cf8bd18..7cb301514d 100644
--- a/docs/content_management/data_migration/exporting_data.md
+++ b/docs/content_management/data_migration/exporting_data.md
@@ -166,9 +166,9 @@ If you don't provide the `--type` option, the command asks you to select a type
 The mandatory `--mode` option defines the action that importing the file performs.
 The following modes are available:
 
-- `create` - creates new items
+- `create` - creates new items.
 - `update` - updates an existing item. Only covers specified fields and properties. If the item doesn't exist, causes an error.
-- `delete` - deletes an existing item. If the item doesn't exist, causes an error
+- `delete` - deletes an existing item. If the item doesn't exist, causes an error.
 
 If you don't provide the `--mode` option, the command asks you to select the mode.
 
diff --git a/docs/content_management/field_types/field_type_reference/datefield.md b/docs/content_management/field_types/field_type_reference/datefield.md
index 6fb985c6a6..8938fd704f 100644
--- a/docs/content_management/field_types/field_type_reference/datefield.md
+++ b/docs/content_management/field_types/field_type_reference/datefield.md
@@ -10,7 +10,7 @@ This field type represents a date without time information.
 
 ### Input expectations
 
-If input value is in `string` or `integer` format, it's' passed directly to [PHP's built-in `\DateTime` class constructor](https://www.php.net/manual/en/datetime.construct.php), therefore the same input format expectations apply.
+If input value is in `string` or `integer` format, it's passed directly to [PHP's built-in `\DateTime` class constructor](https://www.php.net/manual/en/datetime.construct.php), therefore the same input format expectations apply.
 
 It's also possible to directly pass an instance of `\DateTime`.
 
diff --git a/docs/content_management/field_types/field_type_reference/imagefield.md b/docs/content_management/field_types/field_type_reference/imagefield.md
index fa043f5bfe..b28392c6a2 100644
--- a/docs/content_management/field_types/field_type_reference/imagefield.md
+++ b/docs/content_management/field_types/field_type_reference/imagefield.md
@@ -30,7 +30,8 @@ The `value` property of an Image field returns an `Ibexa\Core\FieldType\Image\V
 
 !!! caution
 
-    Properties marked with an asterisk are currently unsupported. they're available but their value is always `null`.
+    Properties marked with an asterisk are currently unsupported.
+    They're available but their value is always `null`.
 
     Follow [EZP-27987](https://issues.ibexa.co/browse/EZP-27987) for future progress on this issue.
 
@@ -40,7 +41,8 @@ This field type doesn't support settings.
 
 ### Image variations
 
-Using the variation Service, variations of the original image can be obtained. they're `Ibexa\Contracts\Core\Variation\Values\ImageVariation` objects with the following properties:
+Using the variation Service, variations of the original image can be obtained.
+They're `Ibexa\Contracts\Core\Variation\Values\ImageVariation` objects with the following properties:
 
 | Property       | Type     | Example  | Description|
 |----------------|----------|----------|------------|
@@ -57,7 +59,8 @@ Using the variation Service, variations of the original image can be obtained. t
 
 !!! caution
 
-    Properties marked with an asterisk are currently unsupported. they're available but their value is always `null`.
+    Properties marked with an asterisk are currently unsupported.
+    They're available but their value is always `null`.
 
     Follow [EZP-27987](https://issues.ibexa.co/browse/EZP-27987) for future progress on this issue.
 
diff --git a/docs/content_management/field_types/field_type_reference/textlinefield.md b/docs/content_management/field_types/field_type_reference/textlinefield.md
index 01332239c9..4b2e252344 100644
--- a/docs/content_management/field_types/field_type_reference/textlinefield.md
+++ b/docs/content_management/field_types/field_type_reference/textlinefield.md
@@ -25,7 +25,7 @@ A TextLine's string representation is the `$text` property's value, as a string.
 
 ##### Constructor
 
-The constructor for this value object ]initializes a new value object with the value provided.
+The constructor for this value object initializes a new value object with the value provided.
 It accepts a string as argument and imports it to the `$text` attribute.
 
 ### Validation
diff --git a/docs/content_management/field_types/field_type_search.md b/docs/content_management/field_types/field_type_search.md
index b477762c4b..63c511aa2b 100644
--- a/docs/content_management/field_types/field_type_search.md
+++ b/docs/content_management/field_types/field_type_search.md
@@ -13,7 +13,9 @@ The `Ibexa\Contracts\Core\FieldType\Indexable` interface defines the methods bel
 
 ### `getIndexData(Field $field, FieldDefinition $fieldDefinition)`
 
-This method returns the actual index data for the provided `Ibexa\Contracts\Core\Persistence\Content\Field`. The index data consists of an array of `Ibexa\Contracts\Core\Search\Field` instances. they're described below in further detail.
+This method returns the actual index data for the provided `Ibexa\Contracts\Core\Persistence\Content\Field`.
+The index data consists of an array of `Ibexa\Contracts\Core\Search\Field` instances.
+They're described below in further detail.
 
 ### `getIndexDefinition()`
 
@@ -26,7 +28,8 @@ To be able to query data properly an indexable field type also is required to re
 ]
 ```
 
-This example from the `Url` field type shows that the field type always returns two indexable values, both strings. They have the names `url` and `text` respectively.
+This example from the `Url` field type shows that the field type always returns two indexable values, both strings.
+They have the names `url` and `text` respectively.
 
 ### `getDefaultMatchField()`
 
@@ -52,7 +55,7 @@ Ibexa\Core\FieldType\Keyword\SearchField:
         - {name: ibexa.field_type.indexable, alias: ezkeyword}
 ```
 
-`alias` should be the same as field type ID.
+The `alias` should be the same as field type ID.
 
 ## Search field values
 
diff --git a/docs/content_management/field_types/field_type_storage.md b/docs/content_management/field_types/field_type_storage.md
index e776b98e8d..663bfcb10e 100644
--- a/docs/content_management/field_types/field_type_storage.md
+++ b/docs/content_management/field_types/field_type_storage.md
@@ -168,7 +168,7 @@ services:
     App\FieldType\MyField\Storage\Gateway\DoctrineStorage: ~
 ```
 
-`ibexa.api.storage_engine.legacy.connection` is of type `Doctrine\DBAL\Connection`. If your gateway still uses an implementation of `eZ\Publish\Core\Persistence\Database\DatabaseHandler` (`eZ\Publish\Core\Persistence\Doctrine\ConnectionHandler`), instead of the `ibexa.api.storage_engine.legacy.connection`, you can pass the `ibexa.api.storage_engine.legacy.dbhandler` service.
+The `ibexa.api.storage_engine.legacy.connection` is of type `Doctrine\DBAL\Connection`. If your gateway still uses an implementation of `eZ\Publish\Core\Persistence\Database\DatabaseHandler` (`eZ\Publish\Core\Persistence\Doctrine\ConnectionHandler`), instead of the `ibexa.api.storage_engine.legacy.connection`, you can pass the `ibexa.api.storage_engine.legacy.dbhandler` service.
 
 
 Also there can be several gateways per field type (one per storage engine).
diff --git a/docs/content_management/field_types/form_and_template.md b/docs/content_management/field_types/form_and_template.md
index cefa299827..3adf4d98d2 100644
--- a/docs/content_management/field_types/form_and_template.md
+++ b/docs/content_management/field_types/form_and_template.md
@@ -174,7 +174,7 @@ ibexa:
             field_templates:
                 -
                     template: 'fields/custom_field_template.html.twig'
-                    # Priority is optional (default is 0). The higher it's, the higher your template gets in the list.
+                    # Priority is optional (default is 0). The higher it is, the higher your template gets in the list.
                     priority: 10
 ```
 
diff --git a/docs/content_management/locations.md b/docs/content_management/locations.md
index 4055180a2f..6b598b7bc2 100644
--- a/docs/content_management/locations.md
+++ b/docs/content_management/locations.md
@@ -96,7 +96,7 @@ When the location of a content item is hidden, the system doesn't display it on
 
     The [visibility switcher](https://doc.ibexa.co/en/latest/content_management/locations/#location-visibility) is a convenient feature for withdrawing content from the frontend.
     It acts as a filter in the frontend by default. You can choose to respect it or ignore it in your code.
-    it'sn't permission-based, and **doesn't restrict access to content**. Hidden content can be read through other means, like the REST API.
+    It isn't permission-based, and **doesn't restrict access to content**. Hidden content can be read through other means, like the REST API.
 
     If you need to restrict access to a given content item, you could create a role that grants read access for a given [**Section**](sections.md) or
     [**Object State**](object_states.md), and set a different section or object state for the given content.
@@ -122,7 +122,7 @@ In the following example, the **Content item 1** is Hidden by superior in the **
 From the visitor's perspective a location behaves the same whether its status is Hidden or Hidden by superior – it's unavailable on the front page.
 
 The difference is that a location Hidden by superior cannot be revealed separately from their parent(s).
-It only becomes visible once all of its parent Llcations are made visible again.
+It only becomes visible once all of its parent locations are made visible again.
 
 A Hidden by superior status doesn't override a Hidden status.
 This means that if a location is Hidden manually and later one of its ancestors is hidden as well, the first location's status doesn't change – it remains Hidden (not Hidden by superior).
diff --git a/docs/content_management/pages/pages.md b/docs/content_management/pages/pages.md
index d861a86c80..e82d0052c4 100644
--- a/docs/content_management/pages/pages.md
+++ b/docs/content_management/pages/pages.md
@@ -12,5 +12,5 @@ Pages are block-based special types of content that editors can create and modif
     "content_management/pages/page_blocks",
     "content_management/pages/page_block_attributes",
     "content_management/pages/page_block_validators",
-    "content_management/pages/create_custom_page_block"
+    "content_management/pages/create_custom_page_block",
 ], columns=3) =]]
diff --git a/docs/content_management/user_generated_content.md b/docs/content_management/user_generated_content.md
index 3c89a41754..4a12ecc3bf 100644
--- a/docs/content_management/user_generated_content.md
+++ b/docs/content_management/user_generated_content.md
@@ -5,7 +5,7 @@ description: You can enable users to create new content in the repository by usi
 # User-generated content
 
 [[= product_name =]] comes with content edition features via the Symfony stack.
-they're meant to allow the implementation of user-generated content from the front end, without entering the back office.
+They're meant to allow the implementation of user-generated content from the front end, without entering the back office.
 
 ## Creating a new draft
 
diff --git a/docs/customer_management/customer_portal_guide.md b/docs/customer_management/customer_portal_guide.md
index 77e7178248..b899158516 100644
--- a/docs/customer_management/customer_portal_guide.md
+++ b/docs/customer_management/customer_portal_guide.md
@@ -153,7 +153,8 @@ It allows you to make use of customer targeting of the segments and create perso
 
 The overall benefit of customer portals is the help they provide to retain customers and increase loyalty, while freeing up customer service employees time for higher-level work.
 They can achieve that by providing customers with up-to-date information about their orders and deliveries, personalize shopping experience, offer special deals available only to B2B partners, and do that in one, accessible space.
-Currently, Customer Portals are a standard in global sites such as Amazon. they're the level of quality that customers expect, and all businesses strive for.
+Currently, Customer Portals are a standard in global sites such as Amazon.
+They're the level of quality that customers expect, and all businesses strive for.
 
 ### Simplified shopping process
 
diff --git a/docs/fonts/Work_Sans/OFL.txt b/docs/fonts/Work_Sans/OFL.txt
index 7dc0f597ec..d3a046cf57 100644
--- a/docs/fonts/Work_Sans/OFL.txt
+++ b/docs/fonts/Work_Sans/OFL.txt
@@ -17,7 +17,7 @@ open framework in which fonts may be shared and improved in partnership
 with others.
 
 The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they're not sold by themselves. The
+redistributed freely as long as they are not sold by themselves. The
 fonts, including any derivative works, can be bundled, embedded, 
 redistributed and/or sold with any software provided that any reserved
 names are not used by derivative works. The fonts and derivatives,
diff --git a/docs/getting_started/first_steps.md b/docs/getting_started/first_steps.md
index 6b7e930408..433ba746d5 100644
--- a/docs/getting_started/first_steps.md
+++ b/docs/getting_started/first_steps.md
@@ -5,7 +5,7 @@ description: Start off working with Ibexa DXP by doing initial configuration and
 # First steps
 
 This page lists first steps you can take after installing [[= product_name =]].
-These steps are most common actions you may need to take in a new installation.
+These steps are the most common actions you may need to take in a new installation.
 
 !!! tip "Beginner tutorial"
 
@@ -90,7 +90,7 @@ For more information, see [Templates](templates.md) and [Twig documentation](htt
 
 ## Create content and test view templates
 
-1\. Go to the back office, activate content/content structure and create a new content item by clicking **Create content**.
+1\. Go to the back office, select **Content** -> **Content structure**, and create a new content item by clicking **Create content**.
 
 ![Creating a Blog Post](first-steps-create-content.png)
 
diff --git a/docs/getting_started/getting_started.md b/docs/getting_started/getting_started.md
index b7b018fd16..67e89c4cd3 100644
--- a/docs/getting_started/getting_started.md
+++ b/docs/getting_started/getting_started.md
@@ -10,5 +10,5 @@ To get started working with [[= product_name =]], see how you can get an install
 [[= cards([
     "getting_started/requirements",
     "getting_started/install_ibexa_dxp",
-    "getting_started/first_steps"
+    "getting_started/first_steps",
 ], columns=3) =]]
diff --git a/docs/getting_started/install_ibexa_dxp.md b/docs/getting_started/install_ibexa_dxp.md
index 9b8d0fc355..4edf449bd2 100644
--- a/docs/getting_started/install_ibexa_dxp.md
+++ b/docs/getting_started/install_ibexa_dxp.md
@@ -103,9 +103,9 @@ Use:
 
 !!! caution "Support agreement expiry"
 
-    If your Support agreement expires, your authentication token(s) doesn't longer work.
-    They become active again if the agreement is renewed, but this process may take up to 24 hours.
-    _(If the agreement is renewed before the expiry date, there is no disruption of service.)_
+    If your Support agreement expires, your authentication token(s) will no longer work.
+    They will become active again if the agreement is renewed, but this process may take up to 24 hours.
+    _(If the agreement is renewed before the expiry date, there will be no disruption of service.)_
 
 ### Create project
 
diff --git a/docs/getting_started/troubleshooting.md b/docs/getting_started/troubleshooting.md
index effafa9390..27c3446909 100644
--- a/docs/getting_started/troubleshooting.md
+++ b/docs/getting_started/troubleshooting.md
@@ -32,7 +32,7 @@ This more than doubles the length of the password, keeping entropy similar.
 If you have problems installing [[= product_name =]] on a system with limited RAM (for example 1GB or 2GB), enable swap.
 It allows your operating system to use the hard disk to supplement RAM when it runs out.
 
-With swap enables you're able to successfully run `php -d memory_limit=-1 bin/console ibexa:install --env prod ezplatform-clean`.
+With swap enabled you're able to successfully run `php -d memory_limit=-1 bin/console ibexa:install --env prod ezplatform-clean`.
 
 When a system runs out of RAM, you may see `Killed` when trying to clear the cache (for example, `php bin/console --env=prod cache:clear` from your project's root directory).
 
diff --git a/docs/ibexa_cloud/ibexa_cloud.md b/docs/ibexa_cloud/ibexa_cloud.md
index 21f24843a0..2978628d5b 100644
--- a/docs/ibexa_cloud/ibexa_cloud.md
+++ b/docs/ibexa_cloud/ibexa_cloud.md
@@ -11,5 +11,5 @@ month_change: false
 [[= cards([
     "ibexa_cloud/ibexa_cloud_guide",
     "ibexa_cloud/install_on_ibexa_cloud",
-    "ibexa_cloud/ddev_and_ibexa_cloud"
+    "ibexa_cloud/ddev_and_ibexa_cloud",
 ], columns=3) =]]
diff --git a/docs/ibexa_engage/ibexa_engage.md b/docs/ibexa_engage/ibexa_engage.md
index 89831e20f4..5fc2515d68 100644
--- a/docs/ibexa_engage/ibexa_engage.md
+++ b/docs/ibexa_engage/ibexa_engage.md
@@ -14,5 +14,5 @@ You can also integrate [[= product_name_engage =]] with [[= product_name_connect
 [[= cards([
     "ibexa_engage/install_ibexa_engage",
     "ibexa_engage/create_campaign",
-    "ibexa_engage/integrate_ibexa_connect"
+    "ibexa_engage/integrate_ibexa_connect",
 ], columns=3) =]]
diff --git a/docs/ibexa_engage/install_ibexa_engage.md b/docs/ibexa_engage/install_ibexa_engage.md
index d7143215d5..3fd434419e 100644
--- a/docs/ibexa_engage/install_ibexa_engage.md
+++ b/docs/ibexa_engage/install_ibexa_engage.md
@@ -3,7 +3,7 @@ description: Install and configure Ibexa Engage.
 edition: experience
 ---
 
-# [[= product_name_engage =]]
+# Ibexa Engage
 
 [[= product_name_engage =]] is a data collection tool. It enables you to engage your audiences by using the [Qualifio](https://qualifio.com/) tools.
 You can use interactive content to gather valuable data, for example, customer data or recent orders list, and create connections.
@@ -51,4 +51,5 @@ In `config/packages` directory add the following `ibexa_connector_qualifio.yaml`
 
     [[= product_name_base =]] configures the `channel` and `client_id` values so that the selections can be filled up automatically on [[= product_name =]] side.
 
-    The `feed_url` and `variable_map` values don't need to be set at the installation process. they're preconfigured and can be overwritten.
\ No newline at end of file
+    The `feed_url` and `variable_map` values don't need to be set at the installation process.
+    They're preconfigured and can be overwritten.
\ No newline at end of file
diff --git a/docs/ibexa_engage/integrate_ibexa_connect.md b/docs/ibexa_engage/integrate_ibexa_connect.md
index b0a8e9d49e..61514f461f 100644
--- a/docs/ibexa_engage/integrate_ibexa_connect.md
+++ b/docs/ibexa_engage/integrate_ibexa_connect.md
@@ -3,7 +3,7 @@ description: Integrate Ibexa Engage with Ibexa Connect.
 edition: experience
 ---
 
-# Use [[= product_name_connect =]]
+# Use Ibexa Connect
 
 You can create workflows using [[[= product_name_connect =]]](https://doc.ibexa.co/projects/connect/en/latest/general/ibexa_connect/).
 [[= product_name_engage =]] collects user data and passes it directly to [[= product_name_connect =]].
diff --git a/docs/infrastructure_and_maintenance/cache/cache.md b/docs/infrastructure_and_maintenance/cache/cache.md
index 939ad7c745..0ca8bf13cd 100644
--- a/docs/infrastructure_and_maintenance/cache/cache.md
+++ b/docs/infrastructure_and_maintenance/cache/cache.md
@@ -10,5 +10,5 @@ page_type: landing_page
 [[= cards([
     "infrastructure_and_maintenance/cache/http_cache/http_cache",
     "infrastructure_and_maintenance/cache/http_cache/reverse_proxy",
-    "infrastructure_and_maintenance/cache/persistence_cache"
+    "infrastructure_and_maintenance/cache/persistence_cache",
 ], columns=3) =]]
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md b/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md
index 308c328abf..bd7ee11a78 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/fastly.md
@@ -12,7 +12,7 @@ It means that you don't have to do any changes to the Fastly configuration to ma
 The information provided here is only applicable if you want to change the default Fastly configuration on [[= product_name_cloud =]], or if you're not using [[= product_name_cloud =]] and want to configure Fastly to work with [[= product_name =]] on premise.
 
 !!! note "The Fastly Web Interface isn't available for [[= product_name_cloud =]]"
-    It's recommend for [[= product_name_cloud =]] customers to use the Fastly CLI instead of using the Fastly API directly with `curl`, and more.
+    It's recommend for [[= product_name_cloud =]] customers to use the Fastly CLI instead of using the Fastly API directly with `curl`, or other alternatives.
 
 !!! note "Disable Varnish when you use Fastly"
     Varnish is automatically provisioned on [[= product_name_cloud =]]. Varnish needs to be disabled on all environments that use
diff --git a/docs/infrastructure_and_maintenance/infrastructure_and_maintenance.md b/docs/infrastructure_and_maintenance/infrastructure_and_maintenance.md
index 611be02702..e78c231344 100644
--- a/docs/infrastructure_and_maintenance/infrastructure_and_maintenance.md
+++ b/docs/infrastructure_and_maintenance/infrastructure_and_maintenance.md
@@ -11,5 +11,5 @@ page_type: landing_page
     "infrastructure_and_maintenance/performance",
     "infrastructure_and_maintenance/databases",
     "infrastructure_and_maintenance/environments",
-    "infrastructure_and_maintenance/support_and_maintenance_faq"
+    "infrastructure_and_maintenance/support_and_maintenance_faq",
 ], columns=3) =]]
diff --git a/docs/infrastructure_and_maintenance/request_lifecycle.md b/docs/infrastructure_and_maintenance/request_lifecycle.md
index 42d3ac435f..19f2d7d15e 100644
--- a/docs/infrastructure_and_maintenance/request_lifecycle.md
+++ b/docs/infrastructure_and_maintenance/request_lifecycle.md
@@ -98,7 +98,7 @@ The `DefaultRouter` is always added to the collection with top priority (priorit
 
 `DefaultRouter` (`router.default`):
 The `DefaultRouter` tries to match the `semanticPathinfo` against routes, close to [the way pure Symfony does](https://symfony.com/doc/current/routing.html), by extending and using `Symfony\Component\Routing\Router`.
-If a route matches, the controller associated with it's responsible for building a `View` or `Response` object.
+If a route matches, the controller associated with it is responsible for building a `View` or `Response` object.
 
 ### `UrlWildcardRouter`
 
diff --git a/docs/infrastructure_and_maintenance/security/reporting_issues.md b/docs/infrastructure_and_maintenance/security/reporting_issues.md
index 09adeeab46..b41279981e 100644
--- a/docs/infrastructure_and_maintenance/security/reporting_issues.md
+++ b/docs/infrastructure_and_maintenance/security/reporting_issues.md
@@ -12,17 +12,17 @@ No engineering team is perfect though, and if you do discover a security issue i
 
 ## Channels
 
-- If you're a customer or partner, please log in to your Service Portal at <https://support.ibexa.co/>, click "New Ticket", and report the issue as you would report a normal support request. [[= product_name_base =]] Product Support responds, takes care of the report, and keeps you informed of the developments.
-- If you're not a customer or partner, please log in to the [[= product_name_base =]] JIRA issue tracker: <https://issues.ibexa.co/>. Create an account if you don't have one, it's free. Click the "Create" button in the top menu to create your report. For "Project", select "[[= product_name_base =]] IBX", or "eZ Publish / Platform", or "eZ Platform Enterprise Edition", depending on which product is affected by the bug. **Important: Select "Security Level": "Security"!** The engineering team takes care of your report.
+- If you're a customer or partner, please log in to your Service Portal at <https://support.ibexa.co/>, click "New Ticket", and report the issue as you would report a normal support request. [[= product_name_base =]] Product Support will respond, take care of the report, and keep you informed of the developments.
+- If you're not a customer or partner, please log in to the [[= product_name_base =]] JIRA issue tracker: <https://issues.ibexa.co/>. Create an account if you don't have one, it's free. Click the "Create" button in the top menu to create your report. For "Project", select "[[= product_name_base =]] IBX", or "eZ Publish / Platform", or "eZ Platform Enterprise Edition", depending on which product is affected by the bug. **Important: Select "Security Level": "Security"!** The engineering team will take care of your report.
 - It's also possible to report security issues by email to <security@ibexa.co> - this requires no account.
 
 ## Verbosity
 
-Please be verbose when reporting issues. The issue is solved faster if you include:
+Please be verbose when reporting issues. The issue will be solved faster if you include:
 
 - A **title** describing the gist of the issue in one sentence
 - A **description** which includes the steps you take to produce the problem, what you expect the result to be, and what actually happens.
-- Make it clear **why you consider it a security issue**. If you know, also include what type of security issue it's (example: SQL injection, CSRF, Role/Policy failure), what the nature of it's (example: slowing/stopping a web site, leaking sensitive information, destroying data, privilege escalation) and how easy it's to exploit (example: Does it require editor login?).
+- Make it clear **why you consider it a security issue**. If you know, also include its type of security issue (example: SQL injection, CSRF, Role/Policy failure), its nature (example: slowing/stopping a web site, leaking sensitive information, destroying data, privilege escalation), and how easy it is to exploit (example: Does it require editor login?).
 
 ## Dialogue
 
diff --git a/docs/infrastructure_and_maintenance/security/security_checklist.md b/docs/infrastructure_and_maintenance/security/security_checklist.md
index c6d846ef89..cf7b7fcd73 100644
--- a/docs/infrastructure_and_maintenance/security/security_checklist.md
+++ b/docs/infrastructure_and_maintenance/security/security_checklist.md
@@ -172,7 +172,7 @@ Use the following checklist to ensure the roles and policies are secure:
 The [visibility switcher](https://doc.ibexa.co/en/latest/content_management/locations/#location-visibility) is a convenient feature for withdrawing content from the frontend.
 It acts as a filter in the frontend by default.
 You can choose to respect it or ignore it in your code.
-It'sn't permission-based, and doesn't restrict read access to content.
+It isn't permission-based, and doesn't restrict read access to content.
 Hidden content can be read through other means, like the REST API or GraphQL.
 
 If you need to restrict read access to a given content item, you could create a role that grants read access for a given [**Section**](https://doc.ibexa.co/en/latest/administration/content_organization/sections/) or [**Object State**](https://doc.ibexa.co/en/latest/administration/content_organization/object_states/), and set a different section or object State for the given content.
diff --git a/docs/multisite/multisite.md b/docs/multisite/multisite.md
index c39960bead..e9e49103fb 100644
--- a/docs/multisite/multisite.md
+++ b/docs/multisite/multisite.md
@@ -18,5 +18,5 @@ To quickly set up new sites with predefined site templates, use [Site Factory](s
     "multisite/set_up_translation_siteaccess",
     "multisite/multisite_configuration",
     "multisite/site_factory/site_factory",
-    "multisite/site_factory/site_factory_configuration"
+    "multisite/site_factory/site_factory_configuration",
 ], columns=3) =]]
diff --git a/docs/multisite/site_factory/site_factory_configuration.md b/docs/multisite/site_factory/site_factory_configuration.md
index 0000cb3733..63dc004337 100644
--- a/docs/multisite/site_factory/site_factory_configuration.md
+++ b/docs/multisite/site_factory/site_factory_configuration.md
@@ -32,7 +32,7 @@ ibexa_site_factory:
 ```
 
 Now, you can see the path to the new site's parent location under design selection.
-If you have sufficient permissions, you can change the defined Llcation during site creation.
+If you have sufficient permissions, you can change the defined location during site creation.
 If the parent location isn't defined, you have to choose it from Universal Discovery Widget.
 
 ## Site skeletons
diff --git a/docs/multisite/siteaccess/siteaccess.md b/docs/multisite/siteaccess/siteaccess.md
index 5e634770e6..a4e8d747e5 100644
--- a/docs/multisite/siteaccess/siteaccess.md
+++ b/docs/multisite/siteaccess/siteaccess.md
@@ -27,5 +27,5 @@ Many other settings in the application are also configured per SiteAccess (also
 [[= cards([
     "multisite/siteaccess/siteaccess_matching",
     "multisite/siteaccess/siteaccess_aware_configuration",
-    "multisite/siteaccess/injecting_siteaccess"
+    "multisite/siteaccess/injecting_siteaccess",
 ], columns=3) =]]
diff --git a/docs/permissions/permission_use_cases.md b/docs/permissions/permission_use_cases.md
index d7de1f48f8..cd043357de 100644
--- a/docs/permissions/permission_use_cases.md
+++ b/docs/permissions/permission_use_cases.md
@@ -246,7 +246,7 @@ See below for a detailed listing of permissions that apply to Commerce, together
 !!! note "Owner limitation"
 
     For anonymous users, orders, shipments, and/or payments are saved with a 'null' user reference.
-    Therefore, when you apply the `Owner/self` imitation to any of the permissions below, anonymous users aren't allowed to interact with any of these entities.
+    Therefore, when you apply the `Owner/self` limitation to any of the permissions below, anonymous users aren't allowed to interact with any of these entities.
 
 ### Cart
 
diff --git a/docs/permissions/permissions.md b/docs/permissions/permissions.md
index 2a9fb2ffb1..9adc744eac 100644
--- a/docs/permissions/permissions.md
+++ b/docs/permissions/permissions.md
@@ -11,6 +11,6 @@ The permission system of [[= product_name =]] enables you to control in detail w
     "permissions/permission_overview",
     "permissions/policies",
     "permissions/permission_use_cases",
-    "permissions/limitations"
+    "permissions/limitations",
 ], columns=4) =]]
 
diff --git a/docs/personalization/api_reference/api_reference.md b/docs/personalization/api_reference/api_reference.md
index 26d349b7f7..7910d07941 100644
--- a/docs/personalization/api_reference/api_reference.md
+++ b/docs/personalization/api_reference/api_reference.md
@@ -11,5 +11,5 @@ This section provides documentation for the Personalization API operations.
     "personalization/api_reference/tracking_api",
     "personalization/api_reference/content_api",
     "personalization/api_reference/recommendation_api",
-    "personalization/api_reference/user_api"
+    "personalization/api_reference/user_api",
 ], columns=4) =]]
diff --git a/docs/personalization/personalization.md b/docs/personalization/personalization.md
index 809d8ca769..68ba2eafda 100644
--- a/docs/personalization/personalization.md
+++ b/docs/personalization/personalization.md
@@ -21,7 +21,7 @@ To provide online recommendations, the service must at least:
     "personalization/how_it_works",
     "personalization/enable_personalization",
     "personalization/integrate_recommendation_service",
-    "personalization/api_reference/api_reference"
+    "personalization/api_reference/api_reference",
 ], columns=3) =]]
 
 
diff --git a/docs/pim/pim.md b/docs/pim/pim.md
index 348a34d22d..2fd55d49f9 100644
--- a/docs/pim/pim.md
+++ b/docs/pim/pim.md
@@ -13,5 +13,5 @@ including their specifications and pricing.
     "pim/products",
     "pim/catalogs",
     "pim/pim_configuration",
-    "pim/prices"
+    "pim/prices",
 ], columns=3) =]]
diff --git a/docs/pim/product_api.md b/docs/pim/product_api.md
index b2a4ac0215..9c1ea854fa 100644
--- a/docs/pim/product_api.md
+++ b/docs/pim/product_api.md
@@ -58,7 +58,7 @@ You can access the variants of a product by using `ProductServiceInterface::find
 The method takes the product object and a `ProductVariantQuery` object as parameters.
 
 A `ProductVariantQuery` lets you define the offset and limit of the variant query.
-The default offset is 0, and limit's 25.
+The default offset is 0, and limit is 25.
 
 ``` php
 [[= include_file('code_samples/api/product_catalog/src/Command/ProductVariantCommand.php', 57, 60) =]]
diff --git a/docs/release_notes/ez_platform_v2.1.0.md b/docs/release_notes/ez_platform_v2.1.0.md
index 63b35ba687..c16a3a0c36 100644
--- a/docs/release_notes/ez_platform_v2.1.0.md
+++ b/docs/release_notes/ez_platform_v2.1.0.md
@@ -50,7 +50,7 @@ You can now change your password, or request a new one if you forgot it.
 
 !!! caution
 
-    The reaction time when requesting a reset of the password is vary depending on whether an account with the provided email exists in the database or not.
+    The reaction time when requesting a reset of the password varies depending on whether an account with the provided email exists in the database or not.
     This could be misused to confirm existing email addresses.
     To avoid this, set Swift Mailer to `spool` mode.
 
diff --git a/docs/release_notes/ez_platform_v2.4.md b/docs/release_notes/ez_platform_v2.4.md
index 9d05a8a449..09ce00c4f7 100644
--- a/docs/release_notes/ez_platform_v2.4.md
+++ b/docs/release_notes/ez_platform_v2.4.md
@@ -150,9 +150,9 @@ This release introduces a few simplifications to API use for content types:
 - Adds possibility to load several content types in bulk using `ContentTypeService->loadContentTypeList()`.
 - `UserService` now exposes `isUser()` and `isUserGroup()`. They don't need to do a lookup to the database to tell if a content item is of type user or user group.
 
-#### Load multiple Locations
+#### Load multiple locations
 
-you're now able to load multiple Locations at once, using `LocationService->loadLocationList()`. The biggest benefit of this feature is saving load time on complex landing pages when HTTP cache is cold or disabled, including when in development mode.
+You're now able to load multiple locations at once, using `LocationService->loadLocationList()`. The biggest benefit of this feature is saving load time on complex landing pages when HTTP cache is cold or disabled, including when in development mode.
 
 ### BC breaks and important behavior changes
 
diff --git a/docs/release_notes/ibexa_dxp_v4.6.md b/docs/release_notes/ibexa_dxp_v4.6.md
index b8ccb3eeb2..1a5818b7fd 100644
--- a/docs/release_notes/ibexa_dxp_v4.6.md
+++ b/docs/release_notes/ibexa_dxp_v4.6.md
@@ -144,7 +144,7 @@ on the dashboard within Recent activity block, or on the user profile.
 
 For more information, see feature's [User Documentation](https://doc.ibexa.co/projects/userguide/en/master/recent_activity/recent_activity/), and [Developer Documentation](https://doc.ibexa.co/en/master/administration/recent_activity/recent_activity/).
 
-#### back office search
+#### Back office search
 
 ##### Search bar, suggestions, autocompletion, and spellcheck
 
diff --git a/docs/release_notes/release_notes.md b/docs/release_notes/release_notes.md
index b056225bce..272bcef664 100644
--- a/docs/release_notes/release_notes.md
+++ b/docs/release_notes/release_notes.md
@@ -12,5 +12,5 @@ The latest stable and LTS (Long Term Support) version of [[= product_name =]] is
     "release_notes/ibexa_dxp_v4.6",
     "release_notes/ibexa_dxp_v4.5",
     "release_notes/ibexa_dxp_v3.3",
-    "release_notes/ez_platform_v2.5"
+    "release_notes/ez_platform_v2.5",
 ], columns=4) =]]
diff --git a/docs/resources/phpstorm_plugin.md b/docs/resources/phpstorm_plugin.md
index 8d570c3542..820971cdbe 100644
--- a/docs/resources/phpstorm_plugin.md
+++ b/docs/resources/phpstorm_plugin.md
@@ -60,7 +60,7 @@ To do it, select **File** > **New Project...** > **[[= product_name =]]**.
 In project settings form you can choose:
 
 - Location of the project
-- Product edition: [[= product_name_oss =]], [[= product_name_content =]], [[= product_name_exp =]], [[= product_name_com =]]
+- Product edition: [[= product_name_oss =]], [[= product_name_headless =]], [[= product_name_exp =]], [[= product_name_com =]]
 - Authentication token (for Content, Experience and Commerce editions)
 - Product version: Default (latest LTS version), Latest (fast track or LTS), Latest LTS and "Next 3.x" (unstable, based on the 3.x branch) and "Next 4.x" (unstable, based on the 4.x branch)
 - Generate [Ibexa Cloud configuration](install_on_ibexa_cloud.md)
diff --git a/docs/resources/release_process_and_roadmap.md b/docs/resources/release_process_and_roadmap.md
index 57fd189ae8..e07c9b864b 100644
--- a/docs/resources/release_process_and_roadmap.md
+++ b/docs/resources/release_process_and_roadmap.md
@@ -17,10 +17,10 @@ Additionally, [[= product_name =]] also has an open-source version called [[= pr
 The [[= product_name_oss =]] code is available on GitHub under the GPLv2 license.
 It comes with no commercial support and maintenance services.
 
-[[= product_name_base =]] manage the release of [[= product_name =]] using an agile iterative process and a continuous software development model, which is why we provide two kinds of [[= product_name =]] releases:
+[[= product_name_base =]] manages the release of [[= product_name =]] using an agile iterative process and a continuous software development model, which is why we provide two kinds of [[= product_name =]] releases:
 
 - Long Term Support releases (LTS) which are supported by [[= product_name_base =]] for a long period of time.
-- Fast Track releases (FT) give access to the latest features and are supported for a short period of time. they're maintained only until the next FT release is introduced.
+- Fast Track releases (FT) give access to the latest features and are supported for a short period of time. They're maintained only until the next FT release is introduced.
 
 FT releases are tailored for those who want to stay up-to-date with newest functionalities, while LTS releases are suitable for highly stable enterprise rollouts.
 
@@ -40,7 +40,7 @@ Distribution files of [[= product_name_base =]] three editions are as follows:
 - for [[= product_name_exp =]]: ibexa-experience-vX.Y.Z.tgz
 - for [[= product_name_com =]]: ibexa-commerce-vX.Y.Z.tgz
 
-[[= product_name_base =]] supports and maintenances services specific to each release are only available from a given start date until an end date.
+[[= product_name_base =]]'s support and maintenance services specific to each release are only available from a given start date until an end date.
 The time in between the start and end dates is what [[= product_name_base =]] calls the product's **Service Life**.
 
 You can find the specific dates of service life for each release on [[= product_name_base =]] [support portal service life page](https://support.ibexa.co/Public/Service-Life).
diff --git a/docs/resources/resources.md b/docs/resources/resources.md
index b00b71f9e1..c93d0b86de 100644
--- a/docs/resources/resources.md
+++ b/docs/resources/resources.md
@@ -10,5 +10,5 @@ See additional information about [[= product_name =]] development process, helpf
 [[= cards([
     "resources/release_process_and_roadmap",
     "resources/phpstorm_plugin",
-    "resources/contributing/report_and_follow_issues"
+    "resources/contributing/report_and_follow_issues",
 ], columns=3) =]]
diff --git a/docs/search/aggregation_reference/basepricestats_aggregation.md b/docs/search/aggregation_reference/basepricestats_aggregation.md
index f504602d16..881da2dbdf 100644
--- a/docs/search/aggregation_reference/basepricestats_aggregation.md
+++ b/docs/search/aggregation_reference/basepricestats_aggregation.md
@@ -4,7 +4,8 @@ description: BasePriceStatsAggregation
 
 # BasePriceStatsAggregation
 
-The BasePriceStatsAggregation aggregates search results by the value of the product's pricecand provides statistical information for the values. You can use the provided getters to access the values:
+The BasePriceStatsAggregation aggregates search results by the value of the product's price cand provides statistical information for the values.
+You can use the provided getters to access the values:
 
 - sum (`getSum()`)
 - count of values (`getCount()`)
diff --git a/docs/search/criteria_reference/ancestor_criterion.md b/docs/search/criteria_reference/ancestor_criterion.md
index be9a335097..ac1b1cd076 100644
--- a/docs/search/criteria_reference/ancestor_criterion.md
+++ b/docs/search/criteria_reference/ancestor_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: Ancestor Search Criterion
-edition: commerce
 ---
 
 # Ancestor Criterion
diff --git a/docs/search/criteria_reference/attributegroupidentifier_criterion.md b/docs/search/criteria_reference/attributegroupidentifier_criterion.md
index fe0ba0cce8..8de29c8b72 100644
--- a/docs/search/criteria_reference/attributegroupidentifier_criterion.md
+++ b/docs/search/criteria_reference/attributegroupidentifier_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: AttributeGroupIdentifier Search Criterion
-edition: commerce
 ---
 
 # AttributeGroupIdentifier Criterion
diff --git a/docs/search/criteria_reference/attributename_criterion.md b/docs/search/criteria_reference/attributename_criterion.md
index 04bbe25542..f7444fcdcc 100644
--- a/docs/search/criteria_reference/attributename_criterion.md
+++ b/docs/search/criteria_reference/attributename_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: AttributeName Search Criterion
-edition: commerce
 ---
 
 # AttributeName Criterion
diff --git a/docs/search/criteria_reference/baseprice_criterion.md b/docs/search/criteria_reference/baseprice_criterion.md
index 0847e7709e..4f6cebe61f 100644
--- a/docs/search/criteria_reference/baseprice_criterion.md
+++ b/docs/search/criteria_reference/baseprice_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: BasePrice Search Criterion
-edition: commerce
 ---
 
 # BasePrice Criterion
diff --git a/docs/search/criteria_reference/catalogidentifier_criterion.md b/docs/search/criteria_reference/catalogidentifier_criterion.md
index 6ee43f54ea..aec176e92d 100644
--- a/docs/search/criteria_reference/catalogidentifier_criterion.md
+++ b/docs/search/criteria_reference/catalogidentifier_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: CatalogIdentifier Search Criterion
-edition: commerce
 ---
 
 # CatalogIdentifier Criterion
diff --git a/docs/search/criteria_reference/catalogname_criterion.md b/docs/search/criteria_reference/catalogname_criterion.md
index 6aca6d91e7..99fc8bafde 100644
--- a/docs/search/criteria_reference/catalogname_criterion.md
+++ b/docs/search/criteria_reference/catalogname_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: CatalogName Search Criterion
-edition: commerce
 ---
 
 # CatalogName Criterion
diff --git a/docs/search/criteria_reference/catalogstatus_criterion.md b/docs/search/criteria_reference/catalogstatus_criterion.md
index ec537f6771..da62c67a8c 100644
--- a/docs/search/criteria_reference/catalogstatus_criterion.md
+++ b/docs/search/criteria_reference/catalogstatus_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: CatalogStatus Search Criterion
-edition: commerce
 ---
 
 # CatalogStatus Criterion
diff --git a/docs/search/criteria_reference/checkboxattribute_criterion.md b/docs/search/criteria_reference/checkboxattribute_criterion.md
index 133519a8ef..eb72b6a723 100644
--- a/docs/search/criteria_reference/checkboxattribute_criterion.md
+++ b/docs/search/criteria_reference/checkboxattribute_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: CheckboxAttribute Search Criterion
-edition: commerce
 ---
 
 # CheckboxAttribute Criterion
diff --git a/docs/search/criteria_reference/colorattribute_criterion.md b/docs/search/criteria_reference/colorattribute_criterion.md
index 7eadc1553c..e196933a1f 100644
--- a/docs/search/criteria_reference/colorattribute_criterion.md
+++ b/docs/search/criteria_reference/colorattribute_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: ColorAttribute Search Criterion
-edition: commerce
 ---
 
 # ColorAttribute Criterion
diff --git a/docs/search/criteria_reference/contentid_criterion.md b/docs/search/criteria_reference/contentid_criterion.md
index fed235dc87..eebe50d90b 100644
--- a/docs/search/criteria_reference/contentid_criterion.md
+++ b/docs/search/criteria_reference/contentid_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: ContentId Search Criterion
-edition: commerce
 ---
 
 # ContentId Criterion
diff --git a/docs/search/criteria_reference/contentname_criterion.md b/docs/search/criteria_reference/contentname_criterion.md
index 9f1bd13b1c..3bb4017422 100644
--- a/docs/search/criteria_reference/contentname_criterion.md
+++ b/docs/search/criteria_reference/contentname_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: ContentName Search Criterion
-edition: commerce
 ---
 
 # ContentName Criterion
diff --git a/docs/search/criteria_reference/contenttypegroupid_criterion.md b/docs/search/criteria_reference/contenttypegroupid_criterion.md
index 66c947e159..6f1370b6c1 100644
--- a/docs/search/criteria_reference/contenttypegroupid_criterion.md
+++ b/docs/search/criteria_reference/contenttypegroupid_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: ContentTypeGroupId Search Criterion
-edition: commerce
 ---
 
 # ContentTypeGroupId Criterion
diff --git a/docs/search/criteria_reference/contenttypeid_criterion.md b/docs/search/criteria_reference/contenttypeid_criterion.md
index 8eaae892fc..5c30b8dc9f 100644
--- a/docs/search/criteria_reference/contenttypeid_criterion.md
+++ b/docs/search/criteria_reference/contenttypeid_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: ContentTypeId Search Criterion
-edition: commerce
 ---
 
 # ContentTypeId Criterion
diff --git a/docs/search/criteria_reference/contenttypeidentifier_criterion.md b/docs/search/criteria_reference/contenttypeidentifier_criterion.md
index 7180489217..8cfa240ce8 100644
--- a/docs/search/criteria_reference/contenttypeidentifier_criterion.md
+++ b/docs/search/criteria_reference/contenttypeidentifier_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: ContentTypeIdentifier Search Criterion
-edition: commerce
 ---
 
 # ContentTypeIdentifier Criterion
diff --git a/docs/search/criteria_reference/createdat_criterion.md b/docs/search/criteria_reference/createdat_criterion.md
index b7d70da318..06ae3046b0 100644
--- a/docs/search/criteria_reference/createdat_criterion.md
+++ b/docs/search/criteria_reference/createdat_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: CreatedAt Search Criterion
-edition: commerce
 ---
 
 # CreatedAt Criterion
diff --git a/docs/search/criteria_reference/createdatrange_criterion.md b/docs/search/criteria_reference/createdatrange_criterion.md
index 1d4c5ea8d9..fe6de80520 100644
--- a/docs/search/criteria_reference/createdatrange_criterion.md
+++ b/docs/search/criteria_reference/createdatrange_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: CreatedAtRange Search Criterion
-edition: commerce
 ---
 
 # CreatedAtRange Criterion
diff --git a/docs/search/criteria_reference/currencycode_criterion.md b/docs/search/criteria_reference/currencycode_criterion.md
index 4e2903e8bd..c98073e693 100644
--- a/docs/search/criteria_reference/currencycode_criterion.md
+++ b/docs/search/criteria_reference/currencycode_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: CurrencyCode Search Criterion
-edition: commerce
 ---
 
 # CurrencyCode Criterion
diff --git a/docs/search/criteria_reference/customergroupid_criterion.md b/docs/search/criteria_reference/customergroupid_criterion.md
index c92dbb1279..4a27b612c6 100644
--- a/docs/search/criteria_reference/customergroupid_criterion.md
+++ b/docs/search/criteria_reference/customergroupid_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: CustomerGroupId Search Criterion
-edition: commerce
 ---
 
 # CustomerGroupId Criterion
diff --git a/docs/search/criteria_reference/customprice_criterion.md b/docs/search/criteria_reference/customprice_criterion.md
index 49982a4d1c..b4752cf374 100644
--- a/docs/search/criteria_reference/customprice_criterion.md
+++ b/docs/search/criteria_reference/customprice_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: CustomPrice Search Criterion
-edition: commerce
 ---
 
 # CustomPrice Criterion
diff --git a/docs/search/criteria_reference/datemetadata_criterion.md b/docs/search/criteria_reference/datemetadata_criterion.md
index 8ca934bcae..4357170d38 100644
--- a/docs/search/criteria_reference/datemetadata_criterion.md
+++ b/docs/search/criteria_reference/datemetadata_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: DateMetadata Search Criterion
-edition: commerce
 ---
 
 # DateMetadata Criterion
diff --git a/docs/search/criteria_reference/depth_criterion.md b/docs/search/criteria_reference/depth_criterion.md
index 9ef14253ae..9ea8dc6166 100644
--- a/docs/search/criteria_reference/depth_criterion.md
+++ b/docs/search/criteria_reference/depth_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: Depth Search Criterion
-edition: commerce
 ---
 
 # Depth Criterion
diff --git a/docs/search/criteria_reference/field_criterion.md b/docs/search/criteria_reference/field_criterion.md
index aa6723f55f..fae6a710c2 100644
--- a/docs/search/criteria_reference/field_criterion.md
+++ b/docs/search/criteria_reference/field_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: Field Search Criterion
-edition: commerce
 ---
 
 # Field Criterion
diff --git a/docs/search/criteria_reference/fieldrelation_criterion.md b/docs/search/criteria_reference/fieldrelation_criterion.md
index 3547991c95..3a5f194c0b 100644
--- a/docs/search/criteria_reference/fieldrelation_criterion.md
+++ b/docs/search/criteria_reference/fieldrelation_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: FieldRelation Search Criterion
-edition: commerce
 ---
 
 # FieldRelation Criterion
diff --git a/docs/search/criteria_reference/floatattribute_criterion.md b/docs/search/criteria_reference/floatattribute_criterion.md
index b67125b46a..37883cc172 100644
--- a/docs/search/criteria_reference/floatattribute_criterion.md
+++ b/docs/search/criteria_reference/floatattribute_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: FloatAttribute Search Criterion
-edition: commerce
 ---
 
 # FloatAttribute Criterion
diff --git a/docs/search/criteria_reference/floatattributerange_criterion.md b/docs/search/criteria_reference/floatattributerange_criterion.md
index 2f8254664f..150531c4d4 100644
--- a/docs/search/criteria_reference/floatattributerange_criterion.md
+++ b/docs/search/criteria_reference/floatattributerange_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: FloatAttributeRange Search Criterion
-edition: commerce
 ---
 
 # FloatAttributeRange Criterion
diff --git a/docs/search/criteria_reference/fulltext_criterion.md b/docs/search/criteria_reference/fulltext_criterion.md
index 80658cec35..bcd96af0d8 100644
--- a/docs/search/criteria_reference/fulltext_criterion.md
+++ b/docs/search/criteria_reference/fulltext_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: FullText Search Criterion
-edition: commerce
 ---
 
 
diff --git a/docs/search/criteria_reference/integerattribute_criterion.md b/docs/search/criteria_reference/integerattribute_criterion.md
index 7ed4ebec1a..bb71bed820 100644
--- a/docs/search/criteria_reference/integerattribute_criterion.md
+++ b/docs/search/criteria_reference/integerattribute_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: IntegerAttribute Search Criterion
-edition: commerce
 ---
 
 # IntegerAttribute Criterion
diff --git a/docs/search/criteria_reference/integerattributerange_criterion.md b/docs/search/criteria_reference/integerattributerange_criterion.md
index 5a33f0005a..62cf613144 100644
--- a/docs/search/criteria_reference/integerattributerange_criterion.md
+++ b/docs/search/criteria_reference/integerattributerange_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: IntegerAttributeRange Search Criterion
-edition: commerce
 ---
 
 # IntegerAttributeRange Criterion
diff --git a/docs/search/criteria_reference/iscurrencyenabled_criterion.md b/docs/search/criteria_reference/iscurrencyenabled_criterion.md
index 7bc0a7b810..1985d5f8e2 100644
--- a/docs/search/criteria_reference/iscurrencyenabled_criterion.md
+++ b/docs/search/criteria_reference/iscurrencyenabled_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: IsCurrencyEnabledCriterion Search Criterion
-edition: commerce
 ---
 
 # IsCurrencyEnabledCriterion Criterion
diff --git a/docs/search/criteria_reference/isfieldempty_criterion.md b/docs/search/criteria_reference/isfieldempty_criterion.md
index ff6a4632ca..46faf09c83 100644
--- a/docs/search/criteria_reference/isfieldempty_criterion.md
+++ b/docs/search/criteria_reference/isfieldempty_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: IsFieldEmpty Search Criterion
-edition: commerce
 ---
 
 # IsFieldEmpty Criterion
diff --git a/docs/search/criteria_reference/ismainlocation_criterion.md b/docs/search/criteria_reference/ismainlocation_criterion.md
index 48e4190f58..7314cf7381 100644
--- a/docs/search/criteria_reference/ismainlocation_criterion.md
+++ b/docs/search/criteria_reference/ismainlocation_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: IsMainLocation Search Criterion
-edition: commerce
 ---
 
 # IsMainLocation Criterion
diff --git a/docs/search/criteria_reference/isproductbased_criterion.md b/docs/search/criteria_reference/isproductbased_criterion.md
index d9e70ab748..077682c18f 100644
--- a/docs/search/criteria_reference/isproductbased_criterion.md
+++ b/docs/search/criteria_reference/isproductbased_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: IsProductBased Search Criterion
-edition: commerce
 ---
 
 # IsProductBased Criterion
diff --git a/docs/search/criteria_reference/isuserbased_criterion.md b/docs/search/criteria_reference/isuserbased_criterion.md
index ef7a2c79e8..50c7d7b409 100644
--- a/docs/search/criteria_reference/isuserbased_criterion.md
+++ b/docs/search/criteria_reference/isuserbased_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: IsUserBased Search Criterion
-edition: commerce
 ---
 
 # IsUserBased Criterion
diff --git a/docs/search/criteria_reference/isuserenabled_criterion.md b/docs/search/criteria_reference/isuserenabled_criterion.md
index 8d2a05aa6d..c7a37f7847 100644
--- a/docs/search/criteria_reference/isuserenabled_criterion.md
+++ b/docs/search/criteria_reference/isuserenabled_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: IsUserEnabled Search Criterion
-edition: commerce
 ---
 
 # IsUserEnabled Criterion
diff --git a/docs/search/criteria_reference/isvirtual_criterion.md b/docs/search/criteria_reference/isvirtual_criterion.md
index df4942de28..26be439adb 100644
--- a/docs/search/criteria_reference/isvirtual_criterion.md
+++ b/docs/search/criteria_reference/isvirtual_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: IsVirtual Search Criterion
-edition: commerce
 ---
 
 # IsVirtual Criterion
diff --git a/docs/search/criteria_reference/languagecode_criterion.md b/docs/search/criteria_reference/languagecode_criterion.md
index f153919cce..5d34f8e506 100644
--- a/docs/search/criteria_reference/languagecode_criterion.md
+++ b/docs/search/criteria_reference/languagecode_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: LanguageCode Search Criterion
-edition: commerce
 ---
 
 # LanguageCode Criterion
diff --git a/docs/search/criteria_reference/locationid_criterion.md b/docs/search/criteria_reference/locationid_criterion.md
index 114b737d9d..f4a9612d5f 100644
--- a/docs/search/criteria_reference/locationid_criterion.md
+++ b/docs/search/criteria_reference/locationid_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: LocationId Search Criterion
-edition: commerce
 ---
 
 # LocationId Criterion
diff --git a/docs/search/criteria_reference/locationremoteid_criterion.md b/docs/search/criteria_reference/locationremoteid_criterion.md
index 0061c61a59..b3ed6697d4 100644
--- a/docs/search/criteria_reference/locationremoteid_criterion.md
+++ b/docs/search/criteria_reference/locationremoteid_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: LocationRemoteId Search Criterion
-edition: commerce
 ---
 
 # LocationRemoteId Criterion
diff --git a/docs/search/criteria_reference/logicaland_criterion.md b/docs/search/criteria_reference/logicaland_criterion.md
index dc22fe7da7..30eeef64c1 100644
--- a/docs/search/criteria_reference/logicaland_criterion.md
+++ b/docs/search/criteria_reference/logicaland_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: LogicalAnd Search Criterion
-edition: commerce
 ---
 
 # LogicalAnd Criterion
diff --git a/docs/search/criteria_reference/logicalnot_criterion.md b/docs/search/criteria_reference/logicalnot_criterion.md
index 7c349d050f..0818f2b392 100644
--- a/docs/search/criteria_reference/logicalnot_criterion.md
+++ b/docs/search/criteria_reference/logicalnot_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: LogicalNot Search Criterion
-edition: commerce
 ---
 
 # LogicalNot Criterion
diff --git a/docs/search/criteria_reference/logicalor_criterion.md b/docs/search/criteria_reference/logicalor_criterion.md
index c834afd06f..5e528f7db9 100644
--- a/docs/search/criteria_reference/logicalor_criterion.md
+++ b/docs/search/criteria_reference/logicalor_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: LogicalOr Search Criterion
-edition: commerce
 ---
 
 # LogicalOr Criterion
diff --git a/docs/search/criteria_reference/maplocationdistance_criterion.md b/docs/search/criteria_reference/maplocationdistance_criterion.md
index 080502107c..20d60bafcc 100644
--- a/docs/search/criteria_reference/maplocationdistance_criterion.md
+++ b/docs/search/criteria_reference/maplocationdistance_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: MapLocationDistance Search Criterion
-edition: commerce
 ---
 
 # MapLocationDistance Criterion
diff --git a/docs/search/criteria_reference/matchall_criterion.md b/docs/search/criteria_reference/matchall_criterion.md
index 84acde3934..ec065cba10 100644
--- a/docs/search/criteria_reference/matchall_criterion.md
+++ b/docs/search/criteria_reference/matchall_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: MatchAll Search Criterion
-edition: commerce
 ---
 
 # MatchAll Criterion
diff --git a/docs/search/criteria_reference/matchnone_criterion.md b/docs/search/criteria_reference/matchnone_criterion.md
index 01a35cde2f..690aece792 100644
--- a/docs/search/criteria_reference/matchnone_criterion.md
+++ b/docs/search/criteria_reference/matchnone_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: MatchNone Search Criterion
-edition: commerce
 ---
 
 # MatchNone Criterion
diff --git a/docs/search/criteria_reference/objectstateid_criterion.md b/docs/search/criteria_reference/objectstateid_criterion.md
index 653477b0a5..b84ccd3e11 100644
--- a/docs/search/criteria_reference/objectstateid_criterion.md
+++ b/docs/search/criteria_reference/objectstateid_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: ObjectStateId Search Criterion
-edition: commerce
 ---
 
 # ObjectStateId Criterion
diff --git a/docs/search/criteria_reference/objectstateidentifier_criterion.md b/docs/search/criteria_reference/objectstateidentifier_criterion.md
index 5cd373f6a3..e6de372b9c 100644
--- a/docs/search/criteria_reference/objectstateidentifier_criterion.md
+++ b/docs/search/criteria_reference/objectstateidentifier_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: ObjectStateIdentifier Search Criterion
-edition: commerce
 ---
 
 # ObjectStateIdentifier Criterion
diff --git a/docs/search/criteria_reference/parentlocationid_criterion.md b/docs/search/criteria_reference/parentlocationid_criterion.md
index 69e146459a..524a5eef34 100644
--- a/docs/search/criteria_reference/parentlocationid_criterion.md
+++ b/docs/search/criteria_reference/parentlocationid_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: ParentLocationId Search Criterion
-edition: commerce
 ---
 
 # ParentLocationId Criterion
diff --git a/docs/search/criteria_reference/parentlocationremoteId_criterion.md b/docs/search/criteria_reference/parentlocationremoteId_criterion.md
index 34097afe01..c136361d93 100644
--- a/docs/search/criteria_reference/parentlocationremoteId_criterion.md
+++ b/docs/search/criteria_reference/parentlocationremoteId_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: ParentLocationRemoteId Search Criterion
-edition: commerce
 ---
 
 # ParentLocationRemoteId Criterion
diff --git a/docs/search/criteria_reference/priority_criterion.md b/docs/search/criteria_reference/priority_criterion.md
index 03d6efeef4..26950ac15a 100644
--- a/docs/search/criteria_reference/priority_criterion.md
+++ b/docs/search/criteria_reference/priority_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: Priority Search Criterion
-edition: commerce
 ---
 
 # Priority Criterion
diff --git a/docs/search/criteria_reference/productavailability_criterion.md b/docs/search/criteria_reference/productavailability_criterion.md
index 678ea72da3..21d0455641 100644
--- a/docs/search/criteria_reference/productavailability_criterion.md
+++ b/docs/search/criteria_reference/productavailability_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: ProductAvailability Search Criterion
-edition: commerce
 ---
 
 # ProductAvailability Criterion
diff --git a/docs/search/criteria_reference/productcategory_criterion.md b/docs/search/criteria_reference/productcategory_criterion.md
index cee0be8260..76d5fa0002 100644
--- a/docs/search/criteria_reference/productcategory_criterion.md
+++ b/docs/search/criteria_reference/productcategory_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: ProductCategory Search Criterion
-edition: commerce
 ---
 
 # ProductCategory Criterion
diff --git a/docs/search/criteria_reference/productcode_criterion.md b/docs/search/criteria_reference/productcode_criterion.md
index 0bed42298f..78655b834d 100644
--- a/docs/search/criteria_reference/productcode_criterion.md
+++ b/docs/search/criteria_reference/productcode_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: ProductCode Search Criterion
-edition: commerce
 ---
 
 # ProductCode Criterion
diff --git a/docs/search/criteria_reference/productname_criterion.md b/docs/search/criteria_reference/productname_criterion.md
index 486f637ac8..a148bf128f 100644
--- a/docs/search/criteria_reference/productname_criterion.md
+++ b/docs/search/criteria_reference/productname_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: ProductName Search Criterion
-edition: commerce
 ---
 
 # ProductName Criterion
diff --git a/docs/search/criteria_reference/productstock_criterion.md b/docs/search/criteria_reference/productstock_criterion.md
index be97cb74ec..d70abe9443 100644
--- a/docs/search/criteria_reference/productstock_criterion.md
+++ b/docs/search/criteria_reference/productstock_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: ProductStock Search Criterion
-edition: commerce
 ---
 
 # ProductStock Criterion
diff --git a/docs/search/criteria_reference/productstockrange_criterion.md b/docs/search/criteria_reference/productstockrange_criterion.md
index a28d533a73..f81d18d6e3 100644
--- a/docs/search/criteria_reference/productstockrange_criterion.md
+++ b/docs/search/criteria_reference/productstockrange_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: ProductStockRange Search Criterion
-edition: commerce
 ---
 
 # ProductStockRange Criterion
diff --git a/docs/search/criteria_reference/producttype_criterion.md b/docs/search/criteria_reference/producttype_criterion.md
index 58707daffb..aab290dcc7 100644
--- a/docs/search/criteria_reference/producttype_criterion.md
+++ b/docs/search/criteria_reference/producttype_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: ProductType Search Criterion
-edition: commerce
 ---
 
 # ProductType Criterion
diff --git a/docs/search/criteria_reference/rangemeasurementattributemaximum_criterion.md b/docs/search/criteria_reference/rangemeasurementattributemaximum_criterion.md
index 229b7e2e59..c28be6ffd8 100644
--- a/docs/search/criteria_reference/rangemeasurementattributemaximum_criterion.md
+++ b/docs/search/criteria_reference/rangemeasurementattributemaximum_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: RangeMeasurementAttributeMaximum Search Criterion
-edition: commerce
 ---
 
 # RangeMeasurementAttributeMaximum Criterion
diff --git a/docs/search/criteria_reference/rangemeasurementattributeminimum_criterion.md b/docs/search/criteria_reference/rangemeasurementattributeminimum_criterion.md
index f2c1a75b18..fb5d54dbad 100644
--- a/docs/search/criteria_reference/rangemeasurementattributeminimum_criterion.md
+++ b/docs/search/criteria_reference/rangemeasurementattributeminimum_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: RangeMeasurementAttributeMinimum Search Criterion
-edition: commerce
 ---
 
 # RangeMeasurementAttributeMinimum Criterion
diff --git a/docs/search/criteria_reference/remoteid_criterion.md b/docs/search/criteria_reference/remoteid_criterion.md
index 066a0cb2c3..cf1347c3da 100644
--- a/docs/search/criteria_reference/remoteid_criterion.md
+++ b/docs/search/criteria_reference/remoteid_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: RemoteId / ContentRemoteId Search Criterion
-edition: commerce
 ---
 
 # RemoteId / ContentRemoteId Criterion
diff --git a/docs/search/criteria_reference/sectionid_criterion.md b/docs/search/criteria_reference/sectionid_criterion.md
index 736e7336c9..c0582b3fcc 100644
--- a/docs/search/criteria_reference/sectionid_criterion.md
+++ b/docs/search/criteria_reference/sectionid_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: SectionId Search Criterion
-edition: commerce
 ---
 
 # SectionId Criterion
diff --git a/docs/search/criteria_reference/sectionidentifier_criterion.md b/docs/search/criteria_reference/sectionidentifier_criterion.md
index 01e6067d03..8b2c49043c 100644
--- a/docs/search/criteria_reference/sectionidentifier_criterion.md
+++ b/docs/search/criteria_reference/sectionidentifier_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: SectionIdentifier Search Criterion
-edition: commerce
 ---
 
 # SectionIdentifier Criterion
diff --git a/docs/search/criteria_reference/selectionattribute_criterion.md b/docs/search/criteria_reference/selectionattribute_criterion.md
index 80f3ce855e..f8eeeed167 100644
--- a/docs/search/criteria_reference/selectionattribute_criterion.md
+++ b/docs/search/criteria_reference/selectionattribute_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: SelectionAttribute Search Criterion
-edition: commerce
 ---
 
 # SelectionAttribute Criterion
diff --git a/docs/search/criteria_reference/sibling_criterion.md b/docs/search/criteria_reference/sibling_criterion.md
index 54afd6ed70..f988a5a592 100644
--- a/docs/search/criteria_reference/sibling_criterion.md
+++ b/docs/search/criteria_reference/sibling_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: Sibling Search Criterion
-edition: commerce
 ---
 
 # Sibling Criterion
diff --git a/docs/search/criteria_reference/simplemeasurementattribute_criterion.md b/docs/search/criteria_reference/simplemeasurementattribute_criterion.md
index fb21a1e88b..034a221ed7 100644
--- a/docs/search/criteria_reference/simplemeasurementattribute_criterion.md
+++ b/docs/search/criteria_reference/simplemeasurementattribute_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: SimpleMeasurementAttribute Search Criterion
-edition: commerce
 ---
 
 # SimpleMeasurementAttribute Criterion
diff --git a/docs/search/criteria_reference/subtree_criterion.md b/docs/search/criteria_reference/subtree_criterion.md
index e934460a78..ed91c3c6eb 100644
--- a/docs/search/criteria_reference/subtree_criterion.md
+++ b/docs/search/criteria_reference/subtree_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: Subtree Search Criterion
-edition: commerce
 ---
 
 # Subtree Criterion
diff --git a/docs/search/criteria_reference/taxonomy_entry_id.md b/docs/search/criteria_reference/taxonomy_entry_id.md
index 37725c4784..01752b478b 100644
--- a/docs/search/criteria_reference/taxonomy_entry_id.md
+++ b/docs/search/criteria_reference/taxonomy_entry_id.md
@@ -1,6 +1,5 @@
 ---
 description: TaxonomyEntryId Search Criterion
-edition: commerce
 ---
 
 # TaxonomyEntryId Criterion
diff --git a/docs/search/criteria_reference/useremail_criterion.md b/docs/search/criteria_reference/useremail_criterion.md
index a223ed4c24..69708152b6 100644
--- a/docs/search/criteria_reference/useremail_criterion.md
+++ b/docs/search/criteria_reference/useremail_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: UserEmail Search Criterion
-edition: commerce
 ---
 
 # UserEmail Criterion
diff --git a/docs/search/criteria_reference/userid_criterion.md b/docs/search/criteria_reference/userid_criterion.md
index 3288a6fc3c..8976042839 100644
--- a/docs/search/criteria_reference/userid_criterion.md
+++ b/docs/search/criteria_reference/userid_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: UserId Search Criterion
-edition: commerce
 ---
 
 # UserId Criterion
diff --git a/docs/search/criteria_reference/userlogin_criterion.md b/docs/search/criteria_reference/userlogin_criterion.md
index 2736654d10..2ede057bba 100644
--- a/docs/search/criteria_reference/userlogin_criterion.md
+++ b/docs/search/criteria_reference/userlogin_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: UserLogin Search Criterion
-edition: commerce
 ---
 
 # UserLogin Criterion
diff --git a/docs/search/criteria_reference/usermetadata_criterion.md b/docs/search/criteria_reference/usermetadata_criterion.md
index 0cdbfc6029..b3c45ad3e3 100644
--- a/docs/search/criteria_reference/usermetadata_criterion.md
+++ b/docs/search/criteria_reference/usermetadata_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: UserMetadata Search Criterion
-edition: commerce
 ---
 
 # UserMetadata Criterion
diff --git a/docs/search/criteria_reference/visibility_criterion.md b/docs/search/criteria_reference/visibility_criterion.md
index c7dcabbbe4..67dd8db185 100644
--- a/docs/search/criteria_reference/visibility_criterion.md
+++ b/docs/search/criteria_reference/visibility_criterion.md
@@ -1,6 +1,5 @@
 ---
 description: Visibility Search Criterion
-edition: commerce
 ---
 
 # Visibility Criterion
diff --git a/docs/search/search.md b/docs/search/search.md
index 384d0c64c7..5e3b78447d 100644
--- a/docs/search/search.md
+++ b/docs/search/search.md
@@ -16,5 +16,5 @@ These are supported across different search engines, allowing you to plug in ano
     "search/search_criteria_and_sort_clauses",
     "search/extensibility/create_custom_search_criterion",
     "search/extensibility/create_custom_sort_clause",
-    "search/extensibility/create_custom_aggregation"
+    "search/extensibility/create_custom_aggregation",
 ], columns=4) =]]
diff --git a/docs/search/search_engines/legacy_search_engine/legacy_search_overview.md b/docs/search/search_engines/legacy_search_engine/legacy_search_overview.md
index b4beb931d7..a74ac1de14 100644
--- a/docs/search/search_engines/legacy_search_engine/legacy_search_overview.md
+++ b/docs/search/search_engines/legacy_search_engine/legacy_search_overview.md
@@ -4,7 +4,8 @@ description: Legacy search engine overview.
 
 # Legacy search engine
 
-Legacy search engine is the default search engine. it's SQL-based and uses Doctrine's database connection.
+Legacy search engine is the default search engine.
+It's SQL-based and uses Doctrine's database connection.
 The connections are defined in the same way as for storage engine, and no further specific configuration is needed.
 Legacy search engine is recommended for basic needs and isn't intended in production.
 It allows you to use filtering and fulltext search, but with some limitations.
diff --git a/docs/search/search_engines/solr_search_engine/install_solr.md b/docs/search/search_engines/solr_search_engine/install_solr.md
index 694811ad4a..884f54064d 100644
--- a/docs/search/search_engines/solr_search_engine/install_solr.md
+++ b/docs/search/search_engines/solr_search_engine/install_solr.md
@@ -52,12 +52,13 @@ To set SolrCloud up follow [SolrCloud reference guide](https://lucene.apache.org
 
 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. it's strongly recommended to set-up `solrconfig.xml` like this:
+This setting is **required** if you want to see the changes after publish.
+It's strongly recommended to set-up `solrconfig.xml` like this:
 
 ``` xml
 <!--solrconfig.xml-->
 <autoCommit>
-  <!-- autoCommit's here left as-is like it's out of the box in Solr, this controls hard commits for durability/replication -->
+  <!-- autoCommit is here left as-is like it is out of the box in Solr, this controls hard commits for durability/replication -->
   <maxTime>${solr.autoCommit.maxTime:15000}</maxTime>
   <openSearcher>false</openSearcher>
 </autoCommit>
diff --git a/docs/search/sort_clause_reference/customprice_sort_clause.md b/docs/search/sort_clause_reference/customprice_sort_clause.md
index 3402e245b8..e042a16adb 100644
--- a/docs/search/sort_clause_reference/customprice_sort_clause.md
+++ b/docs/search/sort_clause_reference/customprice_sort_clause.md
@@ -8,7 +8,8 @@ The `CustomPrice` Sort Clause sorts search results by the product's custom price
 
 ## Arguments
 
-- `currency` - a `CurrencyInterface` object representing the currency to check price for [[= include_file('docs/snippets/sort_direction.md') =]]
+- `currency` - a `CurrencyInterface` object representing the currency to check price for
+[[= include_file('docs/snippets/sort_direction.md') =]]
 - (optional) `customerGroup` - a `CustomerGroupInterface` object representing the customer group to check prices for.
 If you don't provide a customer group, the query uses the group related to the current user.
 
diff --git a/docs/templating/embed_and_list_content/render_images.md b/docs/templating/embed_and_list_content/render_images.md
index 00a904b119..c1db208733 100644
--- a/docs/templating/embed_and_list_content/render_images.md
+++ b/docs/templating/embed_and_list_content/render_images.md
@@ -112,4 +112,4 @@ Then, create the custom Field template in `templates/fields/image.html.twig`, [o
 {% endblock %}
 ```
 
-This template uses the focal point information contained in the image's additional data to position the background so that the focussed part of the image is displayed.
+This template uses the focal point information contained in the image's additional data to position the background so that the focused part of the image is displayed.
diff --git a/docs/templating/layout/add_login_form.md b/docs/templating/layout/add_login_form.md
index 2f276fc5d3..d035abf03e 100644
--- a/docs/templating/layout/add_login_form.md
+++ b/docs/templating/layout/add_login_form.md
@@ -6,7 +6,7 @@ description: Customize the login form for new users in your site front end.
 
 You can create a login form for your users.
 Follow the instruction below to create a template with login form.
-If you want to configure more options for example, password expiration, see [other user management templates](user_registration.md#other-user-management-templates).
+If you want to configure more options, for example, password expiration, see [other user management templates](user_registration.md#other-user-management-templates).
 
 First, make sure you have configured [login methods](login_methods.md).
 
diff --git a/docs/templating/templating.md b/docs/templating/templating.md
index 555adf2440..dbc930a884 100644
--- a/docs/templating/templating.md
+++ b/docs/templating/templating.md
@@ -16,5 +16,5 @@ Content view configuration is SiteAccess-aware.
     "templating/templates/templates",
     "templating/queries_and_controllers/content_queries",
     "templating/twig_function_reference/twig_function_reference",
-    "templating/design_engine/design_engine"
+    "templating/design_engine/design_engine",
 ], columns=4) =]]
diff --git a/docs/tutorials/beginner_tutorial/2_create_the_content_model.md b/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
index 1c5d04a22e..cd86b4243a 100644
--- a/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
+++ b/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
@@ -39,7 +39,8 @@ In the upper-right corner, click the avatar icon to unfold the drop-down menu an
 
 In the main menu, go to **Content** -> **Content types**.
 
-You can see a list of **Content type groups**. they're used to group content types in a logical way.
+You can see a list of **Content type groups**.
+They're used to group content types in a logical way.
 
 Select **Content** and then click the **Create** button. 
 
diff --git a/docs/tutorials/beginner_tutorial/8_enable_account_registration.md b/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
index 6d371c1362..9f69bc69c9 100644
--- a/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
+++ b/docs/tutorials/beginner_tutorial/8_enable_account_registration.md
@@ -143,7 +143,7 @@ Then create the `templates/user/registration_confirmation.html.twig` template:
             <h2>{{ 'Registration completed'|trans }}</h2>
 
             <div class="row confirmation-label">
-                {{ 'you're all set up and ready to go'|trans }}
+                {{ 'You're all set up and ready to go'|trans }}
             </div>
 
             <div class="row">
diff --git a/docs/tutorials/tutorials.md b/docs/tutorials/tutorials.md
index 9980883911..3711d5cc8b 100644
--- a/docs/tutorials/tutorials.md
+++ b/docs/tutorials/tutorials.md
@@ -10,5 +10,5 @@ Get started with tutorials to learn how to create a site with [[= product_name =
 [[= cards([
     "tutorials/beginner_tutorial/beginner_tutorial",
     "tutorials/page_and_form_tutorial/page_and_form_tutorial",
-    "tutorials/generic_field_type/creating_a_point2d_field_type"
+    "tutorials/generic_field_type/creating_a_point2d_field_type",
 ], columns=3) =]]
diff --git a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
index bec0ff0a63..078c1670c5 100644
--- a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
+++ b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
@@ -695,13 +695,12 @@ The built-in Forms folder is located in the Form Section in versions 2.4+.
 
 If you're updating your Enterprise installation, you need to add this Section manually and move the folder to it.
 
-To allow anonymous users to access Forms, you also need to add the `content/read` policy
-with the *Form* Section to the Anonymous User.
+To allow anonymous users to access Forms, you also need to add the `content/read` policy with the *Form* Section to the Anonymous User.
 
 #### Changes to custom tags
 
-v2.4 changed the way of configuring custom tags. they're no longer configured under the `ezpublish` key,
-but one level higher in the YAML structure:
+v2.4 changed the way of configuring custom tags.
+They're no longer configured under the `ezpublish` key, but one level higher in the YAML structure:
 
 ``` yaml
 ezpublish:
diff --git a/docs/update_and_migration/from_3.3/to_4.0.md b/docs/update_and_migration/from_3.3/to_4.0.md
index 8539f097ed..fadc08d452 100644
--- a/docs/update_and_migration/from_3.3/to_4.0.md
+++ b/docs/update_and_migration/from_3.3/to_4.0.md
@@ -140,7 +140,7 @@ If you have no access to [[= product_name =]]'s `ibexa/installer` package, apply
 For every database connection you have configured, perform the following steps:
 
 1. Run `php bin/console doctrine:schema:update --dump-sql --em=ibexa_{connection}`
-2. Check the queries and verify that they're safe and doesn't damage the data.
+2. Check the queries and verify that they're safe and don't damage the data.
 3. Run `php bin/console doctrine:schema:update --dump-sql --em=ibexa_{connection} --force`
 
 Next, run the following commands to import necessary data migration scripts:
diff --git a/docs/update_and_migration/from_4.3/update_from_4.3.md b/docs/update_and_migration/from_4.3/update_from_4.3.md
index a307d35f7d..072c20cc5e 100644
--- a/docs/update_and_migration/from_4.3/update_from_4.3.md
+++ b/docs/update_and_migration/from_4.3/update_from_4.3.md
@@ -18,5 +18,5 @@ B. If you use Commerce functionalities based on the deprecated packages, you can
 
 [[= cards([
     "update_and_migration/from_4.3/update_from_4.3_new_commerce",
-    "update_and_migration/from_4.3/update_from_4.3_old_commerce"
+    "update_and_migration/from_4.3/update_from_4.3_old_commerce",
 ], columns=2) =]]

From 6f775243bf0b5d5be075bcd652b70c1e61bdcd10 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Mon, 25 Nov 2024 15:04:06 +0100
Subject: [PATCH 74/77] Fixes after review

---
 .../administration/admin_panel/admin_panel.md |  2 +-
 docs/administration/administration.md         |  2 +-
 .../administration/back_office/back_office.md |  2 +-
 .../back_office/back_office_configuration.md  |  6 +--
 .../formatting_date_and_time.md               |  6 ++-
 .../reusable_components.md                    |  2 +-
 .../back_office_tabs/back_office_tabs.md      |  2 +-
 .../back_office_tabs/create_dashboard_tab.md  |  4 +-
 .../customize_search_suggestion.md            |  2 +-
 .../configuration/configuration.md            |  7 +--
 .../configuration/repository_configuration.md |  6 +--
 .../content_organization/content_types.md     |  2 +-
 .../dashboard/customize_dashboard.md          |  6 +--
 .../project_organization/architecture.md      |  2 +-
 .../project_organization.md                   |  2 +-
 docs/api/graphql/graphql_operations.md        |  2 +-
 docs/api/graphql/graphql_queries.md           |  2 +-
 docs/api/php_api/php_api.md                   |  6 +--
 .../adding_custom_media_type.md               |  2 +-
 docs/api/rest_api/rest_api_authentication.md  |  4 +-
 .../rest_api/rest_api_usage/rest_api_usage.md |  4 +-
 .../rest_api/rest_api_usage/rest_requests.md  |  6 +--
 .../rest_api_usage/testing_rest_api.md        |  4 +-
 docs/cdp/cdp_guide.md                         |  2 +-
 docs/commerce/cart/cart.md                    |  2 +-
 docs/commerce/cart/cart_api.md                |  4 +-
 docs/commerce/checkout/checkout.md            |  2 +-
 docs/commerce/commerce.md                     |  8 +--
 docs/content_management/content_model.md      |  2 +-
 .../field_types/field_type_storage.md         |  2 +-
 docs/content_management/forms/forms.md        |  2 +-
 docs/content_management/images/images.md      |  2 +-
 .../pages/page_builder_guide.md               | 12 +++--
 .../rich_text/online_editor_guide.md          |  2 +-
 .../content_management/rich_text/rich_text.md |  2 +-
 .../url_management/url_management.md          |  3 +-
 docs/content_management/workflow/workflow.md  | 52 +++++++------------
 docs/customer_management/customer_portal.md   |  2 +-
 docs/getting_started/first_steps.md           |  2 +-
 docs/getting_started/requirements.md          |  6 +--
 docs/getting_started/troubleshooting.md       |  2 +-
 docs/ibexa_cloud/ddev_and_ibexa_cloud.md      |  4 +-
 docs/ibexa_cloud/ibexa_cloud.md               |  2 +-
 docs/ibexa_engage/integrate_ibexa_connect.md  |  2 +-
 docs/ibexa_products/editions.md               |  2 +-
 .../cache/http_cache/content_aware_cache.md   | 14 ++---
 .../cache/http_cache/context_aware_cache.md   |  4 +-
 .../cache/http_cache/reverse_proxy.md         |  4 +-
 .../cache/persistence_cache.md                |  2 +-
 .../clustering/clustering.md                  |  4 +-
 .../clustering/clustering_with_aws_s3.md      |  2 +-
 .../environments.md                           |  2 +-
 .../performance.md                            |  2 +-
 .../security/development_security.md          |  2 +-
 .../sessions.md                               |  4 +-
 docs/multisite/languages/languages.md         |  2 +-
 docs/multisite/multisite.md                   |  2 +-
 docs/multisite/multisite_configuration.md     |  6 +--
 docs/permissions/limitations.md               |  4 +-
 docs/permissions/permissions.md               |  2 +-
 .../api_reference/tracking_api.md             |  4 +-
 .../personalization/enable_personalization.md |  3 +-
 .../legacy_recommendation_api.md              |  2 +-
 .../recommendation_integration.md             |  2 +-
 docs/pim/customize_pim.md                     |  2 +-
 docs/product_guides/product_guides.md         |  2 +-
 docs/release_notes/ez_platform_v1.7.0_lts.md  | 15 ++++--
 docs/release_notes/ez_platform_v1.9.0.md      | 10 +++-
 docs/release_notes/ez_platform_v2.2.0.md      |  2 +-
 docs/release_notes/ez_platform_v2.3.md        |  2 +-
 docs/release_notes/ez_platform_v2.4.md        | 11 ++--
 docs/release_notes/ez_platform_v3.0.md        |  2 +-
 .../ez_platform_v3.0_deprecations.md          |  2 +-
 docs/release_notes/ibexa_dxp_v4.4.md          | 39 ++++++--------
 .../contributing/report_and_follow_issues.md  |  2 +-
 docs/resources/release_process_and_roadmap.md |  2 +-
 docs/search/search.md                         |  2 +-
 docs/search/search_api.md                     | 11 ++--
 .../search_criteria_and_sort_clauses.md       |  5 +-
 .../solr_search_engine/configure_solr.md      |  5 +-
 .../solr_search_engine/solr_overview.md       |  2 +-
 .../shipment_sort_clauses.md                  |  2 +-
 docs/snippets/update/db/update_db_2.5-3.3.md  |  4 +-
 .../layout/customize_storefront_layout.md     |  4 +-
 docs/templating/templates/templates.md        |  2 +-
 .../site_context_twig_functions.md            |  2 +-
 .../twig_function_reference.md                |  2 +-
 .../2_create_the_content_model.md             |  2 +-
 .../3_customize_the_front_page.md             |  4 +-
 .../beginner_tutorial/beginner_tutorial.md    |  4 +-
 .../from_4.5/update_from_4.5.md               |  3 +-
 .../migrate_to_ibexa_dxp/common_issues.md     | 25 +++++----
 .../migrating_from_ez_publish.md              | 23 +++++---
 .../migrating_from_ez_publish_platform.md     | 47 ++++++++++++-----
 docs/users/customer_groups.md                 |  2 +-
 docs/users/login_methods.md                   |  2 +-
 docs/users/passwords.md                       |  2 +-
 docs/users/user_management_guide.md           |  4 +-
 docs/users/users.md                           |  6 +--
 99 files changed, 278 insertions(+), 247 deletions(-)

diff --git a/docs/administration/admin_panel/admin_panel.md b/docs/administration/admin_panel/admin_panel.md
index ed7f692e43..dc5c18cad1 100644
--- a/docs/administration/admin_panel/admin_panel.md
+++ b/docs/administration/admin_panel/admin_panel.md
@@ -18,5 +18,5 @@ To access **Admin** panel, click the icon: ![Admin panel Icon](admin_panel_icon.
     "administration/admin_panel/segments_admin_panel",
     "administration/admin_panel/corporate_admin_panel",
     "administration/admin_panel/workflow_admin_panel",
-    "administration/admin_panel/system_information_admin_panel"
+    "administration/admin_panel/system_information_admin_panel",
 ], columns=4) =]]
diff --git a/docs/administration/administration.md b/docs/administration/administration.md
index cbd7aeb391..6a333d4fea 100644
--- a/docs/administration/administration.md
+++ b/docs/administration/administration.md
@@ -11,5 +11,5 @@ Administer and configure your [[= product_name =]] installation.
     "administration/admin_panel/admin_panel",
     "administration/project_organization/project_organization",
     "administration/configuration/configuration",
-    "administration/back_office/back_office"
+    "administration/back_office/back_office",
 ], columns=4) =]]
diff --git a/docs/administration/back_office/back_office.md b/docs/administration/back_office/back_office.md
index 5fa96badb3..8ab3551355 100644
--- a/docs/administration/back_office/back_office.md
+++ b/docs/administration/back_office/back_office.md
@@ -25,5 +25,5 @@ Some extensibility, such as [adding custom tags](extend_online_editor.md#configu
     "administration/back_office/notifications",
     "administration/back_office/browser/browser",
     "administration/back_office/add_user_setting",
-    "administration/back_office/customize_calendar"
+    "administration/back_office/customize_calendar",
 ], columns=4) =]]
diff --git a/docs/administration/back_office/back_office_configuration.md b/docs/administration/back_office/back_office_configuration.md
index b155e72f24..58a4d3beda 100644
--- a/docs/administration/back_office/back_office_configuration.md
+++ b/docs/administration/back_office/back_office_configuration.md
@@ -41,15 +41,15 @@ ibexa:
 
 ## Copy subtree limit
 
-Copying large subtrees can cause performance issues, so you can limit the number of content items that can be copied at once using the `ibexa.system.<scope>.subtree_operations.copy_subtree.limit` [configuration key](configuration.md#configuration-files).
+Copying large subtrees can cause performance issues, so you can limit the number of content items that can be copied at once by setting the `ibexa.system.<scope>.subtree_operations.copy_subtree.limit` [configuration key](configuration.md#configuration-files).
 
 The default value is `100`. You can set it to `-1` for no limit, or to `0` to completely disable copying subtrees.
 
-You can copy subtree from CLI using the command: `bin/console ibexa:copy-subtree <sourceLocationId> <targetLocationId>`.
+You can copy a subtree by calling the following command in CLI: `bin/console ibexa:copy-subtree <sourceLocationId> <targetLocationId>`.
 
 ## Default locations
 
-Default location IDs for [content structure, Media, and users](locations.md#top-level-locations) in the menu are configured using the `ibexa.system.<scope>.location_ids` [configuration key](configuration.md#configuration-files):
+Default location IDs for [content structure, Media, and users](locations.md#top-level-locations) in the menu are configured with the `ibexa.system.<scope>.location_ids` [configuration key](configuration.md#configuration-files):
 
 ``` yaml
 ibexa:
diff --git a/docs/administration/back_office/back_office_elements/formatting_date_and_time.md b/docs/administration/back_office/back_office_elements/formatting_date_and_time.md
index 499d3216d8..2faff86b23 100644
--- a/docs/administration/back_office/back_office_elements/formatting_date_and_time.md
+++ b/docs/administration/back_office/back_office_elements/formatting_date_and_time.md
@@ -4,7 +4,9 @@ description: Use different formats to render dates and times in the back office
 
 # Formatting date and time
 
-## Using Twig filters and PHP services
+Two methods exist that allow you to specify how the date and time should be formatted.
+
+## With Twig filters and PHP services
 
 You can format date and time by using the following services:
 
@@ -60,7 +62,7 @@ services:
             $shortDateTimeFormatter: '@ibexa.user.settings.short_datetime_format.formatter'
 ```
 
-## Using User settings menu
+## Within User settings menu
 
 Users can set their preferred date and time formats in the user settings menu.
 This format is used throughout the back office.
diff --git a/docs/administration/back_office/back_office_elements/reusable_components.md b/docs/administration/back_office/back_office_elements/reusable_components.md
index cc912509f5..b441fb3f09 100644
--- a/docs/administration/back_office/back_office_elements/reusable_components.md
+++ b/docs/administration/back_office/back_office_elements/reusable_components.md
@@ -217,7 +217,7 @@ Next, pass a button under the `action` parameter to the table headline.
 Action buttons are rendered on the right side of the table headline (don't confuse it with the table header).
 You can also specify headline text, which is a table title displayed above, by passing it under `headline` parameter.
 
-You can generate various headline texts using the `results_headline` macro with a few parameters:
+You can generate various headline texts by using the `results_headline` macro with a few parameters:
 
 - `count` - of all results, not only displayed on the first page
 - `has_filters` - when using filters
diff --git a/docs/administration/back_office/back_office_tabs/back_office_tabs.md b/docs/administration/back_office/back_office_tabs/back_office_tabs.md
index 05f3a89f46..5693f04af7 100644
--- a/docs/administration/back_office/back_office_tabs/back_office_tabs.md
+++ b/docs/administration/back_office/back_office_tabs/back_office_tabs.md
@@ -4,7 +4,7 @@ description: Tabs are used for content view, in dashboard, system information an
 
 # Back office tabs
 
-Many elements of the back office interface, such as content view, dashboard, or system information, are built using tabs.
+Many elements of the back office interface, such as content view, dashboard, or system information, are built with tabs.
 
 ![Tabs in System Information](tabs_system_info.png)
 
diff --git a/docs/administration/back_office/back_office_tabs/create_dashboard_tab.md b/docs/administration/back_office/back_office_tabs/create_dashboard_tab.md
index 5ee6d5f32d..968f6fb7d9 100644
--- a/docs/administration/back_office/back_office_tabs/create_dashboard_tab.md
+++ b/docs/administration/back_office/back_office_tabs/create_dashboard_tab.md
@@ -11,10 +11,10 @@ This adds a tab to the **Common content** dashboard block that displays all arti
 [[= include_file('code_samples/back_office/dashboard/article_tab/src/Tab/Dashboard/Everyone/EveryoneArticleTab.php') =]]
 ```
 
-This tab searches for content with content type "Article" (lines 57-60) and renders the results using the built-in `all_content.html.twig` template, which ensures the tab looks the same as the existing tabs (lines 71-73).
+This tab searches for content with content type "Article" (lines 57-60) and uses the built-in `all_content.html.twig` template to render the results, which ensures that the tab looks the same as the existing tabs (lines 71-73).
 
 The tab also implements OrderedTabInterface (line 17), which enables you to define the order in which the tab is displayed on the dashboard page.
-It's done using the `getOrder()` method (line 45).
+It's done with the `getOrder()` method (line 45).
 
 Register this tab as a service:
 
diff --git a/docs/administration/back_office/customize_search_suggestion.md b/docs/administration/back_office/customize_search_suggestion.md
index 426353baa5..a3e6875fe8 100644
--- a/docs/administration/back_office/customize_search_suggestion.md
+++ b/docs/administration/back_office/customize_search_suggestion.md
@@ -5,7 +5,7 @@ description: Customize search suggestion configuration and sources.
 # Customize search suggestion
 
 In the back office, when you start typing in the search field on the top bar, suggestions about what you could be looking for show up directly under the field.
-For more information about using this feature to search for content, see [User Documentation]([[= user_doc =]]/search/search_for_content).
+For more information about using this feature to search for content, see [user documentation]([[= user_doc =]]/search/search_for_content).
 
 ## Configuration
 
diff --git a/docs/administration/configuration/configuration.md b/docs/administration/configuration/configuration.md
index abd6c88fdf..ec026396b8 100644
--- a/docs/administration/configuration/configuration.md
+++ b/docs/administration/configuration/configuration.md
@@ -4,12 +4,13 @@ description: In Ibexa DXP you store and manage configuration in project files, t
 
 # Configuration
 
-[[= product_name =]] configuration is delivered using a number of dedicated configuration files.
+[[= product_name =]] configuration is delivered by means of a number of dedicated configuration files.
 It contains everything from selecting the content repository to SiteAccesses to language settings.
 
 ### Configuration format
 
-The recommended configuration format is YAML. It's used by default in the kernel (and in examples throughout the documentation).
+The recommended configuration format is YAML.
+It's used by default in the kernel (and in examples throughout the documentation).
 However, you can also use XML or PHP formats for configuration.
 
 ### Configuration files
@@ -22,7 +23,7 @@ It stores, among others, [SiteAccess](multisite.md) information and content view
 
 Other configuration is provided in respective files, for example, `config/packages/ibexa_admin_ui.yaml`, `config/packages/ibexa_http_cache.yaml`.
 
-Configuration can be made environment-specific using separate folders for each environment.
+You can make configuration environment-specific by using separate folders for each environment.
 These files contain additional settings and point to the general (not environment-specific) configuration that is applied in other cases.
 
 !!! note "New configuration files"
diff --git a/docs/administration/configuration/repository_configuration.md b/docs/administration/configuration/repository_configuration.md
index 351aed162e..cd496995d8 100644
--- a/docs/administration/configuration/repository_configuration.md
+++ b/docs/administration/configuration/repository_configuration.md
@@ -48,7 +48,7 @@ ibexa:
 
 You can use only one repository (database) per domain.
 This doesn't prohibit using [different repositories](persistence_cache.md#multi-repository-setup) on different subdomains.
-However, when using URI matching for multisite setup, all SiteAccesses sharing domain also need to share repository.
+However, when you use URI matching for multisite setup, all SiteAccesses sharing domain also need to share repository.
 For example:
 
 - `ibexa.co` domain can use `ibexa_repo`
@@ -59,7 +59,7 @@ But the following configuration would be invalid:
 - `ibexa.co` domain can use `ibexa_repo`
 - `ibexa.co/doc` **cannot** use `doc_repo`, as it's under the same domain.
 
-Invalid configuration causes problems for different parts of the system, for example back-end UI, REST interface, and other non-SiteAccess-aware Symfony routes such as `/_fos_user_context_hash` used by [HTTP cache](http_cache.md).
+Invalid configuration causes problems for different parts of the system, for example, back-end UI, REST interface, and other non-SiteAccess-aware Symfony routes such as `/_fos_user_context_hash` used by [HTTP cache](http_cache.md).
 
 ### Entity manager
 
@@ -84,7 +84,7 @@ For more information, see [DoctrineBundle documentation](https://symfony.com/doc
 
 !!! note
 
-    In contrast with DoctrineBundle, when using the SiteAccess-aware entity manager you need to explicitly set all options: `dir` (it still accepts relative path in case of bundles), `prefix`, `type`, and `is_bundle`.
+    In contrast with DoctrineBundle, when you use the SiteAccess-aware entity manager you need to explicitly set all options: `dir` (it still accepts relative path in case of bundles), `prefix`, `type`, and `is_bundle`.
 
 ### Defining custom connection
 
diff --git a/docs/administration/content_organization/content_types.md b/docs/administration/content_organization/content_types.md
index f804c1e6d1..708507f67a 100644
--- a/docs/administration/content_organization/content_types.md
+++ b/docs/administration/content_organization/content_types.md
@@ -46,7 +46,7 @@ If no pattern is provided, the system automatically uses the first field (option
 **URL alias name pattern** – a pattern which controls how the virtual URLs of the locations are generated when content items are created based on this content type.
 Only the last part of the virtual URL is affected.
 The pattern works in the same way as the content name pattern.
-Text outside the angle brackets is converted using the selected method of URL transformation.
+Text outside the angle brackets is converted with the selected method of URL transformation.
 If no pattern is provided, the system automatically uses the name of the content item itself (optional).
 
 !!! tip "Changing URL alias and content name patterns"
diff --git a/docs/administration/dashboard/customize_dashboard.md b/docs/administration/dashboard/customize_dashboard.md
index aa9aeb971e..a68da7b749 100644
--- a/docs/administration/dashboard/customize_dashboard.md
+++ b/docs/administration/dashboard/customize_dashboard.md
@@ -10,7 +10,7 @@ Customized dashboard displays a set of widgets selected by the user.
 
 !!! tip
 
-     Detailed instruction on how to customize dashboard using Dashboard Builder is available in [[[= product_name =]] User Documentation](https://doc.ibexa.co/projects/userguide/en/latest/getting_started/dashboard/work_with_dashboard/#customize-dashboard).
+     For detailed instruction on how to customize dashboards with the Dashboard Builder, see [User Documentation](https://doc.ibexa.co/projects/userguide/en/latest/getting_started/dashboard/work_with_dashboard/#customize-dashboard).
 
 ## Manage permissions
 
@@ -30,9 +30,9 @@ For more information, see [Customize storefront layout](customize_storefront_lay
 
 ## Create custom blocks
 
-Dashboard builder provides set of ready-to-use blocks, for example, Common content, Quick actions, or [[= product_name =]] News.
+Dashboard Builder provides set of ready-to-use blocks, for example, Common content, Quick actions, or [[= product_name =]] News.
 
-For more information about available blocks, see [[[= product_name =]] User Documentation](https://doc.ibexa.co/projects/userguide/en/latest/getting_started/dashboard/dashboard_block_reference/).
+For more information about available blocks, see [User Documentation](https://doc.ibexa.co/projects/userguide/en/latest/getting_started/dashboard/dashboard_block_reference/).
 
 In addition to existing blocks available in Dashboard Builder, you can also create custom blocks.
 
diff --git a/docs/administration/project_organization/architecture.md b/docs/administration/project_organization/architecture.md
index 78e0ab64a2..56b723c31c 100644
--- a/docs/administration/project_organization/architecture.md
+++ b/docs/administration/project_organization/architecture.md
@@ -20,7 +20,7 @@ The architecture of [[= product_name =]] is layered and uses clearly defined API
 | [HTTP Cache](http_cache.md))                        | Symfony HTTP cache is used to manage content "view" cache with an expiration model. In addition it is extended by using FOSHttpCache to add several advanced features.                         |
 | [Controllers](controllers.md)                       | Controllers created by you to read information from a Request object, create and return a Response objects.                                                                                    |
 | [Twig templates](twig_function_reference.md)        | Set of custom and built-in Twig templates. User interfaces are developed with the Twig template engine and query the public PHP API directly.                                                  |
-| [REST API v2](rest_api_usage.md)                    | The REST API v2 enables you to interact with an [[= product_name =]] installation using the HTTP protocol, following a REST interaction model.                                                 |
+| [REST API v2](rest_api_usage.md)                    | The REST API v2 enables you to interact with an [[= product_name =]] installation through the HTTP protocol, following a REST interaction model.                                                 |
 | [GraphQL](graphql.md)                               | GraphQL for [[= product_name =]] exposes the domain model using the repository, based on content type groups, content types and field definitions.                                             |
 | [Public PHP API](php_api.md)                        | Public PHP API exposes the repository which enables you to create, read, update, manage and delete all objects available in [[= product_name =]].                                              |
 | Business Logic                                      | The business logic is defined in the kernel. This business logic is exposed to applications via an API. It is used to organize development of the user interface layer.                        |
diff --git a/docs/administration/project_organization/project_organization.md b/docs/administration/project_organization/project_organization.md
index fd1f35f989..9f0a24bdfb 100644
--- a/docs/administration/project_organization/project_organization.md
+++ b/docs/administration/project_organization/project_organization.md
@@ -12,7 +12,7 @@ You can see an example of organizing a project in the [companion repository](htt
 
 The project's PHP code (for example, controllers or event listeners) should be placed in the `src` folder.
 
-Reusable libraries should be packaged so that they can be managed using Composer.
+Reusable libraries should be packaged so that they can be managed with Composer.
 
 ## Templates
 
diff --git a/docs/api/graphql/graphql_operations.md b/docs/api/graphql/graphql_operations.md
index ff2264e3ec..164ab3bc84 100644
--- a/docs/api/graphql/graphql_operations.md
+++ b/docs/api/graphql/graphql_operations.md
@@ -4,7 +4,7 @@ description: Use GraphQL operations to create, update, and delete content.
 
 # GraphQL operations
 
-Operations on content in GraphQL are performed using [mutations](https://graphql.org/learn/queries/#mutations).
+Operations on content in GraphQL are performed by using [mutations](https://graphql.org/learn/queries/#mutations).
 They include creating, updating, and deleting content items.
 
 The schema contains two mutations per content type, for example, `createFolder`, and `updateFolder`.
diff --git a/docs/api/graphql/graphql_queries.md b/docs/api/graphql/graphql_queries.md
index e2476eabc4..20513daa6d 100644
--- a/docs/api/graphql/graphql_queries.md
+++ b/docs/api/graphql/graphql_queries.md
@@ -741,7 +741,7 @@ articles(sortBy:[_datePublished,_desc])
 
 GraphQL offers [cursor-based pagination](https://graphql.org/learn/pagination/) for paginating query results.
 
-You can paginate plural fields using `edges`:
+You can paginate plural fields by using `edges`:
 
 ```
 {
diff --git a/docs/api/php_api/php_api.md b/docs/api/php_api/php_api.md
index bd9a1ff333..c3f7c4608c 100644
--- a/docs/api/php_api/php_api.md
+++ b/docs/api/php_api/php_api.md
@@ -87,10 +87,10 @@ For instance, `ContentInfo` contains `currentVersionNo` or `remoteId`, while `Co
 One of the responsibilities of the repository is user authentication.
 Every action is executed *as* a user.
 
-When using the PHP API, authentication is performed in three ways:
+When you use the PHP API, authentication is performed in three ways:
 
 - [automatically in the back office](#back-office-authentication)
-- [using `sudo()`](#using-sudo)
+- [by using `sudo()`](#using-sudo)
 - by [setting the Repository user](#setting-the-repository-user)
 
 ### Back office authentication
@@ -173,7 +173,7 @@ try {
 Symfony service container uses service tags to dedicate services to a specific purpose.
 They're usually used for extension points.
 
-[[= product_name =]] exposes multiple features using service tags.
+[[= product_name =]] uses service tags to expose multiple features.
 For example, field types are tagged `ibexa.field_type`.
 
 !!! tip
diff --git a/docs/api/rest_api/extending_rest_api/adding_custom_media_type.md b/docs/api/rest_api/extending_rest_api/adding_custom_media_type.md
index b3889338d6..0715112198 100644
--- a/docs/api/rest_api/extending_rest_api/adding_custom_media_type.md
+++ b/docs/api/rest_api/extending_rest_api/adding_custom_media_type.md
@@ -7,7 +7,7 @@ description: Add a custom media type to REST API request headers.
 In this example case, you pass a new media type in the `Accept` header of a GET request to `/content/locations/{locationPath}` route and its controller action (`Controller/Location::loadLocation`).
 
 By default, this resource takes an `application/vnd.ibexa.api.Location+xml` (or `+json`) `Accept` header.
-The following example adds the handling of a new media type `application/app.api.Location+xml` (or `+json`) `Accept` header to obtain a different response using the same controller.
+The following example adds the handling of a new media type `application/app.api.Location+xml` (or `+json`) `Accept` header to obtain a different response with the same controller.
 
 You need the following elements:
 
diff --git a/docs/api/rest_api/rest_api_authentication.md b/docs/api/rest_api/rest_api_authentication.md
index 5a1afdb95a..0d5c39aec9 100644
--- a/docs/api/rest_api/rest_api_authentication.md
+++ b/docs/api/rest_api/rest_api_authentication.md
@@ -249,7 +249,7 @@ Then, you have to make sure to confirm with the user if they want to perform an
 
 Example:
 
-A rich JavaScript/web application is using `navigator.registerProtocolHandler()` to register "web+ez:" links to go against REST API.
+A rich JavaScript/web application uses `navigator.registerProtocolHandler()` to register "web+ez:" links to go against REST API.
 It uses a session-based authentication, and it's in widespread use across the net, or/and it's used by everyone within a company.
 A person with minimal insight into this application and the company can easily send out the following link to all employees in that company in email:
 `<a href="web+ez:DELETE /content/locations/1/2">latest reports</a>`.
@@ -383,7 +383,7 @@ Basic authentication requires the username and password to be sent *(username:pa
 For details, see [RFC 2617](https://datatracker.ietf.org/doc/html/rfc2617).
 
 Most HTTP client libraries and REST libraries support this method.
-[Creating content with binary attachments](rest_requests.md#creating-content-with-binary-attachments) has an example using basic authentication with [cURL](https://www.php.net/manual/en/book.curl.php) and its `CURLOPT_USERPWD`.
+[Creating content with binary attachments](rest_requests.md#creating-content-with-binary-attachments) is an example of using basic authentication with [cURL](https://www.php.net/manual/en/book.curl.php) and its `CURLOPT_USERPWD`.
 
 **Raw HTTP request with basic authentication**
 
diff --git a/docs/api/rest_api/rest_api_usage/rest_api_usage.md b/docs/api/rest_api/rest_api_usage/rest_api_usage.md
index 6bc9499dd0..656d04ac91 100644
--- a/docs/api/rest_api/rest_api_usage/rest_api_usage.md
+++ b/docs/api/rest_api/rest_api_usage/rest_api_usage.md
@@ -4,10 +4,10 @@ description: The REST API covers objects in the Ibexa DXP Repository with regula
 
 # REST API usage
 
-The REST API in [[= product_name =]] allows you to interact with an [[= product_name =]] installation using the HTTP protocol, following a [REST](https://en.wikipedia.org/wiki/Representational_state_transfer) interaction model.
+The REST API in [[= product_name =]] allows you to interact with an [[= product_name =]] installation by using the HTTP protocol, following a [REST](https://en.wikipedia.org/wiki/Representational_state_transfer) interaction model.
 
 Each resource (URI) interacts with a part of the system (like content, users or search).
-Every interaction with the Repository than you can do from back office or using the [Public PHP API](php_api.md) can also be done using the REST API.
+Every interaction with the repository than you can do from back office or by using the [Public PHP API](php_api.md) can also be done with the REST API.
 
 The REST API uses HTTP methods (such as `GET` and `PUBLISH`), and HTTP headers to specify the type of request.
 
diff --git a/docs/api/rest_api/rest_api_usage/rest_requests.md b/docs/api/rest_api/rest_api_usage/rest_requests.md
index f112f159ac..b749a7a698 100644
--- a/docs/api/rest_api/rest_api_usage/rest_requests.md
+++ b/docs/api/rest_api/rest_api_usage/rest_requests.md
@@ -36,7 +36,7 @@ For method action details per resource, see the [REST API reference](../rest_api
 !!! note "Caution with custom HTTP methods"
 
     Using custom HTTP methods can cause issues with several HTTP proxies, network firewall/security solutions and simpler web servers.
-    To avoid issues with this, REST API allows you to set these using the HTTP header `X-HTTP-Method-Override` alongside the standard `POST` method instead of using a custom HTTP method. For example: `X-HTTP-Method-Override: PUBLISH`
+    To avoid such issuess, REST API allows you to set these by using the HTTP header `X-HTTP-Method-Override` alongside the standard `POST` method instead of using a custom HTTP method. For example: `X-HTTP-Method-Override: PUBLISH`
 
     If applicable, both methods are always mentioned in the specifications.
 
@@ -104,7 +104,7 @@ X-Siteaccess: restapi
 ```
 
 One of the principles of REST is that the same resource (such as content item, location, content type) should be unique.
-It allows caching your REST API using a reverse proxy such as Varnish.
+It allows caching your REST API with a reverse proxy such as Varnish.
 If the same resource is available in multiple locations, cache purging is noticeably more complex.
 This is why SiteAccess matching with REST isn't enabled at URL level (or domain).
 
@@ -121,7 +121,7 @@ Media types are also used with the [`Content-Type` header](rest_responses.md#con
 See [Creating content with binary attachments](#creating-content-with-binary-attachments) below.
 Also see [Creating session](rest_api_authentication.md#creating-session) examples.
 
-If the resource only returns one media type, it's also possible to skip it and to specify the format using `application/xml` or `application/json`.
+If the resource only returns one media type, it's also possible to skip it and to specify the format with `application/xml` or `application/json`.
 
 A response indicates `href`s to related resources and their media types.
 
diff --git a/docs/api/rest_api/rest_api_usage/testing_rest_api.md b/docs/api/rest_api/rest_api_usage/testing_rest_api.md
index 4c8ff8403c..8c8f5c0c40 100644
--- a/docs/api/rest_api/rest_api_usage/testing_rest_api.md
+++ b/docs/api/rest_api/rest_api_usage/testing_rest_api.md
@@ -8,7 +8,7 @@ A standard web browser isn't sufficient to fully test the API.
 You can, however, try opening the root resource with it, using the session authentication: `http://example.com/api/ibexa/v2/`.
 Depending on how your browser understands XML, it either downloads the XML file, or opens it in the browser.
 
-The following examples show how to interrogate the REST API using cURL, PHP or JS.
+The following examples show how to interrogate the REST API with cURL, PHP or JS.
 
 To test further, you can use browser extensions, like [Advanced REST client for Chrome](https://chrome.google.com/webstore/detail/advanced-rest-client/hgmloofddffdnphfgcellkdfbfbjeloo) or [RESTClient for Firefox](https://addons.mozilla.org/en-US/firefox/addon/restclient/), or dedicated tools.
 For command line users, [HTTPie](https://github.com/httpie/cli) is a good tool.
@@ -36,7 +36,7 @@ Open a PHP shell in a terminal with <nobr>`php -a`</nobr> and copy-paste this co
 On a freshly installed [[= product_name =]], `52` is the Content ID of the home page.
 If necessary, substitute `52` with the content ID of an item from your database.
 
-For a content creation example using PHP, see [Creating content with binary attachments](rest_requests.md#creating-content-with-binary-attachments)
+For a content creation example that uses PHP, see [Creating content with binary attachments](rest_requests.md#creating-content-with-binary-attachments)
 
 ## JS
 
diff --git a/docs/cdp/cdp_guide.md b/docs/cdp/cdp_guide.md
index 3eec2cb5b0..97c30501e9 100644
--- a/docs/cdp/cdp_guide.md
+++ b/docs/cdp/cdp_guide.md
@@ -68,7 +68,7 @@ Configuration in [[= product_name_cdp =]] allows you to automate the process of
 An `ibexa_cdp.data_export` [configuration key](https://doc.ibexa.co/en/latest/cdp/cdp_data_export_schedule/#configuration-key) includes the `schedule` setting where you can find separate sections for exporting user, content, and product.
 Structure of each section is exactly the same and includes `interval` and `options` elements:
 
-- `interval` - sets the frequency of the command invoke using cron expressions, for example, '*/30 * * * *' means "every 30 minutes", '0 */12 * * *' means "every 12th hour"
+- `interval` - sets the frequency at which the command is invoked, uses cron expressions, for example, '*/30 * * * *' means "every 30 minutes", '0 */12 * * *' means "every 12th hour"
 
 - `options` - allows you to add arguments that have to be passed to the export command
 
diff --git a/docs/commerce/cart/cart.md b/docs/commerce/cart/cart.md
index 6fb4b1fe4e..da2e07f345 100644
--- a/docs/commerce/cart/cart.md
+++ b/docs/commerce/cart/cart.md
@@ -79,7 +79,7 @@ document.body.addEventListener(
 
 The Cart package provides `Ibexa\Contracts\Cart\CartServiceInterface` Symfony service, which is the entrypoint for calling the [backend API](cart_api.md).
 
-You can import the service using the following code:
+You can import the service with the following code:
 
 ```js
 import * as cartService from '@ibexa-cart/src/bundle/Resources/public/js/service/cart';
diff --git a/docs/commerce/cart/cart_api.md b/docs/commerce/cart/cart_api.md
index 66d2c97086..afcb234c8f 100644
--- a/docs/commerce/cart/cart_api.md
+++ b/docs/commerce/cart/cart_api.md
@@ -162,7 +162,7 @@ $createStruct->setContext(new ArrayMap([
 $cart = $cartService->createCart($createStruct);
 ```
 
-In the above example, you create a cart using the `CartCreateStruct`, and set the context data using the `setContext` method.
+In the above example, you create a cart with the `CartCreateStruct` method, and set the context data with `setContext`.
 You also add "X1MF7699" coupon code as context data to the cart.
 
 ### Adding context data to cart entry
@@ -178,7 +178,7 @@ $entryAddStruct->setContext(new ArrayMap([
  $cartService->addEntry($cart, $entryAddStruct);
 ```
 
-In the above example, you create a cart entry using the `EntryAddStruct`.
+In the above example, you create a cart entry by using the `EntryAddStruct` method.
 The `setContext` method allows you to attach context data to the cart entry.
 In this case, you attach a "tshirt_text" attribute to the cart entry, which might represent custom text for a T-shirt.
 
diff --git a/docs/commerce/checkout/checkout.md b/docs/commerce/checkout/checkout.md
index 802925107a..bd19cc8ecd 100644
--- a/docs/commerce/checkout/checkout.md
+++ b/docs/commerce/checkout/checkout.md
@@ -54,6 +54,6 @@ Reorder functions as the variant for the checkout workflow and is accessible sol
 It initiates from the user's order history, where they can click **Reorder** and trigger the flow.
 Next, the user is moved to cart where the system validates the order against existing stock.
 If everything is available, customer can move to payment and summary.
-The system pre-fills address, shipping method, and payment details using information from the past order.
+The system uses information from the past order to pre-fill address, shipping method, and payment details.
 
 For more information, see [reorder documentation](reorder.md).
\ No newline at end of file
diff --git a/docs/commerce/commerce.md b/docs/commerce/commerce.md
index 7debfab0bf..7e087baf64 100644
--- a/docs/commerce/commerce.md
+++ b/docs/commerce/commerce.md
@@ -15,7 +15,7 @@ The commerce component of [[= product_name =]] covers various areas of managing
     "commerce/payment/payment",
     "commerce/shipping_management/shipping_management",
     "commerce/storefront/storefront",
-    "commerce/transactional_emails/transactional_emails"
+    "commerce/transactional_emails/transactional_emails",
 ], columns=4) =]]
 
 ## Configure
@@ -25,7 +25,7 @@ The commerce component of [[= product_name =]] covers various areas of managing
     "commerce/order_management/configure_order_management",
     "commerce/payment/configure_payment",
     "commerce/shipping_management/configure_shipment",
-    "commerce/storefront/configure_storefront"
+    "commerce/storefront/configure_storefront",
 ], columns=4) =]]
 
 ## Extend
@@ -35,7 +35,7 @@ The commerce component of [[= product_name =]] covers various areas of managing
     "commerce/payment/extend_payment",
     "commerce/shipping_management/extend_shipping",
     "commerce/storefront/extend_storefront",
-    "commerce/transactional_emails/extend_transactional_emails"
+    "commerce/transactional_emails/extend_transactional_emails",
 ], columns=4) =]]
 
 ## Explore Commerce API
@@ -47,5 +47,5 @@ The commerce component of [[= product_name =]] covers various areas of managing
     "commerce/payment/payment_api",
     "commerce/payment/payment_method_api",
     "commerce/shipping_management/shipping_method_api",
-    "commerce/shipping_management/shipment_api"
+    "commerce/shipping_management/shipment_api",
 ], columns=4) =]]
diff --git a/docs/content_management/content_model.md b/docs/content_management/content_model.md
index 5b5bed4aa8..5eb8ec661c 100644
--- a/docs/content_management/content_model.md
+++ b/docs/content_management/content_model.md
@@ -12,7 +12,7 @@ Each content item is an instance of a content type.
 
 !!! tip
 
-    An introduction to the content model for non-developer users is available in [[[= product_name =]] User Documentation](https://doc.ibexa.co/projects/userguide/en/latest/content_management/content_model/).
+    An introduction to the content model for non-developer users is available in User Documentation](https://doc.ibexa.co/projects/userguide/en/latest/content_management/content_model/).
 
 ## Content items
 
diff --git a/docs/content_management/field_types/field_type_storage.md b/docs/content_management/field_types/field_type_storage.md
index 663bfcb10e..2e2aa0f5a8 100644
--- a/docs/content_management/field_types/field_type_storage.md
+++ b/docs/content_management/field_types/field_type_storage.md
@@ -30,7 +30,7 @@ The SPI `FieldValue` struct has properties which the field type can use:
 
 The Legacy storage engine uses the `ezcontentobject_attribute` table to store field values,
 and `ezcontentclass_attribute` to store field definition values.
-they're both based on the same principle.
+They're both based on the same principle.
 
 Each row represents a field or a field definition, and offers several free fields of different types, where the type can store its data.
 
diff --git a/docs/content_management/forms/forms.md b/docs/content_management/forms/forms.md
index 7bd327a345..663c1dbc27 100644
--- a/docs/content_management/forms/forms.md
+++ b/docs/content_management/forms/forms.md
@@ -14,5 +14,5 @@ Forms are a type of content item that you can use to improve the functionality o
     "content_management/forms/form_api",
     "content_management/forms/create_form_attribute",
     "content_management/forms/create_custom_form_field",
-    "content_management/forms/customize_email_notifications"
+    "content_management/forms/customize_email_notifications",
 ], columns=3) =]]
diff --git a/docs/content_management/images/images.md b/docs/content_management/images/images.md
index c427c6e33e..4410f6de5d 100644
--- a/docs/content_management/images/images.md
+++ b/docs/content_management/images/images.md
@@ -53,7 +53,7 @@ You generate variations based on [filters](image_variations.md#available-variati
 Image variations are generated with [LiipImagineBundle](https://github.com/liip/LiipImagineBundle), by using the underlying [Imagine library](https://imagine.readthedocs.io/en/latest/). 
 The LiipImagineBundle bundle supports GD (default), Imagick or Gmagick PHP extensions, and enables you to define flexible filters in PHP. 
 Image files are stored by using the `IOService,` and are completely independent from the Image field type.
-they're generated only once and cleared on demand, for example, on content removal).
+They're generated only once and cleared on demand, for example, on content removal).
 
 LiipImagineBundle only works on image blobs, so no command line tool is needed.
 
diff --git a/docs/content_management/pages/page_builder_guide.md b/docs/content_management/pages/page_builder_guide.md
index 6c655ddf54..4ff642db95 100644
--- a/docs/content_management/pages/page_builder_guide.md
+++ b/docs/content_management/pages/page_builder_guide.md
@@ -7,7 +7,8 @@ edition: experience
 
 ## What is page
 
-[Page](pages.md) is a block-based type of content. You can create and modify it with a visual drag-and-drop editor - Page Builder.
+[Page](pages.md) is a block-based type of content.
+You can create and modify it with a visual drag-and-drop editor - Page Builder.
 Page is divided into zones into which you can drop various dynamic blocks.
 By editing pages you can customize the layout and content of your website.
 
@@ -29,14 +30,15 @@ To create a new page:
 
 ### Edit page
 
-You can edit any existing page by using Page Builder. To do it, in the back office go to **Content** and select **Content structure**.
+You can edit any existing page with the Page Builder.
+To do it, in the back office go to **Content** and select **Content structure**.
 Then, from the content tree choose the page and click **Edit**.
 
 ## What is Page Builder
 
 Page Builder is a visual tool that allows you to create and edit any page in [[= product_name =]].
 It's more than managing: it's about building pages, creating customized content and fully-targeted landing pages.
-Creating pages in Page Builder involves composing content using ready-to-use elements - blocks, properly configured and customized.
+Creating pages in Page Builder involves composing content from ready-to-use elements - blocks, properly configured and customized.
 It's also important to choose a layout - it determines the arrangement of drop zones that contain content elements.
 
 ![Page Builder - diagram](page_builder_diagram.png)
@@ -95,7 +97,9 @@ Page Builder has two main views that you can use while creating a page:
 
 ![Page blocks](page_blocks_toolbar.png)
 
-- Structure view - shows a structure of the page, including its division into zones and the blocks that it contains. It follows the behavior of the content tree. Structure view has ability to reorder blocks using drag and drop.
+- Structure view - shows a structure of the page, including its division into zones and the blocks that it contains.
+It follows the behavior of the content tree.
+Structure view has ability to reorder blocks using drag and drop.
 
 ![Structure view](structure_view.png)
 
diff --git a/docs/content_management/rich_text/online_editor_guide.md b/docs/content_management/rich_text/online_editor_guide.md
index a2bca69a1c..828a6d8439 100644
--- a/docs/content_management/rich_text/online_editor_guide.md
+++ b/docs/content_management/rich_text/online_editor_guide.md
@@ -18,7 +18,7 @@ Online Editor is available in all supported [[= product_name =]] versions and ed
 ## How to get started
 
 Online Editor is the default editing interface for all RichText fields. 
-To start using it, create any content item with a RichText field (for example, using the built-in Article content type) and edit this field.
+To start using it, create any content item with a RichText field (for example, based on the built-in Article content type) and edit this field.
 
 ## Capabilities
 
diff --git a/docs/content_management/rich_text/rich_text.md b/docs/content_management/rich_text/rich_text.md
index 5319ba4bed..fe5e1d4ce0 100644
--- a/docs/content_management/rich_text/rich_text.md
+++ b/docs/content_management/rich_text/rich_text.md
@@ -10,5 +10,5 @@ RichText is a type of field that you add in any content item in [[= product_name
 [[= cards([
     "content_management/rich_text/online_editor_guide",
     "content_management/rich_text/extend_online_editor",
-    "content_management/rich_text/create_custom_richtext_block"
+    "content_management/rich_text/create_custom_richtext_block",
 ], columns=3) =]]
\ No newline at end of file
diff --git a/docs/content_management/url_management/url_management.md b/docs/content_management/url_management/url_management.md
index d4ec06e4d0..a41052cfb8 100644
--- a/docs/content_management/url_management/url_management.md
+++ b/docs/content_management/url_management/url_management.md
@@ -241,7 +241,8 @@ The **URL wildcards** tab contains all the information about each URL wildcard.
 
 !!! note
 
-    To be able to modify wildcard support settings in the user interface, you must have the `content/urltranslator` Policy. For more information about permissions, see [Permissions](permissions.md).
+    To be able to modify wildcard support settings in the user interface, you must have the `content/urltranslator` policy.
+    For more information about permissions, see [Permissions](permissions.md).
 
 
 ### Configuring URL wildcards with the public PHP API
diff --git a/docs/content_management/workflow/workflow.md b/docs/content_management/workflow/workflow.md
index 7abe85c4b6..2086789661 100644
--- a/docs/content_management/workflow/workflow.md
+++ b/docs/content_management/workflow/workflow.md
@@ -6,8 +6,7 @@ description: Workflow controls how content items pass between stages and allows
 
 The workflow functionality passes a content item version through a series of stages.
 
-For example, an editorial workflow can pass a content item from draft stage through 
-design and proofreading.
+For example, an editorial workflow can pass a content item from draft stage through design and proofreading.
 
 By default, [[= product_name =]] comes pre-configured with a Quick Review workflow.
 You can disable the default workflow and define different workflows in configuration. 
@@ -27,15 +26,17 @@ The following example configuration defines a workflow where you can optionally
 
 ### Matchers
 
-Matchers define when the workflow is used. Their configuration is optional.
+Matchers define when the workflow is used.
+Their configuration is optional.
 
 `content_type` contains an array of content type identifiers that use this workflow.
 
-`content_status` lists the statuses of content items which fall under this workflow. The available values are: `draft` and `published`. 
+`content_status` lists the statuses of content items which fall under this workflow.
+The available values are: `draft` and `published`. 
 
-If set to `draft`, applies for new Content (newly created).
+If set to `draft`, applies for new content (newly created).
 
-If set to `published`, applies for Content that has already been published (for example, edit after the Content was published).
+If set to `published`, applies for content that has already been published (for example, edit after the content was published).
 
 ``` yaml
 [[= include_file('code_samples/workflow/custom_workflow/config/packages/workflows.yaml', 6, 9) =]]
@@ -57,8 +58,7 @@ One stage, listed under `initial_stage`, is the one that the workflow starts wit
 
 Each transition has an identifier and can have a label, a color, and an icon.
 
-A transition must state between which stages it transitions (lines 3-4),
-or be `reverse` to a different transition (line 9).
+A transition must state between which stages it transitions (lines 3-4), or be `reverse` to a different transition (line 9).
 
 ``` yaml hl_lines="3 4 9"
 [[= include_file('code_samples/workflow/custom_workflow/config/packages/workflows.yaml', 23, 30) =]][[= include_file('code_samples/workflow/custom_workflow/config/packages/workflows.yaml', 38, 43) =]]
@@ -70,10 +70,8 @@ When moving a content item through a transition, the user can select a reviewer.
 Assigning a reviewer is mandatory if you set `reviewers.required` to `true` for this transition.
 You can restrict who can review the content item by setting `reviewers.user_group` to a location ID of the user group.
 
-To be able to search for users for review, the user must have the content/read Policy without any Limitation,
-or with a Limitation that allows reading users.
-This means that, in addition to your own settings for this Policy, 
-you must add the /Users subtree to the Limitation and add users in the [content type Limitation](limitation_reference.md#content-type-limitation).
+To be able to search for users for review, the user must have the `content/read` policy without any limitation, or with a limitation that allows reading users.
+This means that, in addition to your own settings for this policy, you must add the /Users subtree to the limitation and add users in the [content type limitation](limitation_reference.md#content-type-limitation).
 
 ``` yaml hl_lines="8 9"
 [[= include_file('code_samples/workflow/custom_workflow/config/packages/workflows.yaml', 23, 32) =]]
@@ -93,14 +91,9 @@ The notification is displayed in the user menu:
 
 #### Draft locking
 
-You can configure draft assignment in a way that when a user sends a draft to review,
-only the first editor of the draft can either edit the draft or unlock it for editing, and no
-other user can take it over. 
+You can configure draft assignment in a way that when a user sends a draft to review, only the first editor of the draft can either edit the draft or unlock it for editing, and no other user can take it over. 
 
-Use the [Version Lock Limitation](limitation_reference.md#version-lock-limitation),
-set to "Assigned only", together with the `content/edit` and `content/unlock`
-Policies to prevent users from editing and unlocking drafts that are locked
-by another user.
+Use the [Version Lock limitation](limitation_reference.md#version-lock-limitation), set to "Assigned only", together with the `content/edit` and `content/unlock` policies to prevent users from editing and unlocking drafts that are locked by another user.
 
 ### Content publishing
 
@@ -153,32 +146,25 @@ The template has to provide a block named `ez_workflow_timeline_entry_{ENTRY_IDE
 
 You can limit access to workflows at stage and transition level.
 
-The `workflow/change_stage` Policy grants permission to change stages in a specific workflow.
+The `workflow/change_stage` policy grants permission to change stages in a specific workflow.
 
-You can limit this Policy with the [Workflow Transition Limitation](limitation_reference.md#workflow-transition-limitation) 
-to only allow sending content in the selected transition.
+You can limit this policy with the [Workflow Transition limitation](limitation_reference.md#workflow-transition-limitation) to only allow sending content in the selected transition.
 
-For example, by using the example above, a `workflow/change_stage` Policy 
-with `WorkflowTransitionLimitation` set to `Approved by legal` allows a legal team to send content forward
-after they're done with their review.
+For example, by using the example above, a `workflow/change_stage` policy with `WorkflowTransitionLimitation` set to `Approved by legal` allows a legal team to send content forward after they're done with their review.
 
-You can also use the [Workflow Stage Limitation](limitation_reference.md#workflow-stage-limitation) 
-together with the `content/edit` and `content/publish` Policies to limit the ability to edit content in specific stages.
+You can also use the [Workflow Stage Limitation](limitation_reference.md#workflow-stage-limitation) together with the `content/edit` and `content/publish` Policies to limit the ability to edit content in specific stages.
 For example, you can use it to only allow a legal team to edit content in the `legal` stage.
 
 ## Validation
 
 ### Validate form before workflow transition
 
-By default, sending content to the next stage of the workflow doesn't validate the form in UI,
-so with the publish action, the form isn't verified for errors in UI.
+By default, sending content to the next stage of the workflow doesn't validate the form in UI, so with the publish action, the form isn't verified for errors in UI.
 However, during the publish action, the sent form is validated in the service.
 
-Therefore, if there are any errors in the form, you return to the edit page but errors aren't triggered,
-which can be confusing when you have two or more tabs.
+Therefore, if there are any errors in the form, you return to the edit page but errors aren't triggered, which can be confusing when you have two or more tabs.
 
-To enable form validation in UI before sending it to the next stage of the workflow,
-add `validate: true` to the transitions of the stage.
+To enable form validation in UI before sending it to the next stage of the workflow, add `validate: true` to the transitions of the stage.
 In the example below the form is validated in two stages:` to_legal` and `done`:
 
 ``` yaml hl_lines="15 28"
diff --git a/docs/customer_management/customer_portal.md b/docs/customer_management/customer_portal.md
index bdb1520efb..555e487b1d 100644
--- a/docs/customer_management/customer_portal.md
+++ b/docs/customer_management/customer_portal.md
@@ -18,5 +18,5 @@ With this feature, your customers can self-register, edit their organization inf
     "customer_management/cp_applications",
     "users/invitations",
     "customer_management/cp_page_builder",
-    "customer_management/create_user_registration_form"
+    "customer_management/create_user_registration_form",
 ], columns=3) =]]
\ No newline at end of file
diff --git a/docs/getting_started/first_steps.md b/docs/getting_started/first_steps.md
index 433ba746d5..6b72a0dae3 100644
--- a/docs/getting_started/first_steps.md
+++ b/docs/getting_started/first_steps.md
@@ -120,7 +120,7 @@ ibexa:
             site_group: [site, de]
 ```
 
-The SiteAccess is automatically matched using the last part of the URI.
+The SiteAccess is automatically matched based on the last part of the URI.
 
 2\. You can now access the front page through the new SiteAccess: `<yourdomain>/de`.
 
diff --git a/docs/getting_started/requirements.md b/docs/getting_started/requirements.md
index 09273a391d..94377fff48 100644
--- a/docs/getting_started/requirements.md
+++ b/docs/getting_started/requirements.md
@@ -428,7 +428,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
     - Verifying your requirements and ensuring they're supported by Platform.sh
     - Additional time for adaptation and configuration work, and testing by your development team
-    - Additional consulting/onboarding time with Platform.sh, Ibexa technical services, and/or one of the many partners with prior experience using Platform.sh with [[= product_name =]]
+    - Additional consulting/onboarding time with Platform.sh, Ibexa technical services, and/or one of the many partners with prior experience in using Platform.sh with [[= product_name =]]
 
     The cost and effort of this isn't included in [[= product_name_cloud =]] subscription and is vary depending on the project.
 
@@ -475,7 +475,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
     - Verifying your requirements and ensuring they're supported by Platform.sh
     - Additional time for adaptation and configuration work, and testing by your development team
-    - Additional consulting/onboarding time with Platform.sh, Ibexa technical services, and/or one of the many partners with prior experience using Platform.sh with [[= product_name =]]
+    - Additional consulting/onboarding time with Platform.sh, Ibexa technical services, and/or one of the many partners with prior experience in using Platform.sh with [[= product_name =]]
 
     The cost and effort of this isn't included in [[= product_name_cloud =]] subscription and is vary depending on the project.
 
@@ -514,7 +514,7 @@ Recommendation for production setups is to use Varnish/Fastly, Redis/Memcached,
 
     - Verifying your legacy configuration and ensuring it's supported by Platform.sh
     - Additional time for adaptation and configuration work, and testing by your own team
-    - Additional consulting/onboarding time with Platform.sh, Ibexa technical services, and/or one of the many partners with prior experience using Platform.sh with eZ Publish legacy
+    - Additional consulting/onboarding time with Platform.sh, Ibexa technical services, and/or one of the many partners with prior experience in using Platform.sh with eZ Publish legacy
 
     The cost and effort of this isn't included in eZ Platform Cloud subscription and is vary depending on the project.
 
diff --git a/docs/getting_started/troubleshooting.md b/docs/getting_started/troubleshooting.md
index 27c3446909..35810d8dd7 100644
--- a/docs/getting_started/troubleshooting.md
+++ b/docs/getting_started/troubleshooting.md
@@ -38,7 +38,7 @@ When a system runs out of RAM, you may see `Killed` when trying to clear the cac
 
 ## Upload size limit
 
-To make use of the back office, the defined maximum upload size must be consistent with the maximum file size defined in the content type using a File, Media, or Image field.
+To make use of the back office, the defined maximum upload size must be consistent with the maximum file size defined in the content type by using a File, Media, or Image field.
 
 It's done by setting `LimitRequestBody` for Apache or `client_max_body_size` for nginx.
 
diff --git a/docs/ibexa_cloud/ddev_and_ibexa_cloud.md b/docs/ibexa_cloud/ddev_and_ibexa_cloud.md
index a78b4f56df..c1fc1e1a3d 100644
--- a/docs/ibexa_cloud/ddev_and_ibexa_cloud.md
+++ b/docs/ibexa_cloud/ddev_and_ibexa_cloud.md
@@ -29,7 +29,7 @@ You must remove Node.js and NVM installations as they're already included in DDE
 
 The following sequence of commands:
 
-1. Downloads the [[= product_name_cloud =]] Platform.sh project from the default environment "production" into a new directory using [Platform.sh CLI alias `ibexa_cloud` defined in introduction](#ibexa-cloud-and-ddev).
+1. Downloads the [[= product_name_cloud =]] Platform.sh project from the default environment "production" into a new directory, based on the [Platform.sh CLI alias `ibexa_cloud` defined in introduction](#ibexa-cloud-and-ddev).
 (Replace `<project-ID>` with the hash of your own project.
 See [`ibexa_cloud help get`](https://docs.platform.sh/administration/cli.html#3-use) for options like selecting another environment).
 1. Configures a new DDEV project.
@@ -73,7 +73,7 @@ The following example adapts the [manual method to run an already existing proje
 
 The following sequence of commands:
 
-1. Downloads the [[= product_name_cloud =]] Platform.sh project from the default environment "production" into a new directory using [Platform.sh CLI alias `ibexa_cloud` defined in introduction](#ibexa-cloud-and-ddev).
+1. Downloads the [[= product_name_cloud =]] Platform.sh project from the default environment "production" into a new directory, based on the [Platform.sh CLI alias `ibexa_cloud` defined in introduction](#ibexa-cloud-and-ddev).
 (Replace `<project-ID>` with the hash of your own project. See [`ibexa_cloud help get`](https://docs.platform.sh/administration/cli.html#3-use) for options like selecting another environment).
 1. Configures a new DDEV project.
 1. Ignores `.ddev/` directory from Git.
diff --git a/docs/ibexa_cloud/ibexa_cloud.md b/docs/ibexa_cloud/ibexa_cloud.md
index 2978628d5b..2635127a5d 100644
--- a/docs/ibexa_cloud/ibexa_cloud.md
+++ b/docs/ibexa_cloud/ibexa_cloud.md
@@ -6,7 +6,7 @@ month_change: false
 
 # [[= product_name_cloud =]]
 
-[[= product_name_cloud =]] is a cloud hosting platform that enables you to host your application in the cloud using the Platform.sh service.
+[[= product_name_cloud =]] is a cloud hosting platform that enables you to host your application in the cloud by using the Platform.sh service.
 
 [[= cards([
     "ibexa_cloud/ibexa_cloud_guide",
diff --git a/docs/ibexa_engage/integrate_ibexa_connect.md b/docs/ibexa_engage/integrate_ibexa_connect.md
index 61514f461f..3b8974bbb9 100644
--- a/docs/ibexa_engage/integrate_ibexa_connect.md
+++ b/docs/ibexa_engage/integrate_ibexa_connect.md
@@ -5,7 +5,7 @@ edition: experience
 
 # Use Ibexa Connect
 
-You can create workflows using [[[= product_name_connect =]]](https://doc.ibexa.co/projects/connect/en/latest/general/ibexa_connect/).
+You can use [[[= product_name_connect =]]](https://doc.ibexa.co/projects/connect/en/latest/general/ibexa_connect/) to create workflows.
 [[= product_name_engage =]] collects user data and passes it directly to [[= product_name_connect =]].
 With this data, you can create scenarios, for example, to add a user to newsletter, or to specific user segment group.
 
diff --git a/docs/ibexa_products/editions.md b/docs/ibexa_products/editions.md
index 3ab8f47700..d4d62332ae 100644
--- a/docs/ibexa_products/editions.md
+++ b/docs/ibexa_products/editions.md
@@ -10,7 +10,7 @@ Three [[= product_name =]] product editions are available to help you accelerate
 [[= cards([
     "ibexa_products/ibexa_headless",
     "ibexa_products/ibexa_experience",
-    "ibexa_products/ibexa_commerce"
+    "ibexa_products/ibexa_commerce",
 ], columns=3) =]]
 
 ## Feature comparison
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
index a6e631e48c..6b480745cb 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/content_aware_cache.md
@@ -5,7 +5,8 @@ description: Content-aware HTTP cache takes into account the content it's connec
 # Content-aware HTTP cache
 
 HTTP cache in [[= product_name =]] is aware of which content or entity it's connected to.
-This awareness is accomplished by means of cache tagging. All supported reverse proxies are content-aware.
+This awareness is accomplished by means of cache tagging.
+All supported reverse proxies are content-aware.
 
 !!! note "Tag header is stripped in production for security reasons"
 
@@ -41,7 +42,8 @@ Current content tags (and when the system purges on them):
 
     Tags aren't prefixed for default repository (index "0").
 
-The content tags are returned in a header in the responses from [[= product_name =]]. The header name is dependent on which HTTP Cache [[= product_name =]] is configured with:
+The content tags are returned in a header in the responses from [[= product_name =]].
+The header name is dependent on which HTTP Cache [[= product_name =]] is configured with:
 
 - Symfony reverse proxy: `X-Cache-Tags`
 - Varnish: `xkey`
@@ -194,7 +196,7 @@ See [Tagging from code](https://foshttpcachebundle.readthedocs.io/en/latest/feat
 
 4\. Use deprecated `X-Location-Id` header.
 
-For custom or built-in controllers (for example, REST) still using `X-Location-Id`, `XLocationIdResponseSubscriber` handles translating this header to tags.
+For custom or built-in controllers (for example, REST) that still use `X-Location-Id`, `XLocationIdResponseSubscriber` handles translating this header to tags.
 It supports singular and comma-separated location ID value(s):
 
 ```php
@@ -443,8 +445,7 @@ Some notes about each of these parameters:
   It's good practice to always include this header when imitating the HTTP Cache.
 - `--header "accept: application/vnd.fos.user-context-hash"` tells [[= product_name =]] that the client wants to receive the user-context-hash
 - `--header "x-fos-original-url: /"` is required by the fos-http-cache bundle to deliver the user-context-hash
-- `https://www.staging.foobar.com.us-2.platformsh.site/_fos_user_context_hash` : here we use the hostname we earlier told
-  curl how to resolve using `---resolve`. `/_fos_user_context_hash` is the route to the controller that are able to deliver the user-context-hash.
+- `https://www.staging.foobar.com.us-2.platformsh.site/_fos_user_context_hash` : here we use the hostname we earlier told curl how to resolve using `---resolve`. `/_fos_user_context_hash` is the route to the controller that are able to deliver the user-context-hash.
 - You may also provide the session cookie (`--cookie ".....=....") for a logged-in-user if you're interested in the x-user-context-hash for a different user but anonymous
 
 The output for this command should look similar to this:
@@ -498,7 +499,8 @@ The document might also be removed from the cache by purging any of the keys pro
 
 So back to the original problem here.
 This resource is for some reason not cached by Fastly (remember the `x-cache: MISS` we started with).
-But origin says this page can be cached for 1 day. How can that be?
+But origin says this page can be cached for 1 day.
+How can that be?
 The likely reason is that this page also contains some ESI fragments and that one or more of these aren't cachable.
 
 So, first let's see if there are any ESIs here.
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md b/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
index 7f7133a4c7..d39204d565 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/context_aware_cache.md
@@ -47,7 +47,7 @@ It also varies on `Authorization` to cover any possible basic authorization head
 
 !!! note "Problems with stale user hash"
 
-    If you notice issues with stale hash usage, before you disable this cache, make sure login or logout always generates new session IDs and performs a full redirect to make sure no requests are being made using stale user context hashes.
+    If you notice issues with stale hash usage, before you disable this cache, make sure login or logout always generates new session IDs and performs a full redirect to make sure no requests are being made with stale user context hashes.
 
 !!! caution "Limitations of the user context hash"
 
@@ -129,7 +129,7 @@ However, **this is strongly discouraged** as it means increasing the amount of c
 Instead, you can create your own hash header for use cases where you need it.
 This way only controllers and views that really vary by your custom logic varies on it.
 
-You can do it using several methods, ranging from completely custom VCL logic and dedicated controller to respond with hash to trusted proxy lookups, but this means additional lookups.
+You can use several methods to do it, ranging from completely custom VCL logic and dedicated controller to respond with hash to trusted proxy lookups, but this means additional lookups.
 
 ### Example for custom vary by logic
 
diff --git a/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md b/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
index f446d35b26..5cc3150671 100644
--- a/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
+++ b/docs/infrastructure_and_maintenance/cache/http_cache/reverse_proxy.md
@@ -81,7 +81,7 @@ framework:
     trusted_proxies: '192.0.0.1,10.0.0.0/8'
 ```
 
-!!! caution "Careful when trusting dynamic IP using `REMOTE_ADDR` value or similar"
+!!! caution "Careful when trusting dynamic IP that uses `REMOTE_ADDR` value or similar"
 
     On Platform.sh, Varnish doesn't have a static IP, like with [AWS LB](https://symfony.com/doc/5.1/deployment/proxies.html#but-what-if-the-ip-of-my-reverse-proxy-changes-constantly).
     For this reason, the `TRUSTED_PROXIES` env variable supports being set to value `REMOTE_ADDR`, which is equal to:
@@ -133,7 +133,7 @@ ibexa:
                 purge_servers: [http://my.varnish.server:8081]
 ```
 
-!!! note "Invalidating Varnish cache using tokens"
+!!! note "Invalidating Varnish cache by using tokens"
 
     In setups where the Varnish server IP can change (for example, on [[= product_name_cloud =]]), you can use token-based cache invalidation through [`ez_purge_acl`](https://github.com/ibexa/http-cache/blob/main/docs/varnish/vcl/varnish5.vcl#L174).
 
diff --git a/docs/infrastructure_and_maintenance/cache/persistence_cache.md b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
index d6f5ce6494..b25cf1f8e4 100644
--- a/docs/infrastructure_and_maintenance/cache/persistence_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
@@ -82,7 +82,7 @@ ibexa:
 
 !!! note "One cache pool for each repository"
 
-    If your installation has several repositories *(databases)*, make sure every group of sites using different Repositories also uses a different cache pool.
+    If your installation has several repositories *(databases)*, make sure every group of sites that uses different repositories also uses a different cache pool.
 
 ### In-Memory cache configuration
 
diff --git a/docs/infrastructure_and_maintenance/clustering/clustering.md b/docs/infrastructure_and_maintenance/clustering/clustering.md
index 20ec49db58..cd5f799d81 100644
--- a/docs/infrastructure_and_maintenance/clustering/clustering.md
+++ b/docs/infrastructure_and_maintenance/clustering/clustering.md
@@ -215,7 +215,7 @@ ibexa:
                 url_prefix: storage
 ```
 
-As an alternative, you may serve images from NFS using a dedicated web server.
+As an alternative, you may serve images from NFS by using a dedicated web server.
 If in the example above, this server listens on `http://static.example.com/` and uses `/path/to/nfs/storage` as the document root, configure `io.url_prefix` as follows:
 
 ``` yaml
@@ -282,4 +282,4 @@ If `--to` is omitted, the first non-default IO configuration is used.
 While the command is running, the files should not be modified.
 To avoid surprises you should create a [backup](backup.md) and/or execute a dry run before doing the actual update, using the `--dry-run` switch.
 
-Since this command can run for a long time, to avoid memory exhaustion run it in the production environment using the `--env=prod` switch.
+Since this command can run for a long time, to avoid memory exhaustion, use the `--env=prod` switch when you run it in the production environment.
diff --git a/docs/infrastructure_and_maintenance/clustering/clustering_with_aws_s3.md b/docs/infrastructure_and_maintenance/clustering/clustering_with_aws_s3.md
index a3492b251f..ba78c00cf7 100644
--- a/docs/infrastructure_and_maintenance/clustering/clustering_with_aws_s3.md
+++ b/docs/infrastructure_and_maintenance/clustering/clustering_with_aws_s3.md
@@ -93,4 +93,4 @@ Clear all caches and reload, and that's it.
 
 ## Migrate your existing binary data to S3
 
-You can [migrate existing binary data](clustering.md#migrating-to-a-cluster-setup) to S3 using the `php bin/console ibexa:io:migrate-files` command which was added in [EZP-25946](https://issues.ibexa.co/browse/EZP-25946).
+You can [migrate existing binary data](clustering.md#migrating-to-a-cluster-setup) to S3 with the `php bin/console ibexa:io:migrate-files` command that was added in [EZP-25946](https://issues.ibexa.co/browse/EZP-25946).
\ No newline at end of file
diff --git a/docs/infrastructure_and_maintenance/environments.md b/docs/infrastructure_and_maintenance/environments.md
index 17bb607dd7..0d88ec1fe0 100644
--- a/docs/infrastructure_and_maintenance/environments.md
+++ b/docs/infrastructure_and_maintenance/environments.md
@@ -15,7 +15,7 @@ You can have different configuration sets for each of them.
 
 ## Web server configuration
 
-For example, using Apache, in the [`VirtualHost` example](https://raw.githubusercontent.com/ibexa/post-install/main/resources/templates/apache2/vhost.template) in your installation, the required `VirtualHost` configurations have been already included.
+For example, when you use Apache, in the [`VirtualHost` example](https://raw.githubusercontent.com/ibexa/post-install/main/resources/templates/apache2/vhost.template) in your installation, the required `VirtualHost` configurations have been already included.
 You can switch to the desired environment by setting the `ENVIRONMENT` variable to `prod`, `dev` or another custom value, like in the following example:
 
 ```
diff --git a/docs/infrastructure_and_maintenance/performance.md b/docs/infrastructure_and_maintenance/performance.md
index 8c1525503c..a9f29c21cd 100644
--- a/docs/infrastructure_and_maintenance/performance.md
+++ b/docs/infrastructure_and_maintenance/performance.md
@@ -111,7 +111,7 @@ To avoid quickly running out of memory while executing such commands you should
                 buffer_size: 200
     ```
 
-1.  Run PHP without memory limits using: `php -d memory_limit=-1 bin/console <command>`
+1.  Run PHP without memory limits: `php -d memory_limit=-1 bin/console <command>`
 1.  Disable `xdebug` *(PHP extension to debug/profile php use)* when running the command, this causes php to use much more memory.
 
 !!! note "Memory still grows"
diff --git a/docs/infrastructure_and_maintenance/security/development_security.md b/docs/infrastructure_and_maintenance/security/development_security.md
index 9300660e2b..298aa5e465 100644
--- a/docs/infrastructure_and_maintenance/security/development_security.md
+++ b/docs/infrastructure_and_maintenance/security/development_security.md
@@ -49,7 +49,7 @@ logout:
 
 ### Authentication using Symfony Security component
 
-Authentication is provided using the Symfony Security component.
+Authentication is provided by the Symfony Security component.
 
 [Native and universal `form_login`]([[= symfony_doc =]]/security/form_login_setup.html) is used, in conjunction with an extended `DaoAuthenticationProvider` (DAO stands for *Data Access Object*), the `RepositoryAuthenticationProvider`.
 Native behavior of `DaoAuthenticationProvider` has been preserved, making it possible to still use it for pure Symfony applications.
diff --git a/docs/infrastructure_and_maintenance/sessions.md b/docs/infrastructure_and_maintenance/sessions.md
index 31285cd5d6..948b7807ce 100644
--- a/docs/infrastructure_and_maintenance/sessions.md
+++ b/docs/infrastructure_and_maintenance/sessions.md
@@ -48,7 +48,7 @@ ibexa:
 
 ## Session handlers
 
-In Symfony, a session handler is configured using `framework.session.handler_id`.
+In Symfony, a session handler is configured with `framework.session.handler_id`.
 Symfony can be configured to use custom handlers, or fall back to what is configured in PHP by setting it to null (`~`).
 
 ### Default configuration
@@ -126,7 +126,7 @@ Ideally keep [persistence cache](persistence_cache.md) and session data separate
 
 If you want to make sure sessions survive Redis or server restarts, consider using a [persistent Redis](https://redis.io/docs/management/persistence/) instance for sessions.
 
-##### Alternative storing sessions in database using PDO
+##### Alternative storing sessions in database by using PDO
 
 For setups where database is preferred for storing sessions, you may use Symfony's PdoSessionHandler, although it's not currently recommended from performance perspective.
 
diff --git a/docs/multisite/languages/languages.md b/docs/multisite/languages/languages.md
index 24b23443c0..c6f53cb3d5 100644
--- a/docs/multisite/languages/languages.md
+++ b/docs/multisite/languages/languages.md
@@ -47,7 +47,7 @@ It's only your decision to exclude the translation possibility for those fields
 When a field isn't flagged as Translatable, its value is copied from the initial/main translation when a new language version is created. This copied value cannot be modified. When a field is Translatable, you have to enter its value in a new language version manually.
 
 For example, let's say that you need to store information about marathon contestants and their results.
-You build a "contestant" content type using the following fields: name, photo, age, nationality, finish time.
+You build a "contestant" content type that includes the following fields: name, photo, age, nationality, finish time.
 Allowing the translation of anything other than nationality would be pointless, since the values stored by the other fields are the same regardless of the language used to describe the contestant.
 In other words, the name, photo, age and finish time would be the same in, for example, both English and Norwegian.
 
diff --git a/docs/multisite/multisite.md b/docs/multisite/multisite.md
index e9e49103fb..7c310dda7f 100644
--- a/docs/multisite/multisite.md
+++ b/docs/multisite/multisite.md
@@ -1,5 +1,5 @@
 ---
-description: Multisite enables hosting multiple websites with different content, templates and configuration using one repository.
+description: Multisite enables hosting multiple websites with different content, templates and configuration by using one repository.
 page_type: landing_page
 ---
 
diff --git a/docs/multisite/multisite_configuration.md b/docs/multisite/multisite_configuration.md
index fbce616759..8a35200057 100644
--- a/docs/multisite/multisite_configuration.md
+++ b/docs/multisite/multisite_configuration.md
@@ -168,7 +168,7 @@ ibexa:
 
 If you need to change between SiteAccesses in Site mode, don't use any functions in the page itself (for example, a language switcher).
 This may cause unexpected errors.
-Instead, switch between SiteAccesses using the SiteAccess bar above the page.
+Instead, switch between SiteAccesses with the SiteAccess bar above the page.
 
 ## Location tree
 
@@ -189,8 +189,8 @@ ibexa:
 ```
 
 - `location_id` defines the location ID of the content root for the SiteAccess.
-- `excluded_uri_prefixes` defines which URIs ignore the root limit set using `location_id`.
-In the example above, the Media and Images folders are accessible using their own URI, even though they're outside the location provided in `content.tree_root.location_id`.
+- `excluded_uri_prefixes` defines which URIs ignore the root limit set by using `location_id`.
+In the example above, to access the Media and Images folders, you can use their own URI, even though they're outside the location provided in `content.tree_root.location_id`.
 - `index_page` is the page shown when you access the root index `/`.
 
 !!! note
diff --git a/docs/permissions/limitations.md b/docs/permissions/limitations.md
index effe7375ee..66663cc618 100644
--- a/docs/permissions/limitations.md
+++ b/docs/permissions/limitations.md
@@ -6,7 +6,7 @@ page_type: reference
 # Limitations
 
 Limitations are part of the permissions system.
-They limit the access granted to users by [Policies](permission_overview.md).
+They limit the access granted to users by [policies](permission_overview.md).
 While a policy grants the user access to a function, Limitations narrow it down by different criteria.
 
 Limitations consist of two parts:
@@ -23,7 +23,7 @@ Currently, this covers [subtree of location](limitation_reference.md#subtree-lim
 | Method | Use |
 |--------|-----|
 | `evaluate` | Evaluates if the User has access to a given object in a certain context (for instance the context can be locations when the object is `Content`), under the condition of the `Limitation` value(s). |
-| `getCriterion` | Generates a `Criterion` using `Limitation` value and current User which `SearchService` by default applies to Search Criteria for filtering search based on permissions. |
+| `getCriterion` | Generates a `Criterion` based on `Limitation` value and current user which `SearchService` by default applies to Search Criteria for filtering search based on permissions. |
 
 ## Limitation reference
 
diff --git a/docs/permissions/permissions.md b/docs/permissions/permissions.md
index 9adc744eac..139ec8ed18 100644
--- a/docs/permissions/permissions.md
+++ b/docs/permissions/permissions.md
@@ -1,5 +1,5 @@
 ---
-description: Use granular permission system to grant access to various parts of the system using roles, policies, and limitations.
+description: Use granular permission system to grant access to various parts of the system by using roles, policies, and limitations.
 page_type: landing_page
 ---
 
diff --git a/docs/personalization/api_reference/tracking_api.md b/docs/personalization/api_reference/tracking_api.md
index 7dcf9b9ec5..dec0d09cf1 100644
--- a/docs/personalization/api_reference/tracking_api.md
+++ b/docs/personalization/api_reference/tracking_api.md
@@ -1,5 +1,5 @@
 ---
-description: Allows to track items using it ID. It covers many content types with the same ID configured for tracking.
+description: Allows to track items based on an ID. It covers many content types with the same ID configured for tracking.
 ---
 
 # Tracking API
@@ -220,7 +220,7 @@ The Click event often provides additional information about the category structu
 !!! note
 
     User IDs aren't stored in the database.
-    they're irreversibly anonymized before saving to disk or building the recommendation model.
+    They're irreversibly anonymized before saving to disk or building the recommendation model.
 
 The URL to track user clicks has the following format:
 
diff --git a/docs/personalization/enable_personalization.md b/docs/personalization/enable_personalization.md
index a1e9bea714..7d630fa4b6 100644
--- a/docs/personalization/enable_personalization.md
+++ b/docs/personalization/enable_personalization.md
@@ -330,7 +330,8 @@ The personalization service also notifies other components of the Personalizatio
     If the export fails, the Personalization server doesn't have full content information.
     As a result, even if the recommendations are displayed, they might miss images, titles or deeplinks.
 
-To display recommendations on your site, you must include the asset in the template using the following code:
+To display recommendations on your site, you must include the asset in the template.
+To do it, use the following code:
 
 ``` html+twig
 {{ encore_entry_script_tags('ibexa-personalization-client-js', null, 'ibexa') }}
diff --git a/docs/personalization/legacy_recommendation_api.md b/docs/personalization/legacy_recommendation_api.md
index 0791c33d31..55c442b602 100644
--- a/docs/personalization/legacy_recommendation_api.md
+++ b/docs/personalization/legacy_recommendation_api.md
@@ -244,7 +244,7 @@ If the website is implemented in a language which supports multithreading or non
 The page generation and the recommendation requests are accomplished in parallel.
 By combining this idea with the previous solution and placing the recommendation results at the bottom of the page you can avoid any interruption in the processing.
 
-#### Loading from JavaScript using JSONP
+#### Using JSONP to load from JavaScript
 
 It's not possible to request the recommendation controller server directly from the JavaScript (over AJAX library or directly over XMLHttpRequest) because of the cross-domain restriction in most browsers.
 One of the possible technique to work around this limitation is [JSONP](https://en.wikipedia.org/wiki/JSONP).
diff --git a/docs/personalization/recommendation_integration.md b/docs/personalization/recommendation_integration.md
index e2d0265b1e..769f3f1671 100644
--- a/docs/personalization/recommendation_integration.md
+++ b/docs/personalization/recommendation_integration.md
@@ -38,7 +38,7 @@ One of the possible ways to work around this limitation is JSONP.
 ## Load over proxy
 
 A better solution than JSONP is to provide the proxy on the server side, which forwards script requests to the Personalization service.
-It can be implemented as a basic proxy using the `mod_proxy` module of the Apache Webserver.
+It can be implemented as a basic proxy by using the `mod_proxy` module of the Apache Webserver.
 It transfers the data and the JavaScript renders the response into HTML itself.
 
 An alternative approach is to create the HTML code on the server side for every target page, to simplify the script on the client side.
diff --git a/docs/pim/customize_pim.md b/docs/pim/customize_pim.md
index eda2db9ca2..877e1daebc 100644
--- a/docs/pim/customize_pim.md
+++ b/docs/pim/customize_pim.md
@@ -11,5 +11,5 @@ You can customize various areas of the Product Information Management solution t
     "pim/create_custom_attribute_type",
     "pim/create_product_code_generator",
     "pim/create_custom_catalog_filter",
-    "pim/create_custom_name_schema_strategy"
+    "pim/create_custom_name_schema_strategy",
 ], columns=4) =]]
diff --git a/docs/product_guides/product_guides.md b/docs/product_guides/product_guides.md
index 0170535db7..699e4deb67 100644
--- a/docs/product_guides/product_guides.md
+++ b/docs/product_guides/product_guides.md
@@ -19,5 +19,5 @@ Discover the primary ones with the help of product guides. Condensed content all
     "personalization/personalization_guide",
     "pim/pim_guide",
     "ibexa_cloud/ibexa_cloud_guide",
-    "cdp/cdp_guide"
+    "cdp/cdp_guide",
 ], columns=4) =]]
diff --git a/docs/release_notes/ez_platform_v1.7.0_lts.md b/docs/release_notes/ez_platform_v1.7.0_lts.md
index 272c9257a0..1fa9e13362 100644
--- a/docs/release_notes/ez_platform_v1.7.0_lts.md
+++ b/docs/release_notes/ez_platform_v1.7.0_lts.md
@@ -74,11 +74,15 @@ The interface lets the editor decide which of the Personalization scenarios conf
 
 ![](personalizationblock.png)
 
-- You can now take advantage of the **Date-Based Publishing** feature – when editing a draft, instead of publishing the content immediately you can select the date and time at which it's automatically published. All your content scheduled to be published are accessible in a dedicated widget on the dashboard.
+- You can now take advantage of the **Date-Based Publishing** feature – when editing a draft, instead of publishing the content immediately you can select the date and time at which it's automatically published.
+All your content scheduled to be published are accessible in a dedicated widget on the dashboard.
 
 ![](future_publication_window.png)
 
-- Create forms in your landing page using the **Form Builder**. A special Form Block allows you to add forms with different types of fields to the landing page. This system has been designed to be extended, so that you can create your own form fields. The system also provide an interface to access the data that has been collected, and download it as CSV files.
+- Create forms in your landing page with the **Form Builder**.
+A special Form Block allows you to add forms with different types of fields to the landing page.
+This system has been designed to be extended, so that you can create your own form fields.
+The system also provide an interface to access the data that has been collected, and download it as CSV files.
 
 ![](form-builder-1.png)
 
@@ -86,12 +90,13 @@ Submitted results can be previewed in the UI or downloaded in a CSV file, and a
 
 ### Updated Demo Sites
 
-The Enterprise demo site has been significantly improved featuring a new **Product content type** that is used to show products in the Tasteful Planet demo. The product we used are meals that, in a non-demo ideal world, would be available to order and consume. This ordering part isn't in the demo, nevertheless, the content looks really yummy... Other improvements includes the good setup of all content type field categories and the demonstration of basic SEO field types. Demo content itself has also been upgraded with more content to better demonstrate the capabilities.
+The Enterprise demo site has been significantly improved featuring a new **Product content type** that is used to show products in the Tasteful Planet demo.
+The product we used are meals that, in a non-demo ideal world, would be available to order and consume.
+This ordering part isn't in the demo, nevertheless, the content looks really yummy... 
+Other improvements includes the good setup of all content type field categories and the demonstration of basic SEO field types. Demo content itself has also been upgraded with more content to better demonstrate the capabilities.
 
 ![](productcontenttype.png)
 
- 
-
 ### Installation
 
 [Installation Guide](https://doc.ibexa.co/en/latest/getting_started/install_ez_platform)
diff --git a/docs/release_notes/ez_platform_v1.9.0.md b/docs/release_notes/ez_platform_v1.9.0.md
index 44e48763b0..4948dd681d 100644
--- a/docs/release_notes/ez_platform_v1.9.0.md
+++ b/docs/release_notes/ez_platform_v1.9.0.md
@@ -14,13 +14,19 @@ If you're looking for the Long Term Support (LTS) release, see[ https://ezplatf
 
 #### Multifile upload
 
-You can now create collections of content quickly: upload multiple files in bulk and they're imported directly into the content repository. The files are automatically imported as content using the content type that matches their MIME type. Go to the content view, drag and drop or select multiple files in the sub-items area and you get direct access for further editing. As ever, this solution can be customized so that you create your own matching rules.
+You can now create collections of content quickly: upload multiple files in bulk and they're imported directly into the content repository.
+The files are automatically imported as content using the content type that matches their MIME type.
+Go to the content view, drag and drop or select multiple files in the sub-items area and you get direct access for further editing.
+As ever, this solution can be customized so that you create your own matching rules.
 
 ![](catsfromtheMET.gif)
 
 #### Content browser
 
-In version 1.8 we introduced a new Content Browser in the Universal Discovery Widget (UDW). This Content Browser is now used to browse content everywhere, also when accessing the content tree through the left pane in Platform UI. This allows users to reach the entire repository from this toolbar (which was previously limited in terms of number of items per level), it also provides a much more consistent user experience. To reflect this change, the content tree button has been renamed **Content browse**.
+In version 1.8 we introduced a new Content Browser in the Universal Discovery Widget (UDW).
+This Content Browser is now used to browse content everywhere, also when accessing the content tree through the left pane in Platform UI.
+This allows users to reach the entire repository from this toolbar (which was previously limited in terms of number of items per level), it also provides a much more consistent user experience.
+To reflect this change, the content tree button has been renamed **Content browse**.
 
 ![](contentbrowse.gif)
 
diff --git a/docs/release_notes/ez_platform_v2.2.0.md b/docs/release_notes/ez_platform_v2.2.0.md
index d3f8a277ff..0007242290 100644
--- a/docs/release_notes/ez_platform_v2.2.0.md
+++ b/docs/release_notes/ez_platform_v2.2.0.md
@@ -59,7 +59,7 @@ You can find the list of all bookmarks in *Browse content* section. There, you c
 
 ### Standard design
 
-eZ Platform now comes with two designs using the [design engine](https://doc.ibexa.co/en/2.5/guide/design_engine): `standard` for content view and `admin` for the back office.
+eZ Platform now comes with two designs that use the [design engine](https://doc.ibexa.co/en/2.5/guide/design_engine): `standard` for content view and `admin` for the back office.
 For more information, see [default designs](https://doc.ibexa.co/en/2.5/guide/design_engine/#default-designs).
 
 !!! caution
diff --git a/docs/release_notes/ez_platform_v2.3.md b/docs/release_notes/ez_platform_v2.3.md
index 12d45c8592..2bcecd0a19 100644
--- a/docs/release_notes/ez_platform_v2.3.md
+++ b/docs/release_notes/ez_platform_v2.3.md
@@ -31,7 +31,7 @@
 
     ![Timeline and list of upcoming events](2.3_timeline_list.png)
 
-    The timeline also shows other events, such a Content published using the date-based publisher.
+    The timeline also shows other events, such a Content published with the date-based publisher.
 
 For more information, see [advanced publishing options](https://doc.ibexa.co/projects/userguide/en/2.5/publishing/advanced_publishing_options) in User Documentation.
 
diff --git a/docs/release_notes/ez_platform_v2.4.md b/docs/release_notes/ez_platform_v2.4.md
index 09ce00c4f7..482c7a62fb 100644
--- a/docs/release_notes/ez_platform_v2.4.md
+++ b/docs/release_notes/ez_platform_v2.4.md
@@ -120,13 +120,13 @@ For more information, see [Simplified Filtered search](https://doc.ibexa.co/proj
 
 ### Sub-items limit
 
-You can now set a number of items displayed in the table using sub-items from your user Settings.
+You can now set a number of items displayed in the table with the **Sub-items** setting in your User Settings.
 
 ![Setting for subitems limit in user preferences](2.4_subitems_limit_pref.png)
 
 ### Policy labels update
 
-The outdated Policy labels are now updated:
+The outdated policy labels are now updated:
 
 |Old|New|
 |---|---|
@@ -138,7 +138,7 @@ The outdated Policy labels are now updated:
 |parentowner|Owner of Parent|
 |subtree|Subtree of Location|
 
-![Updated Policy labels](2.4_policy_verbs.png)
+![Updated policy labels](2.4_policy_verbs.png)
 
 ### API improvements
 
@@ -147,12 +147,13 @@ The outdated Policy labels are now updated:
 This release introduces a few simplifications to API use for content types:
 
 - Exposes `content->getContentType()` for easier use, including from Twig as `content.contentType`. When iterating over the result set of content/Locations these are effectively loaded all at once.
-- Adds possibility to load several content types in bulk using `ContentTypeService->loadContentTypeList()`.
+- Adds a possibility to load several content types in bulk with `ContentTypeService->loadContentTypeList()`.
 - `UserService` now exposes `isUser()` and `isUserGroup()`. They don't need to do a lookup to the database to tell if a content item is of type user or user group.
 
 #### Load multiple locations
 
-You're now able to load multiple locations at once, using `LocationService->loadLocationList()`. The biggest benefit of this feature is saving load time on complex landing pages when HTTP cache is cold or disabled, including when in development mode.
+You're now able to load multiple locations at once, with `LocationService->loadLocationList()`.
+The biggest benefit of this feature is saving load time on complex landing pages when HTTP cache is cold or disabled, including when in development mode.
 
 ### BC breaks and important behavior changes
 
diff --git a/docs/release_notes/ez_platform_v3.0.md b/docs/release_notes/ez_platform_v3.0.md
index 842279568b..d741f25751 100644
--- a/docs/release_notes/ez_platform_v3.0.md
+++ b/docs/release_notes/ez_platform_v3.0.md
@@ -58,7 +58,7 @@ For details, see [Bundles](https://doc.ibexa.co/en/latest/guide/bundles).
 
     #### Schedule calendar
 
-    You can now easily view and perform scheduling actions using the Calendar widget available in the back office.
+    You can now easily view and perform scheduling actions with the Calendar widget that is available in the back office.
     By default, the widget displays content items scheduled for future publication, but custom events can be configured as well.
     You can also filter displayed events and toggle through a day, week, and month view.
 
diff --git a/docs/release_notes/ez_platform_v3.0_deprecations.md b/docs/release_notes/ez_platform_v3.0_deprecations.md
index 22e582f0ec..71ac9dc9ff 100644
--- a/docs/release_notes/ez_platform_v3.0_deprecations.md
+++ b/docs/release_notes/ez_platform_v3.0_deprecations.md
@@ -756,7 +756,7 @@ Insecure password hash types deprecated since v1.13 have been removed:
 - `PASSWORD_HASH_PLAINTEXT`
 
 Login with the removed hashes doesn't longer work.
-Users can request a new, valid password using the "Forgot password" feature.
+Users can use the "Forgot password" feature to request a new, valid password.
 
 ### Strict types for PHP API
 
diff --git a/docs/release_notes/ibexa_dxp_v4.4.md b/docs/release_notes/ibexa_dxp_v4.4.md
index 1d9056a707..89c80bb015 100644
--- a/docs/release_notes/ibexa_dxp_v4.4.md
+++ b/docs/release_notes/ibexa_dxp_v4.4.md
@@ -23,15 +23,13 @@ A new welcome page greets you when opening Ibexa Digital Experience Platform.
 
 ### All-new [[= product_name_com =]] packages [[% include 'snippets/commerce_badge.md' %]]
 
-This release deprecates all Commerce packages that you've known from previous releases 
-and brings a redesigned and reconstructed Commerce offering:
+This release deprecates all Commerce packages that you've known from previous releases and brings a redesigned and reconstructed Commerce offering:
 
 - `ibexa/cart`
 - `ibexa/checkout`
 - `ibexa/storefront`
 
-As part of this effort, two all-new components have been created: Cart and Checkout, 
-that you can use to build your own e-commerce presence. 
+As part of this effort, two all-new components have been created: Cart and Checkout, that you can use to build your own e-commerce presence. 
 
 ![The new cart view](img/4.4_new_cart.png "The new cart view")
 
@@ -41,20 +39,16 @@ For more information, see [Commerce](https://doc.ibexa.co/en/4.4/commerce/commer
 
 #### Storefront
 
-Another addition is the Storefront package that provides a starting kit 
-for the developers.
-It's a working set of components, which you can use to test the new capabilities, 
-and then customize and extend to create your own implementation of a web store.
+Another addition is the Storefront package that provides a starting kit for the developers.
+It's a working set of components, which you can use to test the new capabilities, and then customize and extend to create your own implementation of a web store.
 
 For more information, see [Storefront](https://doc.ibexa.co/en/4.4/commerce/storefront/storefront).
 
 ### Fastly Image Optimizer (Fastly IO)
 
 You can now use Fastly IO to serve optimized versions of your images in real time and cache them.
-Fastly can perform multiple transformations on your image,
-for example, cropping, resizing and trimming before serving it to end user.
-Fastly is an external service that requires a separate subscription,
-to learn more see, [Fastly Image Optimizer website](https://docs.fastly.com/en/guides/about-fastly-image-optimizer).
+Fastly can perform multiple transformations on your image, for example, cropping, resizing, and trimming before serving it to end user.
+Fastly is an external service that requires a separate subscription, to learn more see, [Fastly Image Optimizer website](https://docs.fastly.com/en/guides/about-fastly-image-optimizer).
 
 If you already have Fastly IO subscription, you can move to [Fastly IO configuration in [[= product_name =]]](https://doc.ibexa.co/en/4.4/content_management/images/fastly_io/).
 
@@ -65,8 +59,7 @@ For example, you can define formats or source path for images.
 
 ### New page blocks [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
-This release introduces new page blocks that rely on Personalization and PIM features 
-to let editors visually organize products on a page: 
+This release introduces new page blocks that rely on Personalization and PIM features to let editors visually organize products on a page:
 
 - [Catalog block](https://doc.ibexa.co/projects/userguide/en/4.4/content_management/block_reference/#catalog-block) displays products from a specific catalog to a selected customer group.
 - [Last purchased](https://doc.ibexa.co/projects/userguide/en/4.4/content_management/block_reference/#last-purchased-block) displays a list of products that were recently purchased, either generally, or by a specific user.
@@ -86,15 +79,15 @@ For more information, see [Requesting access to the server](https://doc.ibexa.co
 
 #### New models in Personalization engine
 
-Personalization engine introduces two new recommendation models: [predictive](https://doc.ibexa.co/projects/userguide/en/4.4/personalization/recommendation_models/#predictive) and [recurring purchase](https://doc.ibexa.co/projects/userguide/en/4.4/personalization/recommendation_models/#recurring-purchase). These two new models, based on mathematical approach, help to predict clients behavior and
+Personalization engine introduces two new recommendation models: [predictive](https://doc.ibexa.co/projects/userguide/en/4.4/personalization/recommendation_models/#predictive) and [recurring purchase](https://doc.ibexa.co/projects/userguide/en/4.4/personalization/recommendation_models/#recurring-purchase).
+These two new models, based on mathematical approach, help to predict clients behavior and
 provide the best recommendations.
 
 ## [[= product_name_connect =]]
 
 You can now take advantage of [[[= product_name_connect =]]](https://www.ibexa.co/products/ibexa-connect),
 an iPaaS (integration platform-as-a-service) which allows you to connect [[= product_name =]] with third-party applications.
-[[= product_name_connect =]] features a low-code drag-and-drop interface and hundreds of connectors to different services
-that help you automate business processes.
+[[= product_name_connect =]] features a low-code drag-and-drop interface and hundreds of connectors to different services that help you automate business processes.
 
 See [[[= product_name_connect =]] documentation](https://doc.ibexa.co/projects/connect/en/latest/).
 
@@ -105,13 +98,11 @@ See [[[= product_name_connect =]] documentation](https://doc.ibexa.co/projects/c
 ### Flysystem v2
 
 The codebase has undergone significant upgrades to rely on Flysystem v2.
-The Flysystem Adapter implementation now supports dynamic paths
-described by complex settings resolvable for the SiteAccess context.
+The Flysystem Adapter implementation now supports dynamic paths described by complex settings resolvable for the SiteAccess context.
 
 For more information, see [Configuring the DFS IO handler](https://doc.ibexa.co/en/4.4/infrastructure_and_maintenance/clustering/clustering/#configuring-the-dfs-io-handler).
 
-If your custom project relies directly on a Flysystem features instead of using our IO abstraction, it requires an upgrade as well,
-using [these instructions](https://flysystem.thephpleague.com/docs/upgrade-from-1.x/).
+If your custom project relies directly on a Flysystem features instead of using our IO abstraction, it requires an upgrade as well, performed according to [these instructions](https://flysystem.thephpleague.com/docs/upgrade-from-1.x/).
 
 ### Dedicated migration type for Corporate Accounts
 
@@ -151,8 +142,10 @@ to come in the upcoming releases.
 
 #### Flysystem
 
-- Support for overwriting existing files has been dropped (catch block of `\Ibexa\Core\IO\IOBinarydataHandler\Flysystem::create` and test). The new native Flysystem v2 Local Adapter performs this out of the box.
-- Support for no last modified timestamp has been dropped (in the form of a test case). The new Flysystem v2 throws `UnableToRetrieveMetadata` exception in such case.
+- Support for overwriting existing files has been dropped (catch block of `\Ibexa\Core\IO\IOBinarydataHandler\Flysystem::create` and test).
+The new native Flysystem v2 Local Adapter performs this out of the box.
+- Support for no last modified timestamp has been dropped (in the form of a test case).
+The new Flysystem v2 throws `UnableToRetrieveMetadata` exception in such case.
 
 ## Full changelog
 
diff --git a/docs/resources/contributing/report_and_follow_issues.md b/docs/resources/contributing/report_and_follow_issues.md
index 532b910a4d..6254b4d3aa 100644
--- a/docs/resources/contributing/report_and_follow_issues.md
+++ b/docs/resources/contributing/report_and_follow_issues.md
@@ -15,7 +15,7 @@ If you find any, update them with your comment or additional information instead
 
 !!! caution "Security issues"
 
-    If you discover a security issue, please don't report it using regular channels, but instead take a look at [Security section](reporting_issues.md).
+    If you discover a security issue, please don't report it through regular channels, but instead take a look at the [Security section](reporting_issues.md).
 
 If you have an [[= product_name =]] subscription, report your issues through the [support portal](https://support.ibexa.co) instead of JIRA.
 This ensures the issue can be quickly prioritized according to its impact.
diff --git a/docs/resources/release_process_and_roadmap.md b/docs/resources/release_process_and_roadmap.md
index e07c9b864b..ebe1d5fabd 100644
--- a/docs/resources/release_process_and_roadmap.md
+++ b/docs/resources/release_process_and_roadmap.md
@@ -17,7 +17,7 @@ Additionally, [[= product_name =]] also has an open-source version called [[= pr
 The [[= product_name_oss =]] code is available on GitHub under the GPLv2 license.
 It comes with no commercial support and maintenance services.
 
-[[= product_name_base =]] manages the release of [[= product_name =]] using an agile iterative process and a continuous software development model, which is why we provide two kinds of [[= product_name =]] releases:
+[[= product_name_base =]] manages the release of [[= product_name =]] by using an agile iterative process and a continuous software development model, which is why we provide two kinds of [[= product_name =]] releases:
 
 - Long Term Support releases (LTS) which are supported by [[= product_name_base =]] for a long period of time.
 - Fast Track releases (FT) give access to the latest features and are supported for a short period of time. They're maintained only until the next FT release is introduced.
diff --git a/docs/search/search.md b/docs/search/search.md
index 5e3b78447d..878345ef7a 100644
--- a/docs/search/search.md
+++ b/docs/search/search.md
@@ -5,7 +5,7 @@ page_type: landing_page
 
 # Search
 
-[[= 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.
+[[= product_name =]] exposes a very powerful [Search API](search_api.md), allowing both full-text search and querying the content repository by 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([
diff --git a/docs/search/search_api.md b/docs/search/search_api.md
index f5c2a949a1..ab8f8d183a 100644
--- a/docs/search/search_api.md
+++ b/docs/search/search_api.md
@@ -10,7 +10,7 @@ To do this, you can use the [`SearchService`](#searchservice) or [Repository fil
 
 ## SearchService
 
-[`SearchService`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-SearchService.html) enables you to perform search queries using the PHP API.
+[`SearchService`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-SearchService.html) enables you to perform search queries by using the PHP API.
 
 The service should be [injected into the constructor of your command or controller](php_api.md#service-container).
 
@@ -105,13 +105,14 @@ The following BatchIterator adapters are available, for both `query` and `filter
 
 ## Repository filtering
 
-You can use the `ContentService::find(Filter)` method to find content items or `LocationService::find(Filter)` to find Locations using a defined Filter.
+You can use the `ContentService::find(Filter)` method to find content items or `LocationService::find(Filter)` to find locations by using a defined Filter.
 
 `ContentService::find` returns an iterable [`ContentList`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-ContentList.html) while `LocationService::find` returns an iterable [`LocationList`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-LocationList.html).
 
-Filtering differs from search. It doesn't use the `SearchService` and isn't based on indexed data.
+Filtering differs from search.
+It doesn't use the `SearchService` and isn't based on indexed data.
 
-[`Filter`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Filter-Filter.html) enables you to configure a query using chained methods to select criteria, sorting, limit, and offset.
+[`Filter`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Filter-Filter.html) enables you to configure a query by using chained methods to select criteria, sorting, limit, and offset.
 
 For example, the following command lists all content items under the specified parent location and sorts them by name in descending order:
 
@@ -272,7 +273,7 @@ $query->filter = new Criterion\LogicalAnd([
 ]);
 ```
 
-The query searches for location B using the [`LocationId` Criterion](locationid_criterion.md), and for visible content using the [`Visibility` Criterion](visibility_criterion.md).
+The query searches for location B by using the [`LocationId` Criterion](locationid_criterion.md), and for visible content by using the [`Visibility` Criterion](visibility_criterion.md).
 
 Even though the location B is hidden, the query finds the content because both conditions are satisfied:
 
diff --git a/docs/search/search_criteria_and_sort_clauses.md b/docs/search/search_criteria_and_sort_clauses.md
index ce19059c73..1965857889 100644
--- a/docs/search/search_criteria_and_sort_clauses.md
+++ b/docs/search/search_criteria_and_sort_clauses.md
@@ -18,7 +18,8 @@ As an example take a look at the [`ContentId` Criterion handler](https://github.
 
 ## Custom Criteria and Sort Clauses
 
-Sometimes you can find that standard Search Criteria and Sort Clauses provided with [[= product_name =]] aren't sufficient for your needs. Most often this is the case if you have a custom field type using external storage which cannot be searched using the standard field Criterion.
+Sometimes you may find that standard Search Criteria and Sort Clauses provided with [[= product_name =]] aren't sufficient for your needs.
+Most often this is the case if you have a custom field type using external storage which cannot be searched using the standard field Criterion.
 
 !!! note
 
@@ -106,7 +107,7 @@ For more information about passing parameters, see [Symfony Service Container do
 
 ## Search using custom Field Criterion [REST]
 
-REST search can be performed via `POST /views` using custom `FieldCriterion`.
+REST search can be performed by calling the `POST /views` method with a custom `FieldCriterion`.
 This allows you to build custom content logic queries with nested logical operators OR/AND/NOT.
 
 Custom Field Criterion search mirrors the one already existing in PHP API `Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Field` by exposing it to REST.
diff --git a/docs/search/search_engines/solr_search_engine/configure_solr.md b/docs/search/search_engines/solr_search_engine/configure_solr.md
index 8f97fd2eeb..e38c5c5db9 100644
--- a/docs/search/search_engines/solr_search_engine/configure_solr.md
+++ b/docs/search/search_engines/solr_search_engine/configure_solr.md
@@ -15,12 +15,13 @@ description: Configure Solr search engine to use it with Ibexa DXP.
 
     Boosting of fields or documents affects the score (relevance) of your search result hits when using Search API for any Criteria you specify on `$query->query`, or in REST by using `Query` element.
     When you don't specify anything to sort on, the result is sorted by this relevance.
-    Anything set on `$query->filter`, or in REST using `Filter` element, *doesn't* affect scoring and only works as a pure filter for the result. Thus make sure to place Criteria you want to affect scoring on `query`.
+    Anything set on `$query->filter`, or in REST by using `Filter` element, *doesn't* affect scoring and only works as a pure filter for the result.
+    Thus make sure to place Criteria you want to affect scoring on `query`.
 
 Boosting currently happens when indexing, so if you change your configuration you need to re-index.
 
 Boosting tells the search engine which parts of the content model have more importance when searching, and is an important part of tuning your search results relevance.
-Importance is defined using a numeric value, where `1.0` is default, values higher than that are more important, and values lower (down to `0.0`) are less important.
+Importance is defined by using a numeric value, where `1.0` is default, values higher than that are more important, and values lower (down to `0.0`) are less important.
 
 Boosting is configured per connection that you configure to use for a given repository, like in this `config/packages/ibexa_solr.yaml` example:
 
diff --git a/docs/search/search_engines/solr_search_engine/solr_overview.md b/docs/search/search_engines/solr_search_engine/solr_overview.md
index 086fcd6c1b..da352d5113 100644
--- a/docs/search/search_engines/solr_search_engine/solr_overview.md
+++ b/docs/search/search_engines/solr_search_engine/solr_overview.md
@@ -6,7 +6,7 @@ description: Solr search engine overview.
 
 [Solr search engine](https://github.com/ibexa/solr) allows you to use advanced search features: filtering, query, fulltext search, and aggregations.
 
-When you enable Solr and re-index your content, all your existing Search queries using `SearchService` are powered by Solr automatically.
+When you enable Solr and re-index your content, all your existing Search queries by using `SearchService` are powered by Solr automatically.
 This allows you to scale up your [[= product_name =]] installation and be able to continue development locally against SQL engine, and have a test infrastructure, Staging, and Prod powered by Solr.
 By this, it also removes considerable load from your database.
 
diff --git a/docs/search/sort_clause_reference/shipment_sort_clauses.md b/docs/search/sort_clause_reference/shipment_sort_clauses.md
index f971d0abc8..acae3058cc 100644
--- a/docs/search/sort_clause_reference/shipment_sort_clauses.md
+++ b/docs/search/sort_clause_reference/shipment_sort_clauses.md
@@ -9,7 +9,7 @@ page_type: reference
 
 Shipment Sort Clauses are only supported by [Shipment Search (`ShipmentService::findShipments`)](shipment_api.md#get-multiple-shipments).
 
-By using Sort Clauses you can filter shipments by specific attributes, for example: creation date, status, and more.
+By using Sort Clauses you can filter shipments by specific attributes, for example, creation date or status.
 
 | Sort Clause | Sorting based on |
 |-----|-----|
diff --git a/docs/snippets/update/db/update_db_2.5-3.3.md b/docs/snippets/update/db/update_db_2.5-3.3.md
index e75c35a309..366d30613a 100644
--- a/docs/snippets/update/db/update_db_2.5-3.3.md
+++ b/docs/snippets/update/db/update_db_2.5-3.3.md
@@ -14,10 +14,10 @@ php bin/console ibexa:upgrade
 
     You can only run this command once.
 
-Check the Location ID of the "Components" content item and set it as a value of the `content_tree_module.contextual_tree_root_location_ids` key in `config/ezplatform.yaml`:
+Check the location ID of the "Components" content item and set it as a value of the `content_tree_module.contextual_tree_root_location_ids` key in `config/ezplatform.yaml`:
 
 ```
 - 60 # Components
 ```
 
-If you're upgrading between [[= product_name_com =]] versions, add the `content/read` Policy with the Owner limitation set to `self` to the "Ecommerce registered users" Role.
+If you're upgrading between [[= product_name_com =]] versions, add the `content/read` policy with the Owner limitation set to `self` to the "Ecommerce registered users" role.
diff --git a/docs/templating/layout/customize_storefront_layout.md b/docs/templating/layout/customize_storefront_layout.md
index d8756affb1..fa6682798e 100644
--- a/docs/templating/layout/customize_storefront_layout.md
+++ b/docs/templating/layout/customize_storefront_layout.md
@@ -84,8 +84,8 @@ The most important templates are:
 To avoid self-reference, `@IbexaCart` is used instead of `@ibexadesign`.
 
 Built-in components aren't styled, so you can freely customize them according to your needs.
-You can add CSS classes to the base Twig using attributes' objects.
-For example, if you want to add custom CSS classes to quantity input in Add to Cart component, use the following:
+You can add CSS classes to the base Twig by using attribute objects.
+For example, to add custom CSS classes to quantity input in the "Add to Cart" component, use the following:
 
 ```html+twig
 {% set quantity_input_attr = {
diff --git a/docs/templating/templates/templates.md b/docs/templating/templates/templates.md
index 6bc8bed709..820453b77f 100644
--- a/docs/templating/templates/templates.md
+++ b/docs/templating/templates/templates.md
@@ -16,7 +16,7 @@ Templates use the Twig template engine.
 Templates can inherit from other templates.
 Use this, for example, to inherit a general page layout including a [navigation menu](add_navigation_menu.md) in article templates.
 
-To inherit from other templates, a template must extend the parent templates using the [`extends()`](https://twig.symfony.com/doc/3.x/tags/extends.html) Twig function.
+To inherit from other templates, a template must extend the parent templates by using the [`extends()`](https://twig.symfony.com/doc/3.x/tags/extends.html) Twig function.
 To extend a parent template, the child template must contain Twig blocks.
 These blocks are inserted in the parent template in relevant places.
 
diff --git a/docs/templating/twig_function_reference/site_context_twig_functions.md b/docs/templating/twig_function_reference/site_context_twig_functions.md
index a8e040ffda..0601b0ec15 100644
--- a/docs/templating/twig_function_reference/site_context_twig_functions.md
+++ b/docs/templating/twig_function_reference/site_context_twig_functions.md
@@ -10,7 +10,7 @@ To determine if given location is site context-aware, you can use site context [
 
 ### `ibexa_site_context_aware()`
 
-`ibexa_site_context_aware()` checks whether a given location is site context-aware, meaning it's not excluded from Site context using the `ibexa.system.<scope>.site_context.excluded_paths` configuration.
+`ibexa_site_context_aware()` checks whether a given location is site context-aware, meaning it's not excluded from Site context by using the `ibexa.system.<scope>.site_context.excluded_paths` configuration.
 
 #### Examples
 
diff --git a/docs/templating/twig_function_reference/twig_function_reference.md b/docs/templating/twig_function_reference/twig_function_reference.md
index a9ef5c80c8..60826c8dcf 100644
--- a/docs/templating/twig_function_reference/twig_function_reference.md
+++ b/docs/templating/twig_function_reference/twig_function_reference.md
@@ -19,5 +19,5 @@ In addition to the [native functions provided by Twig](https://twig.symfony.com/
     "templating/twig_function_reference/image_twig_functions",
     "templating/twig_function_reference/url_twig_functions",
     "templating/twig_function_reference/date_twig_filters",
-    "templating/twig_function_reference/other_twig_filters"
+    "templating/twig_function_reference/other_twig_filters",
 ], columns=4) =]]
diff --git a/docs/tutorials/beginner_tutorial/2_create_the_content_model.md b/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
index cd86b4243a..9108c520ab 100644
--- a/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
+++ b/docs/tutorials/beginner_tutorial/2_create_the_content_model.md
@@ -77,7 +77,7 @@ Confirm the creation of the content type by clicking **Save and close**.
     You can learn how to work with Pages in [another tutorial](page_and_form_tutorial.md).
 
 Go back to the content by selecting **Content structure** in the main menu.
-Then browse the content tree and create a Folder named *All Rides* using the **Create content** button on the top right of the screen.
+Then browse the content tree and create a Folder named *All Rides* by clicking the **Create content** button on the top right of the screen.
 Publish the Folder.
 
 While in the folder, create a few of Rides using the **Create content** button, add photos and publish them.
diff --git a/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md b/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md
index bf86f050f9..054c1e88c0 100644
--- a/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md
+++ b/docs/tutorials/beginner_tutorial/3_customize_the_front_page.md
@@ -4,7 +4,7 @@ description: Try customizing the front page by using custom templates and adding
 
 # Step 3 — Customize the front page
 
-In this step you can create the global layout of your site, and display content using custom templates.
+In this step you can create the global layout of your site, and display content by using custom templates.
 
 First, go to the root of the site (`<yourdomain>`).
 You should now see the home page of the clean install, without any kind of layout.
@@ -67,7 +67,7 @@ Create a `home_page.html.twig` file in `templates/full/`:
 </div>
 ```
 
-Refresh the page and you can see an unstyled version of the message.
+Refresh the page to see an unstyled version of the message.
 
 !!! note
 
diff --git a/docs/tutorials/beginner_tutorial/beginner_tutorial.md b/docs/tutorials/beginner_tutorial/beginner_tutorial.md
index a1beb6883a..21e71b8f68 100644
--- a/docs/tutorials/beginner_tutorial/beginner_tutorial.md
+++ b/docs/tutorials/beginner_tutorial/beginner_tutorial.md
@@ -19,10 +19,10 @@ To follow it, you should:
 
 ## Learning outcomes
 
-After finishing this tutorial, you:
+After finishing this tutorial, you should:
 
 - know how to construct the content model of a website.
-- are able to use templates to display your content according to your needs.
+- be able to use templates to display your content according to your needs.
 - know how to manage users and permissions.
 
 ## Scenario
diff --git a/docs/update_and_migration/from_4.5/update_from_4.5.md b/docs/update_and_migration/from_4.5/update_from_4.5.md
index 3a3708e280..eedfb325f7 100644
--- a/docs/update_and_migration/from_4.5/update_from_4.5.md
+++ b/docs/update_and_migration/from_4.5/update_from_4.5.md
@@ -265,7 +265,8 @@ php bin/console ibexa:migrations:migrate --file=2023_09_23_14_15_dashboard_struc
 
 !!! caution
 
-    The `2023_10_10_16_14_dashboard_permissions.yaml` migration creates a Role dedicated for dashboard management and assigns it to the Editors user group. If you have custom user groups which need to manipulate dashboards, you need to skip this migration, copy it to your migrations folder (by default, `src/Migrations/Ibexa/migrations`) and adjust it according to your needs before execution.
+    The `2023_10_10_16_14_dashboard_permissions.yaml` migration creates a role dedicated for dashboard management and assigns it to the Editors user group.
+    If you have custom user groups which need to manipulate dashboards, you need to skip this migration, copy it to your migrations folder (by default, `src/Migrations/Ibexa/migrations`) and adjust it according to your needs before execution.
 
 For [[= product_name_com =]] there's an additional migration:
 ``` bash
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/common_issues.md b/docs/update_and_migration/migrate_to_ibexa_dxp/common_issues.md
index c0c40a46bf..b763973d61 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/common_issues.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/common_issues.md
@@ -4,8 +4,7 @@ description: Check common issues that occur when updating from earlier version t
 
 # Common migration issues
 
-Below you can find cleanup commands from the EzPublishMigrationBundle for the most common
-issues that can occur after migration to [[= product_name =]].
+Below you can find cleanup commands from the EzPublishMigrationBundle for the most common issues that can occur after migration to [[= product_name =]].
 
 !!! note "Enabling EzPublishMigrationBundle bundle"
 
@@ -45,11 +44,12 @@ php bin/console ezplatform:images:normalize-path
 
 ## Unknown relation type 0
 
-"Unknown relation type 0." error occurs only when using REST API. The issue doesn't occur
-the first time article is published (upon creation). It only happens after the article is
-edited and published.
+"Unknown relation type 0." error occurs only when using REST API.
+The issue doesn't occur the first time article is published (upon creation).
+It only happens after the article is edited and published.
 
-If this error occurs use the console command below. It cleans up redundant Relations rows:
+If this error occurs use the console command below.
+It cleans up redundant Relations rows:
 
 ```
 php bin/console ezpublish:update:legacy_storage_clean_up_relation_type_eq_zero
@@ -63,10 +63,9 @@ You can read more about this issue here: [EZP-27254](https://issues.ibexa.co/bro
 
 ## Always available flag set on all fields
 
-Always available flag is set on all fields, instead of only on fields in the main
-language. This problem occurs when [[= product_name =]] is used to create content that is both
-always available and has multiple translations. The cleanup script correctly sets
-always available flag for prioritized language filtering in Legacy search engine.
+Always available flag is set on all fields, instead of only on fields in the main language.
+This problem occurs when [[= product_name =]] is used to create content that is both always available and has multiple translations.
+The cleanup script correctly sets always available flag for prioritized language filtering in Legacy search engine.
 
 ```
 php bin/console ezpublish:update:legacy_storage_fix_fields_always_available_flag
@@ -78,9 +77,9 @@ You can read more about this issue here: [EZP-24882](https://issues.ibexa.co/bro
 
 ## Listing sub-content
 
-it's possible that after upgrade `sort_key_string` is left empty. This may cause problems
-in searches throughout the API. The cleanup script checks if fields of given field
-Type have correct sort key, and update it if needed.
+It's possible that after upgrade `sort_key_string` is left empty.
+This may cause problems in searches throughout the API.
+The cleanup script checks if fields of given field type have correct sort key, and update it if needed.
 
 Execute the following command from the installation root directory:
 
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish.md b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish.md
index 90059905b6..86246a8f06 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish.md
@@ -6,9 +6,13 @@ description: Migrate an older eZ Publish installation to eZ Platform.
 
 eZ Publish was eZ Platform's predecessor, a CMS in development for five major versions and several years.
 
-Users of eZ Publish can find eZ Platform largely similar to what they know. The improvements and enhancements did not turn the fundamental concepts underlying the system, such as the content model, upside down. However, specific features, solutions and recipes may work differently between the two versions.
+Users of eZ Publish can find eZ Platform largely similar to what they know.
+The improvements and enhancements did not turn the fundamental concepts underlying the system, such as the content model, upside down.
+However, specific features, solutions, and recipes may work differently between the two versions.
 
-The release of eZ Platform brought about an inevitable disruption in backwards compatibility with eZ Publish. This means that the process of migrating existing installations requires more effort than simply upgrading from one version to another. Here you can find details on moving existing Publish-powered websites to eZ Platform.
+The release of eZ Platform brought about an inevitable disruption in backwards compatibility with eZ Publish.
+This means that the process of migrating existing installations requires more effort than simply upgrading from one version to another.
+Here you can find details on moving existing Publish-powered websites to eZ Platform.
 
 ## Changes overview
 
@@ -29,7 +33,8 @@ The specific changes that are migrated and are incompatible with legacy are: 
 - Page field (ezflow) has been replaced by the [LandingPage](pagefield.md) field, and is now provided by our commercial product [eZ Platform Enterprise Edition](http://ezstudio.com/)
 - Incremental future improvements to the database schema to improve features and scalability of the content repository 
 
-Together these major improvements make it practically impossible to run eZ Platform side by side with eZ Publish legacy, like it was possible in 5.x series. *For these reasons we recommend that you use eZ Publish Enterprise 5.4  ([which is supported until end of 2021](https://support.ez.no/Public/Service-Life)) if you don't have the option to remake your web application yet, or want to do it gradually.*
+Together these major improvements make it practically impossible to run eZ Platform side by side with eZ Publish legacy, like it was possible in 5.x series.
+*For these reasons we recommend that you use eZ Publish Enterprise 5.4  ([which is supported until end of 2021](https://support.ez.no/Public/Service-Life)) if you don't have the option to remake your web application yet, or want to do it gradually.*
 
 ## Migration Path
 
@@ -37,7 +42,9 @@ Together these major improvements make it practically impossible to run eZ Platf
 
 If you're coming directly from legacy (4.x), you need to follow the best practice 5.x Platform migration path and do the following:
 
-- Rewrite custom field types for the new Platform stack. Alternatively you can use Null field type as a dummy implementation for the custom field types that you don't want to migrate. Using Null field type prevents errors from the Platform Stack, see [Null field type Reference](nullfield.md)
+- Rewrite custom field types for the new Platform stack.
+Alternatively you can use Null field type as a dummy implementation for the custom field types that you don't want to migrate.
+Using Null field type prevents errors from the Platform Stack, see [Null field type Reference](nullfield.md)
 - Rewrite custom web front end to use the new Platform/Symfony stack, see [Beginner Tutorial](beginner_tutorial.md)
 - Rewrite custom admin modules to use the new Platform/Symfony stack
     - And if you do this while on 5.x, you can use several of the [available legacy migration features](https://doc.ez.no/display/EZP/Legacy+code+and+features) to make the new code appear in legacy admin
@@ -48,10 +55,10 @@ See Upgrade documentation on how to perform the actual upgrade: [Upgrade (eZ Pub
 
     If you plan to migrate from from eZ Publish through eZ Publish Platform 5.4 to eZ Platform and further, an exception may occur when you try to migrate the database while it contains internal drafts of landing pages.
     This can happen because such drafts don't have an expected row in the `ezcontentobject_name` table.<a id="migration_exception"></a> 
-    
-    To avoid this exception, you must remove all internal drafts before you migrate. 
-    First, in `content.ini`, set the `InternalDraftsCleanUpLimit` and `InternalDraftsDuration` values to 0. 
-    Then run the [internal drafts cleanup](https://github.com/ezsystems/ezpublish-legacy/blob/2019.03/cronjobs/internal_drafts_cleanup.php) cron job. 
+
+    To avoid this exception, you must remove all internal drafts before you migrate.
+    First, in `content.ini`, set the `InternalDraftsCleanUpLimit` and `InternalDraftsDuration` values to 0.
+    Then run the [internal drafts cleanup](https://github.com/ezsystems/ezpublish-legacy/blob/2019.03/cronjobs/internal_drafts_cleanup.php) cron job.
 
 ### From Platform stack (5.4/2014.11) to eZ Platform
 
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
index 1a23f627a1..f70e7d1f06 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
@@ -17,21 +17,30 @@ You can then proceed with consecutive upgrades to further versions: v1.13 LTS an
 
 !!! caution "Things to be aware of when planning a migration"
 
-    1. While the instructions below are fully supported, we are aware that the community, partners and customers come from a wide range of different versions of eZ Publish, some with issues that don't surface before attempting a migration. That's why we and the community are actively gathering feedback on Slack and/or support channels for Enterprise customers to gradually improve the migration scripts and instructions. Reach out before you start so others who have done this before you can support you.
+    1. While the instructions below are fully supported, we are aware that the community, partners and customers come from a wide range of different versions of eZ Publish, some with issues that don't surface before attempting a migration.
+    That's why we and the community are actively gathering feedback on Slack and/or support channels for Enterprise customers to gradually improve the migration scripts and instructions.
+    Reach out before you start so others who have done this before you can support you.
 
-    1. As of eZ Platform v1.11, Legacy Bridge is a supported option for 1.x and future 2.x series. This means you can plan for a more gradual migration if you want, just like you could on eZ Publish Platform 5.x, with a more feature-rich version of eZ Platform and (with 2.x) also more recent version of Symfony. This is a great option for those who want the latest features and are comfortable with more frequent releases.
+    1. As of eZ Platform v1.11, Legacy Bridge is a supported option for 1.x and future 2.x series.
+    This means you can plan for a more gradual migration if you want, just like you could on eZ Publish Platform 5.x, with a more feature-rich version of eZ Platform and (with 2.x) also more recent version of Symfony.
+    This is a great option for those who want the latest features and are comfortable with more frequent releases.
 
     1. Additionally there are some other topics to be aware of for the code migration from eZ Publish to eZ Platform:
 
-        - Symfony deprecations. The recommended version to migrate to is eZ Platform v2.5 LTS, which is using Symfony 3.4 LTS.
+        - Symfony deprecations.
+        The recommended version to migrate to is eZ Platform v2.5 LTS, which is using Symfony 3.4 LTS.
         - [Field types reference](field_type_reference.md) for overview of field types that do and don't exist in eZ Platform
-        - API changes. While we have a strict backwards compatibility focus, some deprecated API features were removed and some changes were done to internal parts of the system. See [ezpublish-kernel:doc/bc/changes-6.0.md](https://github.com/ezsystems/ezpublish-kernel/blob/v6.7.0/doc/bc/changes-6.0.md)
+        - API changes.
+        While we have a strict backwards compatibility focus, some deprecated API features were removed and some changes were done to internal parts of the system.
+        See [ezpublish-kernel:doc/bc/changes-6.0.md](https://github.com/ezsystems/ezpublish-kernel/blob/v6.7.0/doc/bc/changes-6.0.md)
 
 !!! note
 
-    If you're migrating from a legacy eZ Publish version, this page contains the information you need. However, first have a look at an overview of the process in [Migrating from eZ Publish](migrating_from_ez_publish.md).
+    If you're migrating from a legacy eZ Publish version, this page contains the information you need.
+    However, first have a look at an overview of the process in [Migrating from eZ Publish](migrating_from_ez_publish.md).
 
-This section describes how to upgrade your existing  eZ Publish Platform  5.4/2014.11 installation to eZ Platform and eZ Enterprise. Make sure that you have a working [backup](backup.md) of the site before you do the actual upgrade, and that the installation you're performing the upgrade on is offline.
+This section describes how to upgrade your existing  eZ Publish Platform  5.4/2014.11 installation to eZ Platform and eZ Enterprise.
+Make sure that you have a working [backup](backup.md) of the site before you do the actual upgrade, and that the installation you're performing the upgrade on is offline.
 
 ### Note on Paths
 
@@ -75,13 +84,14 @@ Adapt the command with your `vendor`, `package`, version number, and add `"–d
 
 #### 2.2.2 Install XmlText field type
 
-While no longer bundled, the XmlText field type still exists and is needed to perform a migration from eZ Publish's XmlText to the new docbook-based format used by the RichText field type. If you plan to use Legacy Bridge for a while before migrating content, you also need this for rendering content with XMLText. From `<new-ez-root>` execute:
+While no longer bundled, the XmlText field type still exists and is needed to perform a migration from eZ Publish's XmlText to the new docbook-based format used by the RichText field type.
+If you plan to use Legacy Bridge for a while before migrating content, you also need this for rendering content with XMLText. From `<new-ez-root>` execute:
 
 `composer require --no-update "ezsystems/ezplatform-xmltext-fieldtype:^1.3.0"`
 
 !!! note
 
-    As of v1.3, be aware this field type now uses the Content View system introduced in eZ Platform 1.0, so make sure you adapt custom templates and override rules if you plan to use this for rendering content _(in Legacy Bridge setup)_.
+    As of v1.3, be aware this field type now uses the Content View system introduced in eZ Platform 1.0, so make sure you adapt custom templates and override rules if you plan to use this for rendering content (in Legacy Bridge setup).
 
 
 ### 2.3. Config
@@ -115,7 +125,8 @@ To move over your own custom configurations, follow the conventions below and ma
 
 !!! note "Make sure to adapt SiteAccess names"
 
-    In the default configurations in **ezplatform.yaml** you can find existing SiteAccesses like `site`, and depending on installation perhaps a few others, all under a site group called `site\_group`. Make sure to change those to what you had in **ezpublish.yaml** to avoid issues with having to log in to your website, given `user/login` policy rules need to be updated if you change names of SiteAccess as part of the upgrade.
+    In the default configurations in **ezplatform.yaml** you can find existing SiteAccesses like `site`, and depending on installation perhaps a few others, all under a site group called `site\_group`.
+    Make sure to change those to what you had in **ezpublish.yaml** to avoid issues with having to log in to your website, given `user/login` policy rules need to be updated if you change names of SiteAccess as part of the upgrade.
 
 #### 2.3.1 Image aliases
 
@@ -169,19 +180,27 @@ Move over registration of _your_ bundles you have from src and from composer pac
 
 ### 2.5. Optional: Install Legacy Bridge
 
-If you don't plan to migrate content directly to newer eZ Platform field types, you can optionally install Legacy Bridge and gradually handle code and subsequent content migration afterwards. For installation instructions see [here](https://github.com/ezsystems/LegacyBridge/blob/master/INSTALL.md).
+If you don't plan to migrate content directly to newer eZ Platform field types, you can optionally install Legacy Bridge and gradually handle code and subsequent content migration afterwards.
+For installation instructions see [here](https://github.com/ezsystems/LegacyBridge/blob/master/INSTALL.md).
 
 !!! note
 
-    The Legacy Bridge integration doesn't have the same performance, scalability or integrated experience as a pure Platform setup. Like on eZ Publish Platform 5.x there are known edge cases where, for instance, cache or search index cannot always be immediately updated across the two systems using the bridge. This is one of the many reasons why we recommend a pure Platform setup where that is possible.
+    The Legacy Bridge integration doesn't have the same performance, scalability or integrated experience as a pure Platform setup.
+    Like on eZ Publish Platform 5.x there are known edge cases where, for instance, cache or search index cannot always be immediately updated across the two systems using the bridge.
+    This is one of the many reasons why we recommend a pure Platform setup where that is possible.
 
 #### 2.5.1 Set up symlinks for legacy folders
 
 As eZ Publish legacy is installed via composer, we need to take care of placing some files outside its generated `<new-ez-root>/ezpublish_legacy/` folder, and for instance use symlink to place them inside during installation.
 
-1. For design and settings files that you typically version in git, you can now take advantage of Legacy Bridge's built-in symlink convention. So as installation already hinted about, you can generate a structure and set up symlinks using `bin/console ezpublish:legacy:symlink -c`. This creates folders you can use below in `<new-ez-root>/src/legacy_files/`.
+1. For design and settings files that you typically version in git, you can now take advantage of Legacy Bridge's built-in symlink convention.
+So as installation already hinted about, you can generate a structure and set up symlinks by using `bin/console ezpublish:legacy:symlink -c`.
+This creates folders you can use below in `<new-ez-root>/src/legacy_files/`.
 
-1. The same goes for the `<new-ez-root>/ezpublish_legacy/var/[<site>/]storage` folder. However, as it's typically not versioned in git, there's no predefined convention for this. If you create a folder within your project structure for symlinking into this folder, as opposed to a mount somewhere else, make sure to mark this folder as ignored by git once it and the corresponding `.keep` file have been added to your checkout. The example below assumes `<new-ez-root>/src/legacy_files/storage` was created for this purpose, if you opt for something else just adjust the instructions.
+1. The same goes for the `<new-ez-root>/ezpublish_legacy/var/[<site>/]storage` folder.
+However, as it's typically not versioned in git, there's no predefined convention for this.
+If you create a folder within your project structure for symlinking into this folder, as opposed to a mount somewhere else, make sure to mark this folder as ignored by git once it and the corresponding `.keep` file have been added to your checkout.
+The example below assumes `<new-ez-root>/src/legacy_files/storage` was created for this purpose, if you opt for something else just adjust the instructions.
 
 #### 2.5.2 Upgrade the legacy distribution files
 
@@ -440,7 +459,7 @@ eZ Platform now supports custom tags, including inline custom tags, and limited
 After migrating to RichText, you need to adapt your custom tag config for eZ Platform and rewrite the custom tags in Twig.
 See [Custom tag documentation](https://doc.ibexa.co/en/2.5/guide/extending/extending_online_editor/#custom-tags) for more info.
 
-If you configured custom attributes in legacy in OE using [ezoe_attributes.ini](https://github.com/ezsystems/ezpublish-legacy/blob/master/extension/ezoe/settings/ezoe_attributes.ini#L33-L48), not all types are supported.
+If you configured custom attributes in legacy in OE by using [ezoe_attributes.ini](https://github.com/ezsystems/ezpublish-legacy/blob/master/extension/ezoe/settings/ezoe_attributes.ini#L33-L48), not all types are supported.
 
 Below is a table of the tags that are currently supported, and their corresponding names in eZ Platform.
 
diff --git a/docs/users/customer_groups.md b/docs/users/customer_groups.md
index fb7ca8e0d9..c75822e919 100644
--- a/docs/users/customer_groups.md
+++ b/docs/users/customer_groups.md
@@ -17,6 +17,6 @@ For example, you can offer a 10% discount for all products in the catalog to use
 
 ## Enabling customer groups
 
-To enable using customer groups, you need to modify the user content type's definition by adding a [customer group field](customergroupfield.md).
+To enable the use of customer groups, you need to modify the user content type's definition by adding a [customer group field](customergroupfield.md).
 
 With this field you can add a user to any of the predefined customer groups.
diff --git a/docs/users/login_methods.md b/docs/users/login_methods.md
index 5e349e6f98..06bada84f0 100644
--- a/docs/users/login_methods.md
+++ b/docs/users/login_methods.md
@@ -47,7 +47,7 @@ It lists all user accounts with duplicate emails.
 ## Login rules
 
 You can set the rules for allowed user names in the back office per user field.
-The rules are set using regular expressions.
+The rules are set by using regular expressions.
 
 For example, to ensure that user names can only contain lowercase letters, set `[a-z]+$` as **Username pattern**:
 
diff --git a/docs/users/passwords.md b/docs/users/passwords.md
index ac8eb6e6a1..ce90e7b900 100644
--- a/docs/users/passwords.md
+++ b/docs/users/passwords.md
@@ -18,7 +18,7 @@ For information about how to create and configure the template, see [Add forgot
 The template for this email is located in `Resources/views/forgot_password/mail/forgot_user_password.html.twig` in `ibexa/user`.
 You can [customize it according to your needs](add_login_form.md#customize-login-form).
 
-The validity of the password recovery token can be set using the `ibexa.system.<siteaccess>.security.token_interval_spec` parameter.
+The validity of the password recovery token can be set by using the `ibexa.system.<siteaccess>.security.token_interval_spec` parameter.
 By default, it's set to `PT1H` (one hour).
 
 ## Revoking passwords
diff --git a/docs/users/user_management_guide.md b/docs/users/user_management_guide.md
index 28e08b2d15..627783afc7 100644
--- a/docs/users/user_management_guide.md
+++ b/docs/users/user_management_guide.md
@@ -18,7 +18,7 @@ User management is available in all [[= product_name =]] versions.
 
 ## How does user management work
 
-[[= product_name =]] simplifies user management with an intuitive and powerful system of accounts, Roles, Permissions, groups, and segments.
+[[= product_name =]] simplifies user management with an intuitive and powerful system of accounts, roles, permissions, groups, and segments.
 You can find all user groups and users in the **Admin** panel by selecting **Users**.
 Here, you can manage users, their relations, roles, and policies.
 
@@ -60,7 +60,7 @@ Policies allow for fine-grained control of access based on various factors, such
 
 ### Custom policies
 
-[Tailor user access control](custom_policies.md) to your unique requirements using custom policies.
+[Tailor user access control](custom_policies.md) to your unique requirements by using custom policies.
 Define complex rules and access criteria for different users or groups.
 
 ### Limitations
diff --git a/docs/users/users.md b/docs/users/users.md
index 0f4798b4ab..9ab43425bf 100644
--- a/docs/users/users.md
+++ b/docs/users/users.md
@@ -13,7 +13,7 @@ All such user accounts have the same underlying mechanism and enable you to cont
 [[= cards([
     "users/user_management_guide",
     "users/invitations",
-    "users/user_registration"
+    "users/user_registration",
 ], columns=3) =]]
 
 ## Authenticate users
@@ -23,12 +23,12 @@ All such user accounts have the same underlying mechanism and enable you to cont
     "users/passwords",
     "users/user_authentication",
     "users/oauth_client",
-    "users/oauth_server"
+    "users/oauth_server",
 ], columns=5) =]]
 
 ## Group users
 
 [[= cards([
     "users/customer_groups",
-    "users/segment_api"
+    "users/segment_api",
 ], columns=2) =]]

From e524c96261e98b72156f815b817d1c189e0a3574 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Tue, 26 Nov 2024 12:10:40 +0100
Subject: [PATCH 75/77] Revert changes in api .raml and .html files

---
 ...a-Contracts-Core-FieldType-GatewayBasedStorage.html |  4 ++--
 .../Ibexa-Contracts-Core-FieldType-Generic-Type.html   |  2 +-
 ...exa-Contracts-Core-Persistence-Content-Handler.html |  2 +-
 ...Contracts-Core-Repository-Values-Content-Field.html |  2 +-
 .../namespaces/ibexa-contracts-core-fieldtype.html     |  2 +-
 .../input/ibexa-content-typegroups.raml                |  2 +-
 .../rest_api/rest_api_reference/input/ibexa-types.raml |  8 ++++----
 .../rest_api_reference/rest_api_reference.html         | 10 +++++-----
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-FieldType-GatewayBasedStorage.html b/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-FieldType-GatewayBasedStorage.html
index 7ed6cc5ce7..2906d5c059 100644
--- a/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-FieldType-GatewayBasedStorage.html
+++ b/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-FieldType-GatewayBasedStorage.html
@@ -36456,7 +36456,7 @@ <h1 id="GatewayBasedStorage">
                                     <a href="classes/Ibexa-Contracts-Core-FieldType-FieldStorage.html"><abbr title="\Ibexa\Contracts\Core\FieldType\FieldStorage">FieldStorage</abbr></a>                            </div>
         
                 </div>
-        <p>field type External Storage gateway base class.</p>
+        <p>Field Type External Storage gateway base class.</p>
 
 
 
@@ -36490,7 +36490,7 @@ <h3 id="property_gateway">
                 <img src="./images/copy.svg" title="Copy path" />
     </div>
         </div>
-    <p>field type External Storage Gateway.</p>
+    <p>Field Type External Storage Gateway.</p>
 
 <div class="highlight">
     <table class="highlighttable">
diff --git a/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-FieldType-Generic-Type.html b/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-FieldType-Generic-Type.html
index 516a7ad137..c60909d6f2 100644
--- a/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-FieldType-Generic-Type.html
+++ b/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-FieldType-Generic-Type.html
@@ -38603,7 +38603,7 @@ <h3 id="method_getValueClass">
                 <img src="./images/copy.svg" title="Copy path" />
     </div>
         </div>
-    <p>Returns FQN of class representing field type Value.</p>
+    <p>Returns FQN of class representing Field Type Value.</p>
 
 <div class="highlight">
     <table class="highlighttable">
diff --git a/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Persistence-Content-Handler.html b/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Persistence-Content-Handler.html
index 7528cba834..7879805e5b 100644
--- a/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Persistence-Content-Handler.html
+++ b/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Persistence-Content-Handler.html
@@ -37877,7 +37877,7 @@ <h3 id="method_loadContentList">
 <p>If items are missing but for other reasons then not being found, for instance exceptions during loading field
 data. Then the exception will be logged as warning or error depending on severity.
 The most common case of possible exceptions during loading of Content data is migration,
-where either custom field type configuration or implementation might not be aligned with new
+where either custom Field Type configuration or implementation might not be aligned with new
 version of the system.</p>
 <p>NOTE!!: If you want to take always available flag into account, append main language
 to the list of languages(unless caller is asking for all languages). In some edge cases you'll end up with a
diff --git a/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Field.html b/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Field.html
index e7bf5ba5ac..ee6fff0355 100644
--- a/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Field.html
+++ b/docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Field.html
@@ -36552,7 +36552,7 @@ <h3 id="property_fieldTypeIdentifier">
     </table>
 </div>
     <section class="phpdocumentor-description">
-        <p>Field type identifier</p>
+        <p>field type identifier</p>
 
     </section>
 
diff --git a/docs/api/php_api/php_api_reference/namespaces/ibexa-contracts-core-fieldtype.html b/docs/api/php_api/php_api_reference/namespaces/ibexa-contracts-core-fieldtype.html
index d474a2f3ff..c10fd925a7 100644
--- a/docs/api/php_api/php_api_reference/namespaces/ibexa-contracts-core-fieldtype.html
+++ b/docs/api/php_api/php_api_reference/namespaces/ibexa-contracts-core-fieldtype.html
@@ -36556,7 +36556,7 @@ <h2 id="interfaces">
                     <a href="classes/Ibexa-Contracts-Core-FieldType-GatewayBasedStorage.html">
                         GatewayBasedStorage
                     </a>
-                </span><p>field type External Storage gateway base class.</p></li>
+                </span><p>Field Type External Storage gateway base class.</p></li>
                     <li>
                 <span>
                     <img src="./images/arrow-right.svg" class="arrow" />
diff --git a/docs/api/rest_api/rest_api_reference/input/ibexa-content-typegroups.raml b/docs/api/rest_api/rest_api_reference/input/ibexa-content-typegroups.raml
index 1546ed20d2..ccb92a5929 100644
--- a/docs/api/rest_api/rest_api_reference/input/ibexa-content-typegroups.raml
+++ b/docs/api/rest_api/rest_api_reference/input/ibexa-content-typegroups.raml
@@ -207,7 +207,7 @@ post:
                         application/vnd.ibexa.api.ContentType+json:
                             type: ContentTypeWrapper
                 400:
-                    description: Error - The input does not match the input schema definition. Validation on a Field definition fails. Validation of the content type fails, e.g. multiple Fields of a same singular field type are provided. Publish is set to true and the input is not complete e.g. no Field definitions are provided.
+                    description: Error - The input does not match the input schema definition. Validation on a Field definition fails. Validation of the content type fails, e.g. multiple Fields of a same singular Field Type are provided. Publish is set to true and the input is not complete e.g. no Field definitions are provided.
                 401:
                     description: Error - The user is not authorized to create this content type.
                 403:
diff --git a/docs/api/rest_api/rest_api_reference/input/ibexa-types.raml b/docs/api/rest_api/rest_api_reference/input/ibexa-types.raml
index 2ca6a0f767..3e4f991a8a 100644
--- a/docs/api/rest_api/rest_api_reference/input/ibexa-types.raml
+++ b/docs/api/rest_api/rest_api_reference/input/ibexa-types.raml
@@ -983,11 +983,11 @@ Field:
             type: string
             required: false
         fieldTypeIdentifier:
-            description: 'Field type identifier.'
+            description: 'Field Type identifier.'
             type: string
             required: false
         fieldValue:
-            description: 'A field type value or a value type which can be converted by the corresponding field type.'
+            description: 'A Field Type value or a value type which can be converted by the corresponding Field Type.'
             type: any
 
 FieldDefinitionsWrapper:
@@ -1147,10 +1147,10 @@ FieldDefinitionUpdateStruct:
             description: 'If set the information collector flag is set to this value.'
             type: boolean
         validatorConfiguration:
-            description: 'If set this validator configuration supported by the field type replaces the existing one.'
+            description: 'If set this validator configuration supported by the Field Type replaces the existing one.'
             type: any
         fieldSettings:
-            description: 'If set this settings supported by the field type replaces the existing ones.'
+            description: 'If set this settings supported by the Field Type replaces the existing ones.'
             type: any
         defaultValue:
             description: 'If set the default value for this field is changed to the given value.'
diff --git a/docs/api/rest_api/rest_api_reference/rest_api_reference.html b/docs/api/rest_api/rest_api_reference/rest_api_reference.html
index 073d1b8ca0..697d84f8a2 100644
--- a/docs/api/rest_api/rest_api_reference/rest_api_reference.html
+++ b/docs/api/rest_api/rest_api_reference/rest_api_reference.html
@@ -32998,7 +32998,7 @@ <h6 class="heading text-gray border-bottom pb-2">Possible responses</h6>
                                                             400
                                                     </td>
                         <td>
-                            <p>Error - The input does not match the input schema definition. Validation on a Field definition fails. Validation of the content type fails, e.g. multiple Fields of a same singular field type are provided. Publish is set to true and the input is not complete e.g. no Field definitions are provided.</p>
+                            <p>Error - The input does not match the input schema definition. Validation on a Field definition fails. Validation of the content type fails, e.g. multiple Fields of a same singular Field Type are provided. Publish is set to true and the input is not complete e.g. no Field definitions are provided.</p>
                         </td>
                     </tr>
                                     <tr>
@@ -134702,7 +134702,7 @@ <h6 class="heading text-gray border-bottom pb-2">Types</h6>
 (<span class="font-italic">string</span>)
  - 
 <span>
-    Field type identifier.</span>
+    Field Type identifier.</span>
 
 
                 </li>
@@ -134714,7 +134714,7 @@ <h6 class="heading text-gray border-bottom pb-2">Types</h6>
 (<span class="font-italic">any</span>)
  - 
 <span>
-    A field type value or a value type which can be converted by the corresponding field type.</span>
+    A Field Type value or a value type which can be converted by the corresponding field type.</span>
 
 
                 </li>
@@ -135503,7 +135503,7 @@ <h6 class="heading text-gray border-bottom pb-2">Types</h6>
 (<span class="font-italic">any</span>)
  - 
 <span>
-    If set this validator configuration supported by the field type replaces the existing one.</span>
+    If set this validator configuration supported by the Field Type replaces the existing one.</span>
 
 
                 </li>
@@ -135515,7 +135515,7 @@ <h6 class="heading text-gray border-bottom pb-2">Types</h6>
 (<span class="font-italic">any</span>)
  - 
 <span>
-    If set this settings supported by the field type replaces the existing ones.</span>
+    If set this settings supported by the Field Type replaces the existing ones.</span>
 
 
                 </li>

From 5ce27afb3a0fafd44baf46b927fb290b85de88e8 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Tue, 26 Nov 2024 12:12:37 +0100
Subject: [PATCH 76/77] fix

---
 docs/api/rest_api/rest_api_reference/input/ibexa-types.raml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/rest_api/rest_api_reference/input/ibexa-types.raml b/docs/api/rest_api/rest_api_reference/input/ibexa-types.raml
index 3e4f991a8a..322512ef3d 100644
--- a/docs/api/rest_api/rest_api_reference/input/ibexa-types.raml
+++ b/docs/api/rest_api/rest_api_reference/input/ibexa-types.raml
@@ -987,7 +987,7 @@ Field:
             type: string
             required: false
         fieldValue:
-            description: 'A Field Type value or a value type which can be converted by the corresponding Field Type.'
+            description: 'A Field Type value or a value type which can be converted by the corresponding field type.'
             type: any
 
 FieldDefinitionsWrapper:

From 364ab9fd1349edd51ec5ab15e19741dfaa78f100 Mon Sep 17 00:00:00 2001
From: julitafalcondusza <julita.dusza@ibexa.co>
Date: Thu, 28 Nov 2024 14:13:13 +0100
Subject: [PATCH 77/77] fixes

---
 .../back_office/customize_search_suggestion.md              | 2 +-
 docs/ibexa_products/ibexa_commerce.md                       | 4 ++--
 .../cache/persistence_cache.md                              | 2 +-
 docs/multisite/siteaccess/siteaccess_aware_configuration.md | 6 +++---
 docs/personalization/api_reference/tracking_api.md          | 2 +-
 docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md  | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/administration/back_office/customize_search_suggestion.md b/docs/administration/back_office/customize_search_suggestion.md
index a3e6875fe8..426353baa5 100644
--- a/docs/administration/back_office/customize_search_suggestion.md
+++ b/docs/administration/back_office/customize_search_suggestion.md
@@ -5,7 +5,7 @@ description: Customize search suggestion configuration and sources.
 # Customize search suggestion
 
 In the back office, when you start typing in the search field on the top bar, suggestions about what you could be looking for show up directly under the field.
-For more information about using this feature to search for content, see [user documentation]([[= user_doc =]]/search/search_for_content).
+For more information about using this feature to search for content, see [User Documentation]([[= user_doc =]]/search/search_for_content).
 
 ## Configuration
 
diff --git a/docs/ibexa_products/ibexa_commerce.md b/docs/ibexa_products/ibexa_commerce.md
index ddcd1de306..9789f1d59b 100644
--- a/docs/ibexa_products/ibexa_commerce.md
+++ b/docs/ibexa_products/ibexa_commerce.md
@@ -35,7 +35,7 @@ With a help of documentation and trainings, any developer familiar with Symfony
 
 Version control systems and environment variables allow you to deploy your extensions and settings on several environments, such as [Ibexa Cloud](ibexa_cloud_guide.md).
 
-[[= product_name_com =]] is built on [Ibexa Experience](ibexa_experience.md) and includes all bundles, APIs, and features that come with both [Headless](ibexa_headless.md#core-features) and [Experience](ibexa_experience.md#core-features) editions.
+[[= product_name_com =]] is built on [[[= product_name_exp =]]](ibexa_experience.md) and includes all bundles, APIs, and features that come with both [[[= product_name_product_name_headless =]]](ibexa_headless.md#core-features) and [[[= product_name_exp =]]](ibexa_experience.md#core-features) editions.
 
 ## Capabilities and benefits
 
@@ -72,7 +72,7 @@ Depending on their role, users can also enable or disable shipping methods, chan
 #### Storefront
 
 The [Storefront](storefront.md) package includes a starter kit for developers.
-it's a foundational set of components that developers can customize and extend to create their own web store implementations.
+It's a foundational set of components that developers can customize and extend to create their own web store implementations.
 It contains default UI components and widgets that can be modified to [create a customized web store](customize_storefront_layout.md).
 
 #### Relevant faceted search
diff --git a/docs/infrastructure_and_maintenance/cache/persistence_cache.md b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
index b25cf1f8e4..2e6a2ad02c 100644
--- a/docs/infrastructure_and_maintenance/cache/persistence_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
@@ -138,7 +138,7 @@ There are two Redis adapters available out of the box that fit different needs.
 `volatile-ttl`, `volatile-lru` or `volatile-lfu` (Redis 4.0+).
 Use of LRU or LFU is recommended. it's also possible to use `noeviction`, but it's usually not practical.
 
-**Pros**: it's typically faster than `RedisAdapter`, because fewer lookups needed to cache backend.
+**Pros**: It's typically faster than `RedisAdapter`, because fewer lookups needed to cache backend.
 
 **Cons**: Consumes much more memory. To avoid situations where Redis stops accepting new cache
 (warnings about `Failed to save key`), set aside enough memory for the Redis server.
diff --git a/docs/multisite/siteaccess/siteaccess_aware_configuration.md b/docs/multisite/siteaccess/siteaccess_aware_configuration.md
index f26edadddc..b2e73ac072 100644
--- a/docs/multisite/siteaccess/siteaccess_aware_configuration.md
+++ b/docs/multisite/siteaccess/siteaccess_aware_configuration.md
@@ -126,17 +126,17 @@ class AcmeExampleExtension extends Extension
         $processor->mapConfig(
             $config,
             // Any kind of callable can be used here.
-            // It's called for each declared scope/SiteAccess.
+            // It is called for each declared scope/SiteAccess.
             static function ($scopeSettings, $currentScope, ContextualizerInterface $contextualizer) {
                 // Maps the "name" setting to "acme_example.<$currentScope>.name" container parameter
-                // it's then possible to retrieve this parameter through ConfigResolver in the application code:
+                // It is then possible to retrieve this parameter through ConfigResolver in the application code:
                 // $helloSetting = $configResolver->getParameter( 'name', 'acme_example' );
                 $contextualizer->setContextualParameter('name', $currentScope, $scopeSettings['name']);
             }
         );
 
         // Now map "custom_setting" and ensure the key defined for "my_siteaccess" overrides the one for "my_siteaccess_group"
-        // It's done outside the closure as it's needed only once.
+        // It is done outside the closure as it's needed only once.
         $processor->mapConfigArray('custom_setting', $config);
     }
 }
diff --git a/docs/personalization/api_reference/tracking_api.md b/docs/personalization/api_reference/tracking_api.md
index dec0d09cf1..3c62742e24 100644
--- a/docs/personalization/api_reference/tracking_api.md
+++ b/docs/personalization/api_reference/tracking_api.md
@@ -209,7 +209,7 @@ If product price filtering is activated, the information provided over the produ
 For more information, see [Content API](content_api.md).
 
 The currency is stored with the price and normalized only when statistic information is requested.
-it's often a good choice to select a base currency and convert prices before sending the buy event.
+It's often a good choice to select a base currency and convert prices before sending the buy event.
 The price attached to a buy event never overwrites the price which was defined in an item import.
 
 ### Click event
diff --git a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
index 078c1670c5..d4009bacf0 100644
--- a/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
+++ b/docs/update_and_migration/from_1.x_2.x/update_db_to_2.5.md
@@ -948,4 +948,4 @@ CREATE INDEX idx_workflow_name ON ezeditorialworkflow_workflows(workflow_name);
 
 ## Update to v3.3
 
-it's strongly recommended to also [update to the latest LTS, v3.3](update_from_2.5.md).
+It's strongly recommended to also [update to the latest LTS, v3.3](update_from_2.5.md).