diff --git a/modules/ROOT/pages/errors/gql-errors/08000.adoc b/modules/ROOT/pages/errors/gql-errors/08000.adoc
index a43be0b8..c7556301 100644
--- a/modules/ROOT/pages/errors/gql-errors/08000.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/08000.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: connection exception
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/08007.adoc b/modules/ROOT/pages/errors/gql-errors/08007.adoc
index c26f6c4a..0e5cf356 100644
--- a/modules/ROOT/pages/errors/gql-errors/08007.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/08007.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: connection exception - transaction resolution unknown
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/08N00.adoc b/modules/ROOT/pages/errors/gql-errors/08N00.adoc
index 379988c4..1009357d 100644
--- a/modules/ROOT/pages/errors/gql-errors/08N00.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/08N00.adoc
@@ -1,4 +1,11 @@
 = 08N00
 
 == Status description
-error: connection exception - unable to connect to database. Unable to connect to database `{ $db }`. Unable to get bolt address of the leader. Check the status of the database. Retrying your request at a later time may succeed.
+error: connection exception - unable to connect to database. Unable to connect to database `{ <<db>> }`. Unable to get bolt address of the leader. Check the status of the database. Retrying your request at a later time may succeed.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/08N01.adoc b/modules/ROOT/pages/errors/gql-errors/08N01.adoc
index cc6b4c3c..3d6d29ac 100644
--- a/modules/ROOT/pages/errors/gql-errors/08N01.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/08N01.adoc
@@ -1,9 +1,17 @@
 = 08N01
 
 == Status description
-error: connection exception - unable to write to database. Unable to write to database `{ $db }` on this server. Server-side routing is disabled. Either connect to the database leader directly or enable server-side routing by setting '{ $cfgSetting }=true'.
+error: connection exception - unable to write to database. Unable to write to database `{ <<db>> }` on this server. Server-side routing is disabled. Either connect to the database leader directly or enable server-side routing by setting `{ <<cfgSetting>> }=true`.
 
 
 
 == Possible solution
-Either connect to the database directly using the driver or interactively with the `:use mydb` command), or enable server-side routing by setting `dbms.routing.enabled=true` in the configuration.
\ No newline at end of file
+Either connect to the database directly using the driver or interactively with the `:use mydb` command, or enable server-side routing by setting `dbms.routing.enabled=true` in the configuration.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/08N02.adoc b/modules/ROOT/pages/errors/gql-errors/08N02.adoc
index 11150cd6..805fad3c 100644
--- a/modules/ROOT/pages/errors/gql-errors/08N02.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/08N02.adoc
@@ -1,12 +1,21 @@
 = 08N02
 
 == Status description
-error: connection exception - unable to connect to database. Unable to connect to database `{ $db }`. Server-side routing is disabled. Either connect to `{ $db }` directly, or enable server-side routing by setting '{ $cfgSetting }=true'.
+error: connection exception - unable to connect to database. Unable to connect to database `{ <<db>> }`. Server-side routing is disabled. Either connect to `{ $db }` directly, or enable server-side routing by setting `{ <<cfgSetting>> }=true`.
 
-// [source]
-// ----
-// error: connection exception - unable to connect to database. Unable to connect to database `mydb`. Server-side routing is disabled. Either connect to `mydb` directly, or enable server-side routing by setting 'dbms.routing.enabled=true'.
-// ----
+.Example of error message
+[source]
+----
+error: connection exception - unable to connect to database. Unable to connect to database `mydb`. Server-side routing is disabled. Either connect to `mydb` directly, or enable server-side routing by setting 'dbms.routing.enabled=true'.
+----
 
 == Possible solution
-Either connect to the database directly using the driver or interactively with the `:use mydb` command, or enable server-side routing by setting `dbms.routing.enabled=true` in the configuration.
\ No newline at end of file
+Either connect to the database directly using the driver or interactively with the `:use mydb` command, or enable server-side routing by setting `dbms.routing.enabled=true` in the configuration.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/08N03.adoc b/modules/ROOT/pages/errors/gql-errors/08N03.adoc
index dc7153b4..66c16b2d 100644
--- a/modules/ROOT/pages/errors/gql-errors/08N03.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/08N03.adoc
@@ -1,4 +1,12 @@
 = 08N03
 
 == Status description
-error: connection exception - failed to write to graph. Failed to write to graph `{ $graph }`. Check the defined access mode in both driver and database.
+error: connection exception - failed to write to graph. Failed to write to graph `{ <<graph>> }`. Check the defined access mode in both driver and database.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/08N04.adoc b/modules/ROOT/pages/errors/gql-errors/08N04.adoc
index 0d0d86b5..081d721e 100644
--- a/modules/ROOT/pages/errors/gql-errors/08N04.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/08N04.adoc
@@ -1,4 +1,12 @@
 = 08N04
 
 == Status description
-error: unable to route use clause. Routing with `{ $clause }` is not supported in embedded sessions. Connect to the database directly or try running the query using a Neo4j driver or the HTTP API.
+error: unable to route use clause. Routing with `{ <<clause>> }` is not supported in embedded sessions. Connect to the database directly or try running the query using a Neo4j driver or the HTTP API.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/08N05.adoc b/modules/ROOT/pages/errors/gql-errors/08N05.adoc
index 4406e762..c2d3c833 100644
--- a/modules/ROOT/pages/errors/gql-errors/08N05.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/08N05.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: connection exception - unable to route administration command. Routing administration commands is not supported in embedded sessions. Connect to the system database directly or try running the query using a Neo4j driver or the HTTP API.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/08N06.adoc b/modules/ROOT/pages/errors/gql-errors/08N06.adoc
index e1e29852..1b4f1ad2 100644
--- a/modules/ROOT/pages/errors/gql-errors/08N06.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/08N06.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: connection exception - protocol error. General network protocol error.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/08N07.adoc b/modules/ROOT/pages/errors/gql-errors/08N07.adoc
index 51283f4d..e60b6a0a 100644
--- a/modules/ROOT/pages/errors/gql-errors/08N07.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/08N07.adoc
@@ -5,5 +5,13 @@ error: connection exception - not the leader. This member is not the leader.
 
 
 == Possible solution
+
 No write operations are allowed directly on this database.
-Connect to the leader directly or enable server-side routing by setting `dbms.routing.enabled=true` in the configuration.
\ No newline at end of file
+Connect to the leader directly or enable server-side routing by setting `dbms.routing.enabled=true` in the configuration.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/08N08.adoc b/modules/ROOT/pages/errors/gql-errors/08N08.adoc
index 2530bb39..589eb819 100644
--- a/modules/ROOT/pages/errors/gql-errors/08N08.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/08N08.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: connection exception - database is read only. This database is read only on this server.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/08N09.adoc b/modules/ROOT/pages/errors/gql-errors/08N09.adoc
index 39cbf7a3..e0e0cdb7 100644
--- a/modules/ROOT/pages/errors/gql-errors/08N09.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/08N09.adoc
@@ -1,4 +1,11 @@
 = 08N09
 
 == Status description
-error: connection exception - database unavailable. The database `{ $db }` is currently unavailable. Check the database status. Retry your request at a later time.
+error: connection exception - database unavailable. The database `{ <<db>> }` is currently unavailable. Check the database status. Retry your request at a later time.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/08N10.adoc b/modules/ROOT/pages/errors/gql-errors/08N10.adoc
index c7afce63..58ac25bd 100644
--- a/modules/ROOT/pages/errors/gql-errors/08N10.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/08N10.adoc
@@ -1,4 +1,12 @@
 = 08N10
 
 == Status description
-error: connection exception - invalid server state. Message `{ $msg }` cannot be handled by session in the `{ $boltServerState }` state.
+error: connection exception - invalid server state. Message `{ <<msg>> }` cannot be handled by session in the `{ <<boltServerState>> }` state.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/08N11.adoc b/modules/ROOT/pages/errors/gql-errors/08N11.adoc
index fe9fc1cb..85542ef4 100644
--- a/modules/ROOT/pages/errors/gql-errors/08N11.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/08N11.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: connection exception - request error. The request is invalid and could not be processed by the server. See cause for further details.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/08N12.adoc b/modules/ROOT/pages/errors/gql-errors/08N12.adoc
index d33e4865..56b5be04 100644
--- a/modules/ROOT/pages/errors/gql-errors/08N12.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/08N12.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: connection exception - failed to parse bookmark. Failed to parse the supplied bookmark. Verify it is correct or check the debug log for more information.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/08N13.adoc b/modules/ROOT/pages/errors/gql-errors/08N13.adoc
index 86d841f0..3561a08a 100644
--- a/modules/ROOT/pages/errors/gql-errors/08N13.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/08N13.adoc
@@ -1,4 +1,12 @@
 = 08N13
 
 == Status description
