fix conflict

Author: JPryce-Aklundh

modules/ROOT/content-nav.adoc

@@ -94,8 +94,8 @@
 ** xref:indexes/syntax.adoc[]
 
 * xref:constraints/index.adoc[]
+** xref:constraints/managing-constraints.adoc[]
 ** xref:constraints/syntax.adoc[]
-** xref:constraints/examples.adoc[]
 
 * xref:planning-and-tuning/index.adoc[]
 ** xref:planning-and-tuning/execution-plans.adoc[]

modules/ROOT/pages/appendix/gql-conformance/additional-cypher.adoc

@@ -301,7 +301,9 @@ Either the pattern already exists, or it needs to be created.
 | Returns a 2D or 3D point object, given two or respectively three coordinate values in the Cartesian coordinate system or WGS 84 geographic coordinate system.
 
 | xref:functions/spatial.adoc#functions-point-distance[`point.distance()`]
-| Returns a `FLOAT` representing the geodesic distance between any two points in the same CRS.
+| Returns a `FLOAT` representing the distance between any two points in the same CRS.
+If the points are in the WGS 84 CRS, the function returns the geodesic distance (i.e., the shortest path along the curved surface of the Earth).
+If the points are in a Cartesian CRS, the function returns the Euclidean distance (i.e., the shortest straight-line distance in a flat, planar space).
 
 | xref:functions/spatial.adoc#functions-point-withinBBox[`point.withinBBox()`]
 | Returns true if the provided point is within the bounding box defined by the two provided points.
@@ -507,29 +509,17 @@ GQL supports `GRAPH TYPES` as a way of constraining a graph schema, but does not
 | Cypher feature
 | Description
 
-| xref:constraints/examples.adoc#constraints-examples-node-uniqueness[Node property uniqueness constraints]
-| Ensures that certain nodes have a set of specified properties whose combined value is unique when all properties exist on the node
+| xref:constraints/managing-constraints.adoc#create-property-uniqueness-constraints[Property uniqueness constraints]
+| Ensures that the combined property values are unique for all nodes with a specific label or all relationships with a specific type.
 
-| xref:constraints/examples.adoc#constraints-examples-relationship-uniqueness[Relationship property uniqueness constraints]
-| Ensures that certain relationships have a set of specified properties whose combined value is unique when all properties exist on the relationship.
+| xref:constraints/managing-constraints.adoc#create-property-existence-constraints[Property existence constraints]
+| Ensures that a property exists either for all nodes with a specific label or for all relationships with a specific type.
 
-| xref:constraints/examples.adoc#constraints-examples-node-property-existence[Node property existence constraints]
-| Ensures that certain nodes have a specified property.
+| xref:constraints/managing-constraints.adoc#create-property-type-constraints[Property type constraints]
+| Ensures that a property has the required property type for all nodes with a specific label or for all relationships with a specific type.
 
-| xref:constraints/examples.adoc#constraints-examples-relationship-property-existence[Relationship property existence constraints]
-| Ensures that certain relationships have a specified property.
-
-| xref:constraints/examples.adoc#constraints-examples-node-property-type[Node property type constraints]
-| Ensures that certain nodes have a property of the required property type when the property exists on the node.
-
-| xref:constraints/examples.adoc#constraints-examples-relationship-property-type[Relationship property type constraints]
-| Ensures that certain relationships have a property of the required property type when the property exists on the relationship.
-
-| xref:constraints/examples.adoc#constraints-examples-node-key[Node key constraints]
-| Ensures that certain nodes have a set of specified properties whose combined value is unique and all properties in the set are present.
-
-| xref:constraints/examples.adoc#constraints-examples-relationship-key[Relationship key constraints]
-| Ensures that certain relationships have a set of defined properties whose combined value is unique. It also ensures that all properties in the set are present.
+| xref:constraints/managing-constraints.adoc#create-key-constraints[Key constraints]
+| Ensures that all properties exist and that the combined property values are unique for all nodes with a specific label or all relationships with a specific type.
 
 |===
 

modules/ROOT/pages/clauses/load-csv.adoc

@@ -601,12 +601,12 @@ For more `STRING` manipulation functions, see xref:functions/string.adoc[String
 
 == Recommendations
 
-=== Create uniqueness constraints
+=== Create property uniqueness constraints
 
-Always create uniqueness xref:constraints/index.adoc[constraints] prior to importing data, to avoid duplicates or colliding entities.
+Always create xref:constraints/managing-constraints.adoc#create-property-uniqueness-constraints[property uniqueness constraints] prior to importing data, to avoid duplicates or colliding entities.
 If the source file contains duplicated data and the right constraints are in place, Cypher raises an error.
 
-.Create xref:constraints/examples.adoc#constraints-examples-node-uniqueness[node property uniqueness constraints] on person ID
+.Create a node property uniqueness constraints on person ID
 ====
 
 .persons.csv

modules/ROOT/pages/clauses/merge.adoc

@@ -25,7 +25,7 @@ If partial matches are needed, this can be accomplished by splitting a pattern i
 [NOTE]
 ====
 Under concurrent updates, `MERGE` only guarantees the existence of the `MERGE` pattern, but not uniqueness.
-To guarantee uniqueness of nodes with certain properties, a xref::constraints/index.adoc[property uniqueness constraint] should be used.
+To guarantee uniqueness of nodes with certain properties, a xref:constraints/managing-constraints.adoc#create-property-uniqueness-constraints[property uniqueness constraint] should be used.
 See xref::clauses/merge.adoc#query-merge-using-unique-constraints[Using property uniqueness constraints with `MERGE`].
 ====
 
@@ -511,7 +511,7 @@ This is in contrast to the example shown above in xref::clauses/merge.adoc#merge
 [[query-merge-using-unique-constraints]]
 == Using node property uniqueness constraints with `MERGE`
 
-Cypher prevents getting conflicting results from `MERGE` when using patterns that involve property uniqueness constraints.
+Cypher prevents getting conflicting results from `MERGE` when using patterns that involve xref:constraints/managing-constraints.adoc#create-property-uniqueness-constraints[property uniqueness constraints].
 In this case, there must be at most one node that matches that pattern.
 
 For example, given two property node uniqueness constraints on `:Person(id)` and `:Person(ssn)`, a query such as `MERGE (n:Person {id: 12, ssn: 437})` will fail, if there are two different nodes (one with `id` 12 and one with `ssn` 437), or if there is only one node with only one of the properties.

modules/ROOT/pages/clauses/optional-match.adoc

@@ -54,7 +54,7 @@ For example, the matching variables from one `MATCH` clause will provide the con
 However, there are two important differences between Neo4j and SQL which helps to explain `OPTIONAL MATCH` further.
 
 . While it is both possible and advised to enforce partial schemas using indexes and constraints, Neo4j offers a greater degree of schema flexibility than a relational database.
-Nodes and relationships in a Neo4j database do not have to have a specific property set to them because other nodes or relationships in the same graph have that property (unless there is a existence constraint created on the specific property).
+Nodes and relationships in a Neo4j database do not have to have a specific property set to them because other nodes or relationships in the same graph have that property (unless there is a xref:constraints/managing-constraints.adoc#create-property-existence-constraints[property existence constraint] created on the specific property).
 
 . Queries in Cypher are run as pipelines.
 If a clause returns no results, it will effectively end the query as subsequent clauses will have no data to execute upon.