More review fixes

Author: mnd999

modules/ROOT/pages/errors/gql-errors/22NC6.adoc

@@ -1,10 +1,11 @@
 = 22NC6
 
 == Status description
-The independent constraint `{ <<constrDescrOrName>> }` was defined using the same label `{ <<label>> }` as a node type element.
+error: data exception - independent constraint and node element type have the same label.
+The independent constraint `{ <<constrDescrOrName>> }` is using the same label `{ <<label>> }` as a node element type.
 
 == Explanation
-This error occurs when a label is used both as an identifying label (defining a node type element) and as part of an independent constraint.
+This error occurs when a label is used both as an identifying label (defining a node element type) and as part of an independent constraint.
 A label cannot serve as both an identifying label and be referenced in an independent constraint at the same time.
 
 == Example scenario
@@ -22,7 +23,16 @@ An error will be thrown with GQLSTATUS 22NC6 and the status description:
 
 [source]
 ----
-error: data exception - independent constraint defined on node type element label. The independent constraint '(:`Person` {`name`})' was defined using the same label `Person` as a node type element.
+error: data exception - independent constraint and node element type have the same label. The independent constraint '(:`Person` {`name`})' is using the same label `Person` as a node element type.
+----
+
+The correct fix is to define the existence constraint as part of the node element type:
+
+[source, cypher]
+----
+ALTER CURRENT GRAPH TYPE SET {
+    (p:Person => {name :: STRING NOT NULL})
+}
 ----
 
 ifndef::backend-pdf[]

modules/ROOT/pages/errors/gql-errors/22NC7.adoc

@@ -1,28 +1,37 @@
 = 22NC7
 
 == Status description
-The independent constraint `{ <<constrDescrOrName>> }` was defined using the same relationship type `{ <<relType>> }` as a relationship type element.
+error: data exception - independent constraint and relationship element type have the same relationship type. The independent constraint `{ <<constrDescrOrName>> }` is using the same relationship type `{ <<relType>> }` as a relationship element type.
 
 == Explanation
-This error occurs when a relationship type is used both as an identifying relaionship type (defining a relationship type element) and as part of an independent constraint.
+This error occurs when a relationship type is used both as an identifying relationship type (defining a relationship element type) and as part of an independent constraint.
 A label cannot serve as both an identifying label and be referenced in an independent constraint at the same time.
 
 == Example scenario
-For example, try to set an existance constraint on a property for the relationship type `:REL` where `:REL` is also defined as an identifying relationship type in the graph type:
+For example, try to set an existence constraint on a property for the relationship type `:REL` where `:REL` is also defined as an identifying relationship type in the graph type:
 
 [source,cypher]
 ----
 ALTER CURRENT GRAPH TYPE SET {
-    ()-[:REL => {name :: STRING}]->(),
-    CONSTRAINT FOR ()-[r:REL =>]->() REQUIRE r.name IS NOT NULL,
+    ()-[:REL => {name :: ANY NOT NULL}]->(),
+    CONSTRAINT FOR ()-[r:REL =>]->() REQUIRE r.name IS :: STRING,
 }
 ----
 
 An error will be thrown with GQLSTATUS 22NC7 and the status description:
 
 [source]
 ----
-error: data exception - independent constraint defined on node type element label. The independent constraint '(:`Person` {`name`})' was defined using the same label `Person` as a node type element.
+error: data exception - independent constraint and relationship element type have the same relationship type. The independent constraint '()-[:`REL`]-()' is using the same relationship type `REL` as a relationship element type.
+----
+
+The correct fix is to define the existence constraint as part of the relationship element type:
+
+[source, cypher]
+----
+ALTER CURRENT GRAPH TYPE SET {
+    ()-[:REL => {name :: STRING NOT NULL}]->()
+}
 ----
 
 ifndef::backend-pdf[]

modules/ROOT/pages/errors/gql-errors/22NC9.adoc

@@ -31,7 +31,7 @@ error: data exception - graph type contains duplicated tokens. The graph type in
 
 === Identifiers
 
-Attempt to define two node element types using the same alias.
+Attempt to define two relationship element types using the same relationship type.
 
 [source,cypher]
 ----

modules/ROOT/pages/errors/gql-errors/22NCA.adoc

@@ -1,7 +1,7 @@
 = 22NCA
 
 == Status description
-A `{ <<entityType>> }` element type property `{ <<context>> }` constraint cannot be specified inline of a `{ <<msg>> }` element type
+A `{ <<entityType>> }` element type property `{ <<context>> }` constraint cannot be specified inline of a `{ <<entityType2>> }` element type
 
 == Explanation
 Property type and existance constrains cannot be defined as inline constraints on graph type elements.

modules/ROOT/partials/glossary.adoc

@@ -35,6 +35,7 @@
 [[endpointType]]$endpointType:: One of `start` or `end` of a relationship.
 [[entityId]]$entityId:: ID of a node or a relationship.
 [[entityType]]$entityType:: A node or a relationship.
+[[entityType2]]$entityType2:: A node or a relationship.
 [[expr]]$expr:: Cypher expression, for example, `1 + n.prop`.
 [[exprType]]$exprType:: Freeform expression type, for example, `EXISTS`, `COUNT`, `COLLECT`.
 [[feat]]$feat:: Freeform feature description.