-error: connection exception - database not up to requested bookmark. The database `{ $db }` is not up to the requested bookmark `{ $transactionId1 }`. The latest transaction ID is `{ $transactionId2 }`.
+error: connection exception - database not up to requested bookmark. The database `{ <<db>> }` is not up to the requested bookmark `{ <<transactionId>>1 }`. The latest transaction ID is `{ $transactionId2 }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/08N14.adoc b/modules/ROOT/pages/errors/gql-errors/08N14.adoc
index ae5033f4..7b025ecf 100644
--- a/modules/ROOT/pages/errors/gql-errors/08N14.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/08N14.adoc
@@ -1,4 +1,12 @@
 = 08N14
 
 == Status description
-error: connection exception - alias chains are not permitted. Unable to provide a routing table for the database identifed by the alias `{ $alias1 }` because the request comes from another alias `{ $alias2 }` and alias chains are not permitted.
+error: connection exception - alias chains are not permitted. Unable to provide a routing table for the database identifed by the alias `{ <<alias>>1 }` because the request comes from another alias `{ $alias2 }` and alias chains are not permitted.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/08N15.adoc b/modules/ROOT/pages/errors/gql-errors/08N15.adoc
index a61833e4..c1ccd5c7 100644
--- a/modules/ROOT/pages/errors/gql-errors/08N15.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/08N15.adoc
@@ -1,4 +1,11 @@
 = 08N15
 
 == Status description
-error: connection exception - no such routing policy. Policy definition of the routing policy `{ $routingPolicy }` could not be found. Verify that the spelling is correct.
+error: connection exception - no such routing policy. Policy definition of the routing policy `{ <<routingPolicy>> }` could not be found. Verify that the spelling is correct.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/08N16.adoc b/modules/ROOT/pages/errors/gql-errors/08N16.adoc
index 29f67006..9743939e 100644
--- a/modules/ROOT/pages/errors/gql-errors/08N16.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/08N16.adoc
@@ -1,4 +1,12 @@
 = 08N16
 
 == Status description
-error: connection exception - general driver client error. Remote execution failed with message `{ $msg }`.
+error: connection exception - general driver client error. Remote execution failed with message `{ <<msg>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/08N17.adoc b/modules/ROOT/pages/errors/gql-errors/08N17.adoc
index 1df82f72..9bb27a0c 100644
--- a/modules/ROOT/pages/errors/gql-errors/08N17.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/08N17.adoc
@@ -1,4 +1,12 @@
 = 08N17
 
 == Status description
-error: connection exception - general driver transient error. Remote execution failed with message `{ $msg }`.
+error: connection exception - general driver transient error. Remote execution failed with message `{ <<msg>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/08N18.adoc b/modules/ROOT/pages/errors/gql-errors/08N18.adoc
index e77bd523..b9f0e77c 100644
--- a/modules/ROOT/pages/errors/gql-errors/08N18.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/08N18.adoc
@@ -1,4 +1,12 @@
 = 08N18
 
 == Status description
-error: connection exception - general driver database error. Remote execution failed with message `{ $msg }`.
+error: connection exception - general driver database error. Remote execution failed with message `{ <<msg>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22000.adoc b/modules/ROOT/pages/errors/gql-errors/22000.adoc
index 4619ef29..a603becb 100644
--- a/modules/ROOT/pages/errors/gql-errors/22000.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22000.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: data exception
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22003.adoc b/modules/ROOT/pages/errors/gql-errors/22003.adoc
index 67e12e3c..192294d5 100644
--- a/modules/ROOT/pages/errors/gql-errors/22003.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22003.adoc
@@ -1,4 +1,11 @@
 = 22003
 
 == Status description
-error: data exception - numeric value out of range. The numeric value `{ $value }` is outside the required range.
+error: data exception - numeric value out of range. The numeric value `{ <<value>> }` is outside the required range.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22007.adoc b/modules/ROOT/pages/errors/gql-errors/22007.adoc
index 20ba3c17..41fbca5e 100644
--- a/modules/ROOT/pages/errors/gql-errors/22007.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22007.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: data exception - invalid date, time, or datetime format
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22015.adoc b/modules/ROOT/pages/errors/gql-errors/22015.adoc
index 8a76b53e..e0e87324 100644
--- a/modules/ROOT/pages/errors/gql-errors/22015.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22015.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: data exception - interval field overflow
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22G03.adoc b/modules/ROOT/pages/errors/gql-errors/22G03.adoc
index 9fb32822..18a974be 100644
--- a/modules/ROOT/pages/errors/gql-errors/22G03.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22G03.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: data exception - invalid value type
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22G05.adoc b/modules/ROOT/pages/errors/gql-errors/22G05.adoc
index 545428c9..5115a9c1 100644
--- a/modules/ROOT/pages/errors/gql-errors/22G05.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22G05.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: data exception - invalid date, time, or datetime function field name
\ No newline at end of file
+error: data exception - invalid date, time, or datetime function field name
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N00.adoc b/modules/ROOT/pages/errors/gql-errors/22N00.adoc
index 177b8dc6..e4a6b375 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N00.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N00.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: data exception - unsupported value. The provided value is unsupported and cannot be processed.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N01.adoc b/modules/ROOT/pages/errors/gql-errors/22N01.adoc
index 9d88326a..34961e9e 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N01.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N01.adoc
@@ -2,4 +2,11 @@
 
 == Status description
 error: data exception - invalid type.
-Expected the value `{ $value }` to be of type `{ $valueTypeList }`, but was of type `{ $valueType }`.
\ No newline at end of file
+Expected the value `{ <<value>> }` to be of type `{ <<valueTypeList>> }`, but was of type `{ <<valueType>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N02.adoc b/modules/ROOT/pages/errors/gql-errors/22N02.adoc
index 649b6893..082253ef 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N02.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N02.adoc
@@ -1,4 +1,12 @@
 = 22N02
 
 == Status description
-error: data exception - specified negative numeric value. Expected `{ $option }` to be a positive number but found `{ $value }` instead.
+error: data exception - specified negative numeric value. Expected `{ <<option>> }` to be a positive number but found `{ <<value>> }` instead.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N03.adoc b/modules/ROOT/pages/errors/gql-errors/22N03.adoc
index 5597513e..c4234ee3 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N03.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N03.adoc
@@ -1,4 +1,12 @@
 = 22N03
 
 == Status description
-error: data exception - specified numeric value out of range. Expected `{ $component }` to be of type `{ $valueType }` and in the range `{ $lower }`  to `{ $upper }` but found `{ $value }`.
+error: data exception - specified numeric value out of range. Expected `{ <<component>> }` to be of type `{ <<valueType>> }` and in the range `{ <<lower>> }` to `{ <<upper>> }` but found `{ <<value>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N04.adoc b/modules/ROOT/pages/errors/gql-errors/22N04.adoc
index 0409f80c..d266ca86 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N04.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N04.adoc
@@ -1,4 +1,12 @@
 = 22N04
 
 == Status description
-error: data exception - invalid input value. Invalid input `{ $input }` for `{ $context }`. Expected `{ $inputList }`.
+error: data exception - invalid input value. Invalid input `{ <<input>> }` for `{ <<context>> }`. Expected `{ <<inputList>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N05.adoc b/modules/ROOT/pages/errors/gql-errors/22N05.adoc
index 7921f71a..3e1facae 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N05.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N05.adoc
@@ -1,4 +1,12 @@
 = 22N05
 
 == Status description
-error: data exception - input failed validation. Invalid input `{ $input }` for `{ $context }`.
+error: data exception - input failed validation. Invalid input `{ <<input>> }` for `{ <<context>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N06.adoc b/modules/ROOT/pages/errors/gql-errors/22N06.adoc
index 86c80fa8..8a820281 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N06.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N06.adoc
@@ -1,4 +1,12 @@
 = 22N06
 
 == Status description
-error: data exception - empty input string. Invalid input. `{ $option }` needs to be specified.
+error: data exception - empty input string. Invalid input. `{ <<option>> }` needs to be specified.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N07.adoc b/modules/ROOT/pages/errors/gql-errors/22N07.adoc
index 68f7304f..9e94ed65 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N07.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N07.adoc
@@ -1,4 +1,12 @@
 = 22N07
 
 == Status description
-error: data exception - invalid pre-parser option key. Invalid pre-parser option(s): `{ $optionList }`.
+error: data exception - invalid pre-parser option key. Invalid pre-parser option(s): `{ <<optionList>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N08.adoc b/modules/ROOT/pages/errors/gql-errors/22N08.adoc
index 255216af..4248d6c8 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N08.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N08.adoc
@@ -1,4 +1,11 @@
 = 22N08
 
 == Status description
-error: data exception - invalid pre-parser combination. Invalid pre-parser option, cannot combine `{ $option1 }` with `{ $option2 }`.
+error: data exception - invalid pre-parser combination. Invalid pre-parser option, cannot combine `{ <<option>>1 }` with `{ $option2 }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N09.adoc b/modules/ROOT/pages/errors/gql-errors/22N09.adoc
index ffa08ec5..1730bb8f 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N09.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N09.adoc
@@ -1,4 +1,12 @@
 = 22N09
 
 == Status description
-error: data exception - conflicting pre-parser combination. Invalid pre-parser option, cannot specify multiple conflicting values for `{ $option }`.
+error: data exception - conflicting pre-parser combination. Invalid pre-parser option, cannot specify multiple conflicting values for `{ <<option>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N10.adoc b/modules/ROOT/pages/errors/gql-errors/22N10.adoc
index 389975d3..1e24dc00 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N10.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N10.adoc
@@ -1,4 +1,13 @@
 = 22N10
 
 == Status description
-error: data exception - invalid pre-parser option value. Invalid pre-parser option, specified `{ $input }` is not valid for option `{ $option }`. Valid options are: `{ $optionList }`.
+error: data exception - invalid pre-parser option value. Invalid pre-parser option, specified `{ <<input>> }` is not valid for option `{ <<option>> }`. Valid options are: `{ <<optionList>> }`.
+
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N11.adoc b/modules/ROOT/pages/errors/gql-errors/22N11.adoc
index bf8605fa..c3da5f8c 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N11.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N11.adoc
@@ -1,4 +1,12 @@
 = 22N11
 
 == Status description
-error: data exception - invalid argument. Invalid argument: cannot process `{ $input }`.
+error: data exception - invalid argument. Invalid argument: cannot process `{ <<input>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N12.adoc b/modules/ROOT/pages/errors/gql-errors/22N12.adoc
index cdd418a7..d9944653 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N12.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N12.adoc
@@ -1,4 +1,12 @@
 = 22N12
 
 == Status description
-error: data exception - invalid date, time, or datetime format. Invalid argument: cannot process `{ $input }`.
+error: data exception - invalid date, time, or datetime format. Invalid argument: cannot process `{ <<input>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N13.adoc b/modules/ROOT/pages/errors/gql-errors/22N13.adoc
index 5d856c54..1a7c34bd 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N13.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N13.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: data exception - invalid time zone. Specified time zones must include a date component.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N14.adoc b/modules/ROOT/pages/errors/gql-errors/22N14.adoc
index a072a0b0..4ae821b0 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N14.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N14.adoc
@@ -1,4 +1,12 @@
 = 22N14
 
 == Status description
-error: data exception - invalid temporal value combination. Cannot select both `{ $temporal1 }` and `{ $temporal2 }`.
+error: data exception - invalid temporal value combination. Cannot select both `{ <<temporal>>1 }` and `{ $temporal2 }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
\ No newline at end of file
diff --git a/modules/ROOT/pages/errors/gql-errors/22N15.adoc b/modules/ROOT/pages/errors/gql-errors/22N15.adoc
index 4b6f3241..e892de1f 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N15.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N15.adoc
@@ -1,4 +1,11 @@
 = 22N15
 
 == Status description
-error: data exception - invalid temporal component. Cannot read the specified `{ $component }` component from `{ $temporal }`.
+error: data exception - invalid temporal component. Cannot read the specified `{ <<component>> }` component from `{ <<temporal>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N18.adoc b/modules/ROOT/pages/errors/gql-errors/22N18.adoc
index c74618bf..18516f24 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N18.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N18.adoc
@@ -1,4 +1,11 @@
 = 22N18
 
 == Status description
-error: data exception - incomplete spatial value. A `{ $crs }` POINT must contain `{ $mapKeyList }`.
+error: data exception - incomplete spatial value. A `{ <<crs>> }` POINT must contain `{ <<mapKeyList>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N19.adoc b/modules/ROOT/pages/errors/gql-errors/22N19.adoc
index 3ff788c7..c9096d16 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N19.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N19.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: data exception - invalid spatial value. A `POINT` must contain either 'x' and 'y', or 'latitude' and 'longitude'.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N20.adoc b/modules/ROOT/pages/errors/gql-errors/22N20.adoc
index 35f643c6..f1d8a12b 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N20.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N20.adoc
@@ -1,4 +1,12 @@
 = 22N20
 
 == Status description
-error: data exception - invalid spatial value dimensions. Cannot create POINT with `{ $dim1 }D` coordinate reference system (CRS) and `{ $value }` coordinates. Use the equivalent `{ $dim2 }D` coordinate reference system instead.
+error: data exception - invalid spatial value dimensions. Cannot create POINT with `{ <<dim>>1 }D` coordinate reference system (CRS) and `{ <<value>> }` coordinates. Use the equivalent `{ $dim2 }D` coordinate reference system instead.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N21.adoc b/modules/ROOT/pages/errors/gql-errors/22N21.adoc
index 92b96a7f..04e3d94d 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N21.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N21.adoc
@@ -2,4 +2,11 @@
 
 
 == Status description
-error: data exception - unsupported coordinate reference system. Unsupported coordinate reference system (CRS): `{ $crs }`.
\ No newline at end of file
+error: data exception - unsupported coordinate reference system. Unsupported coordinate reference system (CRS): `{ <<crs>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N22.adoc b/modules/ROOT/pages/errors/gql-errors/22N22.adoc
index e3e4c74b..87e36d15 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N22.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N22.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: data exception - invalid spatial value combination. Cannot specify both coordinate reference system (CRS) and spatial reference identifier (SRID).
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N23.adoc b/modules/ROOT/pages/errors/gql-errors/22N23.adoc
index ea6451bd..16233879 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N23.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N23.adoc
@@ -1,4 +1,12 @@
 = 22N23
 
 == Status description
-error: data exception - invalid latitude value. Cannot create WGS84 POINT with invalid coordinate: `{ $coordinates }`. The valid range for the latitude coordinate is [-90, 90].
+error: data exception - invalid latitude value. Cannot create WGS84 POINT with invalid coordinate: `{ <<coordinates>> }`. The valid range for the latitude coordinate is [-90, 90].
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N24.adoc b/modules/ROOT/pages/errors/gql-errors/22N24.adoc
index f4a30b83..8e76073a 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N24.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N24.adoc
@@ -1,4 +1,12 @@
 = 22N24
 
 == Status description
-error: data exception - invalid coordinate arguments. Cannot construct a `{ $valueType }` from `{ $coordinates }`.
+error: data exception - invalid coordinate arguments. Cannot construct a `{ <<valueType>> }` from `{ <<coordinates>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
\ No newline at end of file
diff --git a/modules/ROOT/pages/errors/gql-errors/22N25.adoc b/modules/ROOT/pages/errors/gql-errors/22N25.adoc
index f774e4f0..bb3e6ad2 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N25.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N25.adoc
@@ -1,4 +1,12 @@
 = 22N25
 
 == Status description
-error: data exception - invalid temporal arguments. Cannot construct a `{ $valueType }` from `{ $temporal }`.
+error: data exception - invalid temporal arguments. Cannot construct a `{ <<valueType>> }` from `{ <<temporal>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N26.adoc b/modules/ROOT/pages/errors/gql-errors/22N26.adoc
index af5d6d18..0835bb3f 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N26.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N26.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: data exception - unsupported rounding mode. Unknown rounding mode. Valid values are: `CEILING`, `FLOOR`, `UP`, `DOWN`, `HALF_EVEN`, `HALF_UP`, `HALF_DOWN`, `UNNECESSARY`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N27.adoc b/modules/ROOT/pages/errors/gql-errors/22N27.adoc
index 38a7a01a..8ea732bf 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N27.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N27.adoc
@@ -1,4 +1,12 @@
 = 22N27
 
 == Status description
-error: data exception - invalid entity type. Invalid input `{ $input }` for `{ $context }`. Expected to be `{ $valueTypeList }`.
+error: data exception - invalid entity type. Invalid input `{ <<input>> }` for `{ <<context>> }`. Expected to be `{ <<valueTypeList>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N28.adoc b/modules/ROOT/pages/errors/gql-errors/22N28.adoc
index a0117908..3bb705d7 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N28.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N28.adoc
@@ -1,4 +1,12 @@
 = 22N28
 
 == Status description
-error: data exception - overflow error. The result of the operation `{ $operation }` has caused an overflow.
+error: data exception - overflow error. The result of the operation `{ <<operation>> }` has caused an overflow.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N31.adoc b/modules/ROOT/pages/errors/gql-errors/22N31.adoc
index da3f43a1..fecd1151 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N31.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N31.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: data exception - invalid properties in merge pattern. 'MERGE' cannot be used with graph element property values that are null or NaN.
\ No newline at end of file
+error: data exception - invalid properties in merge pattern. 'MERGE' cannot be used with graph element property values that are null or NaN.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N32.adoc b/modules/ROOT/pages/errors/gql-errors/22N32.adoc
index 5153c044..70038703 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N32.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N32.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: data exception - non-deterministic sort expression. 'ORDER BY' expressions must be deterministic.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N33.adoc b/modules/ROOT/pages/errors/gql-errors/22N33.adoc
index 522bfd0b..51defc68 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N33.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N33.adoc
@@ -1,4 +1,12 @@
 = 22N33
 
 == Status description
-error: data exception - invalid shortest path expression. Shortest path expressions must contain start and end nodes. Cannot find: `{ $variable }`.
+error: data exception - invalid shortest path expression. Shortest path expressions must contain start and end nodes. Cannot find: `{ <<variable>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N35.adoc b/modules/ROOT/pages/errors/gql-errors/22N35.adoc
index 6c3cf4c7..d7e6dedb 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N35.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N35.adoc
@@ -1,4 +1,12 @@
 = 22N35
 
 == Status description
-error: data exception - invalid date format. Cannot parse `{ $input }` as a DATE. Calendar dates need to be specified using the format 'YYYY-MM', while ordinal dates need to be specified using the format 'YYYY-DDD'.
+error: data exception - invalid date format. Cannot parse `{ <<input>> }` as a DATE. Calendar dates need to be specified using the format 'YYYY-MM', while ordinal dates need to be specified using the format 'YYYY-DDD'.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N36.adoc b/modules/ROOT/pages/errors/gql-errors/22N36.adoc
index 896edb1e..87021e66 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N36.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N36.adoc
@@ -1,4 +1,12 @@
 = 22N36
 
 == Status description
-error: data exception - invalid temporal format. Cannot parse `{ $input }` as a `{ $valueType }`.
+error: data exception - invalid temporal format. Cannot parse `{ <<input>> }` as a `{ <<valueType>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N37.adoc b/modules/ROOT/pages/errors/gql-errors/22N37.adoc
index 817ea14d..c6fbcf98 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N37.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N37.adoc
@@ -1,4 +1,12 @@
 = 22N37
 
 == Status description
-error: data exception - invalid coercion. Cannot coerce `{ $value }` to `{ $valueType }`.
+error: data exception - invalid coercion. Cannot coerce `{ <<value>> }` to `{ <<valueType>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N38.adoc b/modules/ROOT/pages/errors/gql-errors/22N38.adoc
index c6a597ec..197dca0a 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N38.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N38.adoc
@@ -1,4 +1,12 @@
 = 22N38
 
 == Status description
-error: data exception - invalid function argument. Invalid argument to the function `{ $fun }`.
+error: data exception - invalid function argument. Invalid argument to the function `{ <<fun>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N39.adoc b/modules/ROOT/pages/errors/gql-errors/22N39.adoc
index b8125fd5..8e1bfbc2 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N39.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N39.adoc
@@ -2,4 +2,13 @@
 
 
 == Status description
-error: data exception - unsupported property value type. Value `{ $value }` cannot be stored in properties.
\ No newline at end of file
+error: data exception - unsupported property value type. Value `{ <<value>> }` cannot be stored in properties.
+
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N41.adoc b/modules/ROOT/pages/errors/gql-errors/22N41.adoc
index cc56de07..455421c3 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N41.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N41.adoc
@@ -1,4 +1,12 @@
 = 22N41
 
 == Status description
-error: data exception - merge node uniqueness constraint violation. The 'MERGE' clause did not find a matching node `{ $variable }` and cannot create a new node due to conflicts with existing uniqueness constraints.
+error: data exception - merge node uniqueness constraint violation. The 'MERGE' clause did not find a matching node `{ <<variable>> }` and cannot create a new node due to conflicts with existing uniqueness constraints.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N42.adoc b/modules/ROOT/pages/errors/gql-errors/22N42.adoc
index a27a999c..bb40c896 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N42.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N42.adoc
@@ -1,4 +1,12 @@
 = 22N42
 
 == Status description
-error: data exception - merge relationship uniqueness constraint violation. The 'MERGE' clause did not find a matching relationship `{ $variable }` and cannot create a new relationship due to conflicts with existing uniqueness constraints.
+error: data exception - merge relationship uniqueness constraint violation. The 'MERGE' clause did not find a matching relationship `{ <<variable>> }` and cannot create a new relationship due to conflicts with existing uniqueness constraints.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N43.adoc b/modules/ROOT/pages/errors/gql-errors/22N43.adoc
index c626cb8b..f1d50b6e 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N43.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N43.adoc
@@ -1,4 +1,12 @@
 = 22N43
 
 == Status description
-error: data exception - unable to load external resource. Could not load external resource from `{ $url }`.
+error: data exception - unable to load external resource. Could not load external resource from `{ <<url>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N44.adoc b/modules/ROOT/pages/errors/gql-errors/22N44.adoc
index 992e4709..58006004 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N44.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N44.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: data exception - parallel runtime disabled. Parallel runtime has been disabled, enable it or upgrade to a bigger Aura instance.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N46.adoc b/modules/ROOT/pages/errors/gql-errors/22N46.adoc
index 2275befe..9b10f6f5 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N46.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N46.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: data exception - unsupported use of parallel runtime. Parallel runtime does not support updating queries or a change in the state of transactions. Use another runtime.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N47.adoc b/modules/ROOT/pages/errors/gql-errors/22N47.adoc
index 284b61e1..4e1977f3 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N47.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N47.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: data exception - invalid parallel runtime configuration. No workers are configured for the parallel runtime. Set 'server.cypher.parallel.worker_limit' to a larger value.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N48.adoc b/modules/ROOT/pages/errors/gql-errors/22N48.adoc
index 4325884e..5331b97d 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N48.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N48.adoc
@@ -2,4 +2,11 @@
 
 
 == Status description
-error: data exception - unable to use specified runtime. Cannot use the specified runtime { $runtime } due to { $cause } not being supported. Use another runtime.
\ No newline at end of file
+error: data exception - unable to use specified runtime. Cannot use the specified runtime `{ <<runtime>> }` due to `{ <<cause>> }` not being supported. Use another runtime.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N49.adoc b/modules/ROOT/pages/errors/gql-errors/22N49.adoc
index 6b1fe6cd..c7678e51 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N49.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N49.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: data exception - CSV buffer size overflow. Cannot read a CSV field larger than the set buffer size. Ensure the field does not have an unterminated quote, or increase the buffer size via 'dbms.import.csv.buffer_size'.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N51.adoc b/modules/ROOT/pages/errors/gql-errors/22N51.adoc
index a6b5a8c9..50b357c3 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N51.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N51.adoc
@@ -1,4 +1,12 @@
 = 22N51
 
 == Status description
-error: data exception - database or alias does not exist. A [composite] database or alias with the name `{ $db }` does not exist. Verify that the spelling is correct.
+error: data exception - database or alias does not exist. A [composite] database or alias with the name `{ <<db>> }` does not exist. Verify that the spelling is correct.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N52.adoc b/modules/ROOT/pages/errors/gql-errors/22N52.adoc
index f3954338..6190516f 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N52.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N52.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: data exception - invalid combination of PROFILE and EXPLAIN. 'PROFILE' and 'EXPLAIN' cannot be combined.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N53.adoc b/modules/ROOT/pages/errors/gql-errors/22N53.adoc
index fc289d76..b34b82c3 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N53.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N53.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: data exception - invalid use of PROFILE. Cannot 'PROFILE' query before results are materialized.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N54.adoc b/modules/ROOT/pages/errors/gql-errors/22N54.adoc
index 0bda14c1..fa14245f 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N54.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N54.adoc
@@ -1,4 +1,12 @@
 = 22N54
 
 == Status description
-error: data exception - invalid map. Multiple conflicting entries specified for `{ $mapKey }`.
+error: data exception - invalid map. Multiple conflicting entries specified for `{ <<mapKey>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N56.adoc b/modules/ROOT/pages/errors/gql-errors/22N56.adoc
index 12f330f9..a5ec8f11 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N56.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N56.adoc
@@ -1,4 +1,12 @@
 = 22N56
 
 == Status description
-error: data exception - protocol message length limit overflow. Protocol message length limit exceeded (limit: `{ $boltMsgLenLimit }`).
+error: data exception - protocol message length limit overflow. Protocol message length limit exceeded (limit: `{ <<boltMsgLenLimit>> }`).
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N58.adoc b/modules/ROOT/pages/errors/gql-errors/22N58.adoc
index 5bfe8700..498fe0d3 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N58.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N58.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: data exception - invalid spatial component. Cannot read the specified `{ $component }` component from `{ $value }`.
\ No newline at end of file
+error: data exception - invalid spatial component. Cannot read the specified `{ <<component>> }` component from `{ <<value>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N64.adoc b/modules/ROOT/pages/errors/gql-errors/22N64.adoc
index 3ddaec6f..314e32dc 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N64.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N64.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: data exception - constraint does not exist. The constraint `{ $constrDescrOrName }` does not exist.
\ No newline at end of file
+error: data exception - constraint does not exist. The constraint `{ <<constrDescrOrName>> }` does not exist.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N65.adoc b/modules/ROOT/pages/errors/gql-errors/22N65.adoc
index 8b793cfb..674685f0 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N65.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N65.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: data exception - equivalent constraint already exists. An equivalent constraint already exists: `{ $constrDescrOrName }`.
\ No newline at end of file
+error: data exception - equivalent constraint already exists. An equivalent constraint already exists: `{ <<constrDescrOrName>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N66.adoc b/modules/ROOT/pages/errors/gql-errors/22N66.adoc
index a563c24e..bfc32bd6 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N66.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N66.adoc
@@ -1,4 +1,13 @@
 = 22N66
 
 == Status description
-error: data exception - conflicting constraint already exists. A conflicting constraint already exists: `{ $constrDescrOrName }`.
+error: data exception - conflicting constraint already exists. A conflicting constraint already exists: `{ <<constrDescrOrName>> }`.
+
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N67.adoc b/modules/ROOT/pages/errors/gql-errors/22N67.adoc
index b76f5711..761380f6 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N67.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N67.adoc
@@ -1,4 +1,12 @@
 = 22N67
 
 == Status description
-error: data exception - duplicated constraint name. A constraint with the same name already exists: `{ $constr }`.
+error: data exception - duplicated constraint name. A constraint with the same name already exists: `{ <<constr>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N68.adoc b/modules/ROOT/pages/errors/gql-errors/22N68.adoc
index 913965d0..c0fb244a 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N68.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N68.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: data exception - dependent constraint managed individually. Dependent constraints cannot be managed individually and must be managed together with its graph type.
\ No newline at end of file
+error: data exception - dependent constraint managed individually. Dependent constraints cannot be managed individually and must be managed together with its graph type.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N69.adoc b/modules/ROOT/pages/errors/gql-errors/22N69.adoc
index 39eeb5a3..4ee05c3b 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N69.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N69.adoc
@@ -1,4 +1,12 @@
 = 22N69
 
 == Status description
-error: data exception - index does not exist. The index specified by `{ $idxDescrOrName }` does not exist.
+error: data exception - index does not exist. The index specified by `{ <<idxDescrOrName>> }` does not exist.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N70.adoc b/modules/ROOT/pages/errors/gql-errors/22N70.adoc
index be8c52be..893bab90 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N70.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N70.adoc
@@ -2,4 +2,13 @@
 
 
 == Status description
-error: data exception - equivalent index already exists. An equivalent index already exists: `{ $idxDescrOrName }`.
\ No newline at end of file
+error: data exception - equivalent index already exists. An equivalent index already exists: `{ <<idxDescrOrName>> }`.
+
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N71.adoc b/modules/ROOT/pages/errors/gql-errors/22N71.adoc
index 880d2463..c13a5635 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N71.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N71.adoc
@@ -1,4 +1,12 @@
 = 22N71
 
 == Status description
-error: data exception - index with the same name already exists. An index with the same name already exists: `{ $idx }`.
+error: data exception - index with the same name already exists. An index with the same name already exists: `{ <<idx>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N73.adoc b/modules/ROOT/pages/errors/gql-errors/22N73.adoc
index 50adc65c..cc02f205 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N73.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N73.adoc
@@ -2,4 +2,11 @@
 
 
 == Status description
-error: data exception - constraint conflicts with existing index. Constraint conflicts with already existing index `{ $idxDescrOrName }`.
\ No newline at end of file
+error: data exception - constraint conflicts with existing index. Constraint conflicts with already existing index `{ <<idxDescrOrName>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N74.adoc b/modules/ROOT/pages/errors/gql-errors/22N74.adoc
index 23396c8c..3c9519e6 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N74.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N74.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: data exception - index conflicts with existing constraint. An index that belongs to the constraint `{ $constr }` contains a conflicting index.
\ No newline at end of file
+error: data exception - index conflicts with existing constraint. An index that belongs to the constraint `{ <<constr>> }` contains a conflicting index.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N75.adoc b/modules/ROOT/pages/errors/gql-errors/22N75.adoc
index 0d4c735a..369fb8e5 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N75.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N75.adoc
@@ -2,4 +2,13 @@
 
 
 == Status description
-error: data exception - constraint contains duplicated tokens. The constraint specified by `{ $constrDescrOrName }` includes a label, relationship type, or property key with name `{ $token }` more than once.
\ No newline at end of file
+error: data exception - constraint contains duplicated tokens. The constraint specified by `{ <<constrDescrOrName>> }` includes a label, relationship type, or property key with name `{ <<token>> }` more than once.
+
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N76.adoc b/modules/ROOT/pages/errors/gql-errors/22N76.adoc
index 1d0391e7..73aeef8c 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N76.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N76.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: data exception - index contains duplicated tokens. The index specified by `{ $idxDescrOrName }` includes a label, relationship type, or property key with name `{ $token }` more than once.
\ No newline at end of file
+error: data exception - index contains duplicated tokens. The index specified by `{ <<idxDescrOrName>> }` includes a label, relationship type, or property key with name `{ <<token>> }` more than once.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N77.adoc b/modules/ROOT/pages/errors/gql-errors/22N77.adoc
index 417edcf1..d6e6ef2d 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N77.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N77.adoc
@@ -1,4 +1,11 @@
 = 22N77
 
 == Status description
-error: data exception - property presence verification failed. `{ $entityType }` (`{ $entityId }`) with `{ $tokenType }` `{ $token }` must have the following properties: `{ $propKeyList }`.
+error: data exception - property presence verification failed. `{ <<entityType>> }` (`{ <<entityId>> }`) with `{ <<tokenType>> }` `{ <<token>> }` must have the following properties: `{ <<propKeyList>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N78.adoc b/modules/ROOT/pages/errors/gql-errors/22N78.adoc
index 39254005..c4fb158f 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N78.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N78.adoc
@@ -1,4 +1,11 @@
 = 22N78
 
 == Status description
-error: data exception - property type verification failed. `{ $entityType }` (`{ $entityId }`) with `{ $tokenType }` `{ $token }` must have the property `$propKey` with value type `{ $valueType }`.
+error: data exception - property type verification failed. `{ <<entityType>> }` (`{ <<entityId>> }`) with `{ <<tokenType>> }` `{ <<token>> }` must have the property `{ <<propKey>> }` with value type `{ <<valueType>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N79.adoc b/modules/ROOT/pages/errors/gql-errors/22N79.adoc
index 382bfab1..4bfad64f 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N79.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N79.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: data exception - property uniqueness constraint violated. Property uniqueness constraint violated: `{ $reasonList }`.
\ No newline at end of file
+error: data exception - property uniqueness constraint violated. Property uniqueness constraint violated: `{ <<reasonList>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N80.adoc b/modules/ROOT/pages/errors/gql-errors/22N80.adoc
index daefa5b5..091d19d2 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N80.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N80.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: data exception - index entry conflict. Index entry conflict: `{ $value }`.
\ No newline at end of file
+error: data exception - index entry conflict. Index entry conflict: `{ <<value>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N81.adoc b/modules/ROOT/pages/errors/gql-errors/22N81.adoc
index 586c3111..86dca039 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N81.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N81.adoc
@@ -1,4 +1,11 @@
 = 22N81
 
 == Status description
-error: data exception - expression type unsupported here. Invalid input: `{ $exprType }` is not supported in `{ $context }`.
+error: data exception - expression type unsupported here. Invalid input: `{ <<exprType>> }` is not supported in `{ <<context>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N82.adoc b/modules/ROOT/pages/errors/gql-errors/22N82.adoc
index 8f6f6c36..cd0c1db6 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N82.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N82.adoc
@@ -1,4 +1,11 @@
 = 22N82
 
 == Status description
-error: data exception - input contains invalid characters. Input `{ $input }` contains invalid characters for `{ $context }`. Special characters may require that the input is quoted using backticks.
+error: data exception - input contains invalid characters. Input `{ <<input>> }` contains invalid characters for `{ <<context>> }`. Special characters may require that the input is quoted using backticks.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N84.adoc b/modules/ROOT/pages/errors/gql-errors/22N84.adoc
index 09a2f48a..665f82cb 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N84.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N84.adoc
@@ -1,4 +1,11 @@
 = 22N84
 
 == Status description
-error: data exception - string too long. Expected the string to be no more than `{ $upper }` characters long.
+error: data exception - string too long. Expected the string to be no more than `{ <<upper>> }` characters long.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N85.adoc b/modules/ROOT/pages/errors/gql-errors/22N85.adoc
index ed3662c4..87b7d870 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N85.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N85.adoc
@@ -1,4 +1,11 @@
 = 22N85
 
 == Status description
-error: data exception - string too short. Expected the string to be at least `{ $lower }` characters long.
+error: data exception - string too short. Expected the string to be at least `{ <<lower>> }` characters long.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N86.adoc b/modules/ROOT/pages/errors/gql-errors/22N86.adoc
index 25a7f1da..121c046d 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N86.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N86.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: data exception - numeric range 0 disallowed. Expected a nonzero number.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N88.adoc b/modules/ROOT/pages/errors/gql-errors/22N88.adoc
index 8ce564d5..d4f222b6 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N88.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N88.adoc
@@ -1,4 +1,11 @@
 = 22N88
 
 == Status description
-error: data exception - not a valid CIDR IP. `{ $input }` is not a valid CIDR IP.
+error: data exception - not a valid CIDR IP. `{ <<input>> }` is not a valid CIDR IP.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N89.adoc b/modules/ROOT/pages/errors/gql-errors/22N89.adoc
index d7f06f9a..fa030adf 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N89.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N89.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: data exception - new password cannot be the same as the old password. Expected the new password to be different from the old password.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N90.adoc b/modules/ROOT/pages/errors/gql-errors/22N90.adoc
index ddcbe4e3..ecd22b83 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N90.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N90.adoc
@@ -1,4 +1,11 @@
 = 22N90
 
 == Status description
-error: data exception - property type unsupported in constraint. `{ $item }` is not supported in property type constraints.
+error: data exception - property type unsupported in constraint. `{ <<item>> }` is not supported in property type constraints.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N91.adoc b/modules/ROOT/pages/errors/gql-errors/22N91.adoc
index 2b0696c1..81b90e76 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N91.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N91.adoc
@@ -1,4 +1,11 @@
 = 22N91
 
 == Status description
-error: data exception - cannot convert alias local to remote or remote to local. Failed to alter the specified database alias `{ $alias }`. Altering remote alias to a local alias or vice versa is not supported. Drop and recreate the alias instead.
+error: data exception - cannot convert alias local to remote or remote to local. Failed to alter the specified database alias `{ <<alias>> }`. Altering remote alias to a local alias or vice versa is not supported. Drop and recreate the alias instead.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N92.adoc b/modules/ROOT/pages/errors/gql-errors/22N92.adoc
index 9b9e294d..bc0d49d7 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N92.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N92.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: data exception - missing RETURN. This query requires a RETURN clause.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N93.adoc b/modules/ROOT/pages/errors/gql-errors/22N93.adoc
index e4524927..d6673055 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N93.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N93.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: data exception - missing YIELD. A required YIELD clause is missing.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N94.adoc b/modules/ROOT/pages/errors/gql-errors/22N94.adoc
index 4c25ca98..db8e2316 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N94.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N94.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: data exception - invalid YIELD *. 'YIELD *' is not supported in this context. Explicitly specify which columns to yield.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N95.adoc b/modules/ROOT/pages/errors/gql-errors/22N95.adoc
index 4f4c7fa4..efd25809 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N95.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N95.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: data exception - parsing JSON exception. Invalid JSON input. Please check the format.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N96.adoc b/modules/ROOT/pages/errors/gql-errors/22N96.adoc
index e0891b9b..0818b45b 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N96.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N96.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: data exception - mapping JSON exception. Unable to map the JSON input. Please verify the structure.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N97.adoc b/modules/ROOT/pages/errors/gql-errors/22N97.adoc
index edd3fbc8..067d8bd6 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N97.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N97.adoc
@@ -1,4 +1,11 @@
 = 22N97
 
 == Status description
-error: data exception - unexpected struct tag. Unexpected struct tag: `{ $value }`.
+error: data exception - unexpected struct tag. Unexpected struct tag: `{ <<value>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N98.adoc b/modules/ROOT/pages/errors/gql-errors/22N98.adoc
index c7576e60..d2a11378 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N98.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N98.adoc
@@ -1,4 +1,11 @@
 = 22N98
 
 == Status description
-error: data exception - wrong first field during deserialization. Unable to deserialize request. Expected first field to be `{ $field }`, but was '{ $value }'.
+error: data exception - wrong first field during deserialization. Unable to deserialize request. Expected first field to be `{ <<field>> }`, but was `{ <<value>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22N99.adoc b/modules/ROOT/pages/errors/gql-errors/22N99.adoc
index 30907df7..02009052 100644
--- a/modules/ROOT/pages/errors/gql-errors/22N99.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22N99.adoc
@@ -1,4 +1,11 @@
 = 22N99
 
 == Status description
-error: data exception - wrong token during deserialization. Unable to deserialize request. Expected `{ $token }`, found `{ $value }`.
+error: data exception - wrong token during deserialization. Unable to deserialize request. Expected `{ <<token>> }`, found `{ <<value>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22NA0.adoc b/modules/ROOT/pages/errors/gql-errors/22NA0.adoc
index 9f932880..7ff969ae 100644
--- a/modules/ROOT/pages/errors/gql-errors/22NA0.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22NA0.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: data exception - invalid property based access control rule. Failed to administer property rule.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22NA1.adoc b/modules/ROOT/pages/errors/gql-errors/22NA1.adoc
index 13e5551a..2c2bf5e9 100644
--- a/modules/ROOT/pages/errors/gql-errors/22NA1.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22NA1.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: data exception - invalid property based access control rule involving non-commutative expressions. The property `{ $propKey }` must appear on the left hand side of the `{ $operation }` operator.
\ No newline at end of file
+error: data exception - invalid property based access control rule involving non-commutative expressions. The property `{ <<propKey>> }` must appear on the left hand side of the `{ <<operation>> }` operator.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22NA2.adoc b/modules/ROOT/pages/errors/gql-errors/22NA2.adoc
index 7e192a3b..d86467cf 100644
--- a/modules/ROOT/pages/errors/gql-errors/22NA2.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22NA2.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: data exception - invalid property based access control rule involving multiple properties. The expression: `{ $expr }` is not supported. Property rules can only contain one property.
\ No newline at end of file
+error: data exception - invalid property based access control rule involving multiple properties. The expression: `{ <<expr>> }` is not supported. Property rules can only contain one property.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22NA4.adoc b/modules/ROOT/pages/errors/gql-errors/22NA4.adoc
index 4a0a78d0..e790aa29 100644
--- a/modules/ROOT/pages/errors/gql-errors/22NA4.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22NA4.adoc
@@ -1,4 +1,11 @@
 = 22NA4
 
 == Status description
-error: data exception - invalid property based access control rule involving comparison with NULL. The property value access rule pattern `{ $pred }` always evaluates to 'NULL'.
+error: data exception - invalid property based access control rule involving comparison with NULL. The property value access rule pattern `{ <<pred>> }` always evaluates to 'NULL'.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22NA5.adoc b/modules/ROOT/pages/errors/gql-errors/22NA5.adoc
index 99c4770a..2a31b4d9 100644
--- a/modules/ROOT/pages/errors/gql-errors/22NA5.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22NA5.adoc
@@ -1,4 +1,11 @@
 = 22NA5
 
 == Status description
-error: data exception - invalid property based access control rule involving IS NULL. The property value access rule pattern `{ $pred }` always evaluates to 'NULL'. Use `IS NULL' instead.
+error: data exception - invalid property based access control rule involving IS NULL. The property value access rule pattern `{ <<pred>> }` always evaluates to 'NULL'. Use `IS NULL' instead.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22NA6.adoc b/modules/ROOT/pages/errors/gql-errors/22NA6.adoc
index 93d0f672..dbf688f6 100644
--- a/modules/ROOT/pages/errors/gql-errors/22NA6.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22NA6.adoc
@@ -1,4 +1,11 @@
 = 22NA6
 
 == Status description
-error: data exception - invalid property based access control rule involving IS NOT NULL. The property value access rule pattern `{ $pred }` always evaluates to 'NULL'. Use 'IS NOT NULL' instead.
+error: data exception - invalid property based access control rule involving IS NOT NULL. The property value access rule pattern `{ <<pred>> }` always evaluates to 'NULL'. Use 'IS NOT NULL' instead.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22NA7.adoc b/modules/ROOT/pages/errors/gql-errors/22NA7.adoc
index 784930b8..91c215e7 100644
--- a/modules/ROOT/pages/errors/gql-errors/22NA7.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22NA7.adoc
@@ -2,4 +2,13 @@
 
 
 == Status description
-error: data exception - invalid property based access control rule involving nontrivial predicates. The expression: `{ $expr }` is not supported. Only single, literal-based predicate expressions are allowed for property-based access control.
\ No newline at end of file
+error: data exception - invalid property based access control rule involving nontrivial predicates. The expression: `{ <<expr>> }` is not supported. Only single, literal-based predicate expressions are allowed for property-based access control.
+
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22NA8.adoc b/modules/ROOT/pages/errors/gql-errors/22NA8.adoc
index e74d5c18..828da005 100644
--- a/modules/ROOT/pages/errors/gql-errors/22NA8.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22NA8.adoc
@@ -1,4 +1,11 @@
 = 22NA8
 
 == Status description
-error: data exception - parsing JSON failure. Underlying error: `{ $cause }`.
+error: data exception - parsing JSON failure. Underlying error: `{ <<cause>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22NB0.adoc b/modules/ROOT/pages/errors/gql-errors/22NB0.adoc
index bf7e129c..22aca27a 100644
--- a/modules/ROOT/pages/errors/gql-errors/22NB0.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22NB0.adoc
@@ -1,4 +1,11 @@
 = 22NB0
 
 == Status description
-error: data exception - invalid property based access control rule involving WHERE and IS NULL. The property value access rule pattern `{ $pred }` always evaluates to 'NULL'. Use `WHERE` syntax in combination with `IS NULL` instead.
+error: data exception - invalid property based access control rule involving WHERE and IS NULL. The property value access rule pattern `{ <<pred>> }` always evaluates to 'NULL'. Use `WHERE` syntax in combination with `IS NULL` instead.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22NB1.adoc b/modules/ROOT/pages/errors/gql-errors/22NB1.adoc
index c9cf6a14..93864421 100644
--- a/modules/ROOT/pages/errors/gql-errors/22NB1.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22NB1.adoc
@@ -1,4 +1,11 @@
 = 22NB1
 
 == Status description
-error: data exception - type mismatch. Type mismatch: expected to be `{ $valueTypeList }` but was `{ $input }`.
+error: data exception - type mismatch. Type mismatch: expected to be `{ <<valueTypeList>> }` but was `{ <<input>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22NB2.adoc b/modules/ROOT/pages/errors/gql-errors/22NB2.adoc
index a8bd71aa..81beb834 100644
--- a/modules/ROOT/pages/errors/gql-errors/22NB2.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22NB2.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: data exception - incompatible graph type dependence. Graph type `{ $graphTypeDependence1 }` constraint `{ $constrDescrOrName1 }` is incompatible with graph type `{ $graphTypeDependence2 }` constraint `{ $constrDescrOrName2 }` because they have different graph type dependence.
\ No newline at end of file
+error: data exception - incompatible graph type dependence. Graph type `{ <<graphTypeDependence>>1 }` constraint `{ <<constrDescrOrName>>1 }` is incompatible with graph type `{ $graphTypeDependence2 }` constraint `{ $constrDescrOrName2 }` because they have different graph type dependence.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22NB3.adoc b/modules/ROOT/pages/errors/gql-errors/22NB3.adoc
index 8271e9c3..d24d1657 100644
--- a/modules/ROOT/pages/errors/gql-errors/22NB3.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22NB3.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: data exception - token presence verification failed. `{ $entityType }` (`{ $entityId }`) with `{ $tokenType1 }` `{ $token1 }` must have the `{ $tokenType2 }` `{ $token2 }`.
\ No newline at end of file
+error: data exception - token presence verification failed. `{ <<entityType>> }` (`{ <<entityId>> }`) with `{ <<tokenType>>1 }` `{ <<token>>1 }` must have the `{ $tokenType2 }` `{ $token2 }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22NB4.adoc b/modules/ROOT/pages/errors/gql-errors/22NB4.adoc
index 63855ac7..ceba6ba9 100644
--- a/modules/ROOT/pages/errors/gql-errors/22NB4.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/22NB4.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: data exception - endpoint label presence verification failed. Relationship (`{ $entityId1 }`) with type `{ $relType }` requires its `{ $endpointType }` node (`{ $entityId2 }`) to have the label `{ $label }`.
\ No newline at end of file
+error: data exception - endpoint label presence verification failed. Relationship (`{ <<entityId>>1 }`) with type `{ <<relType>> }` requires its `{ <<endpointType>> }` node (`{ $entityId2 }`) to have the label `{ <<label>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/25N01.adoc b/modules/ROOT/pages/errors/gql-errors/25N01.adoc
index ed7532fc..888688b4 100644
--- a/modules/ROOT/pages/errors/gql-errors/25N01.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/25N01.adoc
@@ -1,4 +1,11 @@
 = 25N01
 
 == Status description
-error: invalid transaction state - invalid combination of statement types. Failed to execute the query `{ $query }` due to conflicting statement types (read query, write query, schema modification, or administration command). To execute queries in the same transaction, they must be either of the same type, or be a combination of schema modifications and read commands.
+error: invalid transaction state - invalid combination of statement types. Failed to execute the query `{ <<query>> }` due to conflicting statement types (read query, write query, schema modification, or administration command). To execute queries in the same transaction, they must be either of the same type, or be a combination of schema modifications and read commands.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/25N02.adoc b/modules/ROOT/pages/errors/gql-errors/25N02.adoc
index 5146ddd4..dce390bc 100644
--- a/modules/ROOT/pages/errors/gql-errors/25N02.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/25N02.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: invalid transaction state - unable to complete transaction. Unable to complete transaction. See debug log for details.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/25N03.adoc b/modules/ROOT/pages/errors/gql-errors/25N03.adoc
index a0b84dbb..1562e80a 100644
--- a/modules/ROOT/pages/errors/gql-errors/25N03.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/25N03.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: invalid transaction state - concurrent access violation. Transaction is being used concurrently by another request.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/25N04.adoc b/modules/ROOT/pages/errors/gql-errors/25N04.adoc
index b795b548..16f8c56f 100644
--- a/modules/ROOT/pages/errors/gql-errors/25N04.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/25N04.adoc
@@ -2,4 +2,11 @@
 
 == Status description
 error: invalid transaction state - specified transaction does not exist.
-Transaction `{ $transactionId }` does not exist.
+Transaction `{ <<transactionId>> }` does not exist.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/25N05.adoc b/modules/ROOT/pages/errors/gql-errors/25N05.adoc
index 99345a3b..b9a83413 100644
--- a/modules/ROOT/pages/errors/gql-errors/25N05.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/25N05.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: invalid transaction state - transaction terminated or closed. The transaction has been terminated or closed.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/25N06.adoc b/modules/ROOT/pages/errors/gql-errors/25N06.adoc
index 10a89084..126e405d 100644
--- a/modules/ROOT/pages/errors/gql-errors/25N06.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/25N06.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: invalid transaction state - transaction start failed. Failed to start transaction. See debug log for details.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/25N08.adoc b/modules/ROOT/pages/errors/gql-errors/25N08.adoc
index ced3a852..396216be 100644
--- a/modules/ROOT/pages/errors/gql-errors/25N08.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/25N08.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: invalid transaction state - invalid transaction lease. The lease for the transaction is no longer valid.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/25N09.adoc b/modules/ROOT/pages/errors/gql-errors/25N09.adoc
index eaec09dc..a394518e 100644
--- a/modules/ROOT/pages/errors/gql-errors/25N09.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/25N09.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: invalid transaction state - internal transaction failure. The transaction failed due to an internal error.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/25N11.adoc b/modules/ROOT/pages/errors/gql-errors/25N11.adoc
index f2a01e9b..ffee5822 100644
--- a/modules/ROOT/pages/errors/gql-errors/25N11.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/25N11.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: invalid transaction state - conflicting transaction state. There was a conflict detected between the transaction state and applied updates. Please retry the transaction.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/25N12.adoc b/modules/ROOT/pages/errors/gql-errors/25N12.adoc
index 1703df19..9d826e17 100644
--- a/modules/ROOT/pages/errors/gql-errors/25N12.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/25N12.adoc
@@ -1,4 +1,11 @@
 = 25N12
 
 == Status description
-error: invalid transaction state - index was dropped. Index `{ $idx }` was dropped in this transaction and cannot be used.
+error: invalid transaction state - index was dropped. Index `{ <<idx>> }` was dropped in this transaction and cannot be used.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/25N13.adoc b/modules/ROOT/pages/errors/gql-errors/25N13.adoc
index 4c9dfe21..fbc43fab 100644
--- a/modules/ROOT/pages/errors/gql-errors/25N13.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/25N13.adoc
@@ -1,4 +1,11 @@
 = 25N13
 
 == Status description
-error: invalid transaction state - cannot access entity after removal. A `{ $entityType }` was accessed after being deleted in this transaction. Verify the transaction statements.
+error: invalid transaction state - cannot access entity after removal. A `{ <<entityType>> }` was accessed after being deleted in this transaction. Verify the transaction statements.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/2DN01.adoc b/modules/ROOT/pages/errors/gql-errors/2DN01.adoc
index d6a046b7..c167e5d9 100644
--- a/modules/ROOT/pages/errors/gql-errors/2DN01.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/2DN01.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: invalid transaction termination - commit failed. Failed to commit transaction. See debug log for details.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/2DN02.adoc b/modules/ROOT/pages/errors/gql-errors/2DN02.adoc
index 7e841629..0cce731e 100644
--- a/modules/ROOT/pages/errors/gql-errors/2DN02.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/2DN02.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: invalid transaction termination - constituent commit failed. Failed to commit constituent transaction. See debug log for details.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/2DN03.adoc b/modules/ROOT/pages/errors/gql-errors/2DN03.adoc
index dce9ad9d..70027eb5 100644
--- a/modules/ROOT/pages/errors/gql-errors/2DN03.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/2DN03.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: invalid transaction termination - transaction termination failed. Failed to terminate transaction. See debug log for details.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/2DN04.adoc b/modules/ROOT/pages/errors/gql-errors/2DN04.adoc
index a9a70a3b..cbb6b38a 100644
--- a/modules/ROOT/pages/errors/gql-errors/2DN04.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/2DN04.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: invalid transaction termination - constituent transaction termination failed. Failed to terminate constituent transaction. See debug log for details.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/2DN05.adoc b/modules/ROOT/pages/errors/gql-errors/2DN05.adoc
index a1273009..505bf95c 100644
--- a/modules/ROOT/pages/errors/gql-errors/2DN05.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/2DN05.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: invalid transaction termination - failed to apply transaction. There was an error on applying the transaction. See logs for more information.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/2DN06.adoc b/modules/ROOT/pages/errors/gql-errors/2DN06.adoc
index 418da4da..ee80896e 100644
--- a/modules/ROOT/pages/errors/gql-errors/2DN06.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/2DN06.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: invalid transaction termination - failed to append transaction. There was an error on appending the transaction. See logs for more information.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/2DN07.adoc b/modules/ROOT/pages/errors/gql-errors/2DN07.adoc
index 5d39542a..23c93f5c 100644
--- a/modules/ROOT/pages/errors/gql-errors/2DN07.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/2DN07.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: invalid transaction termination - inner transactions still open. Unable to commit transaction because it still have non-closed inner transactions.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/40000.adoc b/modules/ROOT/pages/errors/gql-errors/40000.adoc
index ac718b51..2c2eb016 100644
--- a/modules/ROOT/pages/errors/gql-errors/40000.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/40000.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: transaction rollback
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/40003.adoc b/modules/ROOT/pages/errors/gql-errors/40003.adoc
index ccf1494e..2d6b949e 100644
--- a/modules/ROOT/pages/errors/gql-errors/40003.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/40003.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: transaction rollback - statement completion unknown
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/40N01.adoc b/modules/ROOT/pages/errors/gql-errors/40N01.adoc
index 7d8fc01f..0b8bed42 100644
--- a/modules/ROOT/pages/errors/gql-errors/40N01.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/40N01.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: transaction rollback - rollback failed. Failed to rollback transaction. See debug log for details.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/40N02.adoc b/modules/ROOT/pages/errors/gql-errors/40N02.adoc
index b79beb06..83e54f70 100644
--- a/modules/ROOT/pages/errors/gql-errors/40N02.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/40N02.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: transaction rollback - constituent rollback failed. Failed to rollback constituent transaction. See debug log for details.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42000.adoc b/modules/ROOT/pages/errors/gql-errors/42000.adoc
index 72159265..90a7eae3 100644
--- a/modules/ROOT/pages/errors/gql-errors/42000.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42000.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42001.adoc b/modules/ROOT/pages/errors/gql-errors/42001.adoc
index ac4df861..bfedcde4 100644
--- a/modules/ROOT/pages/errors/gql-errors/42001.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42001.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - invalid syntax
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42002.adoc b/modules/ROOT/pages/errors/gql-errors/42002.adoc
index 7198901c..05e48add 100644
--- a/modules/ROOT/pages/errors/gql-errors/42002.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42002.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - invalid reference
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42006.adoc b/modules/ROOT/pages/errors/gql-errors/42006.adoc
index 181e3be1..cc3f6688 100644
--- a/modules/ROOT/pages/errors/gql-errors/42006.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42006.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - number of edge labels below supported minimum
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42007.adoc b/modules/ROOT/pages/errors/gql-errors/42007.adoc
index a69f2c8d..f88086cc 100644
--- a/modules/ROOT/pages/errors/gql-errors/42007.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42007.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - number of edge labels exceeds supported maximum
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42008.adoc b/modules/ROOT/pages/errors/gql-errors/42008.adoc
index 587dab17..62780153 100644
--- a/modules/ROOT/pages/errors/gql-errors/42008.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42008.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - number of edge properties exceeds supported maximum
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42009.adoc b/modules/ROOT/pages/errors/gql-errors/42009.adoc
index 26090f2d..ef3d2d65 100644
--- a/modules/ROOT/pages/errors/gql-errors/42009.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42009.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - number of node labels below supported minimum
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42010.adoc b/modules/ROOT/pages/errors/gql-errors/42010.adoc
index fb81519f..e165b5e5 100644
--- a/modules/ROOT/pages/errors/gql-errors/42010.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42010.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - number of node labels exceeds supported maximum
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42011.adoc b/modules/ROOT/pages/errors/gql-errors/42011.adoc
index 6ee035ce..e1302c11 100644
--- a/modules/ROOT/pages/errors/gql-errors/42011.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42011.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - number of node properties exceeds supported maximum
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42012.adoc b/modules/ROOT/pages/errors/gql-errors/42012.adoc
index d7cf60d8..acc63930 100644
--- a/modules/ROOT/pages/errors/gql-errors/42012.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42012.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - number of node type key labels below supported minimum
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42013.adoc b/modules/ROOT/pages/errors/gql-errors/42013.adoc
index bb51a3f5..25e30225 100644
--- a/modules/ROOT/pages/errors/gql-errors/42013.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42013.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - number of node type key labels exceeds supported maximum
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42014.adoc b/modules/ROOT/pages/errors/gql-errors/42014.adoc
index 920881f7..9b3638b7 100644
--- a/modules/ROOT/pages/errors/gql-errors/42014.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42014.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - number of edge type key labels below supported minimum
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42015.adoc b/modules/ROOT/pages/errors/gql-errors/42015.adoc
index bb1e2e88..d5e19ec9 100644
--- a/modules/ROOT/pages/errors/gql-errors/42015.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42015.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - number of edge type key labels exceeds supported maximum
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42I00.adoc b/modules/ROOT/pages/errors/gql-errors/42I00.adoc
index d4bd62f3..dbf65836 100644
--- a/modules/ROOT/pages/errors/gql-errors/42I00.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42I00.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - invalid case expression. 'CASE' expressions must have the same number of 'WHEN' and 'THEN' operands.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42I01.adoc b/modules/ROOT/pages/errors/gql-errors/42I01.adoc
index 04c26c0b..cadcb105 100644
--- a/modules/ROOT/pages/errors/gql-errors/42I01.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42I01.adoc
@@ -1,4 +1,11 @@
 = 42I01
 
 == Status description
-error: syntax error or access rule violation - invalid `FOREACH`. Invalid use of `{ $clause }` inside 'FOREACH'.
+error: syntax error or access rule violation - invalid `FOREACH`. Invalid use of `{ <<clause>> }` inside 'FOREACH'.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42I02.adoc b/modules/ROOT/pages/errors/gql-errors/42I02.adoc
index acda71d7..aed1a022 100644
--- a/modules/ROOT/pages/errors/gql-errors/42I02.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42I02.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - invalid comment. Failed to parse comment. A comment starting with '/\*' must also have a closing '*/'.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42I05.adoc b/modules/ROOT/pages/errors/gql-errors/42I05.adoc
index 229924f0..fd74b2e2 100644
--- a/modules/ROOT/pages/errors/gql-errors/42I05.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42I05.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - invalid FIELDTERMINATOR. The FIELDTERMINATOR specified for LOAD CSV can only be one character wide.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42I06.adoc b/modules/ROOT/pages/errors/gql-errors/42I06.adoc
index 91a35b1e..ef9d0d57 100644
--- a/modules/ROOT/pages/errors/gql-errors/42I06.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42I06.adoc
@@ -1,4 +1,11 @@
 = 42I06
 
 == Status description
-error: syntax error or access rule violation - invalid input. Invalid input `{ $input }`, expected: `{ $valueList }`.
+error: syntax error or access rule violation - invalid input. Invalid input `{ <<input>> }`, expected: `{ <<valueList>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42I08.adoc b/modules/ROOT/pages/errors/gql-errors/42I08.adoc
index 52a31d35..427c41df 100644
--- a/modules/ROOT/pages/errors/gql-errors/42I08.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42I08.adoc
@@ -2,4 +2,13 @@
 
 
 == Status description
-error: syntax error or access rule violation - invalid lower bound. The lower bound of the variable length relationship used in the `{ $fun }` function must be 0 or 1.
\ No newline at end of file
+error: syntax error or access rule violation - invalid lower bound. The lower bound of the variable length relationship used in the `{ <<fun>> }` function must be 0 or 1.
+
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42I13.adoc b/modules/ROOT/pages/errors/gql-errors/42I13.adoc
index 37482e71..1b3d487d 100644
--- a/modules/ROOT/pages/errors/gql-errors/42I13.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42I13.adoc
@@ -1,4 +1,11 @@
 = 42I13
 
 == Status description
-error: syntax error or access rule violation - invalid number of procedure or function arguments. The procedure or function call does not provide the required number of arguments; expected `{ $count1 }` but got `{ $count2 }`. The procedure or function `{ $procFun }` has the signature: `{ $sig }`.
+error: syntax error or access rule violation - invalid number of procedure or function arguments. The procedure or function call does not provide the required number of arguments; expected `{ <<count>>1 }` but got `{ $count2 }`. The procedure or function `{ <<procFun>> }` has the signature: `{ <<sig>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42I18.adoc b/modules/ROOT/pages/errors/gql-errors/42I18.adoc
index 248cb988..b5c64ce3 100644
--- a/modules/ROOT/pages/errors/gql-errors/42I18.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42I18.adoc
@@ -1,4 +1,11 @@
 = 42I18
 
 == Status description
-error: syntax error or access rule violation - invalid reference to implicitly grouped expressions. The aggregation column contains implicit grouping expressions referenced by the variables `{ $varList }`. Implicit grouping expressions are variables not explicitly declared as grouping keys.
+error: syntax error or access rule violation - invalid reference to implicitly grouped expressions. The aggregation column contains implicit grouping expressions referenced by the variables `{ <<variableList>> }`. Implicit grouping expressions are variables not explicitly declared as grouping keys.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42I20.adoc b/modules/ROOT/pages/errors/gql-errors/42I20.adoc
index c9086bf7..f6cf4978 100644
--- a/modules/ROOT/pages/errors/gql-errors/42I20.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42I20.adoc
@@ -1,4 +1,11 @@
 = 42I20
 
 == Status description
-error: syntax error or access rule violation - invalid symbol in expression. Label expressions and relationship type expressions cannot contain `{ $input }`. To express a label disjunction use `{ $labelExpr }` instead.
+error: syntax error or access rule violation - invalid symbol in expression. Label expressions and relationship type expressions cannot contain `{ <<input>> }`. To express a label disjunction use `{ <<labelExpr>> }` instead.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42I23.adoc b/modules/ROOT/pages/errors/gql-errors/42I23.adoc
index 6d7ace2c..cc44c3a7 100644
--- a/modules/ROOT/pages/errors/gql-errors/42I23.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42I23.adoc
@@ -2,4 +2,13 @@
 
 
 == Status description
-error: syntax error or access rule violation - invalid quantified path pattern in shortest path. The `{ $fun }` function cannot contain a quantified path pattern.
\ No newline at end of file
+error: syntax error or access rule violation - invalid quantified path pattern in shortest path. The `{ <<fun>> }` function cannot contain a quantified path pattern.
+
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42I25.adoc b/modules/ROOT/pages/errors/gql-errors/42I25.adoc
index 35c4f514..9d12c468 100644
--- a/modules/ROOT/pages/errors/gql-errors/42I25.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42I25.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - invalid use of `CALL IN TRANSACTIONS`. 'CALL { ... } IN TRANSACTIONS' is not supported after a write clause.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42I26.adoc b/modules/ROOT/pages/errors/gql-errors/42I26.adoc
index 7b21a5d4..87550159 100644
--- a/modules/ROOT/pages/errors/gql-errors/42I26.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42I26.adoc
@@ -2,4 +2,13 @@
 
 
 == Status description
-error: syntax error or access rule violation - invalid `DELETE`. 'DELETE ...' does not support removing labels from a node. Use 'REMOVE ...' instead.
\ No newline at end of file
+error: syntax error or access rule violation - invalid `DELETE`. 'DELETE ...' does not support removing labels from a node. Use 'REMOVE ...' instead.
+
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42I29.adoc b/modules/ROOT/pages/errors/gql-errors/42I29.adoc
index 1d466d3d..826f23c2 100644
--- a/modules/ROOT/pages/errors/gql-errors/42I29.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42I29.adoc
@@ -1,4 +1,11 @@
 = 42I29
 
 == Status description
-error: syntax error or access rule violation - invalid use of `IS`. The `IS` keyword cannot be used together with multiple labels in `{ $input }`. Rewrite the expression as `{ $replacement }`.
+error: syntax error or access rule violation - invalid use of `IS`. The `IS` keyword cannot be used together with multiple labels in `{ <<input>> }`. Rewrite the expression as `{ <<replacement>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42I31.adoc b/modules/ROOT/pages/errors/gql-errors/42I31.adoc
index ffefc374..9d83a1af 100644
--- a/modules/ROOT/pages/errors/gql-errors/42I31.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42I31.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - invalid use of `MATCH`. 'MATCH ...' cannot directly follow an 'OPTIONAL MATCH ...'. Use a `WITH` clause between them.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42I34.adoc b/modules/ROOT/pages/errors/gql-errors/42I34.adoc
index 0cbfe9e2..6cc7e83d 100644
--- a/modules/ROOT/pages/errors/gql-errors/42I34.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42I34.adoc
@@ -2,4 +2,11 @@
 
 
 == Status description
-error: syntax error or access rule violation - invalid use of pattern expression. A pattern expression can only be used to test the existence of a pattern. Use a pattern comprehension instead.
\ No newline at end of file
+error: syntax error or access rule violation - invalid use of pattern expression. A pattern expression can only be used to test the existence of a pattern. Use a pattern comprehension instead.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42I36.adoc b/modules/ROOT/pages/errors/gql-errors/42I36.adoc
index 56f15396..a28769a7 100644
--- a/modules/ROOT/pages/errors/gql-errors/42I36.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42I36.adoc
@@ -2,4 +2,11 @@
 
 
 == Status description
-error: syntax error or access rule violation - invalid use of `REPORT STATUS`. 'REPORT STATUS' can only be used when specifying 'ON ERROR CONTINUE' or 'ON ERROR BREAK'.
\ No newline at end of file
+error: syntax error or access rule violation - invalid use of `REPORT STATUS`. 'REPORT STATUS' can only be used when specifying 'ON ERROR CONTINUE' or 'ON ERROR BREAK'.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42I37.adoc b/modules/ROOT/pages/errors/gql-errors/42I37.adoc
index 196cb316..8b5d4efa 100644
--- a/modules/ROOT/pages/errors/gql-errors/42I37.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42I37.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - invalid use of `RETURN *`. 'RETURN *' is not allowed when there are no variables in scope.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42I38.adoc b/modules/ROOT/pages/errors/gql-errors/42I38.adoc
index 7429b478..55036dac 100644
--- a/modules/ROOT/pages/errors/gql-errors/42I38.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42I38.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - invalid use of `RETURN`. 'RETURN ...' can only be used at the end of a query or subquery.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42I40.adoc b/modules/ROOT/pages/errors/gql-errors/42I40.adoc
index 5ddcecf0..accfa394 100644
--- a/modules/ROOT/pages/errors/gql-errors/42I40.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42I40.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - invalid use of `UNION` and `UNION ALL`. `UNION` and `UNION ALL` cannot be combined.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42I41.adoc b/modules/ROOT/pages/errors/gql-errors/42I41.adoc
index e68029cd..59608154 100644
--- a/modules/ROOT/pages/errors/gql-errors/42I41.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42I41.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: syntax error or access rule violation - invalid use of variable length relationship. Variable length relationships cannot be used in `{ $value }`.
\ No newline at end of file
+error: syntax error or access rule violation - invalid use of variable length relationship. Variable length relationships cannot be used in `{ <<value>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42I45.adoc b/modules/ROOT/pages/errors/gql-errors/42I45.adoc
index c9328908..e6dd5c94 100644
--- a/modules/ROOT/pages/errors/gql-errors/42I45.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42I45.adoc
@@ -1,4 +1,12 @@
 = 42I45
 
 == Status description
-error: syntax error or access rule violation - invalid use of multiple path patterns. Multiple path patterns cannot be used in the same clause in combination with a selective path selector. `{ $action }`
+error: syntax error or access rule violation - invalid use of multiple path patterns. Multiple path patterns cannot be used in the same clause in combination with a selective path selector. `{ <<action>> }`
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42I47.adoc b/modules/ROOT/pages/errors/gql-errors/42I47.adoc
index 56879405..625eb72f 100644
--- a/modules/ROOT/pages/errors/gql-errors/42I47.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42I47.adoc
@@ -1,4 +1,11 @@
 = 42I47
 
 == Status description
-error: syntax error or access rule violation - parser error. Parser Error: `{ $msg }`.
+error: syntax error or access rule violation - parser error. Parser Error: `{ <<msg>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42I48.adoc b/modules/ROOT/pages/errors/gql-errors/42I48.adoc
index 86703341..081ac54c 100644
--- a/modules/ROOT/pages/errors/gql-errors/42I48.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42I48.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - invalid use of a subquery in MERGE. Subqueries are not allowed in a MERGE clause.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42I50.adoc b/modules/ROOT/pages/errors/gql-errors/42I50.adoc
index aca72d16..6ee50d96 100644
--- a/modules/ROOT/pages/errors/gql-errors/42I50.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42I50.adoc
@@ -1,4 +1,11 @@
 = 42I50
 
 == Status description
-error: syntax error or access rule violation - token name too long. Invalid input `{ $input }..`. A `{ $tokenType }` name cannot be longer than `{ $maxTokenLength }`.
+error: syntax error or access rule violation - token name too long. Invalid input `{ <<input>> } ..`. A `{ <<tokenType>> }` name cannot be longer than `{ <<value>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42I51.adoc b/modules/ROOT/pages/errors/gql-errors/42I51.adoc
index 4682c777..7de5eea2 100644
--- a/modules/ROOT/pages/errors/gql-errors/42I51.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42I51.adoc
@@ -1,4 +1,11 @@
 = 42I51
 
 == Status description
-info: invalid call signature. The procedure or function `{ $procFun }` must have the signature: `{ $sig }`.
+info: invalid call signature. The procedure or function `{ <<procFun>> }` must have the signature: `{ <<sig>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N00.adoc b/modules/ROOT/pages/errors/gql-errors/42N00.adoc
index df36c86f..0b060c28 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N00.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N00.adoc
@@ -1,4 +1,11 @@
 = 42N00
 
 == Status description
-error: syntax error or access rule violation - no such database. The database `{ $db }` was not found. Verify that the spelling is correct.
+error: syntax error or access rule violation - no such database. The database `{ <<db>> }` was not found. Verify that the spelling is correct.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N01.adoc b/modules/ROOT/pages/errors/gql-errors/42N01.adoc
index 3dc07ef6..ae669da0 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N01.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N01.adoc
@@ -1,4 +1,11 @@
 = 42N01
 
 == Status description
-error: syntax error or access rule violation - no such constituent graph exists in composite database. The constituent graph `{ $graph }` was not found in the in composite database `{ $db }`. Verify that the spelling is correct.
+error: syntax error or access rule violation - no such constituent graph exists in composite database. The constituent graph `{ <<graph>> }` was not found in the in composite database `{ <<db>> }`. Verify that the spelling is correct.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N02.adoc b/modules/ROOT/pages/errors/gql-errors/42N02.adoc
index 9af69669..4aa792dd 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N02.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N02.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - writing in read access mode. Writing in read access mode not allowed.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N03.adoc b/modules/ROOT/pages/errors/gql-errors/42N03.adoc
index 5c4ad1ee..1fb6402a 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N03.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N03.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - writing to multiple graphs. Writing to multiple graphs in the same transaction is not allowed. Use `CALL IN TRANSACTION` or create separate transactions in your application.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N04.adoc b/modules/ROOT/pages/errors/gql-errors/42N04.adoc
index 91f8f832..8ea54802 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N04.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N04.adoc
@@ -1,4 +1,11 @@
 = 42N04
 
 == Status description
-error: syntax error or access rule violation - unsupported access of composite database. Failed to access database identified by `{ $db1 }` while connected to session database `{ $db2 }`. Connect to `{ $db3 }` directly.
+error: syntax error or access rule violation - unsupported access of composite database. Failed to access database identified by `{ <<db>>1 }` while connected to session database `{ $db2 }`. Connect to `{ $db3 }` directly.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N05.adoc b/modules/ROOT/pages/errors/gql-errors/42N05.adoc
index 2f007172..56822a37 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N05.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N05.adoc
@@ -1,4 +1,11 @@
 = 42N05
 
 == Status description
-error: syntax error or access rule violation - unsupported access of standard database. Failed to access database identified by `{ $db1 }` while connected to composite session database `{ $db2 }`. Connect to `{ $db3 }` directly or create an alias in the composite database.
+error: syntax error or access rule violation - unsupported access of standard database. Failed to access database identified by `{ <<db>>1 }` while connected to composite session database `{ $db2 }`. Connect to `{ $db3 }` directly or create an alias in the composite database.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N06.adoc b/modules/ROOT/pages/errors/gql-errors/42N06.adoc
index 32b52b4b..82fbaedb 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N06.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N06.adoc
@@ -1,4 +1,13 @@
 = 42N06
 
 == Status description
-error: syntax error or access rule violation - unsupported action on composite database. `{ $action }` is not supported on composite databases.
+error: syntax error or access rule violation - unsupported action on composite database. `{ <<action>> }` is not supported on composite databases.
+
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N07.adoc b/modules/ROOT/pages/errors/gql-errors/42N07.adoc
index 064b560e..c9230f91 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N07.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N07.adoc
@@ -1,4 +1,11 @@
 = 42N07
 
 == Status description
-error: syntax error or access rule violation - variable shadowing. The variable `{ $variable }` is shadowing a variable with the same name from the outer scope and needs to be renamed.
+error: syntax error or access rule violation - variable shadowing. The variable `{ <<variable>> }` is shadowing a variable with the same name from the outer scope and needs to be renamed.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N08.adoc b/modules/ROOT/pages/errors/gql-errors/42N08.adoc
index 9b41ad42..89d51fd6 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N08.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N08.adoc
@@ -1,4 +1,11 @@
 = 42N08
 
 == Status description
-error: syntax error or access rule violation - no such procedure or function. The procedure or function `{ $procFun }` was not registered for this database instance. Verify that the spelling is correct.
+error: syntax error or access rule violation - no such procedure or function. The procedure or function `{ <<procFun>> }` was not registered for this database instance. Verify that the spelling is correct.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N09.adoc b/modules/ROOT/pages/errors/gql-errors/42N09.adoc
index f2eaaa74..8bbb23a6 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N09.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N09.adoc
@@ -1,4 +1,11 @@
 = 42N09
 
 == Status description
-error: syntax error or access rule violation - no such user. A user with the name `{ $user }` was not found. Verify that the spelling is correct.
+error: syntax error or access rule violation - no such user. A user with the name `{ <<user>> }` was not found. Verify that the spelling is correct.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N10.adoc b/modules/ROOT/pages/errors/gql-errors/42N10.adoc
index 63256ee4..51a51db7 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N10.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N10.adoc
@@ -1,4 +1,11 @@
 = 42N10
 
 == Status description
-error: syntax error or access rule violation - no such role. A role with the name `{ $role }` was not found. Verify that the spelling is correct.
+error: syntax error or access rule violation - no such role. A role with the name `{ <<role>> }` was not found. Verify that the spelling is correct.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N11.adoc b/modules/ROOT/pages/errors/gql-errors/42N11.adoc
index 9015a4e4..fb641fed 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N11.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N11.adoc
@@ -1,4 +1,11 @@
 = 42N11
 
 == Status description
-error: syntax error or access rule violation - database or alias already exists. A `[composite]` database or alias with the name `{ $db }` already exists.
+error: syntax error or access rule violation - database or alias already exists. A `[composite]` database or alias with the name `{ <<db>> }` already exists.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N12.adoc b/modules/ROOT/pages/errors/gql-errors/42N12.adoc
index f11c6e52..c6e64ff2 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N12.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N12.adoc
@@ -1,4 +1,11 @@
 = 42N12
 
 == Status description
-error: syntax error or access rule violation - user already exists. A user with the name `{ $user }` already exists.
+error: syntax error or access rule violation - user already exists. A user with the name `{ <<user>> }` already exists.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N13.adoc b/modules/ROOT/pages/errors/gql-errors/42N13.adoc
index 573d115e..5921bd24 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N13.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N13.adoc
@@ -1,4 +1,11 @@
 = 42N13
 
 == Status description
-error: syntax error or access rule violation - role already exists. A role with the name `{ $role }` already exists.
+error: syntax error or access rule violation - role already exists. A role with the name `{ <<role>> }` already exists.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N14.adoc b/modules/ROOT/pages/errors/gql-errors/42N14.adoc
index c1acf347..2548566b 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N14.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N14.adoc
@@ -1,4 +1,11 @@
 = 42N14
 
 == Status description
-error: syntax error or access rule violation - invalid use of command. `{ $clause }` cannot be used together with `{ $cmd }`.
+error: syntax error or access rule violation - invalid use of command. `{ <<clause>> }` cannot be used together with `{ <<cmd>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N15.adoc b/modules/ROOT/pages/errors/gql-errors/42N15.adoc
index b1f40776..b8589ced 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N15.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N15.adoc
@@ -1,4 +1,11 @@
 = 42N15
 
 == Status description
-error: syntax error or access rule violation - invalid use of reserved keyword. `{ $syntax }` is a reserved keyword and cannot be used in this place.
+error: syntax error or access rule violation - invalid use of reserved keyword. `{ <<syntax>> }` is a reserved keyword and cannot be used in this place.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N16.adoc b/modules/ROOT/pages/errors/gql-errors/42N16.adoc
index a6af71a8..9ee8906c 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N16.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N16.adoc
@@ -1,4 +1,11 @@
 = 42N16
 
 == Status description
-error: syntax error or access rule violation - unsupported index or constraint. Only single property `{ $idxType }` are supported.
+error: syntax error or access rule violation - unsupported index or constraint. Only single property `{ <<idxType>> }` are supported.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N17.adoc b/modules/ROOT/pages/errors/gql-errors/42N17.adoc
index 85435607..13768f16 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N17.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N17.adoc
@@ -1,4 +1,11 @@
 = 42N17
 
 == Status description
-error: syntax error or access rule violation - unsupported request. `{ $input }` is not allowed on the system database.
+error: syntax error or access rule violation - unsupported request. `{ <<input>> }` is not allowed on the system database.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N18.adoc b/modules/ROOT/pages/errors/gql-errors/42N18.adoc
index 84a64eb6..94fdc380 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N18.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N18.adoc
@@ -2,4 +2,10 @@
 
 
 == Status description
-error: syntax error or access rule violation - read-only database. The database is in read-only mode.
\ No newline at end of file
+error: syntax error or access rule violation - read-only database. The database is in read-only mode.
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N19.adoc b/modules/ROOT/pages/errors/gql-errors/42N19.adoc
index e709eacd..f7704ba7 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N19.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N19.adoc
@@ -1,4 +1,11 @@
 = 42N19
 
 == Status description
-error: syntax error or access rule violation - duplicate clause. Duplicate `{ $syntax }` clause.
+error: syntax error or access rule violation - duplicate clause. Duplicate `{ <<syntax>> }` clause.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N20.adoc b/modules/ROOT/pages/errors/gql-errors/42N20.adoc
index 7ce8fedf..b40fb426 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N20.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N20.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - empty list range operator. The list range operator '[ ]' cannot be empty.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N21.adoc b/modules/ROOT/pages/errors/gql-errors/42N21.adoc
index 777476bf..80e39168 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N21.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N21.adoc
@@ -1,4 +1,11 @@
 = 42N21
 
 == Status description
-error: syntax error or access rule violation - unaliased return item. Expression in `{ $clause }` must be aliased (use AS).
+error: syntax error or access rule violation - unaliased return item. Expression in `{ <<clause>> }` must be aliased (use AS).
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N22.adoc b/modules/ROOT/pages/errors/gql-errors/42N22.adoc
index a0bdf9f8..cefbef49 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N22.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N22.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - single return column required. A `COLLECT` subquery must end with a single return column.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N24.adoc b/modules/ROOT/pages/errors/gql-errors/42N24.adoc
index e3a3c403..3b7bcfbf 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N24.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N24.adoc
@@ -1,4 +1,11 @@
 = 42N24
 
 == Status description
-error: syntax error or access rule violation - missing `WITH`. A `WITH` clause is required between `{ $input1 }` and `{ $input2 }`.
+error: syntax error or access rule violation - missing `WITH`. A `WITH` clause is required between `{ <<input>>1 }` and `{ $input2 }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N29.adoc b/modules/ROOT/pages/errors/gql-errors/42N29.adoc
index 209a85eb..6ff230ee 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N29.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N29.adoc
@@ -1,4 +1,11 @@
 = 42N29
 
 == Status description
-error: syntax error or access rule violation - unbound variables in pattern expression. Pattern expressions are not allowed to introduce new variables: `{ $variable }`.
+error: syntax error or access rule violation - unbound variables in pattern expression. Pattern expressions are not allowed to introduce new variables: `{ <<variable>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N31.adoc b/modules/ROOT/pages/errors/gql-errors/42N31.adoc
index f5f8e686..38d1cb36 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N31.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N31.adoc
@@ -1,4 +1,11 @@
 = 42N31
 
 == Status description
-error: syntax error or access rule violation - specified number out of range. Expected `{ $component }` to be `{ $valueType }` in the range `{ $lower }` to `{ $upper }` but found `{ $value }`.
+error: syntax error or access rule violation - specified number out of range. Expected `{ <<component>> }` to be `{ <<valueType>> }` in the range `{ <<lower>> }` to `{ <<upper>> }` but found `{ <<value>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N32.adoc b/modules/ROOT/pages/errors/gql-errors/42N32.adoc
index 5182f56f..f96eab33 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N32.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N32.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: syntax error or access rule violation - invalid use of parameter map. Parameter maps cannot be used in `{ $keyword }` patterns. Use a literal map instead.
\ No newline at end of file
+error: syntax error or access rule violation - invalid use of parameter map. Parameter maps cannot be used in `{ <<keyword>> }` patterns. Use a literal map instead.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N39.adoc b/modules/ROOT/pages/errors/gql-errors/42N39.adoc
index 9ac2a33d..512afa5a 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N39.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N39.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - incompatible return columns. All subqueries in a `UNION` clause must have the same return column names.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N40.adoc b/modules/ROOT/pages/errors/gql-errors/42N40.adoc
index 23658155..275a80d3 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N40.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N40.adoc
@@ -1,4 +1,11 @@
 = 42N40
 
 == Status description
-error: syntax error or access rule violation - single relationship pattern required. The `{ $fun }` function must contain one relationship pattern.
+error: syntax error or access rule violation - single relationship pattern required. The `{ <<fun>> }` function must contain one relationship pattern.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N42.adoc b/modules/ROOT/pages/errors/gql-errors/42N42.adoc
index c56152b6..c420e344 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N42.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N42.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - unsupported sub-path binding. Sub-path assignment is not supported.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N45.adoc b/modules/ROOT/pages/errors/gql-errors/42N45.adoc
index 26b794c6..6cb7413d 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N45.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N45.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - unexpected end of input. Unexpected end of input, expected 'CYPHER', 'EXPLAIN', 'PROFILE' or a query.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N47.adoc b/modules/ROOT/pages/errors/gql-errors/42N47.adoc
index b38b2f9c..c339a37d 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N47.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N47.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: syntax error or access rule violation - invalid use of `UNION` and `CALL IN TRANSACTIONS`. 'CALL { ... } IN TRANSACTIONS' is not supported in '... UNION ...'.
\ No newline at end of file
+error: syntax error or access rule violation - invalid use of `UNION` and `CALL IN TRANSACTIONS`. 'CALL { ... } IN TRANSACTIONS' is not supported in '... UNION ...'.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N49.adoc b/modules/ROOT/pages/errors/gql-errors/42N49.adoc
index 0c04de6e..c9045285 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N49.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N49.adoc
@@ -1,4 +1,11 @@
 = 42N49
 
 == Status description
-error: syntax error or access rule violation - unsupported normal form. Unknown Normal Form: `{ $input }`.
+error: syntax error or access rule violation - unsupported normal form. Unknown Normal Form: `{ <<input>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N51.adoc b/modules/ROOT/pages/errors/gql-errors/42N51.adoc
index 5cba20d4..74fee0d4 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N51.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N51.adoc
@@ -1,4 +1,11 @@
 = 42N51
 
 == Status description
-error: syntax error or access rule violation - invalid parameter. Invalid parameter `{ $param }`.
+error: syntax error or access rule violation - invalid parameter. Invalid parameter `{ <<param>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N53.adoc b/modules/ROOT/pages/errors/gql-errors/42N53.adoc
index 03cd623c..708f99d6 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N53.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N53.adoc
@@ -2,4 +2,14 @@
 
 
 == Status description
-error: syntax error or access rule violation - unsafe usage of repeatable elements. The quantified path pattern may yield an infinite number of rows under match mode `REPEATABLE ELEMENTS`. Add an upper bound to the quantified path pattern.
\ No newline at end of file
+error: syntax error or access rule violation - unsafe usage of repeatable elements. The quantified path pattern may yield an infinite number of rows under match mode `REPEATABLE ELEMENTS`. Add an upper bound to the quantified path pattern.
+
+
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N56.adoc b/modules/ROOT/pages/errors/gql-errors/42N56.adoc
index cf0d1374..36fb2fd6 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N56.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N56.adoc
@@ -2,4 +2,13 @@
 
 
 == Status description
-error: syntax error or access rule violation - unsupported use of properties. Properties are not supported in the `{ $fun }` function.
\ No newline at end of file
+error: syntax error or access rule violation - unsupported use of properties. Properties are not supported in the `{ <<fun>> }` function.
+
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N57.adoc b/modules/ROOT/pages/errors/gql-errors/42N57.adoc
index 26c2fe19..f35be47b 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N57.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N57.adoc
@@ -1,4 +1,11 @@
 = 42N57
 
 == Status description
-error: syntax error or access rule violation - invalid use of data-modifications in expressions. `{ $expr }` cannot contain any updating clauses.
+error: syntax error or access rule violation - invalid use of data-modifications in expressions. `{ <<expr>> }` cannot contain any updating clauses.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N59.adoc b/modules/ROOT/pages/errors/gql-errors/42N59.adoc
index 1027948e..02176c29 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N59.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N59.adoc
@@ -2,4 +2,13 @@
 
 
 == Status description
-error: syntax error or access rule violation - variable already defined. Variable `{ $variable }` already declared.
\ No newline at end of file
+error: syntax error or access rule violation - variable already defined. Variable `{ <<variable>> }` already declared.
+
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N62.adoc b/modules/ROOT/pages/errors/gql-errors/42N62.adoc
index 50732e40..f7beecb7 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N62.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N62.adoc
@@ -2,4 +2,13 @@
 
 
 == Status description
-error: syntax error or access rule violation - variable not defined. Variable `{ $variable }` not defined.
\ No newline at end of file
+error: syntax error or access rule violation - variable not defined. Variable `{ <<variable>> }` not defined.
+
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N65.adoc b/modules/ROOT/pages/errors/gql-errors/42N65.adoc
index c6c382f8..2795cba9 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N65.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N65.adoc
@@ -2,4 +2,13 @@
 
 
 == Status description
-error: syntax error or access rule violation - node variable not bound. The `{ $fun }` function requires bound node variables when it is not part of a 'MATCH ...'.
\ No newline at end of file
+error: syntax error or access rule violation - node variable not bound. The `{ <<fun>> }` function requires bound node variables when it is not part of a 'MATCH ...'.
+
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N66.adoc b/modules/ROOT/pages/errors/gql-errors/42N66.adoc
index 859a28c1..3a5540ce 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N66.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N66.adoc
@@ -2,4 +2,13 @@
 
 
 == Status description
-error: syntax error or access rule violation - relationship variable already bound. Bound relationships are not allowed in calls to the `{ $fun }` function.
\ No newline at end of file
+error: syntax error or access rule violation - relationship variable already bound. Bound relationships are not allowed in calls to the `{ <<fun>> }` function.
+
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N70.adoc b/modules/ROOT/pages/errors/gql-errors/42N70.adoc
index 123dc5e5..49ee29a6 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N70.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N70.adoc
@@ -1,4 +1,14 @@
 = 42N70
 
 == Status description
-error: syntax error or access rule violation - function without required WHERE clause. The function `{ $fun }` requires a WHERE clause.
+error: syntax error or access rule violation - function without required WHERE clause. The function `{ <<fun>> }` requires a WHERE clause.
+
+
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N71.adoc b/modules/ROOT/pages/errors/gql-errors/42N71.adoc
index 67b5283c..a6e0756b 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N71.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N71.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - incomplete query. A query must conclude with a `RETURN` clause, a `FINISH` clause, an update clause, a unit subquery call, or a procedure call without a `YIELD` clause.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N73.adoc b/modules/ROOT/pages/errors/gql-errors/42N73.adoc
index 79582b65..3451bb7f 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N73.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N73.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - invalid placement of USE clause. The USE clause must be the first clause of a query or an operand to '... UNION ...' . In a CALL sub-query, it can also be the second clause if the first clause is an importing WITH.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N74.adoc b/modules/ROOT/pages/errors/gql-errors/42N74.adoc
index 3e1672ed..cc947117 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N74.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N74.adoc
@@ -1,4 +1,11 @@
 = 42N74
 
 == Status description
-error: syntax error or access rule violation - invalid nested USE clause. Failed to access `{ $db1 }` and `{ $db2 }`. Child USE clauses must target the same graph as their parent query. Run in separate (sub)queries instead.
+error: syntax error or access rule violation - invalid nested USE clause. Failed to access `{ <<db>>1 }` and `{ $db2 }`. Child USE clauses must target the same graph as their parent query. Run in separate (sub)queries instead.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N75.adoc b/modules/ROOT/pages/errors/gql-errors/42N75.adoc
index 75bc342c..22e5efde 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N75.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N75.adoc
@@ -1,4 +1,11 @@
 = 42N75
 
 == Status description
-error: syntax error or access rule violation - invalid use of graph function. A call to the graph function `{ $fun }` is only allowed as the top-level argument of a `USE` clause.
+error: syntax error or access rule violation - invalid use of graph function. A call to the graph function `{ <<fun>> }` is only allowed as the top-level argument of a `USE` clause.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N76.adoc b/modules/ROOT/pages/errors/gql-errors/42N76.adoc
index 5ed5db5f..c58bc1f4 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N76.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N76.adoc
@@ -1,4 +1,11 @@
 = 42N76
 
 == Status description
-error: syntax error or access rule violation - unfulfillable hints. The hint(s) `{ $hintList }` cannot be fulfilled.
+error: syntax error or access rule violation - unfulfillable hints. The hint(s) `{ <<hintList>> }` cannot be fulfilled.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N77.adoc b/modules/ROOT/pages/errors/gql-errors/42N77.adoc
index 0896e63b..00b8bb8f 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N77.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N77.adoc
@@ -1,4 +1,11 @@
 = 42N77
 
 == Status description
-error: syntax error or access rule violation - missing hint predicate. The hint `{ $hint }` cannot be fulfilled. The query does not contain a compatible predicate for `{ $entityType }` on `{ $variable }`.
+error: syntax error or access rule violation - missing hint predicate. The hint `{ <<hint>> }` cannot be fulfilled. The query does not contain a compatible predicate for `{ <<entityType>> }` on `{ <<variable>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N78.adoc b/modules/ROOT/pages/errors/gql-errors/42N78.adoc
index d03fa0e1..15ec779a 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N78.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N78.adoc
@@ -1,5 +1,12 @@
 = 42N78
 
 == Status description
-error: syntax error or access rule violation - variable already bound. Node `{ $variable }` has already been bound and cannot be modified by the `{ $clause }` clause.
+error: syntax error or access rule violation - variable already bound. Node `{ <<variable>> }` has already been bound and cannot be modified by the `{ <<clause>> }` clause.
 
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N81.adoc b/modules/ROOT/pages/errors/gql-errors/42N81.adoc
index 041e26de..5cc842e1 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N81.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N81.adoc
@@ -2,4 +2,13 @@
 
 
 == Status description
-error: syntax error or access rule violation - missing request parameter. Expected `{ $param }`, but got `{ $paramList }`.
\ No newline at end of file
+error: syntax error or access rule violation - missing request parameter. Expected `{ <<param>> }`, but got `{ <<paramList>> }`.
+
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N83.adoc b/modules/ROOT/pages/errors/gql-errors/42N83.adoc
index ffec06cd..5f846ab5 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N83.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N83.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - impersonation disallowed while password change required. Cannot impersonate a user while password change required.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N84.adoc b/modules/ROOT/pages/errors/gql-errors/42N84.adoc
index 68b600de..c1bce612 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N84.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N84.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - `TERMINATE TRANSACTION` misses `YIELD` clause. `WHERE` clause without `YIELD` clause. Use 'TERMINATE TRANSACTION ... YIELD ... WHERE ...'.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N85.adoc b/modules/ROOT/pages/errors/gql-errors/42N85.adoc
index f721b9b6..371d8256 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N85.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N85.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - cannot specify both allowed and denied databases. Allowed and denied database options are mutually exclusive.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N86.adoc b/modules/ROOT/pages/errors/gql-errors/42N86.adoc
index 824686b2..d8d0c0cc 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N86.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N86.adoc
@@ -1,4 +1,11 @@
 = 42N86
 
 == Status description
-error: syntax error or access rule violation - wildcard in parameter. `{ $syntax }` failed. Parameterized database and graph names do not support wildcards.
+error: syntax error or access rule violation - wildcard in parameter. `{ <<syntax>> }` failed. Parameterized database and graph names do not support wildcards.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N88.adoc b/modules/ROOT/pages/errors/gql-errors/42N88.adoc
index efc215ab..153fd2da 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N88.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N88.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - cannot grant privilege. Permission cannot be granted for 'REMOVE IMMUTABLE PRIVILEGE'.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N89.adoc b/modules/ROOT/pages/errors/gql-errors/42N89.adoc
index 4e549852..b6f4da00 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N89.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N89.adoc
@@ -1,4 +1,11 @@
 = 42N89
 
 == Status description
-error: syntax error or access rule violation - invalid driver settings map. Failed evaluating the given driver settings. `{ $cause }`
+error: syntax error or access rule violation - invalid driver settings map. Failed evaluating the given driver settings. `{ <<cause>> }`
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N90.adoc b/modules/ROOT/pages/errors/gql-errors/42N90.adoc
index e1bb9b17..d3826bcb 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N90.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N90.adoc
@@ -1,4 +1,11 @@
 = 42N90
 
 == Status description
-error: syntax error or access rule violation - cannot alter immutable composite database. Composite databases cannot be altered (database: `{ $db }`).
+error: syntax error or access rule violation - cannot alter immutable composite database. Composite databases cannot be altered (database: `{ <<db>> }`).
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N97.adoc b/modules/ROOT/pages/errors/gql-errors/42N97.adoc
index b8d8d520..5f900f02 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N97.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N97.adoc
@@ -1,4 +1,11 @@
 = 42N97
 
 == Status description
-error: syntax error or access rule violation - missing mandatory auth clause. Clause `{ $clause }` is mandatory for auth provider `{ $auth }`.
+error: syntax error or access rule violation - missing mandatory auth clause. Clause `{ <<clause>> }` is mandatory for auth provider `{ <<auth>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N98.adoc b/modules/ROOT/pages/errors/gql-errors/42N98.adoc
index f13c266f..84acd731 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N98.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N98.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - cannot modify own user. Cannot modify the user record of the current user.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N99.adoc b/modules/ROOT/pages/errors/gql-errors/42N99.adoc
index aa80d650..6da3ad8d 100644
--- a/modules/ROOT/pages/errors/gql-errors/42N99.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42N99.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - cannot delete own user. Cannot delete the user record of the current user.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42NA5.adoc b/modules/ROOT/pages/errors/gql-errors/42NA5.adoc
index e95514c5..5885b198 100644
--- a/modules/ROOT/pages/errors/gql-errors/42NA5.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42NA5.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - accessing multiple graphs only supported on composite databases. Accessing multiple graphs in the same query is only supported on composite databases. Connect to a composite database with the desired constituents.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42NA6.adoc b/modules/ROOT/pages/errors/gql-errors/42NA6.adoc
index d31f057d..0427fa50 100644
--- a/modules/ROOT/pages/errors/gql-errors/42NA6.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42NA6.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - invalid alias target. Aliases are not allowed to target composite databases.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42NA7.adoc b/modules/ROOT/pages/errors/gql-errors/42NA7.adoc
index 3cbb8d95..a375148b 100644
--- a/modules/ROOT/pages/errors/gql-errors/42NA7.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42NA7.adoc
@@ -1,4 +1,11 @@
 = 42NA7
 
 == Status description
-error: syntax error or access rule violation - referenced database not found. No database is corresponding to `{ $db }`. Verify that the elementId is correct.
+error: syntax error or access rule violation - referenced database not found. No database is corresponding to `{ <<db>> }`. Verify that the elementId is correct.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42NA8.adoc b/modules/ROOT/pages/errors/gql-errors/42NA8.adoc
index 06e0daf0..869560ab 100644
--- a/modules/ROOT/pages/errors/gql-errors/42NA8.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42NA8.adoc
@@ -1,4 +1,11 @@
 = 42NA8
 
 == Status description
-error: syntax error or access rule violation - invalid reference in command. Invalid reference in command `{ $cmd }`.
+error: syntax error or access rule violation - invalid reference in command. Invalid reference in command `{ <<cmd>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42NA9.adoc b/modules/ROOT/pages/errors/gql-errors/42NA9.adoc
index f0fd5657..b706df94 100644
--- a/modules/ROOT/pages/errors/gql-errors/42NA9.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42NA9.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - system database procedure rules. The system database supports a restricted set of Cypher clauses. The supported clause structure for procedure calls is: 'CALL', 'YIELD', 'RETURN'. 'YIELD' and 'RETURN' clauses are optional. The order of the clauses is fixed and each can only occur once.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42NFD.adoc b/modules/ROOT/pages/errors/gql-errors/42NFD.adoc
index e8004cf8..aec33938 100644
--- a/modules/ROOT/pages/errors/gql-errors/42NFD.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42NFD.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - credentials expired. Permission denied. The credentials you provided were valid, but must be changed before you can use this instance.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42NFE.adoc b/modules/ROOT/pages/errors/gql-errors/42NFE.adoc
index 834933d0..27d18984 100644
--- a/modules/ROOT/pages/errors/gql-errors/42NFE.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42NFE.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - auth info expired. Authentication and/or authorization info expired.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42NFF.adoc b/modules/ROOT/pages/errors/gql-errors/42NFF.adoc
index 114b62bf..2e18022f 100644
--- a/modules/ROOT/pages/errors/gql-errors/42NFF.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/42NFF.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: syntax error or access rule violation - permission/access denied. Access denied, see the security logs for details.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/50N00.adoc b/modules/ROOT/pages/errors/gql-errors/50N00.adoc
index 9a1702fb..a7d60c34 100644
--- a/modules/ROOT/pages/errors/gql-errors/50N00.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/50N00.adoc
@@ -1,4 +1,11 @@
 = 50N00
 
 == Status description
-error: general processing exception - internal error. Internal exception raised `{ $msgTitle }`: `{ $msg }`
+error: general processing exception - internal error. Internal exception raised `{ <<msgTitle>> }`: `{ <<msg>> }`
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/50N05.adoc b/modules/ROOT/pages/errors/gql-errors/50N05.adoc
index c7d85ddd..385d79fa 100644
--- a/modules/ROOT/pages/errors/gql-errors/50N05.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/50N05.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: general processing exception - deadlock detected. Deadlock detected while trying to acquire locks. See log for more details.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/50N06.adoc b/modules/ROOT/pages/errors/gql-errors/50N06.adoc
index f4dfccbd..63209f1c 100644
--- a/modules/ROOT/pages/errors/gql-errors/50N06.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/50N06.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: general processing exception - remote execution client error. Remote execution failed. See cause for more details.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/50N07.adoc b/modules/ROOT/pages/errors/gql-errors/50N07.adoc
index 19920bf2..01da8fcc 100644
--- a/modules/ROOT/pages/errors/gql-errors/50N07.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/50N07.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: general processing exception - execution failed. Execution failed. See cause and debug log for details.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/50N09.adoc b/modules/ROOT/pages/errors/gql-errors/50N09.adoc
index 71ef2f60..31aaa0c9 100644
--- a/modules/ROOT/pages/errors/gql-errors/50N09.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/50N09.adoc
@@ -1,4 +1,11 @@
 = 50N09
 
 == Status description
-error: general processing exception - invalid server state transition. The server transitioned into a server state that is not valid in the current context: `{ $boltServerState }`.
+error: general processing exception - invalid server state transition. The server transitioned into a server state that is not valid in the current context: `{ <<boltServerState>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/50N10.adoc b/modules/ROOT/pages/errors/gql-errors/50N10.adoc
index a69fff06..d2401612 100644
--- a/modules/ROOT/pages/errors/gql-errors/50N10.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/50N10.adoc
@@ -2,4 +2,10 @@
 
 
 == Status description
-error: general processing exception - index drop failed. Unable to drop `{ $idxDescrOrName }`.
\ No newline at end of file
+error: general processing exception - index drop failed. Unable to drop `{ <<idxDescrOrName>> }`.
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/50N11.adoc b/modules/ROOT/pages/errors/gql-errors/50N11.adoc
index 14abf2c2..d1c8e63c 100644
--- a/modules/ROOT/pages/errors/gql-errors/50N11.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/50N11.adoc
@@ -1,4 +1,11 @@
 = 50N11
 
 == Status description
-error: general processing exception - constraint creation failed. Unable to create `{ $constrDescrOrName }`.
+error: general processing exception - constraint creation failed. Unable to create `{ <<constrDescrOrName>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/50N12.adoc b/modules/ROOT/pages/errors/gql-errors/50N12.adoc
index d191c6b5..d66b07b3 100644
--- a/modules/ROOT/pages/errors/gql-errors/50N12.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/50N12.adoc
@@ -1,4 +1,11 @@
 = 50N12
 
 == Status description
-error: general processing exception - constraint drop failed. Unable to drop `{ $constrDescrOrName }`.
+error: general processing exception - constraint drop failed. Unable to drop `{ <<constrDescrOrName>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/50N13.adoc b/modules/ROOT/pages/errors/gql-errors/50N13.adoc
index 6ba25f42..369d0710 100644
--- a/modules/ROOT/pages/errors/gql-errors/50N13.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/50N13.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: general processing exception - constraint validation error. Unable to validate constraint `{ $constrDescrOrName }`.
\ No newline at end of file
+error: general processing exception - constraint validation error. Unable to validate constraint `{ <<constrDescrOrName>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/50N14.adoc b/modules/ROOT/pages/errors/gql-errors/50N14.adoc
index 8c7d1773..be05cda1 100644
--- a/modules/ROOT/pages/errors/gql-errors/50N14.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/50N14.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: general processing exception - constraint violation. A constraint imposed by the database was violated.
\ No newline at end of file
+error: general processing exception - constraint violation. A constraint imposed by the database was violated.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/50N15.adoc b/modules/ROOT/pages/errors/gql-errors/50N15.adoc
index 76fa00b8..88f259b1 100644
--- a/modules/ROOT/pages/errors/gql-errors/50N15.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/50N15.adoc
@@ -2,4 +2,10 @@
 
 
 == Status description
-error: general processing exception - unsupported index operation. The system attemped to execute an unsupported operation on index `{ $idx }`. See debug.log for more information.
\ No newline at end of file
+error: general processing exception - unsupported index operation. The system attemped to execute an unsupported operation on index `{ <<idx>> }`. See debug.log for more information.
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/50N16.adoc b/modules/ROOT/pages/errors/gql-errors/50N16.adoc
index d97b7da6..818cf7aa 100644
--- a/modules/ROOT/pages/errors/gql-errors/50N16.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/50N16.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: general processing exception - remote execution transient error. Remote execution failed. See cause for more details.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/50N17.adoc b/modules/ROOT/pages/errors/gql-errors/50N17.adoc
index 9c7eab3b..6bb0fe35 100644
--- a/modules/ROOT/pages/errors/gql-errors/50N17.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/50N17.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: general processing exception - remote execution database error. Remote execution failed. See cause for more details.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/50N42.adoc b/modules/ROOT/pages/errors/gql-errors/50N42.adoc
index 809233a3..5f146f63 100644
--- a/modules/ROOT/pages/errors/gql-errors/50N42.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/50N42.adoc
@@ -7,4 +7,13 @@ error: general processing exception - unexpected error. Unexpected error has occ
 ====
 50N42 is the default GQLSTATUS code for exceptions without a GQL object.
 For more information, see link:https://neo4j.com/docs/operations-manual/current/monitoring/logging/#_use_json_format_for_the_query_log[Operations Manual -> Use JSON format for the query log].
-====
\ No newline at end of file
+====
+
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N00.adoc b/modules/ROOT/pages/errors/gql-errors/51N00.adoc
index d57d2b8d..904d3733 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N00.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N00.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: system configuration or operation exception - procedure registration error. Failed to register procedure/function.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N01.adoc b/modules/ROOT/pages/errors/gql-errors/51N01.adoc
index 9820f82a..14286ead 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N01.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N01.adoc
@@ -1,4 +1,11 @@
 = 51N01
 
 == Status description
-error: system configuration or operation exception - class field annotation should be public, non-final, and non-static. The field `{ $procField }` in the class `{ $procClass }` is annotated as a '@Context' field, but it is declared as static. '@Context' fields must be public, non-final and non-static.
+error: system configuration or operation exception - class field annotation should be public, non-final, and non-static. The field `{ <<procField>> }` in the class `{ <<procClass>> }` is annotated as a '@Context' field, but it is declared as static. '@Context' fields must be public, non-final and non-static.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N02.adoc b/modules/ROOT/pages/errors/gql-errors/51N02.adoc
index 35207358..0b6357f8 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N02.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N02.adoc
@@ -1,4 +1,11 @@
 = 51N02
 
 == Status description
-error: system configuration or operation exception - unsupported injectable component type. Unable to set up injection for procedure `{ $procClass }`. The field `{ $procField }` has type `{ $procFieldType }` which is not a supported injectable component.
+error: system configuration or operation exception - unsupported injectable component type. Unable to set up injection for procedure `{ <<procClass>> }`. The field `{ <<procField>> }` has type `{ <<procFieldType>> }` which is not a supported injectable component.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N03.adoc b/modules/ROOT/pages/errors/gql-errors/51N03.adoc
index 951ecce4..61a72a0d 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N03.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N03.adoc
@@ -1,4 +1,11 @@
 = 51N03
 
 == Status description
-error: system configuration or operation exception - unable to access field. Unable to set up injection for `{ $procClass }`, failed to access field `{ $procField }`.
+error: system configuration or operation exception - unable to access field. Unable to set up injection for `{ <<procClass>> }`, failed to access field `{ <<procField>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N04.adoc b/modules/ROOT/pages/errors/gql-errors/51N04.adoc
index a715bcd0..41d50486 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N04.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N04.adoc
@@ -1,4 +1,11 @@
 = 51N04
 
 == Status description
-error: system configuration or operation exception - missing class field annotation. The field `{ $procField }` on `{ $procClass }` must be annotated as a '@Context' field in order to store its state.
+error: system configuration or operation exception - missing class field annotation. The field `{ <<procField>> }` on `{ <<procClass>> }` must be annotated as a '@Context' field in order to store its state.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N05.adoc b/modules/ROOT/pages/errors/gql-errors/51N05.adoc
index 4bee6970..9c741ebb 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N05.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N05.adoc
@@ -1,4 +1,11 @@
 = 51N05
 
 == Status description
-error: system configuration or operation exception - class field should be public and non-final. The field `{ $procField }` on `{ $procClass }` must be declared non-final and public.
+error: system configuration or operation exception - class field should be public and non-final. The field `{ <<procField>> }` on `{ <<procClass>> }` must be declared non-final and public.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N06.adoc b/modules/ROOT/pages/errors/gql-errors/51N06.adoc
index 5e110e95..814630a3 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N06.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N06.adoc
@@ -1,4 +1,11 @@
 = 51N06
 
 == Status description
-error: system configuration or operation exception - missing argument name. The argument at position `{ $pos }` in `{ $procMethod }` requires a '@Name' annotation and a non-empty name.
+error: system configuration or operation exception - missing argument name. The argument at position `{ <<pos>> }` in `{ <<procMethod>> }` requires a '@Name' annotation and a non-empty name.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N07.adoc b/modules/ROOT/pages/errors/gql-errors/51N07.adoc
index 633ed0b5..370a0bfd 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N07.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N07.adoc
@@ -1,4 +1,11 @@
 = 51N07
 
 == Status description
-error: system configuration or operation exception - invalid ordering of default arguments. The `{ $procFun }` contains a non-default argument after a default argument. Non-default arguments are not allowed to be positioned after default arguments.
+error: system configuration or operation exception - invalid ordering of default arguments. The `{ <<procFun>> }` contains a non-default argument after a default argument. Non-default arguments are not allowed to be positioned after default arguments.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N08.adoc b/modules/ROOT/pages/errors/gql-errors/51N08.adoc
index ad6cd58d..043f9e67 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N08.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N08.adoc
@@ -1,4 +1,11 @@
 = 51N08
 
 == Status description
-error: system configuration or operation exception - exactly one @UserAggregationResult method and one @UserAggregationUpdate method required. The class `{ $procClass }` must contain exactly one '@UserAggregationResult' method and exactly one '@UserAggregationUpdate' method.
+error: system configuration or operation exception - exactly one @UserAggregationResult method and one @UserAggregationUpdate method required. The class `{ <<procClass>> }` must contain exactly one '@UserAggregationResult' method and exactly one '@UserAggregationUpdate' method.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N09.adoc b/modules/ROOT/pages/errors/gql-errors/51N09.adoc
index 440d8bbf..e9f502f6 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N09.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N09.adoc
@@ -1,4 +1,11 @@
 = 51N09
 
 == Status description
-error: system configuration or operation exception - @UserAggregationUpdate method must be public and void. The '@UserAggregationUpdate' method `{ $procMethod }` of `{ $procClass }` must be public and have the return type 'void'.
+error: system configuration or operation exception - @UserAggregationUpdate method must be public and void. The '@UserAggregationUpdate' method `{ <<procMethod>> }` of `{ <<procClass>> }` must be public and have the return type 'void'.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N10.adoc b/modules/ROOT/pages/errors/gql-errors/51N10.adoc
index c0e77c5e..ad6b162a 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N10.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N10.adoc
@@ -1,4 +1,11 @@
 = 51N10
 
 == Status description
-error: system configuration or operation exception - aggregation method not public. The method `{ $procMethod }` of `{ $procClass }` must be public.
+error: system configuration or operation exception - aggregation method not public. The method `{ <<procMethod>> }` of `{ <<procClass>> }` must be public.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N11.adoc b/modules/ROOT/pages/errors/gql-errors/51N11.adoc
index 714822a8..012645a2 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N11.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N11.adoc
@@ -1,4 +1,11 @@
 = 51N11
 
 == Status description
-error: system configuration or operation exception - class not public. The class `{ $procClass }` must be public.
+error: system configuration or operation exception - class not public. The class `{ <<procClass>> }` must be public.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N12.adoc b/modules/ROOT/pages/errors/gql-errors/51N12.adoc
index e6700a49..534c8eef 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N12.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N12.adoc
@@ -1,4 +1,11 @@
 = 51N12
 
 == Status description
-error: system configuration or operation exception - class not void. The procedure `{ $proc }` has zero output fields and must be defined as void.
+error: system configuration or operation exception - class not void. The procedure `{ <<proc>> }` has zero output fields and must be defined as void.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N13.adoc b/modules/ROOT/pages/errors/gql-errors/51N13.adoc
index cf629ebe..7ee9807e 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N13.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N13.adoc
@@ -1,4 +1,11 @@
 = 51N13
 
 == Status description
-error: system configuration or operation exception - procedure or function name already in use. Unable to register the procedure or function `{ $procFun }` because the name is already in use.
+error: system configuration or operation exception - procedure or function name already in use. Unable to register the procedure or function `{ <<procFun>> }` because the name is already in use.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N14.adoc b/modules/ROOT/pages/errors/gql-errors/51N14.adoc
index 102a9fa3..0cb7d587 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N14.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N14.adoc
@@ -2,4 +2,11 @@
 
 == Status description
 error: system configuration or operation exception - duplicate field name.
-The procedure `{ $proc }` has a duplicate `{ $procFieldType }` field, `{ $procField }`.
+The procedure `{ <<proc>> }` has a duplicate `{ <<procFieldType>> }` field, `{ <<procField>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N15.adoc b/modules/ROOT/pages/errors/gql-errors/51N15.adoc
index 0a952da1..34a96002 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N15.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N15.adoc
@@ -1,4 +1,11 @@
 = 51N15
 
 == Status description
-error: system configuration or operation exception - invalid map key type. Type mismatch for map key. Required 'STRING', but found `{ $valueType }`.
+error: system configuration or operation exception - invalid map key type. Type mismatch for map key. Required 'STRING', but found `{ <<valueType>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N16.adoc b/modules/ROOT/pages/errors/gql-errors/51N16.adoc
index d647e818..39fa1937 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N16.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N16.adoc
@@ -1,4 +1,11 @@
 = 51N16
 
 == Status description
-error: system configuration or operation exception - invalid default value type. Type mismatch for the default value. Required `{ $valueType }`, but found `{ $input }`.
+error: system configuration or operation exception - invalid default value type. Type mismatch for the default value. Required `{ <<valueType>> }`, but found `{ <<input>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N17.adoc b/modules/ROOT/pages/errors/gql-errors/51N17.adoc
index 7dc9c639..f559a2bd 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N17.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N17.adoc
@@ -1,4 +1,11 @@
 = 51N17
 
 == Status description
-error: system configuration or operation exception - invalid procedure or function name. Procedures and functions cannot be defined in the root namespace, or use a reserved namespace. Use the package name instead (e.g., org.example.com.`{ $procFun })`.
+error: system configuration or operation exception - invalid procedure or function name. Procedures and functions cannot be defined in the root namespace, or use a reserved namespace. Use the package name instead (e.g., org.example.com.`{ <<procFun>> }`)`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N18.adoc b/modules/ROOT/pages/errors/gql-errors/51N18.adoc
index b7383875..81473a45 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N18.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N18.adoc
@@ -1,4 +1,11 @@
 = 51N18
 
 == Status description
-error: system configuration or operation exception - invalid method return type. The method `{ $procMethod }` has an invalid return type. Procedures must return a stream of records, where each record is of a defined concrete class.
+error: system configuration or operation exception - invalid method return type. The method `{ <<procMethod>> }` has an invalid return type. Procedures must return a stream of records, where each record is of a defined concrete class.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N20.adoc b/modules/ROOT/pages/errors/gql-errors/51N20.adoc
index a311c658..ff085d31 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N20.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N20.adoc
@@ -1,4 +1,11 @@
 = 51N20
 
 == Status description
-error: system configuration or operation exception - cannot inject field. The field `{ $procField }` is not injectable. Ensure the field is marked as public and non-final.
+error: system configuration or operation exception - cannot inject field. The field `{ <<procField>> }` is not injectable. Ensure the field is marked as public and non-final.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N21.adoc b/modules/ROOT/pages/errors/gql-errors/51N21.adoc
index 6edb9a5a..42520409 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N21.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N21.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: system configuration or operation exception - procedure registry is busy. The procedure registration failed because the procedure registry was busy. Try again.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N22.adoc b/modules/ROOT/pages/errors/gql-errors/51N22.adoc
index db3ad03f..0405fcf3 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N22.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N22.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: system configuration or operation exception - exhaustive shortest path search disabled. Finding the shortest path for the given pattern requires an exhaustive search. To enable exhaustive searches, set 'cypher.forbid_exhaustive_shortestpath' to false.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N23.adoc b/modules/ROOT/pages/errors/gql-errors/51N23.adoc
index 7905ed20..85346437 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N23.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N23.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: system configuration or operation exception - cyclic shortest path search disabled. Cannot find the shortest path when the start and end nodes are the same. To enable this behavior, set 'dbms.cypher.forbid_shortestpath_common_nodes' to false.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N24.adoc b/modules/ROOT/pages/errors/gql-errors/51N24.adoc
index 9ef56e76..0daa194d 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N24.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N24.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: system configuration or operation exception - insufficient resources for plan search. Could not find a query plan within given time and space limits.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N25.adoc b/modules/ROOT/pages/errors/gql-errors/51N25.adoc
index f8c0b901..6f442267 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N25.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N25.adoc
@@ -2,4 +2,13 @@
 
 
 == Status description
-error: system configuration or operation exception - database is busy. Cannot compile query due to excessive updates to indexes and constraints.
\ No newline at end of file
+error: system configuration or operation exception - database is busy. Cannot compile query due to excessive updates to indexes and constraints.
+
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N27.adoc b/modules/ROOT/pages/errors/gql-errors/51N27.adoc
index 4e682e75..0b38b6b4 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N27.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N27.adoc
@@ -2,7 +2,7 @@
 
 == Status description
 
-error: system configuration or operation exception - not supported in this edition. `{ $component }` is not supported in `{ $edition }`.
+error: system configuration or operation exception - not supported in this edition. `{ <<component>> }` is not supported in `{ <<edition>> }`.
 
 == Explanation
 
@@ -24,4 +24,10 @@ Error message will be:
 [source]
 ----
 error: system configuration or operation exception - not supported in this edition. `SET STATUS` is not supported in community edition.
-----
\ No newline at end of file
+----
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N29.adoc b/modules/ROOT/pages/errors/gql-errors/51N29.adoc
index bd4dade3..f19cfaa7 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N29.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N29.adoc
@@ -1,4 +1,11 @@
 = 51N29
 
 == Status description
-error: system configuration or operation exception - not supported by this server. The command `{ $cmd }` must be executed on the current 'LEADER' server.
+error: system configuration or operation exception - not supported by this server. The command `{ <<cmd>> }` must be executed on the current 'LEADER' server.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N30.adoc b/modules/ROOT/pages/errors/gql-errors/51N30.adoc
index 4063f09b..9c472dd4 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N30.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N30.adoc
@@ -1,4 +1,11 @@
 = 51N30
 
 == Status description
-error: system configuration or operation exception - not supported with this configuration. `{ $item }` is not supported in `{ $context }`.
+error: system configuration or operation exception - not supported with this configuration. `{ <<item>> }` is not supported in `{ <<context>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N32.adoc b/modules/ROOT/pages/errors/gql-errors/51N32.adoc
index 0f8a5a8d..9440e866 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N32.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N32.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: system configuration or operation exception - server panic. Server is in panic.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N33.adoc b/modules/ROOT/pages/errors/gql-errors/51N33.adoc
index 5a155c0f..295e4b7d 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N33.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N33.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: system configuration or operation exception - replication error. This member failed to replicate transaction, try again.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N34.adoc b/modules/ROOT/pages/errors/gql-errors/51N34.adoc
index 670e4020..f2e845a8 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N34.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N34.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: system configuration or operation exception - write transaction failed due to leader change. Failed to write to the database due to a cluster leader change. Retrying your request at a later time may succeed.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N35.adoc b/modules/ROOT/pages/errors/gql-errors/51N35.adoc
index 290386ec..d327bed0 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N35.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N35.adoc
@@ -1,4 +1,11 @@
 = 51N35
 
 == Status description
-error: system configuration or operation exception - database location changed. The location of `{ $db }` has changed while the transaction was running.
+error: system configuration or operation exception - database location changed. The location of `{ <<db>> }` has changed while the transaction was running.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N36.adoc b/modules/ROOT/pages/errors/gql-errors/51N36.adoc
index d48ac9a0..8dfa65e5 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N36.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N36.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: system configuration or operation exception - out of memory. There is not enough memory to perform the current task.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N37.adoc b/modules/ROOT/pages/errors/gql-errors/51N37.adoc
index 43b1e55e..a81dc9b1 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N37.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N37.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: system configuration or operation exception - stack overflow. There is not enough stack size to perform the current task.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N38.adoc b/modules/ROOT/pages/errors/gql-errors/51N38.adoc
index 561f2eb8..34e8450d 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N38.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N38.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: system configuration or operation exception - failed to acquire execution thread. There are insufficient threads available for executing the current task.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N39.adoc b/modules/ROOT/pages/errors/gql-errors/51N39.adoc
index ecd9f5a2..f27a3493 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N39.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N39.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: system configuration or operation exception - raft log corrupted. Expected set of files not found on disk. Please restore from backup.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N40.adoc b/modules/ROOT/pages/errors/gql-errors/51N40.adoc
index 95ac1ccc..9a8267c3 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N40.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N40.adoc
@@ -1,4 +1,11 @@
 = 51N40
 
 == Status description
-error: system configuration or operation exception - unable to start database. Database `{ $db }` failed to start. Try restarting it.
+error: system configuration or operation exception - unable to start database. Database `{ <<db>> }` failed to start. Try restarting it.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N41.adoc b/modules/ROOT/pages/errors/gql-errors/51N41.adoc
index 7025f74d..d6bf25db 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N41.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N41.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: system configuration or operation exception - admin operation failed. Server or database admin operation not possible.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N43.adoc b/modules/ROOT/pages/errors/gql-errors/51N43.adoc
index 859682c9..2e1a3e81 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N43.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N43.adoc
@@ -1,4 +1,11 @@
 = 51N43
 
 == Status description
-error: system configuration or operation exception - cannot deallocate servers. Cannot deallocate server(s) `{ $serverList }`.
+error: system configuration or operation exception - cannot deallocate servers. Cannot deallocate server(s) `{ <<serverList>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N44.adoc b/modules/ROOT/pages/errors/gql-errors/51N44.adoc
index 44b1ae36..c8402886 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N44.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N44.adoc
@@ -1,4 +1,11 @@
 = 51N44
 
 == Status description
-error: system configuration or operation exception - cannot drop server. Cannot drop server `{ $server }`.
+error: system configuration or operation exception - cannot drop server. Cannot drop server `{ <<server>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N45.adoc b/modules/ROOT/pages/errors/gql-errors/51N45.adoc
index 4dfcc0f4..01c9bb43 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N45.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N45.adoc
@@ -1,4 +1,11 @@
 = 51N45
 
 == Status description
-error: system configuration or operation exception - cannot cordon server. Cannot cordon server `{ $server }`.
+error: system configuration or operation exception - cannot cordon server. Cannot cordon server `{ <<server>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N46.adoc b/modules/ROOT/pages/errors/gql-errors/51N46.adoc
index 41ed8a50..86d2607f 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N46.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N46.adoc
@@ -1,4 +1,11 @@
 = 51N46
 
 == Status description
-error: system configuration or operation exception - cannot alter server. Cannot alter server `{ $server }`.
+error: system configuration or operation exception - cannot alter server. Cannot alter server `{ <<server>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N47.adoc b/modules/ROOT/pages/errors/gql-errors/51N47.adoc
index d8ae8378..71ab97cd 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N47.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N47.adoc
@@ -1,4 +1,11 @@
 = 51N47
 
 == Status description
-error: system configuration or operation exception - cannot rename server. Cannot rename server `{ $server }`.
+error: system configuration or operation exception - cannot rename server. Cannot rename server `{ <<server>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N48.adoc b/modules/ROOT/pages/errors/gql-errors/51N48.adoc
index c8763920..f3241b99 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N48.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N48.adoc
@@ -1,4 +1,11 @@
 = 51N48
 
 == Status description
-error: system configuration or operation exception - cannot enable server. Cannot enable server `{ $server }`.
+error: system configuration or operation exception - cannot enable server. Cannot enable server `{ <<server>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N49.adoc b/modules/ROOT/pages/errors/gql-errors/51N49.adoc
index 9ef08d94..4af8bde7 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N49.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N49.adoc
@@ -1,4 +1,11 @@
 = 51N49
 
 == Status description
-error: system configuration or operation exception - cannot alter database. Cannot alter database `{ $db }`.
+error: system configuration or operation exception - cannot alter database. Cannot alter database `{ <<db>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N50.adoc b/modules/ROOT/pages/errors/gql-errors/51N50.adoc
index d478805b..ac192a4d 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N50.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N50.adoc
@@ -1,4 +1,11 @@
 = 51N50
 
 == Status description
-error: system configuration or operation exception - cannot recreate database. Cannot recreate database `{ $db }`.
+error: system configuration or operation exception - cannot recreate database. Cannot recreate database `{ <<db>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N51.adoc b/modules/ROOT/pages/errors/gql-errors/51N51.adoc
index 4efe9a50..745decf4 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N51.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N51.adoc
@@ -1,4 +1,11 @@
 = 51N51
 
 == Status description
-error: system configuration or operation exception - cannot create database. Cannot create database `{ $db }`.
+error: system configuration or operation exception - cannot create database. Cannot create database `{ <<db>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N52.adoc b/modules/ROOT/pages/errors/gql-errors/51N52.adoc
index cf0097f4..f0af724f 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N52.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N52.adoc
@@ -1,4 +1,11 @@
 = 51N52
 
 == Status description
-error: system configuration or operation exception - number of primaries out of range. Cannot alter database topology.  Number of primaries `{ $count }` needs to be at least 1 and may not exceed `{ $upper }`.
+error: system configuration or operation exception - number of primaries out of range. Cannot alter database topology.  Number of primaries `{ <<count>> }` needs to be at least 1 and may not exceed `{ <<upper>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N53.adoc b/modules/ROOT/pages/errors/gql-errors/51N53.adoc
index 45a324a5..33689ab8 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N53.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N53.adoc
@@ -1,4 +1,11 @@
 = 51N53
 
 == Status description
-error: system configuration or operation exception - number of secondaries out of range. Cannot alter database topology. Number of secondaries `{ $count }` needs to be at least 0 and may not exceed `{ $upper }`.
+error: system configuration or operation exception - number of secondaries out of range. Cannot alter database topology. Number of secondaries `{ <<count>> }` needs to be at least 0 and may not exceed `{ <<upper>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N54.adoc b/modules/ROOT/pages/errors/gql-errors/51N54.adoc
index 48fdabda..74a3788d 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N54.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N54.adoc
@@ -1,4 +1,11 @@
 = 51N54
 
 == Status description
-error: system configuration or operation exception - cannot reallocate. Failed to calculate reallocation for databases. { $msg }
+error: system configuration or operation exception - cannot reallocate. Failed to calculate reallocation for databases. `{ <<msg>> }`
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N55.adoc b/modules/ROOT/pages/errors/gql-errors/51N55.adoc
index a5b68105..df51b865 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N55.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N55.adoc
@@ -1,4 +1,11 @@
 = 51N55
 
 == Status description
-error: system configuration or operation exception - cannot create additional database. Failed to create the database `{ $db }`. The limit of databases is reached. Either increase the limit using the config setting `{ $cfgSetting }` or drop a database.
+error: system configuration or operation exception - cannot create additional database. Failed to create the database `{ <<db>> }`. The limit of databases is reached. Either increase the limit using the config setting `{ <<cfgSetting>> }` or drop a database.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N56.adoc b/modules/ROOT/pages/errors/gql-errors/51N56.adoc
index dda500d5..f6db685a 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N56.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N56.adoc
@@ -1,4 +1,11 @@
 = 51N56
 
 == Status description
-error: system configuration or operation exception - topology out of range. The number of `{ $serverType }` seeding servers `{ $count1 }` is larger than the desired number of `{ $allocType }` allocations `{ $count2 }`.
+error: system configuration or operation exception - topology out of range. The number of `{ <<serverType>> }` seeding servers `{ <<count>>1 }` is larger than the desired number of `{ <<allocType>> }` allocations `{ $count2 }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N57.adoc b/modules/ROOT/pages/errors/gql-errors/51N57.adoc
index 2e3d8477..523a6dad 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N57.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N57.adoc
@@ -1,4 +1,11 @@
 = 51N57
 
 == Status description
-error: system configuration or operation exception - generic topology modification error. Unexpected error while picking allocations. { $msg }
+error: system configuration or operation exception - generic topology modification error. Unexpected error while picking allocations. `{ <<msg>> }`
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N59.adoc b/modules/ROOT/pages/errors/gql-errors/51N59.adoc
index a1fb9123..00fc54c7 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N59.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N59.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: system configuration or operation exception - internal resource exhaustion. The DBMS is unable to handle the request, please retry later or contact the system operator. More information is present in the logs.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N60.adoc b/modules/ROOT/pages/errors/gql-errors/51N60.adoc
index 706ac807..1cd98f14 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N60.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N60.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: system configuration or operation exception - unable to check enterprise license acceptance. The DBMS is unable to determine the enterprise license acceptance status.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N61.adoc b/modules/ROOT/pages/errors/gql-errors/51N61.adoc
index b3b9fe09..a430fb7e 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N61.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N61.adoc
@@ -2,4 +2,10 @@
 
 
 == Status description
-error: system configuration or operation exception - index population failed. Index `{ $idx }` population failed.
\ No newline at end of file
+error: system configuration or operation exception - index population failed. Index `{ <<idx>> }` population failed.
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N62.adoc b/modules/ROOT/pages/errors/gql-errors/51N62.adoc
index 4770e6b1..91ed9b1b 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N62.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N62.adoc
@@ -2,4 +2,10 @@
 
 
 == Status description
-error: system configuration or operation exception - index is in a failed state. Unable to use index `{ $idx }` because it is in a failed state. See logs for more information.
\ No newline at end of file
+error: system configuration or operation exception - index is in a failed state. Unable to use index `{ <<idx>> }` because it is in a failed state. See logs for more information.
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N63.adoc b/modules/ROOT/pages/errors/gql-errors/51N63.adoc
index a5d210bd..b7c81b6c 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N63.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N63.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: system configuration or operation exception - index is still populating. Index is not ready yet. Wait until it finishes populating and retry the transaction.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N64.adoc b/modules/ROOT/pages/errors/gql-errors/51N64.adoc
index 611ebb8a..5a4a744c 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N64.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N64.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: system configuration or operation exception - index dropped while sampling. The index dropped while sampling.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N65.adoc b/modules/ROOT/pages/errors/gql-errors/51N65.adoc
index 5232098c..65c3b721 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N65.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N65.adoc
@@ -1,4 +1,12 @@
 = 51N65
 
 == Status description
-error: system configuration or operation exception - vector index dimensionality mismatch. Vector index `{ $idx }` has a dimensionality of `{ $dim1 }`, but indexed vectors have `{ $dim2 }`.
+error: system configuration or operation exception - vector index dimensionality mismatch. Vector index `{ <<idx>> }` has a dimensionality of `{ <<dim>>1 }`, but indexed vectors have `{ $dim2 }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N66.adoc b/modules/ROOT/pages/errors/gql-errors/51N66.adoc
index 0b5be11f..1e9f0320 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N66.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N66.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: system configuration or operation exception - resource exhaustion. Insufficient resources to complete the request.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N68.adoc b/modules/ROOT/pages/errors/gql-errors/51N68.adoc
index 372a8314..00749b1d 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N68.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N68.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: system configuration or operation exception - CDC is disabled for this database. Change Data Capture is not currently enabled for this database.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N69.adoc b/modules/ROOT/pages/errors/gql-errors/51N69.adoc
index 8a016fee..dad8f9ac 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N69.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N69.adoc
@@ -1,4 +1,11 @@
 = 51N69
 
 == Status description
-error: system configuration or operation exception - system database is immutable. It is not possible to perform `{ $operation }` on the system database.
+error: system configuration or operation exception - system database is immutable. It is not possible to perform `{ <<operation>> }` on the system database.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N70.adoc b/modules/ROOT/pages/errors/gql-errors/51N70.adoc
index 30d6a096..9e140228 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N70.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N70.adoc
@@ -1,4 +1,11 @@
 = 51N70
 
 == Status description
-error: system configuration or operation exception - bolt is not enabled. Cannot get routing table for `{ $db }` because Bolt is not enabled. Please update your configuration such that 'server.bolt.enabled' is set to true.
+error: system configuration or operation exception - bolt is not enabled. Cannot get routing table for `{ <<db>> }` because Bolt is not enabled. Please update your configuration such that 'server.bolt.enabled' is set to true.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N71.adoc b/modules/ROOT/pages/errors/gql-errors/51N71.adoc
index 99c77fb2..e9c4ac7f 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N71.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N71.adoc
@@ -1,4 +1,11 @@
 = 51N71
 
 == Status description
-error: system configuration or operation exception - unsupported operation of a sharded database. Feature: `{ $feat }` is not available in a sharded database.
+error: system configuration or operation exception - unsupported operation of a sharded database. Feature: `{ <<feat>> }` is not available in a sharded database.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N72.adoc b/modules/ROOT/pages/errors/gql-errors/51N72.adoc
index f89bafe7..b22c92af 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N72.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N72.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: system configuration or operation exception - memory pool out of memory. Failed to allocate memory in a memory pool. See `{ $cfgSetting }` in the neo4j.conf file.
\ No newline at end of file
+error: system configuration or operation exception - memory pool out of memory. Failed to allocate memory in a memory pool. See `{ <<cfgSetting>> }` in the neo4j.conf file.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N73.adoc b/modules/ROOT/pages/errors/gql-errors/51N73.adoc
index e3536c20..9a66b69b 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N73.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N73.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: system configuration or operation exception - transaction memory limit reached. The transaction uses more memory than is allowed. The maximum allowed size for a transaction can be configured with `{ $cfgSetting }` in the neo4j.conf file.
\ No newline at end of file
+error: system configuration or operation exception - transaction memory limit reached. The transaction uses more memory than is allowed. The maximum allowed size for a transaction can be configured with `{ <<cfgSetting>> }` in the neo4j.conf file.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/51N74.adoc b/modules/ROOT/pages/errors/gql-errors/51N74.adoc
index fef31e4a..b5534c5a 100644
--- a/modules/ROOT/pages/errors/gql-errors/51N74.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/51N74.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: system configuration or operation exception - maximum number of transactions reached. Failed to start a new transaction. The limit of concurrent transactions is reached. Increase the number of concurrent transactions using `{ $cfgSetting }` in the neo4j.conf file.
\ No newline at end of file
+error: system configuration or operation exception - maximum number of transactions reached. Failed to start a new transaction. The limit of concurrent transactions is reached. Increase the number of concurrent transactions using `{ <<cfgSetting>> }` in the neo4j.conf file.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N01.adoc b/modules/ROOT/pages/errors/gql-errors/52N01.adoc
index 08afc456..479fc298 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N01.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N01.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: procedure exception - procedure execution timeout. Execution of the procedure `{ $proc }` timed out after `{ $timeAmount }` `{ $timeUnit }`.
\ No newline at end of file
+error: procedure exception - procedure execution timeout. Execution of the procedure `{ <<proc>> }` timed out after `{ <<timeAmount>> }` `{ <<timeUnit>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N02.adoc b/modules/ROOT/pages/errors/gql-errors/52N02.adoc
index 16033422..439e34dd 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N02.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N02.adoc
@@ -1,4 +1,11 @@
 = 52N02
 
 == Status description
-error: procedure exception - procedure execution client error. Execution of the procedure `{ $proc }` failed due to a client error.
+error: procedure exception - procedure execution client error. Execution of the procedure `{ <<proc>> }` failed due to a client error.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N03.adoc b/modules/ROOT/pages/errors/gql-errors/52N03.adoc
index abfeabb0..4a34c0be 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N03.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N03.adoc
@@ -1,4 +1,11 @@
 = 52N03
 
 == Status description
-error: procedure exception - invalid procedure execution mode. Execution of the procedure `{ $proc }` failed due to an invalid specified execution mode `{ $procExeMode }`.
+error: procedure exception - invalid procedure execution mode. Execution of the procedure `{ <<proc>> }` failed due to an invalid specified execution mode `{ <<procExeMode>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N05.adoc b/modules/ROOT/pages/errors/gql-errors/52N05.adoc
index 031a87fc..0f3fd955 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N05.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N05.adoc
@@ -1,4 +1,11 @@
 = 52N05
 
 == Status description
-error: procedure exception - must invoke procedure on secondary. Cannot invoke procedure on this member because it is not a secondary for the database `{ $db }`.
+error: procedure exception - must invoke procedure on secondary. Cannot invoke procedure on this member because it is not a secondary for the database `{ <<db>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N06.adoc b/modules/ROOT/pages/errors/gql-errors/52N06.adoc
index dae75249..19bcbdeb 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N06.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N06.adoc
@@ -1,4 +1,11 @@
 = 52N06
 
 == Status description
-error: procedure exception - invalid number of arguments to checkConnectivity. Unexpected number of arguments (expected 0-2 but received `{ $count }`).
+error: procedure exception - invalid number of arguments to checkConnectivity. Unexpected number of arguments (expected 0-2 but received `{ <<count>> }`).
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N07.adoc b/modules/ROOT/pages/errors/gql-errors/52N07.adoc
index 3b1d0bba..6b7745a5 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N07.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N07.adoc
@@ -1,4 +1,11 @@
 = 52N07
 
 == Status description
-error: procedure exception - invalid port argument to checkConnectivity. Unrecognised port name `{ $port }` (valid values are: `{ $portList }`.
+error: procedure exception - invalid port argument to checkConnectivity. Unrecognised port name `{ <<port>> }` (valid values are: `{ <<portList>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N08.adoc b/modules/ROOT/pages/errors/gql-errors/52N08.adoc
index e34dfb9b..a6473a81 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N08.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N08.adoc
@@ -1,4 +1,11 @@
 = 52N08
 
 == Status description
-error: procedure exception - invalid server id argument to checkConnectivity. Unable to parse server id `{ $server }`.
+error: procedure exception - invalid server id argument to checkConnectivity. Unable to parse server id `{ <<server>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N09.adoc b/modules/ROOT/pages/errors/gql-errors/52N09.adoc
index db0cc078..865a5684 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N09.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N09.adoc
@@ -1,4 +1,11 @@
 = 52N09
 
 == Status description
-error: procedure exception - procedure execution database error. Execution of the procedure `{ $proc }` failed due to a database error.
+error: procedure exception - procedure execution database error. Execution of the procedure `{ <<proc>> }` failed due to a database error.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N10.adoc b/modules/ROOT/pages/errors/gql-errors/52N10.adoc
index 68fb0e59..8742761d 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N10.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N10.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: procedure exception - invalid address key. An address key is included in the query string provided to the GetRoutingTableProcedure, but its value could not be parsed.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N11.adoc b/modules/ROOT/pages/errors/gql-errors/52N11.adoc
index 15798d97..ddcacf29 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N11.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N11.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: procedure exception - generic topology procedure error. An unexpected error has occurred. Please refer to the server's debug log for more information.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N12.adoc b/modules/ROOT/pages/errors/gql-errors/52N12.adoc
index 598a4ddf..237dd417 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N12.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N12.adoc
@@ -1,4 +1,11 @@
 = 52N12
 
 == Status description
-error: procedure exception - cannot change default database. The previous default database `{ $db }` is still running.
+error: procedure exception - cannot change default database. The previous default database `{ <<db>> }` is still running.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N13.adoc b/modules/ROOT/pages/errors/gql-errors/52N13.adoc
index 2eea36ad..45d5e208 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N13.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N13.adoc
@@ -1,4 +1,11 @@
 = 52N13
 
 == Status description
-error: procedure exception - new default database does not exist. New default database `{ $db }` does not exist.
+error: procedure exception - new default database does not exist. New default database `{ <<db>> }` does not exist.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N14.adoc b/modules/ROOT/pages/errors/gql-errors/52N14.adoc
index 5249cb7b..6021d98e 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N14.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N14.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: procedure exception - system cannot be default database. System database cannot be set as default.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N16.adoc b/modules/ROOT/pages/errors/gql-errors/52N16.adoc
index e2e9d3ad..491dc0a5 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N16.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N16.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: procedure exception - invalid procedure argument list. Invalid arguments to procedure.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N17.adoc b/modules/ROOT/pages/errors/gql-errors/52N17.adoc
index 70d8c822..8c96ff05 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N17.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N17.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: procedure exception - quarantine change failed. Setting/removing the quarantine marker failed.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N18.adoc b/modules/ROOT/pages/errors/gql-errors/52N18.adoc
index e655f77a..88290420 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N18.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N18.adoc
@@ -1,4 +1,11 @@
 = 52N18
 
 == Status description
-error: procedure exception - too many seeders. The number of seeding servers `{ $countSeeders }` is larger than the defined number of allocations `{ $countAllocs }`.
+error: procedure exception - too many seeders. The number of seeding servers `{ <<countSeeders>> }` is larger than the defined number of allocations `{ <<countAllocs>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N19.adoc b/modules/ROOT/pages/errors/gql-errors/52N19.adoc
index 8cfb5f3a..7857475c 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N19.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N19.adoc
@@ -1,4 +1,11 @@
 = 52N19
 
 == Status description
-error: procedure exception - no such seeder. The specified seeding server with id `{ $server }` was not found. Verify that the spelling is correct.
+error: procedure exception - no such seeder. The specified seeding server with id `{ <<server>> }` was not found. Verify that the spelling is correct.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N22.adoc b/modules/ROOT/pages/errors/gql-errors/52N22.adoc
index d0fef701..448cd923 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N22.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N22.adoc
@@ -2,4 +2,13 @@
 
 
 == Status description
-error: procedure exception - invalid procedure argument. Invalid argument `{ $field }` for `{ $procParam }` on procedure `{ $proc }`. The expected format of `{ $procParam }` is `{ $procParamFmt }`.
\ No newline at end of file
+error: procedure exception - invalid procedure argument. Invalid argument `{ <<field>> }` for `{ <<procParam>> }` on procedure `{ <<proc>> }`. The expected format of `{ <<procParam>> }` is `{ <<procParamFmt>> }`.
+
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N23.adoc b/modules/ROOT/pages/errors/gql-errors/52N23.adoc
index 15f7a4a5..e3567555 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N23.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N23.adoc
@@ -1,4 +1,11 @@
 = 52N23
 
 == Status description
-error: procedure exception - non-reloadable namespace. The following namespaces are not reloadable: `{ $namespaceList }`
+error: procedure exception - non-reloadable namespace. The following namespaces are not reloadable: `{ <<namespaceList>> }`
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N25.adoc b/modules/ROOT/pages/errors/gql-errors/52N25.adoc
index dec17af6..7365f25a 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N25.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N25.adoc
@@ -1,4 +1,11 @@
 = 52N25
 
 == Status description
-error: procedure exception - JMX error. JMX error while accessing `{ $param }`. See logs for more information.
+error: procedure exception - JMX error. JMX error while accessing `{ <<param>> }`. See logs for more information.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N29.adoc b/modules/ROOT/pages/errors/gql-errors/52N29.adoc
index 60d8daba..ddcf03eb 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N29.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N29.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: procedure exception - outdated change identifier. Given ChangeIdentifier describes a transaction that occurred before any enrichment records exist.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N30.adoc b/modules/ROOT/pages/errors/gql-errors/52N30.adoc
index faffa60f..46771f9c 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N30.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N30.adoc
@@ -2,3 +2,10 @@
 
 == Status description
 error: procedure exception - future change identifier. Given ChangeIdentifier describes a transaction that hasn't yet occurred.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N31.adoc b/modules/ROOT/pages/errors/gql-errors/52N31.adoc
index 78c3342b..38a08cb4 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N31.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N31.adoc
@@ -1,4 +1,11 @@
 = 52N31
 
 == Status description
-error: procedure exception - wrong database. Change identifier `{ $param }` does not belong to this database.
+error: procedure exception - wrong database. Change identifier `{ <<param>> }` does not belong to this database.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N32.adoc b/modules/ROOT/pages/errors/gql-errors/52N32.adoc
index 499ced95..aee91aa9 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N32.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N32.adoc
@@ -1,4 +1,11 @@
 = 52N32
 
 == Status description
-error: procedure exception - invalid sequence number. Change identifier `{ $param1 }` has an invalid sequence number `{ $param2 }`.
+error: procedure exception - invalid sequence number. Change identifier `{ <<param>>1 }` has an invalid sequence number `{ $param2 }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N33.adoc b/modules/ROOT/pages/errors/gql-errors/52N33.adoc
index c8baf9d3..aa05ecc5 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N33.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N33.adoc
@@ -1,4 +1,11 @@
 = 52N33
 
 == Status description
-error: procedure exception - procedure invocation failed. Failed to invoke procedure/function `{ $sig }` caused by: `{ $msg }`.
+error: procedure exception - procedure invocation failed. Failed to invoke procedure/function `{ <<sig>> }` caused by: `{ <<msg>> }`.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N34.adoc b/modules/ROOT/pages/errors/gql-errors/52N34.adoc
index b022bb98..88684a8e 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N34.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N34.adoc
@@ -1,4 +1,11 @@
 = 52N34
 
 == Status description
-error: procedure exception - procedure sandboxed. `{ $sig }` is unavailable because it is sandboxed. Sandboxing is controlled by the dbms.security.procedures.unrestricted setting. Only un-restrict procedures you can trust with access to database internals.
+error: procedure exception - procedure restricted. `{ <<fun>> }` is restricted and accesses database internals. Procedure restriction is controlled by the dbms.security.procedures.unrestricted setting. Only un-restrict procedures you can trust with access to database internals.
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N35.adoc b/modules/ROOT/pages/errors/gql-errors/52N35.adoc
index 583dbb3d..587e4049 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N35.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N35.adoc
@@ -1,4 +1,11 @@
 = 52N35
 
 == Status description
-error: procedure exception - procedure compilation failed. Failed to compile procedure defined in `{ $procClass }`: `{ $msg }`
+error: procedure exception - procedure compilation failed. Failed to compile procedure defined in `{ <<procClass>> }`: `{ <<msg>> }`
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N36.adoc b/modules/ROOT/pages/errors/gql-errors/52N36.adoc
index 2c117b16..dc6b90b2 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N36.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N36.adoc
@@ -2,4 +2,10 @@
 
 
 == Status description
-error: procedure exception - invalid procedure argument with API documentation hint. Invalid argument `{ $field }` for `{ $procParam }` on procedure `{ $proc }`. The expected format of `{ $procParam }` is outlined in the `{ $procParamFmt }` API documentation.
\ No newline at end of file
+error: procedure exception - invalid procedure argument with API documentation hint. Invalid argument `{ <<field>> }` for `{ <<procParam>> }` on procedure `{ <<proc>> }`. The expected format of `{ <<procParam>> }` is outlined in the `{ <<procParamFmt>> }` API documentation.
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N37.adoc b/modules/ROOT/pages/errors/gql-errors/52N37.adoc
index c0bf7aa9..7529d2cf 100644
--- a/modules/ROOT/pages/errors/gql-errors/52N37.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52N37.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: procedure exception - procedure execution error. Execution of the procedure `{ $proc } ` failed.
\ No newline at end of file
+error: procedure exception - procedure execution error. Execution of the procedure `{ <<proc>> }` ` failed.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52U00.adoc b/modules/ROOT/pages/errors/gql-errors/52U00.adoc
index 794ff5ae..e5d9049b 100644
--- a/modules/ROOT/pages/errors/gql-errors/52U00.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/52U00.adoc
@@ -2,4 +2,10 @@
 
 
 == Status description
-error: procedure exception - custom procedure execution error cause. Execution of the procedure `{ $proc }` failed due to `{ $msgTitle }`: { $msg }.
\ No newline at end of file
+error: procedure exception - custom procedure execution error cause. Execution of the procedure `{ <<proc>> }` failed due to `{ <<msgTitle>> }`: `{ <<msg>> }`.
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/53N34.adoc b/modules/ROOT/pages/errors/gql-errors/53N34.adoc
index 0db3a377..6939f106 100644
--- a/modules/ROOT/pages/errors/gql-errors/53N34.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/53N34.adoc
@@ -2,4 +2,12 @@
 
 
 == Status description
-error: function exception - function restricted. `{ $fun }` is restricted and accesses database internals. User-defined function restriction is controlled by the `dbms.security.procedures.unrestricted` setting. Only un-restrict user-defined functions you can trust with access to database internals.
\ No newline at end of file
+error: function exception - function restricted. `{ <<fun>> }` is restricted and accesses database internals. User-defined function restriction is controlled by the `dbms.security.procedures.unrestricted` setting. Only un-restrict user-defined functions you can trust with access to database internals.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/53N35.adoc b/modules/ROOT/pages/errors/gql-errors/53N35.adoc
index 67c802f9..20062cba 100644
--- a/modules/ROOT/pages/errors/gql-errors/53N35.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/53N35.adoc
@@ -2,4 +2,10 @@
 
 
 == Status description
-error: function exception - function compilation failed. Failed to compile function defined in `{ $funClass }`: { $msg }
\ No newline at end of file
+error: function exception - function compilation failed. Failed to compile function defined in `{ <<funClass>> }`: `{ <<msg>> }`
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/53N37.adoc b/modules/ROOT/pages/errors/gql-errors/53N37.adoc
index a4795172..9732e226 100644
--- a/modules/ROOT/pages/errors/gql-errors/53N37.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/53N37.adoc
@@ -2,4 +2,10 @@
 
 
 == Status description
-error: function exception - function execution error. Execution of the function `{ $fun }` failed.
\ No newline at end of file
+error: function exception - function execution error. Execution of the function `{ <<fun>> }` failed.
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/53U00.adoc b/modules/ROOT/pages/errors/gql-errors/53U00.adoc
index 666066f3..dbea11fb 100644
--- a/modules/ROOT/pages/errors/gql-errors/53U00.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/53U00.adoc
@@ -2,4 +2,10 @@
 
 
 == Status description
-error: function exception - custom function execution error cause. Execution of the function `{ $fun }` failed due to `{ $msgTitle }`: { $msg }.
\ No newline at end of file
+error: function exception - custom function execution error cause. Execution of the function `{ <<fun>> }` failed due to `{ <<msgTitle>> }`: `{ <<msg>> }`.
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/index.adoc b/modules/ROOT/pages/errors/gql-errors/index.adoc
index 5660c4fe..e693a878 100644
--- a/modules/ROOT/pages/errors/gql-errors/index.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/index.adoc
@@ -27,25 +27,25 @@ Status description:: error: connection exception - transaction resolution unknow
 
 === xref:errors/gql-errors/08N00.adoc[08N00]
 
-Status description:: error: connection exception - unable to connect to database. Unable to connect to database `{ $db }`. Unable to get bolt address of the leader. Check the status of the database. Retrying your request at a later time may succeed.
+Status description:: error: connection exception - unable to connect to database. Unable to connect to database `{ <<db>> }`. Unable to get bolt address of the leader. Check the status of the database. Retrying your request at a later time may succeed.
 
 
 === xref:errors/gql-errors/08N01.adoc[08N01]
 
-Status description:: error: connection exception - unable to write to database. Unable to write to database `{ $db }` on this server. Server-side routing is disabled. Either connect to the database leader directly or enable server-side routing by setting '{ $cfgSetting }=true'.
+Status description:: error: connection exception - unable to write to database. Unable to write to database `{ <<db>> }` on this server. Server-side routing is disabled. Either connect to the database leader directly or enable server-side routing by setting `{ <<cfgSetting>> }=true`.
 
 
 === xref:errors/gql-errors/08N02.adoc[08N02]
 
-Status description:: error: connection exception - unable to connect to database. Unable to connect to database `{ $db }`. Server-side routing is disabled. Either connect to `{ $db }` directly, or enable server-side routing by setting '{ $cfgSetting }=true'.
+Status description:: error: connection exception - unable to connect to database. Unable to connect to database `{ <<db>> }`. Server-side routing is disabled. Either connect to `{ $db }` directly, or enable server-side routing by setting `{ <<cfgSetting>> }=true`.
 
 === xref:errors/gql-errors/08N03.adoc[08N03]
 
-Status description:: error: connection exception - failed to write to graph. Failed to write to graph `{ $graph }`. Check the defined access mode in both driver and database.
+Status description:: error: connection exception - failed to write to graph. Failed to write to graph `{ <<graph>> }`. Check the defined access mode in both driver and database.
 
 === xref:errors/gql-errors/08N04.adoc[08N04]
 
-Status description:: error: unable to route use clause. Routing with `{ $clause }` is not supported in embedded sessions. Connect to the database directly or try running the query using a Neo4j driver or the HTTP API.
+Status description:: error: unable to route use clause. Routing with `{ <<clause>> }` is not supported in embedded sessions. Connect to the database directly or try running the query using a Neo4j driver or the HTTP API.
 
 === xref:errors/gql-errors/08N05.adoc[08N05]
 
@@ -65,11 +65,11 @@ Status description:: error: connection exception - database is read only. This d
 
 === xref:errors/gql-errors/08N09.adoc[08N09]
 
-Status description:: error: connection exception - database unavailable. The database `{ $db }` is currently unavailable. Check the database status. Retry your request at a later time.
+Status description:: error: connection exception - database unavailable. The database `{ <<db>> }` is currently unavailable. Check the database status. Retry your request at a later time.
 
 === xref:errors/gql-errors/08N10.adoc[08N10]
 
-Status description:: error: connection exception - invalid server state. Message `{ $msg }` cannot be handled by session in the `{ $boltServerState }` state.
+Status description:: error: connection exception - invalid server state. Message `{ <<msg>> }` cannot be handled by session in the `{ <<boltServerState>> }` state.
 
 === xref:errors/gql-errors/08N11.adoc[08N11]
 
@@ -81,27 +81,27 @@ Status description:: error: connection exception - failed to parse bookmark. Fai
 
 === xref:errors/gql-errors/08N13.adoc[08N13]
 
-Status description:: error: connection exception - database not up to requested bookmark. The database `{ $db }` is not up to the requested bookmark `{ $transactionId1 }`. The latest transaction ID is `{ $transactionId2 }`.
+Status description:: error: connection exception - database not up to requested bookmark. The database `{ <<db>> }` is not up to the requested bookmark `{ <<transactionId>>1 }`. The latest transaction ID is `{ $transactionId2 }`.
 
 === xref:errors/gql-errors/08N14.adoc[08N14]
 
-Status description:: error: connection exception - alias chains are not permitted. Unable to provide a routing table for the database identifed by the alias `{ $alias1 }` because the request comes from another alias `{ $alias2 }` and alias chains are not permitted.
+Status description:: error: connection exception - alias chains are not permitted. Unable to provide a routing table for the database identifed by the alias `{ <<alias>>1 }` because the request comes from another alias `{ $alias2 }` and alias chains are not permitted.
 
 === xref:errors/gql-errors/08N15.adoc[08N15]
 
-Status description:: error: connection exception - no such routing policy. Policy definition of the routing policy `{ $routingPolicy }` could not be found. Verify that the spelling is correct.
+Status description:: error: connection exception - no such routing policy. Policy definition of the routing policy `{ <<routingPolicy>> }` could not be found. Verify that the spelling is correct.
 
 === xref:errors/gql-errors/08N16.adoc[08N16]
 
-Status description:: error: connection exception - general driver client error. Remote execution failed with message `{ $msg }`.
+Status description:: error: connection exception - general driver client error. Remote execution failed with message `{ <<msg>> }`.
 
 === xref:errors/gql-errors/08N17.adoc[08N17]
 
-Status description:: error: connection exception - general driver transient error. Remote execution failed with message `{ $msg }`.
+Status description:: error: connection exception - general driver transient error. Remote execution failed with message `{ <<msg>> }`.
 
 === xref:errors/gql-errors/08N18.adoc[08N18]
 
-Status description:: error: connection exception - general driver database error. Remote execution failed with message `{ $msg }`.
+Status description:: error: connection exception - general driver database error. Remote execution failed with message `{ <<msg>> }`.
 
 [[data-exceptions]]
 == Data exceptions
@@ -115,7 +115,7 @@ Status description:: error: data exception
 
 === xref:errors/gql-errors/22003.adoc[22003]
 
-Status description:: error: data exception - numeric value out of range. The numeric value `{ $value }` is outside the required range.
+Status description:: error: data exception - numeric value out of range. The numeric value `{ <<value>> }` is outside the required range.
 
 === xref:errors/gql-errors/22007.adoc[22007]
 
@@ -140,51 +140,51 @@ Status description:: error: data exception - unsupported value. The provided val
 === xref:errors/gql-errors/22N01.adoc[22N01]
 
 Status description:: error: data exception - invalid type.
-Expected the value `{ $value }` to be of type `{ $valueTypeList }`, but was of type `{ $valueType }`.
+Expected the value `{ <<value>> }` to be of type `{ <<valueTypeList>> }`, but was of type `{ <<valueType>> }`.
 
 === xref:errors/gql-errors/22N02.adoc[22N02]
 
-Status description:: error: data exception - specified negative numeric value. Expected `{ $option }` to be a positive number but found `{ $value }` instead.
+Status description:: error: data exception - specified negative numeric value. Expected `{ <<option>> }` to be a positive number but found `{ <<value>> }` instead.
 
 === xref:errors/gql-errors/22N03.adoc[22N03]
 
-Status description:: error: data exception - specified numeric value out of range. Expected `{ $component }` to be of type `{ $valueType }` and in the range `{ $lower }`  to `{ $upper }` but found `{ $value }`.
+Status description:: error: data exception - specified numeric value out of range. Expected `{ <<component>> }` to be of type `{ <<valueType>> }` and in the range `{ <<lower>> }`  to `{ <<upper>> }` but found `{ <<value>> }`.
 
 === xref:errors/gql-errors/22N04.adoc[22N04]
 
-Status description:: error: data exception - invalid input value. Invalid input `{ $input }` for `{ $context }`. Expected `{ $inputList }`.
+Status description:: error: data exception - invalid input value. Invalid input `{ <<input>> }` for `{ <<context>> }`. Expected `{ <<inputList>> }`.
 
 === xref:errors/gql-errors/22N05.adoc[22N05]
 
-Status description:: error: data exception - input failed validation. Invalid input `{ $input }` for `{ $context }`.
+Status description:: error: data exception - input failed validation. Invalid input `{ <<input>> }` for `{ <<context>> }`.
 
 === xref:errors/gql-errors/22N06.adoc[22N06]
 
-Status description:: error: data exception - empty input string. Invalid input. `{ $option }` needs to be specified.
+Status description:: error: data exception - empty input string. Invalid input. `{ <<option>> }` needs to be specified.
 
 === xref:errors/gql-errors/22N07.adoc[22N07]
 
-Status description:: error: data exception - invalid pre-parser option key. Invalid pre-parser option(s): `{ $optionList }`.
+Status description:: error: data exception - invalid pre-parser option key. Invalid pre-parser option(s): `{ <<optionList>> }`.
 
 === xref:errors/gql-errors/22N08.adoc[22N08]
 
-Status description:: error: data exception - invalid pre-parser combination. Invalid pre-parser option, cannot combine `{ $option1 }` with `{ $option2 }`.
+Status description:: error: data exception - invalid pre-parser combination. Invalid pre-parser option, cannot combine `{ <<option>>1 }` with `{ $option2 }`.
 
 === xref:errors/gql-errors/22N09.adoc[22N09]
 
-Status description:: error: data exception - conflicting pre-parser combination. Invalid pre-parser option, cannot specify multiple conflicting values for `{ $option }`.
+Status description:: error: data exception - conflicting pre-parser combination. Invalid pre-parser option, cannot specify multiple conflicting values for `{ <<option>> }`.
 
 === xref:errors/gql-errors/22N10.adoc[22N10]
 
-Status description:: error: data exception - invalid pre-parser option value. Invalid pre-parser option, specified `{ $input }` is not valid for option `{ $option }`. Valid options are: `{ $optionList }`.
+Status description:: error: data exception - invalid pre-parser option value. Invalid pre-parser option, specified `{ <<input>> }` is not valid for option `{ <<option>> }`. Valid options are: `{ <<optionList>> }`.
 
 === xref:errors/gql-errors/22N11.adoc[22N11]
 
-Status description:: error: data exception - invalid argument. Invalid argument: cannot process `{ $input }`.
+Status description:: error: data exception - invalid argument. Invalid argument: cannot process `{ <<input>> }`.
 
 === xref:errors/gql-errors/22N12.adoc[22N12]
 
-Status description:: error: data exception - invalid date, time, or datetime format. Invalid argument: cannot process `{ $input }`.
+Status description:: error: data exception - invalid date, time, or datetime format. Invalid argument: cannot process `{ <<input>> }`.
 
 === xref:errors/gql-errors/22N13.adoc[22N13]
 
@@ -192,15 +192,15 @@ Status description:: error: data exception - invalid time zone. Specified time z
 
 === xref:errors/gql-errors/22N14.adoc[22N14]
 
-Status description:: error: data exception - invalid temporal value combination. Cannot select both `{ $temporal1 }` and `{ $temporal2 }`.
+Status description:: error: data exception - invalid temporal value combination. Cannot select both `{ <<temporal>>1 }` and `{ $temporal2 }`.
 
 === xref:errors/gql-errors/22N15.adoc[22N15]
 
-Status description:: error: data exception - invalid temporal component. Cannot read the specified `{ $component }` component from `{ $temporal }`.
+Status description:: error: data exception - invalid temporal component. Cannot read the specified `{ <<component>> }` component from `{ <<temporal>> }`.
 
 === xref:errors/gql-errors/22N18.adoc[22N18]
 
-Status description:: error: data exception - incomplete spatial value. A `{ $crs }` POINT must contain `{ $mapKeyList }`.
+Status description:: error: data exception - incomplete spatial value. A `{ <<crs>> }` POINT must contain `{ <<mapKeyList>> }`.
 
 === xref:errors/gql-errors/22N19.adoc[22N19]
 
@@ -208,11 +208,11 @@ Status description:: error: data exception - invalid spatial value. A `POINT` mu
 
 === xref:errors/gql-errors/22N20.adoc[22N20]
 
-Status description:: error: data exception - invalid spatial value dimensions. Cannot create POINT with `{ $dim1 }D` coordinate reference system (CRS) and `{ $value }` coordinates. Use the equivalent `{ $dim2 }D` coordinate reference system instead.
+Status description:: error: data exception - invalid spatial value dimensions. Cannot create POINT with `{ <<dim>>1D }` coordinate reference system (CRS) and `{ <<value>> }` coordinates. Use the equivalent `{ $dim2D }` coordinate reference system instead.
 
 === xref:errors/gql-errors/22N21.adoc[22N21]
 
-Status description:: error: data exception - unsupported coordinate reference system. Unsupported coordinate reference system (CRS): `{ $crs }`.
+Status description:: error: data exception - unsupported coordinate reference system. Unsupported coordinate reference system (CRS): `{ <<crs>> }`.
 
 === xref:errors/gql-errors/22N22.adoc[22N22]
 
@@ -220,15 +220,15 @@ Status description:: error: data exception - invalid spatial value combination.
 
 === xref:errors/gql-errors/22N23.adoc[22N23]
 
-Status description:: error: data exception - invalid latitude value. Cannot create WGS84 POINT with invalid coordinate: `{ $coordinates }`. The valid range for the latitude coordinate is [-90, 90].
+Status description:: error: data exception - invalid latitude value. Cannot create WGS84 POINT with invalid coordinate: `{ <<coordinates>> }`. The valid range for the latitude coordinate is [-90, 90].
 
 === xref:errors/gql-errors/22N24.adoc[22N24]
 
-Status description:: error: data exception - invalid coordinate arguments. Cannot construct a `{ $valueType }` from `{ $coordinates }`.
+Status description:: error: data exception - invalid coordinate arguments. Cannot construct a `{ <<valueType>> }` from `{ <<coordinates>> }`.
 
 === xref:errors/gql-errors/22N25.adoc[22N25]
 
-Status description:: error: data exception - invalid temporal arguments. Cannot construct a `{ $valueType }` from `{ $temporal }`.
+Status description:: error: data exception - invalid temporal arguments. Cannot construct a `{ <<valueType>> }` from `{ <<temporal>> }`.
 
 === xref:errors/gql-errors/22N26.adoc[22N26]
 
@@ -236,11 +236,11 @@ Status description:: error: data exception - unsupported rounding mode. Unknown
 
 === xref:errors/gql-errors/22N27.adoc[22N27]
 
-Status description:: error: data exception - invalid entity type. Invalid input `{ $input }` for `{ $context }`. Expected to be `{ $valueTypeList }`.
+Status description:: error: data exception - invalid entity type. Invalid input `{ <<input>> }` for `{ <<context>> }`. Expected to be `{ <<valueTypeList>> }`.
 
 === xref:errors/gql-errors/22N28.adoc[22N28]
 
-Status description:: error: data exception - overflow error. The result of the operation `{ $operation }` has caused an overflow.
+Status description:: error: data exception - overflow error. The result of the operation `{ <<operation>> }` has caused an overflow.
 
 === xref:errors/gql-errors/22N31.adoc[22N31]
 
@@ -252,39 +252,39 @@ Status description:: error: data exception - non-deterministic sort expression.
 
 === xref:errors/gql-errors/22N33.adoc[22N33]
 
-Status description:: error: data exception - invalid shortest path expression. Shortest path expressions must contain start and end nodes. Cannot find: `{ $variable }`.
+Status description:: error: data exception - invalid shortest path expression. Shortest path expressions must contain start and end nodes. Cannot find: `{ <<variable>> }`.
 
 === xref:errors/gql-errors/22N35.adoc[22N35]
 
-Status description:: error: data exception - invalid date format. Cannot parse `{ $input }` as a DATE. Calendar dates need to be specified using the format 'YYYY-MM', while ordinal dates need to be specified using the format 'YYYY-DDD'.
+Status description:: error: data exception - invalid date format. Cannot parse `{ <<input>> }` as a DATE. Calendar dates need to be specified using the format 'YYYY-MM', while ordinal dates need to be specified using the format 'YYYY-DDD'.
 
 === xref:errors/gql-errors/22N36.adoc[22N36]
 
-Status description:: error: data exception - invalid temporal format. Cannot parse `{ $input }` as a `{ $valueType }`.
+Status description:: error: data exception - invalid temporal format. Cannot parse `{ <<input>> }` as a `{ <<valueType>> }`.
 
 === xref:errors/gql-errors/22N37.adoc[22N37]
 
-Status description:: error: data exception - invalid coercion. Cannot coerce `{ $value }` to `{ $valueType }`.
+Status description:: error: data exception - invalid coercion. Cannot coerce `{ <<value>> }` to `{ <<valueType>> }`.
 
 === xref:errors/gql-errors/22N38.adoc[22N38]
 
-Status description:: error: data exception - invalid function argument. Invalid argument to the function `{ $fun }`.
+Status description:: error: data exception - invalid function argument. Invalid argument to the function `{ <<fun>> }`.
 
 === xref:errors/gql-errors/22N39.adoc[22N39]
 
-Status description:: error: data exception - unsupported property value type. Value `{ $value }` cannot be stored in properties.
+Status description:: error: data exception - unsupported property value type. Value `{ <<value>> }` cannot be stored in properties.
 
 === xref:errors/gql-errors/22N41.adoc[22N41]
 
-Status description:: error: data exception - merge node uniqueness constraint violation. The 'MERGE' clause did not find a matching node `{ $variable }` and cannot create a new node due to conflicts with existing uniqueness constraints.
+Status description:: error: data exception - merge node uniqueness constraint violation. The 'MERGE' clause did not find a matching node `{ <<variable>> }` and cannot create a new node due to conflicts with existing uniqueness constraints.
 
 === xref:errors/gql-errors/22N42.adoc[22N42]
 
-Status description:: error: data exception - merge relationship uniqueness constraint violation. The 'MERGE' clause did not find a matching relationship `{ $variable }` and cannot create a new relationship due to conflicts with existing uniqueness constraints.
+Status description:: error: data exception - merge relationship uniqueness constraint violation. The 'MERGE' clause did not find a matching relationship `{ <<variable>> }` and cannot create a new relationship due to conflicts with existing uniqueness constraints.
 
 === xref:errors/gql-errors/22N43.adoc[22N43]
 
-Status description:: error: data exception - unable to load external resource. Could not load external resource from `{ $url }`.
+Status description:: error: data exception - unable to load external resource. Could not load external resource from `{ <<url>> }`.
 
 === xref:errors/gql-errors/22N44.adoc[22N44]
 
@@ -300,7 +300,7 @@ Status description:: error: data exception - invalid parallel runtime configurat
 
 === xref:errors/gql-errors/22N48.adoc[22N48]
 
-Status description:: error: data exception - unable to use specified runtime. Cannot use the specified runtime { $runtime } due to { $cause } not being supported. Use another runtime.
+Status description:: error: data exception - unable to use specified runtime. Cannot use the specified runtime `{ <<runtime>> }` due to `{ <<cause>> }` not being supported. Use another runtime.
 
 === xref:errors/gql-errors/22N49.adoc[22N49]
 
@@ -308,7 +308,7 @@ Status description:: error: data exception - CSV buffer size overflow. Cannot re
 
 === xref:errors/gql-errors/22N51.adoc[22N51]
 
-Status description:: error: data exception - database or alias does not exist. A [composite] database or alias with the name `{ $db }` does not exist. Verify that the spelling is correct.
+Status description:: error: data exception - database or alias does not exist. A [composite] database or alias with the name `{ <<db>> }` does not exist. Verify that the spelling is correct.
 
 === xref:errors/gql-errors/22N52.adoc[22N52]
 
@@ -320,31 +320,31 @@ Status description:: error: data exception - invalid use of PROFILE. Cannot 'PRO
 
 === xref:errors/gql-errors/22N54.adoc[22N54]
 
-Status description:: error: data exception - invalid map. Multiple conflicting entries specified for `{ $mapKey }`.
+Status description:: error: data exception - invalid map. Multiple conflicting entries specified for `{ <<mapKey>> }`.
 
 === xref:errors/gql-errors/22N56.adoc[22N56]
 
-Status description:: error: data exception - protocol message length limit overflow. Protocol message length limit exceeded (limit: `{ $boltMsgLenLimit }`).
+Status description:: error: data exception - protocol message length limit overflow. Protocol message length limit exceeded (limit: `{ <<boltMsgLenLimit>> }`).
 
 === xref:errors/gql-errors/22N58.adoc[22N58]
 
-Status description:: error: data exception - invalid spatial component. Cannot read the specified `{ $component }` component from `{ $value }`.
+Status description:: error: data exception - invalid spatial component. Cannot read the specified `{ <<component>> }` component from `{ <<value>> }`.
 
 === xref:errors/gql-errors/22N64.adoc[22N64]
 
-Status description:: error: data exception - constraint does not exist. The constraint `{ $constrDescrOrName }` does not exist.
+Status description:: error: data exception - constraint does not exist. The constraint `{ <<constrDescrOrName>> }` does not exist.
 
 === xref:errors/gql-errors/22N65.adoc[22N65]
 
-Status description:: error: data exception - equivalent constraint already exists. An equivalent constraint already exists: `{ $constrDescrOrName }`.
+Status description:: error: data exception - equivalent constraint already exists. An equivalent constraint already exists: `{ <<constrDescrOrName>> }`.
 
 === xref:errors/gql-errors/22N66.adoc[22N66]
 
-Status description:: error: data exception - conflicting constraint already exists. A conflicting constraint already exists: `{ $constrDescrOrName }`.
+Status description:: error: data exception - conflicting constraint already exists. A conflicting constraint already exists: `{ <<constrDescrOrName>> }`.
 
 === xref:errors/gql-errors/22N67.adoc[22N67]
 
-Status description:: error: data exception - duplicated constraint name. A constraint with the same name already exists: `{ $constr }`.
+Status description:: error: data exception - duplicated constraint name. A constraint with the same name already exists: `{ <<constr>> }`.
 
 === xref:errors/gql-errors/22N68.adoc[22N68]
 
@@ -352,63 +352,63 @@ Status description:: error: data exception - dependent constraint managed indivi
 
 === xref:errors/gql-errors/22N69.adoc[22N69]
 
-Status description:: error: data exception - index does not exist. The index specified by `{ $idxDescrOrName }` does not exist.
+Status description:: error: data exception - index does not exist. The index specified by `{ <<idxDescrOrName>> }` does not exist.
 
 === xref:errors/gql-errors/22N70.adoc[22N70]
 
-Status description:: error: data exception - equivalent index already exists. An equivalent index already exists: `{ $idxDescrOrName }`.
+Status description:: error: data exception - equivalent index already exists. An equivalent index already exists: `{ <<idxDescrOrName>> }`.
 
 === xref:errors/gql-errors/22N71.adoc[22N71]
 
-Status description:: error: data exception - index with the same name already exists. An index with the same name already exists: `{ $idx }`.
+Status description:: error: data exception - index with the same name already exists. An index with the same name already exists: `{ <<idx>> }`.
 
 === xref:errors/gql-errors/22N73.adoc[22N73]
 
-Status description:: error: data exception - constraint conflicts with existing index. Constraint conflicts with already existing index `{ $idxDescrOrName }`.
+Status description:: error: data exception - constraint conflicts with existing index. Constraint conflicts with already existing index `{ <<idxDescrOrName>> }`.
 
 === xref:errors/gql-errors/22N74.adoc[22N74]
 
-Status description:: error: data exception - index conflicts with existing constraint. An index that belongs to the constraint `{ $constr }` contains a conflicting index.
+Status description:: error: data exception - index conflicts with existing constraint. An index that belongs to the constraint `{ <<constr>> }` contains a conflicting index.
 
 === xref:errors/gql-errors/22N75.adoc[22N75]
 
-Status description:: error: data exception - constraint contains duplicated tokens. The constraint specified by `{ $constrDescrOrName }` includes a label, relationship type, or property key with name `{ $token }` more than once.
+Status description:: error: data exception - constraint contains duplicated tokens. The constraint specified by `{ <<constrDescrOrName>> }` includes a label, relationship type, or property key with name `{ <<token>> }` more than once.
 
 === xref:errors/gql-errors/22N76.adoc[22N76]
 
-Status description:: error: data exception - index contains duplicated tokens. The index specified by `{ $idxDescrOrName }` includes a label, relationship type, or property key with name `{ $token }` more than once.
+Status description:: error: data exception - index contains duplicated tokens. The index specified by `{ <<idxDescrOrName>> }` includes a label, relationship type, or property key with name `{ <<token>> }` more than once.
 
 === xref:errors/gql-errors/22N77.adoc[22N77]
 
-Status description:: error: data exception - property presence verification failed. `{ $entityType }` (`{ $entityId }`) with `{ $tokenType }` `{ $token }` must have the following properties: `{ $propKeyList }`.
+Status description:: error: data exception - property presence verification failed. `{ <<entityType>> }` (`{ <<entityId>> }`) with `{ <<tokenType>> }` `{ <<token>> }` must have the following properties: `{ <<propKeyList>> }`.
 
 === xref:errors/gql-errors/22N78.adoc[22N78]
 
-Status description:: error: data exception - property type verification failed. `{ $entityType }` (`{ $entityId }`) with `{ $tokenType }` `{ $token }` must have the property `$propKey` with value type `{ $valueType }`.
+Status description:: error: data exception - property type verification failed. `{ <<entityType>> }` (`{ <<entityId>> }`) with `{ <<tokenType>> }` `{ <<token>> }` must have the property `{ <<propKey>> }` with value type `{ <<valueType>> }`.
 
 === xref:errors/gql-errors/22N79.adoc[22N79]
 
-Status description:: error: data exception - property uniqueness constraint violated. Property uniqueness constraint violated: `{ $reasonList }`.
+Status description:: error: data exception - property uniqueness constraint violated. Property uniqueness constraint violated: `{ <<reasonList>> }`.
 
 === xref:errors/gql-errors/22N80.adoc[22N80]
 
-Status description:: error: data exception - index entry conflict. Index entry conflict: `{ $value }`.
+Status description:: error: data exception - index entry conflict. Index entry conflict: `{ <<value>> }`.
 
 === xref:errors/gql-errors/22N81.adoc[22N81]
 
-Status description:: error: data exception - expression type unsupported here. Invalid input: `{ $exprType }` is not supported in `{ $context }`.
+Status description:: error: data exception - expression type unsupported here. Invalid input: `{ <<exprType>> }` is not supported in `{ <<context>> }`.
 
 === xref:errors/gql-errors/22N82.adoc[22N82]
 
-Status description:: error: data exception - input contains invalid characters. Input `{ $input }` contains invalid characters for `{ $context }`. Special characters may require that the input is quoted using backticks.
+Status description:: error: data exception - input contains invalid characters. Input `{ <<input>> }` contains invalid characters for `{ <<context>> }`. Special characters may require that the input is quoted using backticks.
 
 === xref:errors/gql-errors/22N84.adoc[22N84]
 
-Status description:: error: data exception - string too long. Expected the string to be no more than `{ $upper }` characters long.
+Status description:: error: data exception - string too long. Expected the string to be no more than `{ <<upper>> }` characters long.
 
 === xref:errors/gql-errors/22N85.adoc[22N85]
 
-Status description:: error: data exception - string too short. Expected the string to be at least `{ $lower }` characters long.
+Status description:: error: data exception - string too short. Expected the string to be at least `{ <<lower>> }` characters long.
 
 === xref:errors/gql-errors/22N86.adoc[22N86]
 
@@ -416,7 +416,7 @@ Status description:: error: data exception - numeric range 0 disallowed. Expecte
 
 === xref:errors/gql-errors/22N88.adoc[22N88]
 
-Status description:: error: data exception - not a valid CIDR IP. `{ $input }` is not a valid CIDR IP.
+Status description:: error: data exception - not a valid CIDR IP. `{ <<input>> }` is not a valid CIDR IP.
 
 === xref:errors/gql-errors/22N89.adoc[22N89]
 
@@ -424,11 +424,11 @@ Status description:: error: data exception - new password cannot be the same as
 
 === xref:errors/gql-errors/22N90.adoc[22N90]
 
-Status description:: error: data exception - property type unsupported in constraint. `{ $item }` is not supported in property type constraints.
+Status description:: error: data exception - property type unsupported in constraint. `{ <<item>> }` is not supported in property type constraints.
 
 === xref:errors/gql-errors/22N91.adoc[22N91]
 
-Status description:: error: data exception - cannot convert alias local to remote or remote to local. Failed to alter the specified database alias `{ $alias }`. Altering remote alias to a local alias or vice versa is not supported. Drop and recreate the alias instead.
+Status description:: error: data exception - cannot convert alias local to remote or remote to local. Failed to alter the specified database alias `{ <<alias>> }`. Altering remote alias to a local alias or vice versa is not supported. Drop and recreate the alias instead.
 
 === xref:errors/gql-errors/22N92.adoc[22N92]
 
@@ -452,15 +452,15 @@ Status description:: error: data exception - mapping JSON exception. Unable to m
 
 === xref:errors/gql-errors/22N97.adoc[22N97]
 
-Status description:: error: data exception - unexpected struct tag. Unexpected struct tag: `{ $value }`.
+Status description:: error: data exception - unexpected struct tag. Unexpected struct tag: `{ <<value>> }`.
 
 === xref:errors/gql-errors/22N98.adoc[22N98]
 
-Status description:: error: data exception - wrong first field during deserialization. Unable to deserialize request. Expected first field to be `{ $field }`, but was '{ $value }'.
+Status description:: error: data exception - wrong first field during deserialization. Unable to deserialize request. Expected first field to be `{ <<field>> }`, but was `{ <<value>> }`.
 
 === xref:errors/gql-errors/22N99.adoc[22N99]
 
-Status description:: error: data exception - wrong token during deserialization. Unable to deserialize request. Expected `{ $token }`, found `{ $value }`.
+Status description:: error: data exception - wrong token during deserialization. Unable to deserialize request. Expected `{ <<token>> }`, found `{ <<value>> }`.
 
 === xref:errors/gql-errors/22NA0.adoc[22NA0]
 
@@ -468,51 +468,51 @@ Status description:: error: data exception - invalid property based access contr
 
 === xref:errors/gql-errors/22NA1.adoc[22NA1]
 
-Status description:: error: data exception - invalid property based access control rule involving non-commutative expressions. The property `{ $propKey }` must appear on the left hand side of the `{ $operation }` operator.
+Status description:: error: data exception - invalid property based access control rule involving non-commutative expressions. The property `{ <<propKey>> }` must appear on the left hand side of the `{ <<operation>> }` operator.
 
 === xref:errors/gql-errors/22NA2.adoc[22NA2]
 
-Status description:: error: data exception - invalid property based access control rule involving multiple properties. The expression: `{ $expr }` is not supported. Property rules can only contain one property.
+Status description:: error: data exception - invalid property based access control rule involving multiple properties. The expression: `{ <<expr>> }` is not supported. Property rules can only contain one property.
 
 === xref:errors/gql-errors/22NA4.adoc[22NA4]
 
-Status description:: error: data exception - invalid property based access control rule involving comparison with NULL. The property value access rule pattern `{ $pred }` always evaluates to 'NULL'.
+Status description:: error: data exception - invalid property based access control rule involving comparison with NULL. The property value access rule pattern `{ <<pred>> }` always evaluates to 'NULL'.
 
 === xref:errors/gql-errors/22NA5.adoc[22NA5]
 
-Status description:: error: data exception - invalid property based access control rule involving IS NULL. The property value access rule pattern `{ $pred }` always evaluates to 'NULL'. Use `IS NULL' instead.
+Status description:: error: data exception - invalid property based access control rule involving IS NULL. The property value access rule pattern `{ <<pred>> }` always evaluates to 'NULL'. Use `IS NULL' instead.
 
 === xref:errors/gql-errors/22NA6.adoc[22NA6]
 
-Status description:: error: data exception - invalid property based access control rule involving IS NOT NULL. The property value access rule pattern `{ $pred }` always evaluates to 'NULL'. Use 'IS NOT NULL' instead.
+Status description:: error: data exception - invalid property based access control rule involving IS NOT NULL. The property value access rule pattern `{ <<pred>> }` always evaluates to 'NULL'. Use 'IS NOT NULL' instead.
 
 === xref:errors/gql-errors/22NA7.adoc[22NA7]
 
-Status description:: error: data exception - invalid property based access control rule involving nontrivial predicates. The expression: `{ $expr }` is not supported. Only single, literal-based predicate expressions are allowed for property-based access control.
+Status description:: error: data exception - invalid property based access control rule involving nontrivial predicates. The expression: `{ <<expr>> }` is not supported. Only single, literal-based predicate expressions are allowed for property-based access control.
 
 === xref:errors/gql-errors/22NA8.adoc[22NA8]
 
-Status description:: error: data exception - parsing JSON failure. Underlying error: `{ $cause }`.
+Status description:: error: data exception - parsing JSON failure. Underlying error: `{ <<cause>> }`.
 
 === xref:errors/gql-errors/22NB0.adoc[22NB0]
 
-Status description:: error: data exception - invalid property based access control rule involving WHERE and IS NULL. The property value access rule pattern `{ $pred }` always evaluates to 'NULL'. Use `WHERE` syntax in combination with `IS NULL` instead.
+Status description:: error: data exception - invalid property based access control rule involving WHERE and IS NULL. The property value access rule pattern `{ <<pred>> }` always evaluates to 'NULL'. Use `WHERE` syntax in combination with `IS NULL` instead.
 
 === xref:errors/gql-errors/22NB1.adoc[22NB1]
 
-Status description:: error: data exception - type mismatch. Type mismatch: expected to be `{ $valueTypeList }` but was `{ $input }`.
+Status description:: error: data exception - type mismatch. Type mismatch: expected to be `{ <<valueTypeList>> }` but was `{ <<input>> }`.
 
 === xref:errors/gql-errors/22NB2.adoc[22NB2]
 
-Status description:: error: data exception - incompatible graph type dependence. Graph type `{ $graphTypeDependence1 }` constraint `{ $constrDescrOrName1 }` is incompatible with graph type `{ $graphTypeDependence2 }` constraint `{ $constrDescrOrName2 }` because they have different graph type dependence.
+Status description:: error: data exception - incompatible graph type dependence. Graph type `{ <<graphTypeDependence>>1 }` constraint `{ <<constrDescrOrName>>1 }` is incompatible with graph type `{ $graphTypeDependence2 }` constraint `{ $constrDescrOrName2 }` because they have different graph type dependence.
 
 === xref:errors/gql-errors/22NB3.adoc[22NB3]
 
-Status description:: error: data exception - token presence verification failed. `{ $entityType }` (`{ $entityId }`) with `{ $tokenType1 }` `{ $token1 }` must have the `{ $tokenType2 }` `{ $token2 }`.
+Status description:: error: data exception - token presence verification failed. `{ <<entityType>> }` (`{ <<entityId>> }`) with `{ <<tokenType>>1 }` `{ <<token>>1 }` must have the `{ $tokenType2 }` `{ $token2 }`.
 
 === xref:errors/gql-errors/22NB4.adoc[22NB4]
 
-Status description:: error: data exception - endpoint label presence verification failed. Relationship (`{ $entityId1 }`) with type `{ $relType }` requires its `{ $endpointType }` node (`{ $entityId2 }`) to have the label `{ $label }`.
+Status description:: error: data exception - endpoint label presence verification failed. Relationship (`{ <<entityId>>1 }`) with type `{ <<relType>> }` requires its `{ <<endpointType>> }` node (`{ $entityId2 }`) to have the label `{ <<label>> }`.
 
 [[invalid-transaction-state]]
 == Invalid transaction state
@@ -521,7 +521,7 @@ Invalid transaction state errors occur when the transaction is in an invalid sta
 
 === xref:errors/gql-errors/25N01.adoc[25N01]
 
-Status description:: error: invalid transaction state - invalid combination of statement types. Failed to execute the query `{ $query }` due to conflicting statement types (read query, write query, schema modification, or administration command). To execute queries in the same transaction, they must be either of the same type, or be a combination of schema modifications and read commands.
+Status description:: error: invalid transaction state - invalid combination of statement types. Failed to execute the query `{ <<query>> }` due to conflicting statement types (read query, write query, schema modification, or administration command). To execute queries in the same transaction, they must be either of the same type, or be a combination of schema modifications and read commands.
 
 === xref:errors/gql-errors/25N02.adoc[25N02]
 
@@ -534,7 +534,7 @@ Status description:: error: invalid transaction state - concurrent access violat
 === xref:errors/gql-errors/25N04.adoc[25N04]
 
 Status description:: error: invalid transaction state - specified transaction does not exist.
-Transaction `{ $transactionId }` does not exist.
+Transaction `{ <<transactionId>> }` does not exist.
 
 === xref:errors/gql-errors/25N05.adoc[25N05]
 
@@ -558,11 +558,11 @@ Status description:: error: invalid transaction state - conflicting transaction
 
 === xref:errors/gql-errors/25N12.adoc[25N12]
 
-Status description:: error: invalid transaction state - index was dropped. Index `{ $idx }` was dropped in this transaction and cannot be used.
+Status description:: error: invalid transaction state - index was dropped. Index `{ <<idx>> }` was dropped in this transaction and cannot be used.
 
 === xref:errors/gql-errors/25N13.adoc[25N13]
 
-Status description:: error: invalid transaction state - cannot access entity after removal. A `{ $entityType }` was accessed after being deleted in this transaction. Verify the transaction statements.
+Status description:: error: invalid transaction state - cannot access entity after removal. A `{ <<entityType>> }` was accessed after being deleted in this transaction. Verify the transaction statements.
 
 [[invalid-transaction-termination]]
 == Invalid transaction termination
@@ -681,7 +681,7 @@ Status description:: error: syntax error or access rule violation - invalid case
 
 === xref:errors/gql-errors/42I01.adoc[42I01]
 
-Status description:: error: syntax error or access rule violation - invalid `FOREACH`. Invalid use of `{ $clause }` inside 'FOREACH'.
+Status description:: error: syntax error or access rule violation - invalid `FOREACH`. Invalid use of `{ <<clause>> }` inside 'FOREACH'.
 
 === xref:errors/gql-errors/42I02.adoc[42I02]
 
@@ -693,28 +693,28 @@ Status description:: error: syntax error or access rule violation - invalid FIEL
 
 === xref:errors/gql-errors/42I06.adoc[42I06]
 
-Status description:: error: syntax error or access rule violation - invalid input. Invalid input `{ $input }`, expected: `{ $valueList }`.
+Status description:: error: syntax error or access rule violation - invalid input. Invalid input `{ <<input>> }`, expected: `{ <<valueList>> }`.
 
 === xref:errors/gql-errors/42I08.adoc[42I08]
 
-Status description:: error: syntax error or access rule violation - invalid lower bound. The lower bound of the variable length relationship used in the `{ $fun }` function must be 0 or 1.
+Status description:: error: syntax error or access rule violation - invalid lower bound. The lower bound of the variable length relationship used in the `{ <<fun>> }` function must be 0 or 1.
 
 
 === xref:errors/gql-errors/42I13.adoc[42I13]
 
-Status description:: error: syntax error or access rule violation - invalid number of procedure or function arguments. The procedure or function call does not provide the required number of arguments; expected `{ $count1 }` but got `{ $count2 }`. The procedure or function `{ $procFun }` has the signature: `{ $sig }`.
+Status description:: error: syntax error or access rule violation - invalid number of procedure or function arguments. The procedure or function call does not provide the required number of arguments; expected `{ <<count>>1 }` but got `{ $count2 }`. The procedure or function `{ <<procFun>> }` has the signature: `{ <<sig>> }`.
 
 === xref:errors/gql-errors/42I18.adoc[42I18]
 
-Status description:: error: syntax error or access rule violation - invalid reference to implicitly grouped expressions. The aggregation column contains implicit grouping expressions referenced by the variables `{ $varList }`. Implicit grouping expressions are variables not explicitly declared as grouping keys.
+Status description:: error: syntax error or access rule violation - invalid reference to implicitly grouped expressions. The aggregation column contains implicit grouping expressions referenced by the variables `{ <<variableList>> }`. Implicit grouping expressions are variables not explicitly declared as grouping keys.
 
 === xref:errors/gql-errors/42I20.adoc[42I20]
 
-Status description:: error: syntax error or access rule violation - invalid symbol in expression. Label expressions and relationship type expressions cannot contain `{ $input }`. To express a label disjunction use `{ $labelExpr }` instead.
+Status description:: error: syntax error or access rule violation - invalid symbol in expression. Label expressions and relationship type expressions cannot contain `{ <<input>> }`. To express a label disjunction use `{ <<labelExpr>> }` instead.
 
 === xref:errors/gql-errors/42I23.adoc[42I23]
 
-Status description:: error: syntax error or access rule violation - invalid quantified path pattern in shortest path. The `{ $fun }` function cannot contain a quantified path pattern.
+Status description:: error: syntax error or access rule violation - invalid quantified path pattern in shortest path. The `{ <<fun>> }` function cannot contain a quantified path pattern.
 
 === xref:errors/gql-errors/42I25.adoc[42I25]
 
@@ -726,7 +726,7 @@ Status description:: error: syntax error or access rule violation - invalid `DEL
 
 === xref:errors/gql-errors/42I29.adoc[42I29]
 
-Status description:: error: syntax error or access rule violation - invalid use of `IS`. The `IS` keyword cannot be used together with multiple labels in `{ $input }`. Rewrite the expression as `{ $replacement }`.
+Status description:: error: syntax error or access rule violation - invalid use of `IS`. The `IS` keyword cannot be used together with multiple labels in `{ <<input>> }`. Rewrite the expression as `{ <<replacement>> }`.
 
 === xref:errors/gql-errors/42I31.adoc[42I31]
 
@@ -754,15 +754,15 @@ Status description:: error: syntax error or access rule violation - invalid use
 
 === xref:errors/gql-errors/42I41.adoc[42I41]
 
-Status description:: error: syntax error or access rule violation - invalid use of variable length relationship. Variable length relationships cannot be used in `{ $value }`.
+Status description:: error: syntax error or access rule violation - invalid use of variable length relationship. Variable length relationships cannot be used in `{ <<value>> }`.
 
 === xref:errors/gql-errors/42I45.adoc[42I45]
 
-Status description:: error: syntax error or access rule violation - invalid use of multiple path patterns. Multiple path patterns cannot be used in the same clause in combination with a selective path selector. `{ $action }`
+Status description:: error: syntax error or access rule violation - invalid use of multiple path patterns. Multiple path patterns cannot be used in the same clause in combination with a selective path selector. `{ <<action>> }`
 
 === xref:errors/gql-errors/42I47.adoc[42I47]
 
-Status description:: error: syntax error or access rule violation - parser error. Parser Error: `{ $msg }`.
+Status description:: error: syntax error or access rule violation - parser error. Parser Error: `{ <<msg>> }`.
 
 === xref:errors/gql-errors/42I48.adoc[42I48]
 
@@ -770,19 +770,19 @@ Status description:: error: syntax error or access rule violation - invalid use
 
 === xref:errors/gql-errors/42I50.adoc[42I50]
 
-Status description:: error: syntax error or access rule violation - token name too long. Invalid input `{ $input }..`. A `{ $tokenType }` name cannot be longer than `{ $maxTokenLength }`.
+Status description:: error: syntax error or access rule violation - token name too long. Invalid input `{ <<input>> }..`. A `{ <<tokenType>> }` name cannot be longer than `{ <<value>> }`.
 
 === xref:errors/gql-errors/42I51.adoc[42I51]
 
-Status description:: info: invalid call signature. The procedure or function `{ $procFun }` must have the signature: `{ $sig }`.
+Status description:: info: invalid call signature. The procedure or function `{ <<procFun>> }` must have the signature: `{ <<sig>> }`.
 
 === xref:errors/gql-errors/42N00.adoc[42N00]
 
-Status description:: error: syntax error or access rule violation - no such database. The database `{ $db }` was not found. Verify that the spelling is correct.
+Status description:: error: syntax error or access rule violation - no such database. The database `{ <<db>> }` was not found. Verify that the spelling is correct.
 
 === xref:errors/gql-errors/42N01.adoc[42N01]
 
-Status description:: error: syntax error or access rule violation - no such constituent graph exists in composite database. The constituent graph `{ $graph }` was not found in the in composite database `{ $db }`. Verify that the spelling is correct.
+Status description:: error: syntax error or access rule violation - no such constituent graph exists in composite database. The constituent graph `{ <<graph>> }` was not found in the in composite database `{ <<db>> }`. Verify that the spelling is correct.
 
 === xref:errors/gql-errors/42N02.adoc[42N02]
 
@@ -794,59 +794,59 @@ Status description:: error: syntax error or access rule violation - writing to m
 
 === xref:errors/gql-errors/42N04.adoc[42N04]
 
-Status description:: error: syntax error or access rule violation - unsupported access of composite database. Failed to access database identified by `{ $db1 }` while connected to session database `{ $db2 }`. Connect to `{ $db3 }` directly.
+Status description:: error: syntax error or access rule violation - unsupported access of composite database. Failed to access database identified by `{ <<db>>1 }` while connected to session database `{ $db2 }`. Connect to `{ $db3 }` directly.
 
 === xref:errors/gql-errors/42N05.adoc[42N05]
 
-Status description:: error: syntax error or access rule violation - unsupported access of standard database. Failed to access database identified by `{ $db1 }` while connected to composite session database `{ $db2 }`. Connect to `{ $db3 }` directly or create an alias in the composite database.
+Status description:: error: syntax error or access rule violation - unsupported access of standard database. Failed to access database identified by `{ <<db>>1 }` while connected to composite session database `{ $db2 }`. Connect to `{ $db3 }` directly or create an alias in the composite database.
 
 === xref:errors/gql-errors/42N06.adoc[42N06]
 
-Status description:: error: syntax error or access rule violation - unsupported action on composite database. `{ $action }` is not supported on composite databases.
+Status description:: error: syntax error or access rule violation - unsupported action on composite database. `{ <<action>> }` is not supported on composite databases.
 
 === xref:errors/gql-errors/42N07.adoc[42N07]
 
-Status description:: error: syntax error or access rule violation - variable shadowing. The variable `{ $variable }` is shadowing a variable with the same name from the outer scope and needs to be renamed.
+Status description:: error: syntax error or access rule violation - variable shadowing. The variable `{ <<variable>> }` is shadowing a variable with the same name from the outer scope and needs to be renamed.
 
 === xref:errors/gql-errors/42N08.adoc[42N08]
 
-Status description:: error: syntax error or access rule violation - no such procedure or function. The procedure or function `{ $procFun }` was not registered for this database instance. Verify that the spelling is correct.
+Status description:: error: syntax error or access rule violation - no such procedure or function. The procedure or function `{ <<procFun>> }` was not registered for this database instance. Verify that the spelling is correct.
 
 === xref:errors/gql-errors/42N09.adoc[42N09]
 
-Status description:: error: syntax error or access rule violation - no such user. A user with the name `{ $user }` was not found. Verify that the spelling is correct.
+Status description:: error: syntax error or access rule violation - no such user. A user with the name `{ <<user>> }` was not found. Verify that the spelling is correct.
 
 === xref:errors/gql-errors/42N10.adoc[42N10]
 
-Status description:: error: syntax error or access rule violation - no such role. A role with the name `{ $role }` was not found. Verify that the spelling is correct.
+Status description:: error: syntax error or access rule violation - no such role. A role with the name `{ <<role>> }` was not found. Verify that the spelling is correct.
 
 === xref:errors/gql-errors/42N11.adoc[42N11]
 
-Status description:: error: syntax error or access rule violation - database or alias already exists. A `[composite]` database or alias with the name `{ $db }` already exists.
+Status description:: error: syntax error or access rule violation - database or alias already exists. A `[composite]` database or alias with the name `{ <<db>> }` already exists.
 
 === xref:errors/gql-errors/42N12.adoc[42N12]
 
-Status description:: error: syntax error or access rule violation - user already exists. A user with the name `{ $user }` already exists.
+Status description:: error: syntax error or access rule violation - user already exists. A user with the name `{ <<user>> }` already exists.
 
 === xref:errors/gql-errors/42N13.adoc[42N13]
 
-Status description:: error: syntax error or access rule violation - role already exists. A role with the name `{ $role }` already exists.
+Status description:: error: syntax error or access rule violation - role already exists. A role with the name `{ <<role>> }` already exists.
 
 === xref:errors/gql-errors/42N14.adoc[42N14]
 
-Status description:: error: syntax error or access rule violation - invalid use of command. `{ $clause }` cannot be used together with `{ $cmd }`.
+Status description:: error: syntax error or access rule violation - invalid use of command. `{ <<clause>> }` cannot be used together with `{ <<cmd>> }`.
 
 === xref:errors/gql-errors/42N15.adoc[42N15]
 
-Status description:: error: syntax error or access rule violation - invalid use of reserved keyword. `{ $syntax }` is a reserved keyword and cannot be used in this place.
+Status description:: error: syntax error or access rule violation - invalid use of reserved keyword. `{ <<syntax>> }` is a reserved keyword and cannot be used in this place.
 
 === xref:errors/gql-errors/42N16.adoc[42N16]
 
-Status description:: error: syntax error or access rule violation - unsupported index or constraint. Only single property `{ $idxType }` are supported.
+Status description:: error: syntax error or access rule violation - unsupported index or constraint. Only single property `{ <<idxType>> }` are supported.
 
 === xref:errors/gql-errors/42N17.adoc[42N17]
 
-Status description:: error: syntax error or access rule violation - unsupported request. `{ $input }` is not allowed on the system database.
+Status description:: error: syntax error or access rule violation - unsupported request. `{ <<input>> }` is not allowed on the system database.
 
 === xref:errors/gql-errors/42N18.adoc[42N18]
 
@@ -854,7 +854,7 @@ Status description:: error: syntax error or access rule violation - read-only da
 
 === xref:errors/gql-errors/42N19.adoc[42N19]
 
-Status description:: error: syntax error or access rule violation - duplicate clause. Duplicate `{ $syntax }` clause.
+Status description:: error: syntax error or access rule violation - duplicate clause. Duplicate `{ <<syntax>> }` clause.
 
 === xref:errors/gql-errors/42N20.adoc[42N20]
 
@@ -863,7 +863,7 @@ Status description:: error: syntax error or access rule violation - empty list r
 
 === xref:errors/gql-errors/42N21.adoc[42N21]
 
-Status description:: error: syntax error or access rule violation - unaliased return item. Expression in `{ $clause }` must be aliased (use AS).
+Status description:: error: syntax error or access rule violation - unaliased return item. Expression in `{ <<clause>> }` must be aliased (use AS).
 
 
 === xref:errors/gql-errors/42N22.adoc[42N22]
@@ -872,19 +872,19 @@ Status description:: error: syntax error or access rule violation - single retur
 
 === xref:errors/gql-errors/42N24.adoc[42N24]
 
-Status description:: error: syntax error or access rule violation - missing `WITH`. A `WITH` clause is required between `{ $input1 }` and `{ $input2 }`.
+Status description:: error: syntax error or access rule violation - missing `WITH`. A `WITH` clause is required between `{ <<input>>1 }` and `{ $input2 }`.
 
 === xref:errors/gql-errors/42N29.adoc[42N29]
 
-Status description:: error: syntax error or access rule violation - unbound variables in pattern expression. Pattern expressions are not allowed to introduce new variables: `{ $variable }`.
+Status description:: error: syntax error or access rule violation - unbound variables in pattern expression. Pattern expressions are not allowed to introduce new variables: `{ <<variable>> }`.
 
 === xref:errors/gql-errors/42N31.adoc[42N31]
 
-Status description:: error: syntax error or access rule violation - specified number out of range. Expected `{ $component }` to be `{ $valueType }` in the range `{ $lower }` to `{ $upper }` but found `{ $value }`.
+Status description:: error: syntax error or access rule violation - specified number out of range. Expected `{ <<component>> }` to be `{ <<valueType>> }` in the range `{ <<lower>> }` to `{ <<upper>> }` but found `{ <<value>> }`.
 
 === xref:errors/gql-errors/42N32.adoc[42N32]
 
-Status description:: error: syntax error or access rule violation - invalid use of parameter map. Parameter maps cannot be used in `{ $keyword }` patterns. Use a literal map instead.
+Status description:: error: syntax error or access rule violation - invalid use of parameter map. Parameter maps cannot be used in `{ <<keyword>> }` patterns. Use a literal map instead.
 
 === xref:errors/gql-errors/42N39.adoc[42N39]
 
@@ -892,7 +892,7 @@ Status description:: error: syntax error or access rule violation - incompatible
 
 === xref:errors/gql-errors/42N40.adoc[42N40]
 
-Status description:: error: syntax error or access rule violation - single relationship pattern required. The `{ $fun }` function must contain one relationship pattern.
+Status description:: error: syntax error or access rule violation - single relationship pattern required. The `{ <<fun>> }` function must contain one relationship pattern.
 
 === xref:errors/gql-errors/42N42.adoc[42N42]
 
@@ -908,11 +908,11 @@ Status description:: error: syntax error or access rule violation - invalid use
 
 === xref:errors/gql-errors/42N49.adoc[42N49]
 
-Status description:: error: syntax error or access rule violation - unsupported normal form. Unknown Normal Form: `{ $input }`.
+Status description:: error: syntax error or access rule violation - unsupported normal form. Unknown Normal Form: `{ <<input>> }`.
 
 === xref:errors/gql-errors/42N51.adoc[42N51]
 
-Status description:: error: syntax error or access rule violation - invalid parameter. Invalid parameter `{ $param }`.
+Status description:: error: syntax error or access rule violation - invalid parameter. Invalid parameter `{ <<param>> }`.
 
 === xref:errors/gql-errors/42N53.adoc[42N53]
 
@@ -921,32 +921,32 @@ Status description:: error: syntax error or access rule violation - unsafe usage
 
 === xref:errors/gql-errors/42N56.adoc[42N56]
 
-Status description:: error: syntax error or access rule violation - unsupported use of properties. Properties are not supported in the `{ $fun }` function.
+Status description:: error: syntax error or access rule violation - unsupported use of properties. Properties are not supported in the `{ <<fun>> }` function.
 
 
 === xref:errors/gql-errors/42N57.adoc[42N57]
 
-Status description:: error: syntax error or access rule violation - invalid use of data-modifications in expressions. `{ $expr }` cannot contain any updating clauses.
+Status description:: error: syntax error or access rule violation - invalid use of data-modifications in expressions. `{ <<expr>> }` cannot contain any updating clauses.
 
 === xref:errors/gql-errors/42N59.adoc[42N59]
 
-Status description:: error: syntax error or access rule violation - variable already defined. Variable `{ $variable }` already declared.
+Status description:: error: syntax error or access rule violation - variable already defined. Variable `{ <<variable>> }` already declared.
 
 === xref:errors/gql-errors/42N62.adoc[42N62]
 
-Status description:: error: syntax error or access rule violation - variable not defined. Variable `{ $variable }` not defined.
+Status description:: error: syntax error or access rule violation - variable not defined. Variable `{ <<variable>> }` not defined.
 
 === xref:errors/gql-errors/42N65.adoc[42N65]
 
-Status description:: error: syntax error or access rule violation - node variable not bound. The `{ $fun }` function requires bound node variables when it is not part of a 'MATCH ...'.
+Status description:: error: syntax error or access rule violation - node variable not bound. The `{ <<fun>> }` function requires bound node variables when it is not part of a 'MATCH ...'.
 
 === xref:errors/gql-errors/42N66.adoc[42N66]
 
-Status description:: error: syntax error or access rule violation - relationship variable already bound. Bound relationships are not allowed in calls to the `{ $fun }` function.
+Status description:: error: syntax error or access rule violation - relationship variable already bound. Bound relationships are not allowed in calls to the `{ <<fun>> }` function.
 
 === xref:errors/gql-errors/42N70.adoc[42N70]
 
-Status description:: error: syntax error or access rule violation - function without required WHERE clause. The function `{ $fun }` requires a WHERE clause.
+Status description:: error: syntax error or access rule violation - function without required WHERE clause. The function `{ <<fun>> }` requires a WHERE clause.
 
 === xref:errors/gql-errors/42N71.adoc[42N71]
 
@@ -958,27 +958,27 @@ Status description:: error: syntax error or access rule violation - invalid plac
 
 === xref:errors/gql-errors/42N74.adoc[42N74]
 
-Status description:: error: syntax error or access rule violation - invalid nested USE clause. Failed to access `{ $db1 }` and `{ $db2 }`. Child USE clauses must target the same graph as their parent query. Run in separate (sub)queries instead.
+Status description:: error: syntax error or access rule violation - invalid nested USE clause. Failed to access `{ <<db>>1 }` and `{ $db2 }`. Child USE clauses must target the same graph as their parent query. Run in separate (sub)queries instead.
 
 === xref:errors/gql-errors/42N75.adoc[42N75]
 
-Status description:: error: syntax error or access rule violation - invalid use of graph function. A call to the graph function `{ $fun }` is only allowed as the top-level argument of a `USE` clause.
+Status description:: error: syntax error or access rule violation - invalid use of graph function. A call to the graph function `{ <<fun>> }` is only allowed as the top-level argument of a `USE` clause.
 
 === xref:errors/gql-errors/42N76.adoc[42N76]
 
-Status description:: error: syntax error or access rule violation - unfulfillable hints. The hint(s) `{ $hintList }` cannot be fulfilled.
+Status description:: error: syntax error or access rule violation - unfulfillable hints. The hint(s) `{ <<hintList>> }` cannot be fulfilled.
 
 === xref:errors/gql-errors/42N77.adoc[42N77]
 
-Status description:: error: syntax error or access rule violation - missing hint predicate. The hint `{ $hint }` cannot be fulfilled. The query does not contain a compatible predicate for `{ $entityType }` on `{ $variable }`.
+Status description:: error: syntax error or access rule violation - missing hint predicate. The hint `{ <<hint>> }` cannot be fulfilled. The query does not contain a compatible predicate for `{ <<entityType>> }` on `{ <<variable>> }`.
 
 === xref:errors/gql-errors/42N78.adoc[42N78]
 
-Status description:: error: syntax error or access rule violation - variable already bound. Node `{ $variable }` has already been bound and cannot be modified by the `{ $clause }` clause.
+Status description:: error: syntax error or access rule violation - variable already bound. Node `{ <<variable>> }` has already been bound and cannot be modified by the `{ <<clause>> }` clause.
 
 === xref:errors/gql-errors/42N81.adoc[42N81]
 
-Status description:: error: syntax error or access rule violation - missing request parameter. Expected `{ $param }`, but got `{ $paramList }`.
+Status description:: error: syntax error or access rule violation - missing request parameter. Expected `{ <<param>> }`, but got `{ <<paramList>> }`.
 
 === xref:errors/gql-errors/42N83.adoc[42N83]
 
@@ -994,7 +994,7 @@ Status description:: error: syntax error or access rule violation - cannot speci
 
 === xref:errors/gql-errors/42N86.adoc[42N86]
 
-Status description:: error: syntax error or access rule violation - wildcard in parameter. `{ $syntax }` failed. Parameterized database and graph names do not support wildcards.
+Status description:: error: syntax error or access rule violation - wildcard in parameter. `{ <<syntax>> }` failed. Parameterized database and graph names do not support wildcards.
 
 === xref:errors/gql-errors/42N88.adoc[42N88]
 
@@ -1002,15 +1002,15 @@ Status description:: error: syntax error or access rule violation - cannot grant
 
 === xref:errors/gql-errors/42N89.adoc[42N89]
 
-Status description:: error: syntax error or access rule violation - invalid driver settings map. Failed evaluating the given driver settings. `{ $cause }`
+Status description:: error: syntax error or access rule violation - invalid driver settings map. Failed evaluating the given driver settings. `{ <<cause>> }`
 
 === xref:errors/gql-errors/42N90.adoc[42N90]
 
-Status description:: error: syntax error or access rule violation - cannot alter immutable composite database. Composite databases cannot be altered (database: `{ $db }`).
+Status description:: error: syntax error or access rule violation - cannot alter immutable composite database. Composite databases cannot be altered (database: `{ <<db>> }`).
 
 === xref:errors/gql-errors/42N97.adoc[42N97]
 
-Status description:: error: syntax error or access rule violation - missing mandatory auth clause. Clause `{ $clause }` is mandatory for auth provider `{ $auth }`.
+Status description:: error: syntax error or access rule violation - missing mandatory auth clause. Clause `{ <<clause>> }` is mandatory for auth provider `{ <<auth>> }`.
 
 
 === xref:errors/gql-errors/42N98.adoc[42N98]
@@ -1031,11 +1031,11 @@ Status description:: error: syntax error or access rule violation - invalid alia
 
 === xref:errors/gql-errors/42NA7.adoc[42NA7]
 
-Status description:: error: syntax error or access rule violation - referenced database not found. No database is corresponding to `{ $db }`. Verify that the elementId is correct.
+Status description:: error: syntax error or access rule violation - referenced database not found. No database is corresponding to `{ <<db>> }`. Verify that the elementId is correct.
 
 === xref:errors/gql-errors/42NA8.adoc[42NA8]
 
-Status description:: error: syntax error or access rule violation - invalid reference in command. Invalid reference in command `{ $cmd }`.
+Status description:: error: syntax error or access rule violation - invalid reference in command. Invalid reference in command `{ <<cmd>> }`.
 
 === xref:errors/gql-errors/42NA9.adoc[42NA9]
 
@@ -1060,7 +1060,7 @@ General processing exceptions occur when there is a general processing error, su
 
 === xref:errors/gql-errors/50N00.adoc[50N00]
 
-Status description:: error: general processing exception - internal error. Internal exception raised `{ $msgTitle }`: `{ $msg }`
+Status description:: error: general processing exception - internal error. Internal exception raised `{ <<msgTitle>> }`: `{ <<msg>> }`
 
 === xref:errors/gql-errors/50N05.adoc[50N05]
 
@@ -1076,23 +1076,23 @@ Status description:: error: general processing exception - execution failed. Exe
 
 === xref:errors/gql-errors/50N09.adoc[50N09]
 
-Status description:: error: general processing exception - invalid server state transition. The server transitioned into a server state that is not valid in the current context: `{ $boltServerState }`.
+Status description:: error: general processing exception - invalid server state transition. The server transitioned into a server state that is not valid in the current context: `{ <<boltServerState>> }`.
 
 === xref:errors/gql-errors/50N10.adoc[50N10]
 
-Status description:: error: general processing exception - index drop failed. Unable to drop `{ $idxDescrOrName }`.
+Status description:: error: general processing exception - index drop failed. Unable to drop `{ <<idxDescrOrName>> }`.
 
 === xref:errors/gql-errors/50N11.adoc[50N11]
 
-Status description:: error: general processing exception - constraint creation failed. Unable to create `{ $constrDescrOrName }`.
+Status description:: error: general processing exception - constraint creation failed. Unable to create `{ <<constrDescrOrName>> }`.
 
 === xref:errors/gql-errors/50N12.adoc[50N12]
 
-Status description:: error: general processing exception - constraint drop failed. Unable to drop `{ $constrDescrOrName }`.
+Status description:: error: general processing exception - constraint drop failed. Unable to drop `{ <<constrDescrOrName>> }`.
 
 === xref:errors/gql-errors/50N13.adoc[50N13]
 
-Status description:: error: general processing exception - constraint validation error. Unable to validate constraint `{ $constrDescrOrName }`.
+Status description:: error: general processing exception - constraint validation error. Unable to validate constraint `{ <<constrDescrOrName>> }`.
 
 === xref:errors/gql-errors/50N14.adoc[50N14]
 
@@ -1100,7 +1100,7 @@ Status description:: error: general processing exception - constraint violation.
 
 === xref:errors/gql-errors/50N15.adoc[50N15]
 
-Status description:: error: general processing exception - unsupported index operation. The system attemped to execute an unsupported operation on index `{ $idx }`. See debug.log for more information.
+Status description:: error: general processing exception - unsupported index operation. The system attemped to execute an unsupported operation on index `{ <<idx>> }`. See debug.log for more information.
 
 === xref:errors/gql-errors/50N16.adoc[50N16]
 
@@ -1126,95 +1126,95 @@ Status description:: error: system configuration or operation exception - proced
 
 === xref:errors/gql-errors/51N01.adoc[51N01]
 
-Status description:: error: system configuration or operation exception - class field annotation should be public, non-final, and non-static. The field `{ $procField }` in the class `{ $procClass }` is annotated as a '@Context' field, but it is declared as static. '@Context' fields must be public, non-final and non-static.
+Status description:: error: system configuration or operation exception - class field annotation should be public, non-final, and non-static. The field `{ <<procField>> }` in the class `{ <<procClass>> }` is annotated as a '@Context' field, but it is declared as static. '@Context' fields must be public, non-final and non-static.
 
 === xref:errors/gql-errors/51N02.adoc[51N02]
 
-Status description:: error: system configuration or operation exception - unsupported injectable component type. Unable to set up injection for procedure `{ $procClass }`. The field `{ $procField }` has type `{ $procFieldType }` which is not a supported injectable component.
+Status description:: error: system configuration or operation exception - unsupported injectable component type. Unable to set up injection for procedure `{ <<procClass>> }`. The field `{ <<procField>> }` has type `{ <<procFieldType>> }` which is not a supported injectable component.
 
 
 === xref:errors/gql-errors/51N03.adoc[51N03]
 
-Status description:: error: system configuration or operation exception - unable to access field. Unable to set up injection for `{ $procClass }`, failed to access field `{ $procField }`.
+Status description:: error: system configuration or operation exception - unable to access field. Unable to set up injection for `{ <<procClass>> }`, failed to access field `{ <<procField>> }`.
 
 
 === xref:errors/gql-errors/51N04.adoc[51N04]
 
-Status description:: error: system configuration or operation exception - missing class field annotation. The field `{ $procField }` on `{ $procClass }` must be annotated as a '@Context' field in order to store its state.
+Status description:: error: system configuration or operation exception - missing class field annotation. The field `{ <<procField>> }` on `{ <<procClass>> }` must be annotated as a '@Context' field in order to store its state.
 
 
 === xref:errors/gql-errors/51N05.adoc[51N05]
 
-Status description:: error: system configuration or operation exception - class field should be public and non-final. The field `{ $procField }` on `{ $procClass }` must be declared non-final and public.
+Status description:: error: system configuration or operation exception - class field should be public and non-final. The field `{ <<procField>> }` on `{ <<procClass>> }` must be declared non-final and public.
 
 
 === xref:errors/gql-errors/51N06.adoc[51N06]
 
-Status description:: error: system configuration or operation exception - missing argument name. The argument at position `{ $pos }` in `{ $procMethod }` requires a '@Name' annotation and a non-empty name.
+Status description:: error: system configuration or operation exception - missing argument name. The argument at position `{ <<pos>> }` in `{ <<procMethod>> }` requires a '@Name' annotation and a non-empty name.
 
 
 === xref:errors/gql-errors/51N07.adoc[51N07]
 
-Status description:: error: system configuration or operation exception - invalid ordering of default arguments. The `{ $procFun }` contains a non-default argument after a default argument. Non-default arguments are not allowed to be positioned after default arguments.
+Status description:: error: system configuration or operation exception - invalid ordering of default arguments. The `{ <<procFun>> }` contains a non-default argument after a default argument. Non-default arguments are not allowed to be positioned after default arguments.
 
 
 === xref:errors/gql-errors/51N08.adoc[51N08]
 
-Status description:: error: system configuration or operation exception - exactly one @UserAggregationResult method and one @UserAggregationUpdate method required. The class `{ $procClass }` must contain exactly one '@UserAggregationResult' method and exactly one '@UserAggregationUpdate' method.
+Status description:: error: system configuration or operation exception - exactly one @UserAggregationResult method and one @UserAggregationUpdate method required. The class `{ <<procClass>> }` must contain exactly one '@UserAggregationResult' method and exactly one '@UserAggregationUpdate' method.
 
 
 === xref:errors/gql-errors/51N09.adoc[51N09]
 
-Status description:: error: system configuration or operation exception - @UserAggregationUpdate method must be public and void. The '@UserAggregationUpdate' method `{ $procMethod }` of `{ $procClass }` must be public and have the return type 'void'.
+Status description:: error: system configuration or operation exception - @UserAggregationUpdate method must be public and void. The '@UserAggregationUpdate' method `{ <<procMethod>> }` of `{ <<procClass>> }` must be public and have the return type 'void'.
 
 
 === xref:errors/gql-errors/51N10.adoc[51N10]
 
-Status description:: error: system configuration or operation exception - aggregation method not public. The method `{ $procMethod }` of `{ $procClass }` must be public.
+Status description:: error: system configuration or operation exception - aggregation method not public. The method `{ <<procMethod>> }` of `{ <<procClass>> }` must be public.
 
 
 === xref:errors/gql-errors/51N11.adoc[51N11]
 
-Status description:: error: system configuration or operation exception - class not public. The class `{ $procClass }` must be public.
+Status description:: error: system configuration or operation exception - class not public. The class `{ <<procClass>> }` must be public.
 
 
 === xref:errors/gql-errors/51N12.adoc[51N12]
 
-Status description:: error: system configuration or operation exception - class not void. The procedure `{ $proc }` has zero output fields and must be defined as void.
+Status description:: error: system configuration or operation exception - class not void. The procedure `{ <<proc>> }` has zero output fields and must be defined as void.
 
 
 === xref:errors/gql-errors/51N13.adoc[51N13]
 
-Status description:: error: system configuration or operation exception - procedure or function name already in use. Unable to register the procedure or function `{ $procFun }` because the name is already in use.
+Status description:: error: system configuration or operation exception - procedure or function name already in use. Unable to register the procedure or function `{ <<procFun>> }` because the name is already in use.
 
 
 === xref:errors/gql-errors/51N14.adoc[51N14]
 
 Status description:: error: system configuration or operation exception - duplicate field name.
-The procedure `{ $proc }` has a duplicate `{ $procFieldType }` field, `{ $procField }`.
+The procedure `{ <<proc>> }` has a duplicate `{ <<procFieldType>> }` field, `{ <<procField>> }`.
 
 === xref:errors/gql-errors/51N15.adoc[51N15]
 
-Status description:: error: system configuration or operation exception - invalid map key type. Type mismatch for map key. Required 'STRING', but found `{ $valueType }`.
+Status description:: error: system configuration or operation exception - invalid map key type. Type mismatch for map key. Required 'STRING', but found `{ <<valueType>> }`.
 
 
 === xref:errors/gql-errors/51N16.adoc[51N16]
 
-Status description:: error: system configuration or operation exception - invalid default value type. Type mismatch for the default value. Required `{ $valueType }`, but found `{ $input }`.
+Status description:: error: system configuration or operation exception - invalid default value type. Type mismatch for the default value. Required `{ <<valueType>> }`, but found `{ <<input>> }`.
 
 
 === xref:errors/gql-errors/51N17.adoc[51N17]
 
-Status description:: error: system configuration or operation exception - invalid procedure or function name. Procedures and functions cannot be defined in the root namespace, or use a reserved namespace. Use the package name instead (e.g., org.example.com.`{ $procFun })`.
+Status description:: error: system configuration or operation exception - invalid procedure or function name. Procedures and functions cannot be defined in the root namespace, or use a reserved namespace. Use the package name instead (e.g., org.example.com.`{ <<procFun>> }`)`.
 
 === xref:errors/gql-errors/51N18.adoc[51N18]
 
-Status description:: error: system configuration or operation exception - invalid method return type. The method `{ $procMethod }` has an invalid return type. Procedures must return a stream of records, where each record is of a defined concrete class.
+Status description:: error: system configuration or operation exception - invalid method return type. The method `{ <<procMethod>> }` has an invalid return type. Procedures must return a stream of records, where each record is of a defined concrete class.
 
 
 === xref:errors/gql-errors/51N20.adoc[51N20]
 
-Status description:: error: system configuration or operation exception - cannot inject field. The field `{ $procField }` is not injectable. Ensure the field is marked as public and non-final.
+Status description:: error: system configuration or operation exception - cannot inject field. The field `{ <<procField>> }` is not injectable. Ensure the field is marked as public and non-final.
 
 === xref:errors/gql-errors/51N21.adoc[51N21]
 
@@ -1240,17 +1240,17 @@ Status description:: error: system configuration or operation exception - databa
 
 === xref:errors/gql-errors/51N27.adoc[51N27]
 
-Status description:: error: system configuration or operation exception - not supported in this edition. `{ $component }` is not supported in `{ $edition }`.
+Status description:: error: system configuration or operation exception - not supported in this edition. `{ <<component>> }` is not supported in `{ <<edition>> }`.
 
 
 === xref:errors/gql-errors/51N29.adoc[51N29]
 
-Status description:: error: system configuration or operation exception - not supported by this server. The command `{ $cmd }` must be executed on the current 'LEADER' server.
+Status description:: error: system configuration or operation exception - not supported by this server. The command `{ <<cmd>> }` must be executed on the current 'LEADER' server.
 
 
 === xref:errors/gql-errors/51N30.adoc[51N30]
 
-Status description:: error: system configuration or operation exception - not supported with this configuration. `{ $item }` is not supported in `{ $context }`.
+Status description:: error: system configuration or operation exception - not supported with this configuration. `{ <<item>> }` is not supported in `{ <<context>> }`.
 
 
 === xref:errors/gql-errors/51N32.adoc[51N32]
@@ -1270,7 +1270,7 @@ Status description:: error: system configuration or operation exception - write
 
 === xref:errors/gql-errors/51N35.adoc[51N35]
 
-Status description:: error: system configuration or operation exception - database location changed. The location of `{ $db }` has changed while the transaction was running.
+Status description:: error: system configuration or operation exception - database location changed. The location of `{ <<db>> }` has changed while the transaction was running.
 
 === xref:errors/gql-errors/51N36.adoc[51N36]
 
@@ -1291,7 +1291,7 @@ Status description:: error: system configuration or operation exception - raft l
 
 === xref:errors/gql-errors/51N40.adoc[51N40]
 
-Status description:: error: system configuration or operation exception - unable to start database. Database `{ $db }` failed to start. Try restarting it.
+Status description:: error: system configuration or operation exception - unable to start database. Database `{ <<db>> }` failed to start. Try restarting it.
 
 
 === xref:errors/gql-errors/51N41.adoc[51N41]
@@ -1301,75 +1301,75 @@ Status description:: error: system configuration or operation exception - admin
 
 === xref:errors/gql-errors/51N43.adoc[51N43]
 
-Status description:: error: system configuration or operation exception - cannot deallocate servers. Cannot deallocate server(s) `{ $serverList }`.
+Status description:: error: system configuration or operation exception - cannot deallocate servers. Cannot deallocate server(s) `{ <<serverList>> }`.
 
 
 === xref:errors/gql-errors/51N44.adoc[51N44]
 
-Status description:: error: system configuration or operation exception - cannot drop server. Cannot drop server `{ $server }`.
+Status description:: error: system configuration or operation exception - cannot drop server. Cannot drop server `{ <<server>> }`.
 
 
 === xref:errors/gql-errors/51N45.adoc[51N45]
 
-Status description:: error: system configuration or operation exception - cannot cordon server. Cannot cordon server `{ $server }`.
+Status description:: error: system configuration or operation exception - cannot cordon server. Cannot cordon server `{ <<server>> }`.
 
 
 === xref:errors/gql-errors/51N46.adoc[51N46]
 
-Status description:: error: system configuration or operation exception - cannot alter server. Cannot alter server `{ $server }`.
+Status description:: error: system configuration or operation exception - cannot alter server. Cannot alter server `{ <<server>> }`.
 
 
 === xref:errors/gql-errors/51N47.adoc[51N47]
 
-Status description:: error: system configuration or operation exception - cannot rename server. Cannot rename server `{ $server }`.
+Status description:: error: system configuration or operation exception - cannot rename server. Cannot rename server `{ <<server>> }`.
 
 
 === xref:errors/gql-errors/51N48.adoc[51N48]
 
-Status description:: error: system configuration or operation exception - cannot enable server. Cannot enable server `{ $server }`.
+Status description:: error: system configuration or operation exception - cannot enable server. Cannot enable server `{ <<server>> }`.
 
 
 === xref:errors/gql-errors/51N49.adoc[51N49]
 
-Status description:: error: system configuration or operation exception - cannot alter database. Cannot alter database `{ $db }`.
+Status description:: error: system configuration or operation exception - cannot alter database. Cannot alter database `{ <<db>> }`.
 
 
 === xref:errors/gql-errors/51N50.adoc[51N50]
 
-Status description:: error: system configuration or operation exception - cannot recreate database. Cannot recreate database `{ $db }`.
+Status description:: error: system configuration or operation exception - cannot recreate database. Cannot recreate database `{ <<db>> }`.
 
 
 === xref:errors/gql-errors/51N51.adoc[51N51]
 
-Status description:: error: system configuration or operation exception - cannot create database. Cannot create database `{ $db }`.
+Status description:: error: system configuration or operation exception - cannot create database. Cannot create database `{ <<db>> }`.
 
 
 === xref:errors/gql-errors/51N52.adoc[51N52]
 
-Status description:: error: system configuration or operation exception - number of primaries out of range. Cannot alter database topology.  Number of primaries `{ $count }` needs to be at least 1 and may not exceed `{ $upper }`.
+Status description:: error: system configuration or operation exception - number of primaries out of range. Cannot alter database topology.  Number of primaries `{ <<count>> }` needs to be at least 1 and may not exceed `{ <<upper>> }`.
 
 
 === xref:errors/gql-errors/51N53.adoc[51N53]
 
-Status description:: error: system configuration or operation exception - number of secondaries out of range. Cannot alter database topology. Number of secondaries `{ $count }` needs to be at least 0 and may not exceed `{ $upper }`.
+Status description:: error: system configuration or operation exception - number of secondaries out of range. Cannot alter database topology. Number of secondaries `{ <<count>> }` needs to be at least 0 and may not exceed `{ <<upper>> }`.
 
 === xref:errors/gql-errors/51N54.adoc[51N54]
 
-Status description:: error: system configuration or operation exception - cannot reallocate. Failed to calculate reallocation for databases. { $msg }
+Status description:: error: system configuration or operation exception - cannot reallocate. Failed to calculate reallocation for databases. `{ <<msg>> }`
 
 
 === xref:errors/gql-errors/51N55.adoc[51N55]
 
-Status description:: error: system configuration or operation exception - cannot create additional database. Failed to create the database `{ $db }`. The limit of databases is reached. Either increase the limit using the config setting `{ $cfgSetting }` or drop a database.
+Status description:: error: system configuration or operation exception - cannot create additional database. Failed to create the database `{ <<db>> }`. The limit of databases is reached. Either increase the limit using the config setting `{ <<cfgSetting>> }` or drop a database.
 
 === xref:errors/gql-errors/51N56.adoc[51N56]
 
-Status description:: error: system configuration or operation exception - topology out of range. The number of `{ $serverType }` seeding servers `{ $count1 }` is larger than the desired number of `{ $allocType }` allocations `{ $count2 }`.
+Status description:: error: system configuration or operation exception - topology out of range. The number of `{ <<serverType>> }` seeding servers `{ <<count>>1 }` is larger than the desired number of `{ <<allocType>> }` allocations `{ $count2 }`.
 
 
 === xref:errors/gql-errors/51N57.adoc[51N57]
 
-Status description:: error: system configuration or operation exception - generic topology modification error. Unexpected error while picking allocations. { $msg }
+Status description:: error: system configuration or operation exception - generic topology modification error. Unexpected error while picking allocations. `{ <<msg>> }`
 
 === xref:errors/gql-errors/51N59.adoc[51N59]
 
@@ -1381,11 +1381,11 @@ Status description:: error: system configuration or operation exception - unable
 
 === xref:errors/gql-errors/51N61.adoc[51N61]
 
-Status description:: error: system configuration or operation exception - index population failed. Index `{ $idx }` population failed.
+Status description:: error: system configuration or operation exception - index population failed. Index `{ <<idx>> }` population failed.
 
 === xref:errors/gql-errors/51N62.adoc[51N62]
 
-Status description:: error: system configuration or operation exception - index is in a failed state. Unable to use index `{ $idx }` because it is in a failed state. See logs for more information.
+Status description:: error: system configuration or operation exception - index is in a failed state. Unable to use index `{ <<idx>> }` because it is in a failed state. See logs for more information.
 
 === xref:errors/gql-errors/51N63.adoc[51N63]
 
@@ -1399,7 +1399,7 @@ Status description:: error: system configuration or operation exception - index
 
 === xref:errors/gql-errors/51N65.adoc[51N65]
 
-Status description:: error: system configuration or operation exception - vector index dimensionality mismatch. Vector index `{ $idx }` has a dimensionality of `{ $dim1 }`, but indexed vectors have `{ $dim2 }`.
+Status description:: error: system configuration or operation exception - vector index dimensionality mismatch. Vector index `{ <<idx>> }` has a dimensionality of `{ <<dim>>1 }`, but indexed vectors have `{ $dim2}`.
 
 
 === xref:errors/gql-errors/51N66.adoc[51N66]
@@ -1412,27 +1412,27 @@ Status description:: error: system configuration or operation exception - CDC is
 
 === xref:errors/gql-errors/51N69.adoc[51N69]
 
-Status description:: error: system configuration or operation exception - system database is immutable. It is not possible to perform `{ $operation }` on the system database.
+Status description:: error: system configuration or operation exception - system database is immutable. It is not possible to perform `{ <<operation>> }` on the system database.
 
 === xref:errors/gql-errors/51N70.adoc[51N70]
 
-Status description:: error: system configuration or operation exception - bolt is not enabled. Cannot get routing table for `{ $db }` because Bolt is not enabled. Please update your configuration such that 'server.bolt.enabled' is set to true.
+Status description:: error: system configuration or operation exception - bolt is not enabled. Cannot get routing table for `{ <<db>> }` because Bolt is not enabled. Please update your configuration such that 'server.bolt.enabled' is set to true.
 
 === xref:errors/gql-errors/51N71.adoc[51N71]
 
-Status description:: error: system configuration or operation exception - unsupported operation of a sharded database. Feature: `{ $feat }` is not available in a sharded database.
+Status description:: error: system configuration or operation exception - unsupported operation of a sharded database. Feature: `{ <<feat>> }` is not available in a sharded database.
 
 === xref:errors/gql-errors/51N72.adoc[51N72]
 
-Status description:: error: system configuration or operation exception - memory pool out of memory. Failed to allocate memory in a memory pool. See `{ $cfgSetting }` in the neo4j.conf file.
+Status description:: error: system configuration or operation exception - memory pool out of memory. Failed to allocate memory in a memory pool. See `{ <<cfgSetting>> }` in the neo4j.conf file.
 
 === xref:errors/gql-errors/51N73.adoc[51N73]
 
-Status description:: error: system configuration or operation exception - transaction memory limit reached. The transaction uses more memory than is allowed. The maximum allowed size for a transaction can be configured with `{ $cfgSetting }` in the neo4j.conf file.
+Status description:: error: system configuration or operation exception - transaction memory limit reached. The transaction uses more memory than is allowed. The maximum allowed size for a transaction can be configured with `{ <<cfgSetting>> }` in the neo4j.conf file.
 
 === xref:errors/gql-errors/51N74.adoc[51N74]
 
-Status description:: error: system configuration or operation exception - maximum number of transactions reached. Failed to start a new transaction. The limit of concurrent transactions is reached. Increase the number of concurrent transactions using `{ $cfgSetting }` in the neo4j.conf file.
+Status description:: error: system configuration or operation exception - maximum number of transactions reached. Failed to start a new transaction. The limit of concurrent transactions is reached. Increase the number of concurrent transactions using `{ <<cfgSetting>> }` in the neo4j.conf file.
 
 [[procedure-exceptions]]
 == Procedure exceptions
@@ -1441,35 +1441,35 @@ Procedure exceptions occur when there is an error in executing a procedure, such
 
 === xref:errors/gql-errors/52N01.adoc[52N01]
 
-Status description:: error: procedure exception - procedure execution timeout. Execution of the procedure `{ $proc }` timed out after `{ $timeAmount }` `{ $timeUnit }`.
+Status description:: error: procedure exception - procedure execution timeout. Execution of the procedure `{ <<proc>> }` timed out after `{ <<timeAmount>> }` `{ <<timeUnit>> }`.
 
 === xref:errors/gql-errors/52N02.adoc[52N02]
 
-Status description:: error: procedure exception - procedure execution client error. Execution of the procedure `{ $proc }` failed due to a client error.
+Status description:: error: procedure exception - procedure execution client error. Execution of the procedure `{ <<proc>> }` failed due to a client error.
 
 === xref:errors/gql-errors/52N03.adoc[52N03]
 
-Status description:: error: procedure exception - invalid procedure execution mode. Execution of the procedure `{ $proc }` failed due to an invalid specified execution mode `{ $procExeMode }`.
+Status description:: error: procedure exception - invalid procedure execution mode. Execution of the procedure `{ <<proc>> }` failed due to an invalid specified execution mode `{ <<procExeMode>> }`.
 
 === xref:errors/gql-errors/52N05.adoc[52N05]
 
-Status description:: error: procedure exception - must invoke procedure on secondary. Cannot invoke procedure on this member because it is not a secondary for the database `{ $db }`.
+Status description:: error: procedure exception - must invoke procedure on secondary. Cannot invoke procedure on this member because it is not a secondary for the database `{ <<db>> }`.
 
 === xref:errors/gql-errors/52N06.adoc[52N06]
 
-Status description:: error: procedure exception - invalid number of arguments to checkConnectivity. Unexpected number of arguments (expected 0-2 but received `{ $count }`).
+Status description:: error: procedure exception - invalid number of arguments to checkConnectivity. Unexpected number of arguments (expected 0-2 but received `{ <<count>> }`).
 
 === xref:errors/gql-errors/52N07.adoc[52N07]
 
-Status description:: error: procedure exception - invalid port argument to checkConnectivity. Unrecognised port name `{ $port }` (valid values are: `{ $portList }`.
+Status description:: error: procedure exception - invalid port argument to checkConnectivity. Unrecognised port name `{ <<port>> }` (valid values are: `{ <<portList>> }`.
 
 === xref:errors/gql-errors/52N08.adoc[52N08]
 
-Status description:: error: procedure exception - invalid server id argument to checkConnectivity. Unable to parse server id `{ $server }`.
+Status description:: error: procedure exception - invalid server id argument to checkConnectivity. Unable to parse server id `{ <<server>> }`.
 
 === xref:errors/gql-errors/52N09.adoc[52N09]
 
-Status description:: error: procedure exception - procedure execution database error. Execution of the procedure `{ $proc }` failed due to a database error.
+Status description:: error: procedure exception - procedure execution database error. Execution of the procedure `{ <<proc>> }` failed due to a database error.
 
 === xref:errors/gql-errors/52N10.adoc[52N10]
 
@@ -1481,11 +1481,11 @@ Status description:: error: procedure exception - generic topology procedure err
 
 === xref:errors/gql-errors/52N12.adoc[52N12]
 
-Status description:: error: procedure exception - cannot change default database. The previous default database `{ $db }` is still running.
+Status description:: error: procedure exception - cannot change default database. The previous default database `{ <<db>> }` is still running.
 
 === xref:errors/gql-errors/52N13.adoc[52N13]
 
-Status description:: error: procedure exception - new default database does not exist. New default database `{ $db }` does not exist.
+Status description:: error: procedure exception - new default database does not exist. New default database `{ <<db>> }` does not exist.
 
 === xref:errors/gql-errors/52N14.adoc[52N14]
 
@@ -1501,23 +1501,23 @@ Status description:: error: procedure exception - quarantine change failed. Sett
 
 === xref:errors/gql-errors/52N18.adoc[52N18]
 
-Status description:: error: procedure exception - too many seeders. The number of seeding servers `{ $countSeeders }` is larger than the defined number of allocations `{ $countAllocs }`.
+Status description:: error: procedure exception - too many seeders. The number of seeding servers `{ <<countSeeders>> }` is larger than the defined number of allocations `{ <<countAllocs>> }`.
 
 === xref:errors/gql-errors/52N19.adoc[52N19]
 
-Status description:: error: procedure exception - no such seeder. The specified seeding server with id `{ $server }` was not found. Verify that the spelling is correct.
+Status description:: error: procedure exception - no such seeder. The specified seeding server with id `{ <<server>> }` was not found. Verify that the spelling is correct.
 
 === xref:errors/gql-errors/52N22.adoc[52N22]
 
-Status description:: error: procedure exception - invalid procedure argument. Invalid argument `{ $field }` for `{ $procParam }` on procedure `{ $proc }`. The expected format of `{ $procParam }` is `{ $procParamFmt }`.
+Status description:: error: procedure exception - invalid procedure argument. Invalid argument `{ <<field>> }` for `{ <<procParam>> }` on procedure `{ <<proc>> }`. The expected format of `{ <<procParam>> }` is `{ <<procParamFmt>> }`.
 
 === xref:errors/gql-errors/52N23.adoc[52N23]
 
-Status description:: error: procedure exception - non-reloadable namespace. The following namespaces are not reloadable: `{ $namespaceList }`
+Status description:: error: procedure exception - non-reloadable namespace. The following namespaces are not reloadable: `{ <<namespaceList>> }`
 
 === xref:errors/gql-errors/52N25.adoc[52N25]
 
-Status description:: error: procedure exception - JMX error. JMX error while accessing `{ $param }`. See logs for more information.
+Status description:: error: procedure exception - JMX error. JMX error while accessing `{ <<param>> }`. See logs for more information.
 
 === xref:errors/gql-errors/52N29.adoc[52N29]
 
@@ -1529,51 +1529,57 @@ Status description:: error: procedure exception - future change identifier. Give
 
 === xref:errors/gql-errors/52N31.adoc[52N31]
 
-Status description:: error: procedure exception - wrong database. Change identifier `{ $param }` does not belong to this database.
+Status description:: error: procedure exception - wrong database. Change identifier `{ <<param>> }` does not belong to this database.
 
 === xref:errors/gql-errors/52N32.adoc[52N32]
 
-Status description:: error: procedure exception - invalid sequence number. Change identifier `{ $param1 }` has an invalid sequence number `{ $param2 }`.
+Status description:: error: procedure exception - invalid sequence number. Change identifier `{ <<param>>1 }` has an invalid sequence number `{ $param2 }`.
 
 === xref:errors/gql-errors/52N33.adoc[52N33]
 
-Status description:: error: procedure exception - procedure invocation failed. Failed to invoke procedure/function `{ $sig }` caused by: `{ $msg }`.
+Status description:: error: procedure exception - procedure invocation failed. Failed to invoke procedure/function `{ <<sig>> }` caused by: `{ <<msg>> }`.
 
 === xref:errors/gql-errors/52N34.adoc[52N34]
 
-Status description:: error: procedure exception - procedure sandboxed. `{ $sig }` is unavailable because it is sandboxed. Sandboxing is controlled by the dbms.security.procedures.unrestricted setting. Only un-restrict procedures you can trust with access to database internals.
+Status description:: error: procedure exception - procedure restricted. `{ <<fun>> }` is restricted and accesses database internals. Procedure restriction is controlled by the dbms.security.procedures.unrestricted setting. Only un-restrict procedures you can trust with access to database internals.
 
 === xref:errors/gql-errors/52N35.adoc[52N35]
 
-Status description:: error: procedure exception - procedure compilation failed. Failed to compile procedure defined in `{ $procClass }`: `{ $msg }`
+Status description:: error: procedure exception - procedure compilation failed. Failed to compile procedure defined in `{ <<procClass>> }`: `{ <<msg>> }`
 
 === xref:errors/gql-errors/52N36.adoc[52N36]
 
-Status description:: error: procedure exception - invalid procedure argument with API documentation hint. Invalid argument `{ $field }` for `{ $procParam }` on procedure `{ $proc }`. The expected format of `{ $procParam }` is outlined in the `{ $procParamFmt }` API documentation.
+Status description:: error: procedure exception - invalid procedure argument with API documentation hint. Invalid argument `{ <<field>> }` for `{ <<procParam>> }` on procedure `{ <<proc>> }`. The expected format of `{ <<procParam>> }` is outlined in the `{ <<procParamFmt>> }` API documentation.
 
 === xref:errors/gql-errors/52N37.adoc[52N37]
 
-Status description:: error: procedure exception - procedure execution error. Execution of the procedure `{ $proc } ` failed.
+Status description:: error: procedure exception - procedure execution error. Execution of the procedure `{ <<proc>> }` ` failed.
 
 === xref:errors/gql-errors/52U00.adoc[52U00]
 
-Status description:: error: procedure exception - custom procedure execution error cause. Execution of the procedure `{ $proc }` failed due to `{ $msgTitle }`: { $msg }.
+Status description:: error: procedure exception - custom procedure execution error cause. Execution of the procedure `{ <<proc>> }` failed due to `{ <<msgTitle>> }`: `{ <<msg>> }`.
 
 [[function-exceptions]]
 == Function exceptions
 
 === xref:errors/gql-errors/53N34.adoc[53N34]
 
-Status description:: error: function exception - function restricted. `{ $fun }` is restricted and accesses database internals. User-defined function restriction is controlled by the `dbms.security.procedures.unrestricted` setting. Only un-restrict user-defined functions you can trust with access to database internals.
+Status description:: error: function exception - function restricted. `{ <<fun>> }` is restricted and accesses database internals. User-defined function restriction is controlled by the `dbms.security.procedures.unrestricted` setting. Only un-restrict user-defined functions you can trust with access to database internals.
 
 === xref:errors/gql-errors/53N35.adoc[53N35]
 
-Status description:: error: function exception - function compilation failed. Failed to compile function defined in `{ $funClass }`: { $msg }
+Status description:: error: function exception - function compilation failed. Failed to compile function defined in `{ <<funClass>> }`: `{ <<msg>> }`
 
 === xref:errors/gql-errors/53N37.adoc[53N37]
 
-Status description:: error: function exception - function execution error. Execution of the function `{ $fun }` failed.
+Status description:: error: function exception - function execution error. Execution of the function `{ <<fun>> }` failed.
 
 === xref:errors/gql-errors/53U00.adoc[53U00]
 
-Status description:: error: function exception - custom function execution error cause. Execution of the function `{ $fun }` failed due to `{ $msgTitle }`: { $msg }.
\ No newline at end of file
+Status description:: error: function exception - custom function execution error cause. Execution of the function `{ <<fun>> }` failed due to `{ <<msgTitle>> }`: `{ <<msg>> }`.
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/partials/glossary.adoc b/modules/ROOT/partials/glossary.adoc
new file mode 100644
index 00000000..40632a27
--- /dev/null
+++ b/modules/ROOT/partials/glossary.adoc
@@ -0,0 +1,116 @@
+[glossary]
+
+[[action]]$action:: Freeform description of an action.
+[[alias]]$alias:: An alias name.
+[[alloc]]$alloc:: Allocator name.
+[[allocType]]$allocType:: Allocation type.
+[[auth]]$auth:: Auth provider name.
+[[boltMsgLenLimit]]$boltMsgLenLimit:: Bolt message length limit.
+[[boltServerState]]$boltServerState:: Bolt server state.
+[[cause]]$cause:: Freeform description of what caused the error.
+[[cfgSetting]]$cfgSetting:: Configuration setting key, for example, `server.https.enabled`.
+[[clause]]$clause:: A clause, for example, `USE`.
+[[cmd]]$cmd:: Cypher administrative command, for example, `DROP DATABASE`.
+[[component]]$component:: Component name.
+[[constr]]$constr:: Constraint name.
+[[constrDescrOrName]]$constrDescrOrName:: Constraint descriptor or name.
+[[context]]$context:: Freeform description of a context.
+[[coordinates]]$coordinates:: Coordinate value.
+[[count]]$count:: Amount
+[[countAllocs]]$countAllocs:: Desired number of servers to use.
+[[countSeeders]]$countSeeders:: Number of seeding servers.
+[[crs]]$crs:: Coordinate reference system, for example, WGS84.
+[[db]]$db:: Database name, for example, `myDb`.
+[[dim]]$dim:: Number representing index dimenionality.
+[[edition]]$edition:: Freeform edition description.
+[[endpointType]]$endpointType:: One of `start`, `end`.
+[[entityId]]$entityId:: ID of a node or a relationship.
+[[entityType]]$entityType:: A node or a relationship.
+[[expr]]$expr:: Cypher expression, for example, `1 + n.prop`.
+[[exprType]]$exprType:: Freeform expression type.
+[[feat]]$feat:: Freeform feature description.
+[[field]]$field:: Input field, for example, for a procedure or deserialization.
+[[format]]$format:: Duration format.
+[[fun]]$fun:: Function name.
+[[funClass]]$funClass:: User defined function implementation class name.
+[[graph]]$graph:: The name of a graph, for example, `myGraph`.
+[[graphTypeDependence]]$graphTypeDependence:: Graph type dependencency for constraint.
+[[hint]]$hint:: Freeform description of a "hint".
+[[hintList]]$hintList:: Comma-separated list of free form descriptions of hints.
+[[ident]]$ident:: Generic identifier.
+[[idx]]$idx:: Index name.
+[[idxDescr]]$idxDescr:: Index descriptor.
+[[idxDescrOrName]]$idxDescrOrName:: Index descriptor or name.
+[[idxOrConstr]]$idxOrConstr:: Index or constraint name
+[[idxOrConstrPat]]$idxOrConstrPat:: Index or constraint pattern
+[[idxType]]$idxType:: Index type, for example, text, vector, etc.
+[[input]]$input:: Piece of input.
+[[inputList]]$inputList:: Comma-separated list of inputs.
+[[item]]$item:: Freeform description of an item.
+[[keyword]]$keyword:: Cypher keyword, for example, `MERGE`.
+[[label]]$label:: Label name, for example, `Person`.
+[[labelExpr]]$labelExpr:: Label expression, for example, `Person&Human`.
+[[labelList]]$labelList:: Comma-separated list of label names, for example, `Person, Actor`.
+[[lower]]$lower:: Lower bound.
+[[mapKey]]$mapKey:: Map key.
+[[mapKeyList]]$mapKeyList:: Comma-separated list of keys.
+[[matchMode]]$matchMode:: GPM match mode.
+[[maxTokenLength]]$maxTokenLength:: Maximum token length.
+[[msg]]$msg:: Freeform message, for example, "Howdy, Partner!".
+[[msgTitle]]$msgTitle:: Freeform message title.
+[[namespace]]$namespace:: Namespace
+[[namespaceList]]$namespaceList:: Comma-separated list of namespaces.
+[[operation]]$operation:: Operation, for example, a function.
+[[option]]$option:: Option name
+[[optionList]]$optionList:: Comma-separated list of option names.
+[[param]]$param:: Parameter name
+[[paramList]]$paramList:: Parameter list
+[[pat]]$pat:: Pattern, for example, `(:Person)`.
+[[port]]$port:: Port name
+[[portList]]$portList:: Comma-separated list of port names.
+[[pos]]$pos:: A position, for example, in a sequence.
+[[pred]]$pred:: A predicate, for example, `'x = 3'`.
+[[predList]]$predList:: Comma-separated list of predicates, for example, `'x = 3', 'y > 4'`.
+[[preparserInput]]$preparserInput:: Piece of preparser input.
+[[proc]]$proc:: Procedure name, for example, `lauchRocket`.
+[[procClass]]$procClass:: Procedure implementation class name.
+[[procExeMode]]$procExeMode:: Procedure execution mode
+[[procField]]$procField:: Procedure implementation class field name, for example, `someField`.
+[[procFieldType]]$procFieldType:: Procedure implmenetation class field type.
+[[procFun]]$procFun:: Procedure or function name or ID.
+[[procMethod]]$procMethod:: Procedure implmenetation class method name.
+[[procParam]]$procParam:: Procedure parameter name.
+[[procParamFmt]]$procParamFmt:: Freeform procedure parameter format.
+[[propKey]]$propKey:: Property key name, for example, name.
+[[propKeyList]]$propKeyList:: Comma-separated list of property key names.
+[[query]]$query:: Query string extract, for example, `MATCH (n) WHERE n.prop...`.
+[[reasonList]]$reasonList:: Comma-separated list of reasons of the failure.
+[[relType]]$relType:: Relationship type name, for example, `KNOWS`.
+[[replacement]]$replacement:: Replacement
+[[role]]$role:: Role name, for example, `admin`.
+[[routingPolicy]]$routingPolicy:: Routing policy name.
+[[runtime]]$runtime:: Cypher runtime name.
+[[schemaDescr]]$schemaDescr:: Schema descriptor
+[[selector]]$selector:: GPM path selector.
+[[selectorType]]$selectorType:: Selector type.
+[[server]]$server:: Server name or ID, for example, `25a7efc7-d063-44b8-bdee-f23357f89f01`.
+[[serverList]]$serverList:: Comma-separated list of server names or IDs, for example, `'server-1', 'server-2'`.
+[[serverType]]$serverType:: Server type.
+[[sig]]$sig:: Procedure or function signature.
+[[syntax]]$syntax:: Freeform syntax or keyword.
+[[temporal]]$temporal:: Temporal value.
+[[timeAmount]]$timeAmount:: Integral amount of time unit.
+[[timeUnit]]$timeUnit:: Common time unit name.
+[[token]]$token:: Token name.
+[[tokenId]]$tokenId:: Token ID.
+[[tokenType]]$tokenType:: Token type.
+[[transactionId]]$transactionId:: The transaction ID of a running query.
+[[upper]]$upper:: An upper bound.
+[[url]]$url:: A URL, for example, https://example.com.
+[[user]]$user:: A user name, for example, `neo4j`.
+[[value]]$value:: Some value.
+[[valueList]]$valueList:: Comma-separated list of values.
+[[valueType]]$valueType:: Value type.
+[[valueTypeList]]$valueTypeList:: Comma-separated list of value types.
+[[variable]]$variable:: Variable name, for example, `n`.
+[[variableList]]$variableList:: Comma-separated list of variable names, for example, `a, b, c`.
\ No newline at end of file
diff --git a/preview.yml b/preview.yml
index afc7e0d3..e4a641c2 100644
--- a/preview.yml
+++ b/preview.yml
@@ -40,8 +40,9 @@ asciidoc:
     includePDF: false
     nonhtmloutput: ""
     experimental: ''
-    copyright: 2024
+    copyright: 2025
     common-license-page-uri: https://neo4j.com/docs/license/
-    # attributes for doc links to other manuals in publish playbook
-    neo4j-base-uri: https://neo4j.com 
+    neo4j-base-uri: https://neo4j.com
     neo4j-docs-base-uri: https://neo4j.com/docs
+    # attributes for doc links within the manual
+    # partials-path: docs-status-codes/modules/ROOT/partials
\ No newline at end of file
diff --git a/publish.yml b/publish.yml
index 3c3e04f5..87ea52ef 100644
--- a/publish.yml
+++ b/publish.yml
@@ -40,8 +40,11 @@ asciidoc:
     includePDF: false
     nonhtmloutput: ""
     experimental: ''
-    copyright: 2024
+    copyright: 2025
     common-license-page-uri: https://neo4j.com/docs/license/
+    # common-partial: 5@ROOT:partial$@
+    # check-mark: icon:check[]
+    # cross-mark: icon:times[]
     # attributes for doc links to other manuals in publish playbook
     neo4j-base-uri: ''
     neo4j-docs-base-uri: /docs