Clean up some function pages (#1039)

Author: JPryce-Aklundh

modules/ROOT/images/graph_list_functions.svg

@@ -17,7 +17,7 @@ To learn more about how Cypher handles aggregations performed on zero rows, refe
 
 The following graph is used for the examples below:
 
-image::graph_aggregating_functions.svg[]
+image::graph_aggregating_functions.svg[role="middle", width="700"]
 
 To recreate the graph, run the following query against an empty Neo4j database:
 

modules/ROOT/images/graph_numeric_functions.svg

@@ -8,22 +8,23 @@ List functions return lists of different data entities.
 
 Further details and examples of lists may be found in xref::values-and-types/lists.adoc[Lists] and xref::syntax/operators.adoc#query-operators-list[List operators].
 
+[[example-graph]]
 == Example graph
 
 The following graph is used for the examples below:
 
-image:graph_list_functions.svg[]
+image::graph_list_functions.svg[role="middle", width="700"]
 
-To recreate the graph, run the following query in an empty Neo4j database: 
+To recreate the graph, run the following query against an empty Neo4j database: 
 
 [source, cypher, role=test-setup]
 ----
 CREATE
-  (alice:Person:Developer {name:'Alice', age: 38, eyes: 'brown'}),
-  (bob {name: 'Bob', age: 25, eyes: 'blue'}),
-  (charlie {name: 'Charlie', age: 53, eyes: 'green'}),
-  (daniel {name: 'Daniel', age: 54, eyes: 'brown'}),
-  (eskil {name: 'Eskil', age: 41, eyes: 'blue', array: ['one', 'two', 'three']}),
+  (alice:Developer {name:'Alice', age: 38, eyes: 'Brown'}),
+  (bob:Administrator {name: 'Bob', age: 25, eyes: 'Blue'}),
+  (charlie:Administrator {name: 'Charlie', age: 53, eyes: 'Green'}),
+  (daniel:Adminstrator {name: 'Daniel', age: 54, eyes: 'Brown'}),
+  (eskil:Designer {name: 'Eskil', age: 41, eyes: 'blue', likedColors: ['Pink', 'Yellow', 'Black']}),
   (alice)-[:KNOWS]->(bob),
   (alice)-[:KNOWS]->(charlie),
   (bob)-[:KNOWS]->(daniel),
@@ -68,7 +69,7 @@ A `LIST<STRING>` containing the names of all the properties on the node bound to
 |===
 
 | keys(a)
-| ["eyes","name","age"]
+| ["eyes", "name", "age"]
 1+d|Rows: 1
 
 |===
@@ -115,7 +116,7 @@ A `LIST<STRING>` containing all the labels of the node bound to `a` is returned.
 |===
 
 | labels(a)
-| ["Person","Developer"]
+| ["Developer"]
 1+d|Rows: 1
 
 |===
@@ -160,8 +161,8 @@ A `LIST<NODE>` containing all the nodes in the path `p` is returned.
 [role="queryresult",options="header,footer",cols="1*<m"]
 |===
 
-| +nodes(p)+
-| +[(:Person:Developer {name: "Alice",eyes: "brown",age: 38}), ({name: "Bob",eyes: "blue",age: 25}), ({array: ['one', 'two', 'three'],name: "Eskil",eyes: "blue",age: 41})]+
+| nodes(p)
+| [(:Developer {name: "Alice", eyes: "Brown", age: 38}), (:Administrator {name: "Bob", eyes: "Blue", age: 25}), (:Designer {name: "Eskil", likedColors: ["Pink", "Yellow", "Black"], eyes: "blue", age: 41})]
 1+d|Rows: 1
 
 |===
@@ -367,17 +368,17 @@ RETURN reverse(ids)
 [source, cypher]
 ----
 MATCH (a) WHERE a.name = 'Eskil'
-RETURN a.array, tail(a.array)
+RETURN a.likedColors, tail(a.likedColors)
 ----
 
-The property named `array` and a `LIST<ANY>` comprising all but the first element of the `array` property are returned.
+The property named `likedColors` and a `LIST<ANY>` comprising all but the first element of the `likedColors` property are returned.
 
 .Result
 [role="queryresult",options="header,footer",cols="2*<m"]
 |===
 
-| a.array | tail(a.array)
-| ["one","two","three"] | ["two","three"]
+| a.likedColors | tail(a.likedColors)
+| ["Pink", "Yellow", "Black"] | ["Yellow", "Black"]
 2+d|Rows: 1
 
 |===

modules/ROOT/images/graph_scalar_functions.svg

@@ -7,27 +7,29 @@
 Numeric mathematical functions operate on numeric expressions only, and will return an error if used on any other values.
 See also xref::syntax/operators.adoc#query-operators-mathematical[Mathematical operators].
 
+[[example-graph]]
+== Example graph
+
 The following graph is used for the examples below:
 
-image:graph_numeric_functions.svg[]
+image::graph_numeric_functions.svg[role="middle", width="700"]
+
+To recreate the graph, run the following query against an empty Neo4j database:
 
-////
 [source, cypher, role=test-setup]
 ----
 CREATE
-  (alice:A {name:'Alice', age: 38, eyes: 'brown'}),
-  (bob:B {name: 'Bob', age: 25, eyes: 'blue'}),
-  (charlie:C {name: 'Charlie', age: 53, eyes: 'green'}),
-  (daniel:D {name: 'Daniel', age: 54, eyes: 'brown'}),
-  (eskil:E {name: 'Eskil', age: 41, eyes: 'blue', array: ['one', 'two', 'three']}),
+  (alice:Developer {name:'Alice', age: 38, eyes: 'Brown'}),
+  (bob:Administrator {name: 'Bob', age: 25, eyes: 'Blue'}),
+  (charlie:Administrator {name: 'Charlie', age: 53, eyes: 'Green'}),
+  (daniel:Adminstrator {name: 'Daniel', age: 54, eyes: 'Brown'}),
+  (eskil:Designer {name: 'Eskil', age: 41, eyes: 'blue', likedColors: ['Pink', 'Yellow', 'Black']}),
   (alice)-[:KNOWS]->(bob),
   (alice)-[:KNOWS]->(charlie),
   (bob)-[:KNOWS]->(daniel),
   (charlie)-[:KNOWS]->(daniel),
   (bob)-[:MARRIED]->(eskil)
 ----
-////
-
 
 [[functions-abs]]
 == abs()
@@ -55,7 +57,8 @@ CREATE
 .Query
 [source, cypher, indent=0]
 ----
-MATCH (a), (e) WHERE a.name = 'Alice' AND e.name = 'Eskil' RETURN a.age, e.age, abs(a.age - e.age)
+MATCH (a), (e) WHERE a.name = 'Alice' AND e.name = 'Eskil'
+RETURN a.age, e.age, abs(a.age - e.age)
 ----
 
 The absolute value of the age difference is returned.

modules/ROOT/images/graph_spatial_functions.svg

@@ -6,33 +6,29 @@
 
 Scalar functions return a single value.
 
-[IMPORTANT]
-====
-The `length()` and `size()` functions are quite similar, and so it is important to take note of the difference.
+[[example-graph]]
+== Example graph
 
-Function `length()`:: Only works for xref::functions/scalar.adoc#functions-length[paths].
-Function `size()`:: Only works for the three types: xref::functions/scalar.adoc#functions-size-of-string[`STRING` values], xref::functions/scalar.adoc#functions-size[lists], xref::functions/scalar.adoc#functions-size-of-pattern-comprehension[pattern comprehension].
-====
+The following graph is used for the examples below:
 
-image:graph_scalar_functions.svg[]
+image::graph_scalar_functions.svg[role="middle", width="700"]
+
+To recreate the graph, run the following query against an empty Neo4j database:
 
-////
 [source, cypher, role=test-setup]
 ----
 CREATE
-  (alice:Developer {name:'Alice', age: 38, eyes: 'brown'}),
-  (bob {name: 'Bob', age: 25, eyes: 'blue'}),
-  (charlie {name: 'Charlie', age: 53, eyes: 'green'}),
-  (daniel {name: 'Daniel', age: 54, eyes: 'brown'}),
-  (eskil {name: 'Eskil', age: 41, eyes: 'blue', liked_colors: ['pink', 'yellow', 'black']}),
+  (alice:Developer {name:'Alice', age: 38, eyes: 'Brown'}),
+  (bob:Administrator {name: 'Bob', age: 25, eyes: 'Blue'}),
+  (charlie:Administrator {name: 'Charlie', age: 53, eyes: 'Green'}),
+  (daniel:Adminstrator {name: 'Daniel', age: 54, eyes: 'Brown'}),
+  (eskil:Designer {name: 'Eskil', age: 41, eyes: 'blue', likedColors: ['Pink', 'Yellow', 'Black']}),
   (alice)-[:KNOWS]->(bob),
   (alice)-[:KNOWS]->(charlie),
   (bob)-[:KNOWS]->(daniel),
   (charlie)-[:KNOWS]->(daniel),
   (bob)-[:MARRIED]->(eskil)
 ----
-////
-
 
 [role=label--new-5.13]
 [[functions-char_length]]
@@ -162,7 +158,7 @@ RETURN coalesce(a.hairColor, a.eyes)
 |===
 
 | coalesce(a.hairColor, a.eyes)
-| "brown"
+| "Brown"
 1+d|Rows: 1
 
 |===
@@ -282,8 +278,8 @@ RETURN endNode(r)
 [role="queryresult",options="header,footer",cols="1*<m"]
 |===
 | endNode(r)
-| {name:"Bob",age:25,eyes:"blue"}
-| {name:"Charlie",age:53,eyes:"green"}
+| {name: "Bob", age: 25, eyes: "Blue"}
+| {name: "Charlie", age: 53, eyes: "Green"}
 1+d|Rows: 2
 |===
 
@@ -320,7 +316,7 @@ RETURN endNode(r)
 ----
 MATCH (a)
 WHERE a.name = 'Eskil'
-RETURN a.liked_colors, head(a.liked_colors)
+RETURN a.likedColors, head(a.likedColors)
 ----
 
 The first element in the list is returned.
@@ -329,8 +325,8 @@ The first element in the list is returned.
 [role="queryresult",options="header,footer",cols="2*<m"]
 |===
 
-| a.liked_colors+ | +head(a.liked_colors)
-| ["pink","yellow","black"] | "pink"
+| a.likedColors+ | +head(a.likedColors)
+| ["Pink", "Yellow", "Black"] | "Pink"
 2+d|Rows: 1
 
 |===
@@ -446,7 +442,7 @@ The node identifier for each of the nodes is returned.
 ----
 MATCH (a)
 WHERE a.name = 'Eskil'
-RETURN a.liked_colors, last(a.liked_colors)
+RETURN a.likedColors, last(a.likedColors)
 ----
 
 The last element in the list is returned.
@@ -456,7 +452,7 @@ The last element in the list is returned.
 |===
 
 | a.liked_colors | last(a.liked_colors)
-| ["pink","yellow","black"] | "black"
+| ["Pink", "Yellow", "Black"] | "Black"
 2+d|Rows: 1
 
 |===
@@ -483,6 +479,8 @@ The last element in the list is returned.
 
 |===
 
+[NOTE]
+To calculate the length of a `LIST` of the number of Unicode characters in a `STRING`, see xref:functions/scalar.adoc#functions-size[`size()`]
 
 .+length()+
 ======
@@ -583,7 +581,7 @@ The `nullIf()` function can be used in conjunction with the `coalesce()` functio
 [source, cypher, indent=0]
 ----
 MATCH (a)
-RETURN a.name AS name, coalesce(nullIf(a.eyes, "brown"), "hazel") AS eyeColor
+RETURN a.name AS name, coalesce(nullIf(a.eyes, "Brown"), "Hazel") AS eyeColor
 ----
 
 
@@ -592,11 +590,11 @@ RETURN a.name AS name, coalesce(nullIf(a.eyes, "brown"), "hazel") AS eyeColor
 |===
 
 | name      | eyeColor
-| "Alice"   | "hazel"
-| "Bob"     | "blue"
-| "Charlie" | "green"
-| "Daniel"  | "hazel"
-| "Eskil"   | "blue"
+| "Alice"   | "Hazel"
+| "Bob"     | "Blue"
+| "Charlie" | "Green"
+| "Daniel"  | "Hazel"
+| "Eskil"   | "Blue"
 2+d|Rows: 5
 
 |===
@@ -640,7 +638,7 @@ RETURN properties(p)
 |===
 
 | properties(p)
-| {"city":"Berlin","name":"Stefan"}
+| {"city": "Berlin", "name": "Stefan"}
 1+d|Rows: 1
 |===
 
@@ -693,6 +691,9 @@ A randomly-generated UUID is returned.
 | *Returns* 3+| `INTEGER`
 |===
 
+[NOTE]
+To calculate the length of a `PATH`, see xref:functions/scalar.adoc#functions-length[`length()`].
+
 .Considerations
 |===
 
@@ -811,8 +812,8 @@ RETURN startNode(r)
 |===
 
 | +startNode(r)+
-| {name:"Alice",age:38,eyes:"brown"}
-| {name:"Alice",age:38,eyes:"brown"}
+| {name: "Alice", age: 38, eyes: "Brown"}
+| {name: "Alice", age: 38, eyes: "Brown"}
 1+d|Rows: 2
 
 |===