remove conflicts

Author: renetapopova

modules/ROOT/pages/database-internals/store-formats.adoc

@@ -120,21 +120,8 @@ CREATE DATABASE blockdb OPTIONS {storeFormat: 'block'}
 [[change-store-format]]
 === Changing the store format of existing databases
 
-<<<<<<< HEAD
-Starting from 5.23, `block` format is the recommended format for Enterprise Edition due to its superior performance and scalability.
-It uses advanced data structures and inlining techniques to enhance data locality, which leads to better resource utilization.
-Therefore, it is highly recommended that Enterprise Edition users migrate all databases to `block` format at their earliest convenience to ensure the best possible performance.
-`block` format is the default format for new databases created in 5.23 and later, and is the default format for all databases in 5.26 and later.
-
-From 5.25 onwards, the `block` format supports token names (including node labels, property keys, and relationship type names) of any length up to the GQL identifier max length of 16,383 characters.
-Thus, token names must adhere to this length limit when migrating from `aligned` to `block` format.
-
-`standard` and `high_limit` formats are deprecated in 5.23 and will be removed in a future release.
-For more information, see <<format-deprecations, Format deprecations>>.
-=======
 The `block` format is the default format for Enterprise Edition due to its superior performance and scalability.
 Therefore, migrating all databases to `block` format is recommended to ensure optimal performance.
->>>>>>> eed2dd82 (remove and update many more mentions of 5.x)
 
 [NOTE]
 ====

modules/ROOT/pages/index.adoc

@@ -15,81 +15,7 @@ For all information on *upgrading and migrating Neo4j*, see the link:{neo4j-docs
 For more information on link:https://neo4j.com/aura/[Aura], the Neo4j fully managed cloud service, see the link:{neo4j-docs-base-uri}/aura/[Aura] [Neo4j Aura Manual].
 
 
-<<<<<<< HEAD
 The latest version of Neo4j is *{neo4j-version-exact}*.
-=======
-== Documentation updates for Neo4j 5
-
-* Restructured chapter on clustering.
-+
-The new clustering infrastructure decouples servers from databases, improving scalability and cloud-readiness.
-As such, the documentation has been restructured and rewritten.
-For a detailed description and instructions on how to set up clustering, see xref:clustering/index.adoc[Clustering].
-
-* Composite databases.
-+
-Fabric technology is used to improve the setting and management of sharded and federated databases with dynamic compositions of databases.
-A new surface to administer Fabric databases, named Composite databases, is new in 5.0.
-Configuration settings have been removed and Composite databases are now administered via Cypher commands.
-For more information, see the new chapter on xref:database-administration/composite-databases/concepts.adoc[Composite databases], which replaces the _Fabric_ chapter from previous versions.
-
-* `neo4j-admin` refresh.
-+
-All admin functionalities have been consolidated into a single tool, and all commands have been grouped by scope.
-There is an optional neo4j-admin conf file and individual conf files for each command so that there is more control over values provided for each command.
-Improved features, more control, and a consistent set of arguments for the database administrator. +
-See xref:tools/neo4j-admin/index.adoc[Neo4j Admin and Neo4j CLI] for details.
-
-* A major overhaul of backup and restore.
-+
-The new backup subsystem provides:
-
-** Full and differential backup to an immutable file, and aggregation to compile a chain of backups into a full backup.
-** Differential backup reduces storage requirements and provides point-in-time restore on timestamps or transaction IDs.
-** A new backup API for backup management and operability and target multiple URIs in a single backup command to support clusters.
-
-* Incremental offline import.
-+
-The `neo4j-admin database import` command can now add more data to existing databases. +
-xref:tools/neo4j-admin/neo4j-admin-import.adoc[Import chapter] has been updated.
-You can find more details there.
-
-* Log4j integration completion.
-+
-The logging framework is fully integrated with Log4j, providing more functionality and better control of all the database logs. +
-Configuration settings are located in the `<NEO4J_HOME>/conf` folder in the _user-logs.xml_ used for _neo4j.log_ and _server-logs.xml_ used for _debug.log_, _security.log_, _http.log_, and _query.log_.
-Query log uses the same format as _neo4j.log_. +
-Users are able to use/modify Log4j XML files. +
-See xref:monitoring/logging.adoc[the section on the logging mechanisms in Neo4j] for more details.
-
-* Updates in the *Cypher Shell* section.
-
-** Cypher Shell supports impersonation.
-+
-Cypher Shell users can impersonate other users via `--impersonate` or the command `:impersonate` (requires `IMPERSONATE` privileges). +
-Visit xref:tools/cypher-shell.adoc[Cypher Shell page] for more details.
-
-** Cypher Shell logging.
-+
-New option `--log` is introduced to enable Java Driver logging to the specified file.
-When users report problems with Java Driver/Bolt, now they can use Cypher Shell to try and replicate the issue without having to edit the client app that uses the driver. +
-You can find more information in the xref:tools/cypher-shell.adoc[Cypher Shell section].
-
-* Immutable privileges.
-+
-Immutable roles and privileges are useful for restricting the actions of users who themselves are able to administer privileges. +
-Cloud operators can use sidecar design pattern to control RBAC-based permissions. +
-For more information, see xref:authentication-authorization/immutable-roles-privileges.adoc[Immutable roles and privileges].
-
-* Changes to Neo4j indexes
-** The B-tree index type has been removed.
-** New Range and Point index types are available now.
-** An improved index provider, `text-2.0`, for enhanced performance.
-New Text indexes will use the `text-2.0` provider by default.
-**  Full-text indexes can now index lists of strings.
-+
-See xref:performance/index-configuration.adoc[Index configuration] for more details.
->>>>>>> eed2dd82 (remove and update many more mentions of 5.x)
 
 ifdef::backend-pdf[]
 include::license.adoc[leveloffset=+1]

modules/ROOT/pages/procedures.adoc

@@ -184,7 +184,7 @@ For more information, see the link:{neo4j-docs-base-uri}/cypher-manual/{page-ver
 
 For more information, see the link:{neo4j-docs-base-uri}/cdc/{page-version}/[CDC documentation].
 
-[role=label--beta label--deprecated-5.17]
+[role=label--deprecated-5.17]
 [[procedure_cdc_current]]
 === cdc.current()
 
@@ -199,7 +199,7 @@ For more information, see the link:{neo4j-docs-base-uri}/cdc/{page-version}/[CDC
 | *Replaced by* 3+| xref:procedures.adoc#procedure_db_cdc_current[`db.cdc.current()`]
 |===
 
-[role=label--beta label--deprecated-5.17]
+[role=label--deprecated-5.17]
 [[procedure_cdc_earliest]]
 === cdc.earliest()
 
@@ -214,7 +214,7 @@ For more information, see the link:{neo4j-docs-base-uri}/cdc/{page-version}/[CDC
 | *Replaced by* 3+| xref:procedures.adoc#procedure_db_cdc_earliest[`db.cdc.earliest()`]
 |===
 
-[role=label--beta label--deprecated-5.17 label--admin-only]
+[role=label--deprecated-5.17 label--admin-only]
 [[procedure_cdc_query]]
 === cdc.query()