diff --git a/modules/ROOT/pages/notifications/all-notifications.adoc b/modules/ROOT/pages/notifications/all-notifications.adoc
index d35ddefa..483def31 100644
--- a/modules/ROOT/pages/notifications/all-notifications.adoc
+++ b/modules/ROOT/pages/notifications/all-notifications.adoc
@@ -1906,11 +1906,11 @@ CREATE TEXT INDEX FOR (n:Label) ON (n.prop) OPTIONS {indexProvider : 'text-2.0'}
 .Using a renamed or a deprecated procedure
 [.tabbed-example]
 =====
-[.include-with-GQLSTATUS-deprecated-with-replacement]
+[.include-with-GQLSTATUS-code]
 ======
 [source,cypher]
 ----
-CALL cdc.query
+CALL cdc.query()
 ----
 
 Returned GQLSTATUS code::
@@ -1921,43 +1921,42 @@ warn: feature deprecated with replacement.
 `cdc.query` is deprecated.
 It is replaced by `db.cdc.query`.
 
-======
-[.include-with-GQLSTATUS-deprecated-without-replacement]
-======
+Suggestions for improvement::
+Use the procedure `db.cdc.query` instead.
++
 [source,cypher]
 ----
-CALL unsupported.dbms.shutdown
+CALL db.cdc.query()
 ----
-
-Returned GQLSTATUS code::
-01N02
-
-Returned status description::
-warn: feature deprecated without replacement.
-`unsupported.dbms.shutdown` is deprecated and will be removed without a replacement.
 ======
+
 [.include-with-neo4j-code]
 ======
 
+Query::
++
 [source,cypher]
 ----
-CALL unsupported.dbms.shutdown
+CALL cdc.query()
 ----
 
 Description of the returned code::
-The query used a deprecated procedure: `'unsupported.dbms.shutdown'`.
+The query used a deprecated procedure: `cdc.query`.
 
 Suggestions for improvement::
-Remove the use of the deprecated procedure.
-If there is a suggested replacement, update to use the replacement instead.
-
+Use the procedure `db.cdc.query` instead.
++
+[source,cypher]
+----
+CALL db.cdc.query()
+----
 ======
 =====
 
 .Using id() function
 [.tabbed-example]
 =====
-[.include-with-GQLSTATUS-deprecated-with-replacement]
+[.include-with-GQLSTATUS-code]
 ======
 Query::
 +
@@ -1972,8 +1971,8 @@ Returned GQLSTATUS code::
 
 Returned status description::
 warn: feature deprecated with replacement.
-`id` is deprecated.
-It is replaced by `elementId()`.
+id is deprecated.
+It is replaced by elementId or an application-generated id.
 
 Suggestions for improvement::
 Use the function `elementId()` instead.
@@ -1984,23 +1983,6 @@ MATCH (a)
 RETURN elementId(a)
 ----
 ======
-[.include-with-GQLSTATUS-deprecated-without-replacement]
-======
-Query::
-+
-[source,cypher]
-----
-MATCH (a)
-RETURN id(a)
-----
-
-Returned GQLSTATUS code::
-01N02
-
-Returned status description::
-warn: feature deprecated without replacement.
-`id` is deprecated and will be removed without a replacement.
-======
 [.include-with-neo4j-code]
 ======
 
@@ -2029,7 +2011,7 @@ RETURN elementId(a)
 .Using an unescaped variable named 'where' in a node pattern
 [.tabbed-example]
 =====
-[.include-with-GQLSTATUS-deprecated-with-replacement]
+[.include-with-GQLSTATUS-code]
 ======
 Query::
 +
@@ -2084,7 +2066,7 @@ RETURN `where`.p
 .Using an unescaped variable named 'where' in a relationship pattern
 [.tabbed-example]
 =====
-[.include-with-GQLSTATUS-deprecated-with-replacement]
+[.include-with-GQLSTATUS-code]
 ======
 Query::
 +
@@ -2138,7 +2120,7 @@ RETURN `where`.p
 .Using an unparenthesized label expression predicate as the right-hand side operand of `+`
 [.tabbed-example]
 =====
-[.include-with-GQLSTATUS-deprecated-with-replacement]
+[.include-with-GQLSTATUS-code]
 ======
 Query::
 +
@@ -2196,7 +2178,7 @@ RETURN listOfBooleans + (m:A)
 .Using an unparenthesized label expression predicate as the right-hand side operand of `+`
 [.tabbed-example]
 =====
-[.include-with-GQLSTATUS-deprecated-with-replacement]
+[.include-with-GQLSTATUS-code]
 ======
 Query::
 +
@@ -2254,7 +2236,7 @@ RETURN listOfBooleans + (r:C|D)
 .Using an unescaped variable named `is` as a `WHEN` operand in a simple `CASE` expression
 [.tabbed-example]
 =====
-[.include-with-GQLSTATUS-deprecated-with-replacement]
+[.include-with-GQLSTATUS-code]
 ======
 Query::
 +
@@ -2324,7 +2306,7 @@ END AS standardsName
 .Using an unescaped variable named `contains` in addition operations within a `WHEN` operand in a simple `CASE` expression
 [.tabbed-example]
 =====
-[.include-with-GQLSTATUS-deprecated-with-replacement]
+[.include-with-GQLSTATUS-code]
 ======
 Query::
 +
@@ -2394,7 +2376,7 @@ END AS check
 .Using an unescaped variable named `contains` in subtraction operations within a `WHEN` operand in a simple `CASE` expression
 [.tabbed-example]
 =====
-[.include-with-GQLSTATUS-deprecated-with-replacement]
+[.include-with-GQLSTATUS-code]
 ======
 Query::
 +
@@ -2465,7 +2447,7 @@ END AS check
 .Using the `[]` operator on an unescaped variable named `in` within a `WHEN` operand in a simple `CASE` expression
 [.tabbed-example]
 =====
-[.include-with-GQLSTATUS-deprecated-with-replacement]
+[.include-with-GQLSTATUS-code]
 ======
 Query::
 +
@@ -2536,7 +2518,7 @@ END AS check
 .Using the `[]` operator on an unescaped variable named `in` within a `WHEN` operand in a simple `CASE` expression
 [.tabbed-example]
 =====
-[.include-with-GQLSTATUS-deprecated-with-replacement]
+[.include-with-GQLSTATUS-code]
 ======
 Query::
 +
@@ -2665,6 +2647,50 @@ For more information, see link:https://neo4j.com/docs/cypher-manual/current/quer
 ======
 =====
 
+.Using a deprecated procedure
+[.tabbed-example]
+=====
+[.include-with-GQLSTATUS-code]
+======
+Query::
++
+[source,cypher]
+----
+CALL unsupported.dbms.shutdown()
+----
+
+Returned GQLSTATUS code::
+01N02
+
+Returned status description::
+warn: feature deprecated without replacement.
+`unsupported.dbms.shutdown` is deprecated and will be removed without a replacement.
+
+Suggestions for improvement::
+Remove the use of the deprecated procedure.
+If there is a suggested replacement, update to use the replacement instead.
+
+======
+[.include-with-neo4j-code]
+======
+
+Query::
++
+[source,cypher]
+----
+CALL unsupported.dbms.shutdown()
+----
+
+Description of the returned code::
+The query used a deprecated procedure: `'unsupported.dbms.shutdown'`.
+
+Suggestions for improvement::
+Remove the use of the deprecated procedure.
+If there is a suggested replacement, update to use the replacement instead.
+
+======
+=====
+
 [[_deprecated-procedure-result-column]]
 === Procedure field deprecated