Merge 5.6 PRs to 5.x (#480)

Author: JPryce-Aklundh

modules/ROOT/images/graph_expression_subqueries.svg

@@ -5747,11 +5747,7 @@ label:new[]
 DROP CONSTRAINT name
 ----
 a|
-<<<<<<< HEAD
 xref:constraints/managing-constraints.adoc#drop-constraint[New command] for dropping a constraint by name, no matter the type.
-=======
-xref:constraints/syntax.adoc#constraints-syntax-drop[New command] for dropping a constraint by name, no matter the type.
->>>>>>> b38c1e9 (Document relationship key and uniqueness constraints (#225))
 
 
 a|
@@ -5862,13 +5858,8 @@ An example of this is `CALL db.index.explicit.searchNodes('my_index','email:me*'
 | `MATCH (n)-[x:A\|:B\|:C]-() RETURN n`     | Syntax | Deprecated | Replaced by `MATCH (n)-[x:A\|B\|C]-() RETURN n`
 | `MATCH (n)-[x:A\|:B\|:C*]-() RETURN n`     | Syntax | Deprecated | Replaced by `MATCH (n)-[x:A\|B\|C*]-() RETURN n`
 | link:/docs/java-reference/5/extending-neo4j/aggregation-functions#extending-neo4j-aggregation-functions[User-defined aggregation functions] | Functionality | Added |
-<<<<<<< HEAD
 | xref:indexes/search-performance-indexes/managing-indexes.adoc[Composite indexes] | Index | Added |
 | xref:constraints/managing-constraints.adoc#create-key-constraint[Node Key] | Index | Added | Neo4j Enterprise Edition only
-=======
-| xref:indexes-for-search-performance.adoc[Composite indexes] | Index | Added |
-| xref:constraints/examples.adoc#constraints-examples-node-key[Node Key] | Index | Added | Neo4j Enterprise Edition only
->>>>>>> b38c1e9 (Document relationship key and uniqueness constraints (#225))
 | `CYPHER runtime=compiled` (Compiled runtime) | Functionality | Added | Neo4j Enterprise Edition only
 | xref:functions/list.adoc#functions-reverse-list[reverse()] | Function  | Extended | Now also allows a list as input
 | xref:functions/aggregating.adoc#functions-max[max()], xref:functions/aggregating.adoc#functions-min[min()] | Function  | Extended | Now also supports aggregation over a set containing both strings and numbers

modules/ROOT/images/privileges_grant_and_deny_syntax_dbms_privileges.svg

@@ -0,0 +1,98 @@
+:description: This is the Cypher Query Language documentation for Neo4j, authored by the Neo4j Team.
+
+[[cypher-manual]]
+= The Neo4j Cypher Manual v{neo4j-version}
+:neo4j-buildnumber: {neo4j-version-minor}
+
+Cypher is Neo4j's graph query language that allows users to store and retrieve data from the graph database.
+It is a declarative, SQL-inspired language for describing visual patterns in graphs.
+The syntax provides a visual and logical way to match patterns of nodes and relationships in the graph.
+
+
+== Documentation updates for Neo4j 5
+
+Neo4j {neo4j-version} includes a number of new features and updates.
+A highlight of these include:
+
+* Cypher syntax improvements with Graph Pattern Matching (relationships and labels):
++
+** In `MATCH` clauses, `WHERE` can be placed inside a relationship pattern to filter relationships.
+** In `MATCH` clauses, nodes and relationships can be filtered using more sophisticated label (type) expressions.
+** Simpler alternative syntax to navigate and traverse graphs using the following operators:
+*** `&`: logical `AND`
+*** `|`: logical `OR`
+*** `!`: logical `NOT`
+*** `%`: a "wildcard", meaning "any label" (in Cypher this translates to `size(labels(n)) > 0`). +
+
++
+For more information, see the xref:syntax/expressions.adoc#label-expressions[section on Label expressions] and in xref:clauses/where.adoc[the `WHERE` clause].
+
+* New `elementID` for graph objects:
++
+New IDs are introduced to uniquely identify graph elements in Neo4j databases. 
+Node ID will exist with each release of Neo4j {neo4j-version}. 
++
+For more information, see xref:functions/scalar.adoc#functions-elementid[`elementId()`].
+
+* Composite databases.
++
+Composite databases allow queries that access multiple graphs at once. 
+You can create, update, and remove configurations without a restart, whether the database is within the same cluster, or hosted remotely. 
++
+For more information on composite databases, and how to create composite databases, see link:https://neo4j.com/docs/operations-manual/current/composite-databases/[Operations Manual -> Composite databases], and xref:databases.adoc#administration-databases-create-composite-database[Creating composite databases].
+
+* Immutable privileges. 
++
+Immutable privileges are useful for restricting the actions of users who themselves are able to administer privileges. +
+For more information, see xref:access-control/privileges-immutable.adoc[Immutable privileges].
+
+* `Execute` and `ExecuteBoosted` privilege.
++
+The permissions for the execution of admin procedures have been refreshed; these two privileges are now hierarchically related. 
++
+For more information, see xref:access-control/dbms-administration.adoc#access-control-execute-procedure[the `EXECUTE PROCEDURE` privilege] and xref:access-control/dbms-administration.adoc#access-control-execute-boosted-procedure[the `EXECUTE BOOSTED PROCEDURE` privilege].
+
+* `EXISTS` and `COUNT` are now both expressions.
++
+For more information, see xref:syntax/expressions.adoc#cypher-subquery-expressions[Subquery expressions].
+
+* `SHOW` and `TERMINATE TRANSACTIONS` improvements.
++
+You can now combine these two commands in the same query.
+The ability to yield and filter the output from `TERMINATE TRANSACTIONS` has been added. 
++
+For more information, see xref:deprecations-additions-removals-compatibility.adoc#_updated_features[Updated features list].
+
+* `SHOW SETTINGS` clause.
++
+You can now query configuration settings using `SHOW SETTINGS` clause.
++
+For more information, see xref:clauses/listing-settings.adoc[SHOW SETTINGS].
+
+* Changes to Neo4j indexes:
++
+** The B-tree index type has been removed. 
+** New Range and Point index types are available now.
+** Faster Text index provider for `ENDS WITH` and `CONTAINS` queries is introduced.
+** Full-text indexes can now index lists of strings.
+
++ 
+For more information, see xref:indexes-for-search-performance.adoc[new index types]. 
+
+
+ifdef::backend-html5[(C) {copyright}]
+ifndef::backend-pdf[]
+
+Documentation license: link:{common-license-page-uri}[Creative Commons 4.0]
+endif::[]
+ifdef::backend-pdf[]
+(C) {copyright}
+
+Documentation license: <<license, Creative Commons 4.0>>
+endif::[]
+
+ifdef::backend-pdf[]
+include::license.adoc[leveloffset=+1]
+endif::[]
+
+

modules/ROOT/images/privileges_hierarchy_dbms.svg

@@ -0,0 +1,52 @@
+= Aura and Cypher
+
+== Introduction
+
+Aura is Neo4j's fully managed cloud service. 
+It consists of AuraDB and AuraDS.
+AuraDB is a graph database service for developers building intelligent applications, and AuraDS is a Graph Data Science (GDS) service for data scientists building predictive models and analytics workflows. 
+
+AuraDB is available on the following tiers: 
+
+* AuraDB Free
+* AuraDB Pro
+* AuraDB Enterprise
+
+For more information, see link:{neo4j-docs-base-uri}/aura/auradb[Aura docs - Neo4j AuraDB overview].
+
+AuraDS is available on the following tiers: 
+
+* AuraDS Pro
+* AuraDS Enterprise
+
+For more information, see link:{neo4j-docs-base-uri}/aura/aurads[Aura docs - Neo4j AuraDS overview]
+
+== Using Cypher on Aura
+
+Most Cypher features are available on all tiers of Aura. 
+There are, however, some features which are not available to Aura instances.
+For example, it is not possible to create, alter, or drop databases using Aura, nor is it possible to alter or drop servers.
+
+There are also certain Cypher features which are only available on AuraDB Enterprise instances.
+These can be categorized as the role-based access-control features of Cypher. 
+For example, it is not possible to create, alter, or drop roles using AuraDB Free, AuraDB Pro, AuraDS Pro, or AuraDS Enterprise, but it is possible using AuraDB Enterprise. 
+
+The Cypher Manual uses two different labels to differentiate this distinction:
+
+[options="header,cols=""2a,2a"]
+|===
+| Label | Description
+| label:not-on-aura[] | Cypher feature not available on any tier of Aura.
+| label:aura-db-enterprise[] | Cypher feature only available on AuraDB Enterprise.
+|===
+
+////
+TODO: remove comment blocks once Aura Cheat Sheet has been published. 
+
+== Aura and the Cypher Cheat Sheet
+
+Each different tier of Aura has a customized version of the Cypher Cheat Sheet which only shows the features of Cypher available for the chosen tier. 
+
+The Aura Cheat Sheet can be accessed here: //Add url when available
+Note that the default tier is AuraDB Enterprise. 
+////