5.8 dev reconciliation (#564)

This PR updates 5.x with updates from PRs into dev that were not
cherry-picked into 5.x at any point.

While it looks like a lot of commits were missing, in the end it amounts
to changes in 14 files, some of which are trivial and do not affect the
content or output.

I'd be happy to use 'squash and merge' to reduce this update to a single
commit in 5.x

Author: recrwplay

README.adoc

@@ -40,7 +40,6 @@ To view the built site, launch a local server:
 . `npm start`
 . In a browser tab, go to `localhost:8000`
 
-
 === Live preview
 
 When you run `npm start`, the project is monitored for updates to asciidoc files.

modules/ROOT/pages/administration/access-control/built-in-roles.adoc

@@ -453,8 +453,7 @@ To restore the role to its original capabilities two steps are needed.
 First, execute `DROP ROLE admin`.
 Secondly, run these queries:
 
-// we cannot test this right now cause we would delete the role the test user is logged with
-
+// cannot test as it would require deleting the role the test user is logged with
 [source, cypher, role=noplay test-skip]
 ----
 CREATE ROLE admin

modules/ROOT/pages/administration/access-control/manage-users.adoc

@@ -817,6 +817,7 @@ Users can change their password using `ALTER CURRENT USER SET PASSWORD`.
 The old password is required in addition to the new one, and either or both can be a string value or a string parameter.
 When a user executes this command it will change their password as well as set the `CHANGE NOT REQUIRED` flag.
 
+// can't test, don't want to hardcode test user password
 [source, cypher, role=test-skip]
 ----
 ALTER CURRENT USER

modules/ROOT/pages/administration/aliases.adoc

@@ -575,6 +575,7 @@ SHOW ALIAS `northwind` FOR DATABASE
 ======
 
 Local database aliases can also be given properties.
+These properties can then be used in queries with the xref::functions/graph.adoc#functions-graph-propertiesByName[`graph.propertiesByName()` function].
 
 .Query
 [source, cypher]
@@ -761,6 +762,7 @@ SHOW ALIAS `remote-with-driver-settings` FOR DATABASE YIELD *
 .+Setting properties for remote database aliases+
 ======
 Just as the local database aliases, the remote database aliases can be given properties.
+These properties can then be used in queries with the xref::functions/graph.adoc#functions-graph-propertiesByName[`graph.propertiesByName()` function].
 
 .Query
 [source, cypher]
@@ -1083,6 +1085,8 @@ ALTER ALIAS `movie scripts` SET DATABASE PROPERTIES { nameContainsSpace: true }
 System updates: 1
 Rows: 0
 ----
+
+The updated properties can then be used in queries with the xref::functions/graph.adoc#functions-graph-propertiesByName[`graph.propertiesByName()` function].
 ======
 
 .+Altering local and remote aliases in composite databases+
@@ -1113,6 +1117,8 @@ System updates: 1
 Rows: 0
 ----
 
+The updated properties can then be used in queries with the xref::functions/graph.adoc#functions-graph-propertiesByName[`graph.propertiesByName()` function].
+
 ======
 
 The changes for all database aliases will show up in the `SHOW ALIASES FOR DATABASE` command.

modules/ROOT/pages/administration/databases.adoc

@@ -611,15 +611,6 @@ CREATE COMPOSITE DATABASE inventory
 [role="statsonlyqueryresult"]
 0 rows, System updates: 1
 
-[NOTE]
-====
-Composite database names are subject to the same rules as standard databases.
-One difference is however that the deprecated syntax using dots without enclosing the name in backticks is not available.
-Both dots and dashes needs to be enclosed within backticks when using composite databases.
-
-
-====
-
 When a composite database has been created, it will show up in the listing provided by the command `SHOW DATABASES`.
 
 

modules/ROOT/pages/functions/list.adoc

@@ -19,7 +19,11 @@ The following graph is used for the examples below:
 
 image::graph-list-functions.svg[Example graph connecting people after their roles as administrator, designer, and developer,role=popup,width=600]
 
+<<<<<<< HEAD
 To recreate the graph, run the following query against an empty Neo4j database: 
+=======
+To recreate the graph, run the following query in an empty Neo4j database: 
+>>>>>>> bec9309 (5.8 dev reconciliation (#564))
 
 [source, cypher, role=test-setup]
 ----
@@ -60,7 +64,10 @@ CREATE
 ======
 
 .Query
+<<<<<<< HEAD
 // tag::functions_list_keys[]
+=======
+>>>>>>> bec9309 (5.8 dev reconciliation (#564))
 [source, cypher]
 ----
 MATCH (a) WHERE a.name = 'Alice'
@@ -74,8 +81,13 @@ A `LIST<STRING>` containing the names of all the properties on the node bound to
 [role="queryresult",options="header,footer",cols="1*<m"]
 |===
 
+<<<<<<< HEAD
 | keys(a)
 | ["eyes", "name", "age"]
+=======
+| +keys(a)+
+| +["eyes","name","age"]+
+>>>>>>> bec9309 (5.8 dev reconciliation (#564))
 1+d|Rows: 1
 
 |===
@@ -109,7 +121,10 @@ A `LIST<STRING>` containing the names of all the properties on the node bound to
 ======
 
 .Query
+<<<<<<< HEAD
 // tag::functions_list_labels[]
+=======
+>>>>>>> bec9309 (5.8 dev reconciliation (#564))
 [source, cypher]
 ----
 MATCH (a) WHERE a.name = 'Alice'
@@ -157,7 +172,10 @@ A `LIST<STRING>` containing all the labels of the node bound to `a` is returned.
 ======
 
 .Query
+<<<<<<< HEAD
 // tag::functions_list_nodes[]
+=======
+>>>>>>> bec9309 (5.8 dev reconciliation (#564))
 [source, cypher]
 ----
 MATCH p = (a)-->(b)-->(c)
@@ -208,7 +226,10 @@ The only exception where the range does not contain `start` are empty ranges.
 ======
 
 .Query
+<<<<<<< HEAD
 // tag::functions_list_range[]
+=======
+>>>>>>> bec9309 (5.8 dev reconciliation (#564))
 [source, cypher]
 ----
 RETURN range(0, 10), range(2, 18, 3), range(0, 5, -1)
@@ -257,7 +278,10 @@ As such, Cypher's `reduce()` is analogous to the `fold` or `reduce` methods in f
 ======
 
 .Query
+<<<<<<< HEAD
 // tag::functions_list_reduce[]
+=======
+>>>>>>> bec9309 (5.8 dev reconciliation (#564))
 [source, cypher]
 ----
 MATCH p = (a)-->(b)-->(c)
@@ -305,7 +329,10 @@ The `age` property of all `NODE` values in the `PATH` are summed and returned as
 ======
 
 .Query
+<<<<<<< HEAD
 // tag::functions_list_relationships[]
+=======
+>>>>>>> bec9309 (5.8 dev reconciliation (#564))
 [source, cypher]
 ----
 MATCH p = (a)-->(b)-->(c)
@@ -354,7 +381,10 @@ A `LIST<RELATIONSHIP>` containing all the `RELATIONSHIP` values in the `PATH` `p
 ======
 
 .Query
+<<<<<<< HEAD
 // tag::functions_list_reverse[]
+=======
+>>>>>>> bec9309 (5.8 dev reconciliation (#564))
 [source, cypher]
 ----
 WITH [4923,'abc',521, null, 487] AS ids
@@ -391,7 +421,10 @@ RETURN reverse(ids)
 ======
 
 .Query
+<<<<<<< HEAD
 // tag::functions_list_tail[]
+=======
+>>>>>>> bec9309 (5.8 dev reconciliation (#564))
 [source, cypher]
 ----
 MATCH (a) WHERE a.name = 'Eskil'
@@ -492,7 +525,10 @@ toBooleanList(['a string', true, 'false', null, ['A','B']]) as mixedList
 ======
 
 .Query
+<<<<<<< HEAD
 // tag::functions_list_to_float_list[]
+=======
+>>>>>>> bec9309 (5.8 dev reconciliation (#564))
 [source, cypher]
 ----
 RETURN toFloatList(null) as noList,
@@ -542,7 +578,10 @@ toFloatList(['a string', 2.5, '3.14159', null, ['A','B']]) as mixedList
 ======
 
 .Query
+<<<<<<< HEAD
 // tag::functions_list_to_integer_list[]
+=======
+>>>>>>> bec9309 (5.8 dev reconciliation (#564))
 [source, cypher]
 ----
 RETURN toIntegerList(null) as noList,

modules/ROOT/pages/introduction/cypher-overview.adoc

@@ -13,6 +13,15 @@ MERGE (keanu)-[:ACTED_IN]->(matrix)
 ----
 ////
 
+////
+[source, cypher, role=test-setup]
+----
+MERGE (matrix:Movie {title: 'The Matrix', rating: 10})
+MERGE (keanu:Person {name: 'Keanu Reeves'})
+MERGE (keanu)-[:ACTED_IN]->(matrix)
+----
+////
+
 == What is Cypher?
 
 Cypher is Neo4j’s declarative graph query language.