Improve the page on managing servers in cluster (#2702)

Author: NataliaIvakina

modules/ROOT/images/server-lifecycle.svg

@@ -4,8 +4,11 @@
 [[database-management]]
 = Managing databases in a cluster
 
-The number of both primary and secondary servers to host a database can be set when the database is created and altered after creation.
-The command `CREATE DATABASE` can be used to specify the initial topology and `ALTER DATABASE` can be used to change the topology once the database is created.
+When creating a database or altering it after creation, you can specify its role: `PRIMARY` or `SECONDARY`.
+To specify the initial topology, use the command `CREATE DATABASE`.
+To change the topology once the database is created, run the `ALTER DATABASE` command.
+Note that the database role must be aligned with the server's xref:clustering/servers.adoc#server-enabled-state[`modeConstraint`], which value can be `PRIMARY`, or `SECONDARY`, or `NONE`.
+
 If a database is no longer needed, the command `DROP DATABASE` deletes the database from the cluster.
 
 [[cluster-system-db]]
@@ -15,7 +18,8 @@ The `system` database contains metadata on the DBMS and security configuration.
 When connected to this database you can only perform a specific set of administrative tasks, such as managing databases, servers, and access control.
 
 In the clustered environment, the `system` database can be in a primary or secondary mode.
-To configure its mode, use the xref:configuration/configuration-settings.adoc#config_server.cluster.system_database_mode[`server.cluster.system_database_mode`] setting.
+To configure its mode, use the xref:configuration/configuration-settings.adoc#config_server.cluster.system_database_mode[`server.cluster.system_database_mode`] setting in the _neo4j.conf_ file.
+This has to be done before starting the Neo4j process.
 
 Deploying a cluster for the first time, consider configuring the xref:configuration/configuration-settings.adoc#config_dbms.cluster.minimum_initial_system_primaries_count[`dbms.cluster.minimum_initial_system_primaries_count`].
 This setting defaults to `3`.
@@ -61,7 +65,7 @@ For example, if the cluster's servers are set up with mode constraints to contai
 [NOTE]
 ====
 If `TOPOLOGY` is not specified, the database is created according to `initial.dbms.default_primaries_count` and `initial.dbms.default_secondaries_count` specified in _neo4j.conf_.
-After cluster startup, you can overwrite these values using the `dbms.setDefaultAllocationNumbers` procedure.
+After cluster startup, you can overwrite these values using the `dbms.setDefaultAllocationNumbers()` procedure.
 ====
 
 [NOTE]

modules/ROOT/images/server-states.png

@@ -1,21 +1,23 @@
 :description: This section provides a summary of server management Cypher syntax.
 [role=enterprise-edition]
 [[server-commands-reference]]
-= Server commands reference
+= Server management command syntax
 
-Servers can be added and managed using a set of Cypher administration commands executed against the `system` database.
+Servers can be added and managed using a set of Cypher administrative commands executed against the `system` database.
 
-When connected to the DBMS over `bolt`, administration commands are automatically routed to the `system` database.
+When connected to the DBMS over `bolt`, administrative commands are automatically routed to the `system` database.
 
 
 [[server-management-syntax]]
 == Server management command syntax
 
 [NOTE]
 ====
-More details about the syntax descriptions can be found xref:database-administration/syntax.adoc[here].
+More details about the syntax descriptions can be found on the page xref:database-administration/syntax.adoc#administration-syntax-reading[Database management command syntax -> Reading the administrative commands syntax].
 ====
 
+=== Enable a server
+
 [cols="<15s,<85"]
 |===
 | Command
@@ -38,73 +40,86 @@ a| `GRANT SERVER MANAGEMENT`
 (see xref:authentication-authorization/dbms-administration.adoc#access-control-dbms-administration-privilege-management[SERVER MANAGEMENT privileges])
 |===
 
+
+=== List servers
+
 [cols="<15s,<85"]
 |===
 | Command
-m| ALTER SERVER
+m| SHOW SERVERS
 
 | Syntax
 a|
 [source, syntax, role=noheader]
 ----
-ALTER SERVER 'name' SET OPTIONS "{" option: value[,...] "}"
+SHOW SERVER[S]
+  [YIELD { * \| field[, ...] } [ORDER BY field[, ...]] [SKIP n] [LIMIT n]]
+  [WHERE expression]
+  [RETURN field[, ...] [ORDER BY field[, ...]] [SKIP n] [LIMIT n]]
 ----
 
 | Description
-a| Changes the constraints for a server.
-For more information see xref:clustering/servers.adoc#alter-server-options[Altering server options].
+a| Lists all servers visible to the cluster.
+For more information see xref:clustering/servers.adoc#_listing_servers[Listing servers].
 
 | Required privilege
-a| `GRANT SERVER MANAGEMENT`
+a| `GRANT SHOW SERVERS`
 
 (see xref:authentication-authorization/dbms-administration.adoc#access-control-dbms-administration-privilege-management[SERVER MANAGEMENT privileges])
 |===
 
+
+=== Alter server's options
+
 [cols="<15s,<85"]
 |===
 | Command
-m| RENAME SERVER
+m| ALTER SERVER
 
 | Syntax
 a|
 [source, syntax, role=noheader]
 ----
-RENAME SERVER 'name' TO 'newName'
+ALTER SERVER 'name' SET OPTIONS "{" option: value[,...] "}"
 ----
 
 | Description
-a| Changes the name of a server.
-For more information see xref:clustering/servers.adoc#_renaming_a_server[Renaming a server].
+a| Changes the constraints for a server.
+For more information see xref:clustering/servers.adoc#alter-server-options[Altering server options].
 
 | Required privilege
 a| `GRANT SERVER MANAGEMENT`
 
 (see xref:authentication-authorization/dbms-administration.adoc#access-control-dbms-administration-privilege-management[SERVER MANAGEMENT privileges])
 |===
 
+=== Rename a server
 
 [cols="<15s,<85"]
 |===
 | Command
-m| DEALLOCATE DATABASES
+m| RENAME SERVER
 
 | Syntax
 a|
 [source, syntax, role=noheader]
 ----
-[DRYRUN] DEALLOCATE DATABASE[S] FROM SERVER[S] 'name'[, ...]
+RENAME SERVER 'name' TO 'newName'
 ----
 
 | Description
-a| Removes all databases from the given servers.
-For more information see xref:clustering/servers.adoc#_deallocating_databases_from_a_server[Deallocating databases from  server].
+a| Changes the name of a server.
+For more information see xref:clustering/servers.adoc#_renaming_a_server[Renaming a server].
 
 | Required privilege
 a| `GRANT SERVER MANAGEMENT`
 
 (see xref:authentication-authorization/dbms-administration.adoc#access-control-dbms-administration-privilege-management[SERVER MANAGEMENT privileges])
 |===
 
+
+=== Remove a server
+
 [cols="<15s,<85"]
 |===
 | Command
@@ -127,48 +142,51 @@ a| `GRANT SERVER MANAGEMENT`
 (see xref:authentication-authorization/dbms-administration.adoc#access-control-dbms-administration-privilege-management[SERVER MANAGEMENT privileges])
 |===
 
+
+=== Reallocate databases in a cluster
+
 [cols="<15s,<85"]
 |===
 | Command
-m| SHOW SERVERS
+m| REALLOCATE DATABASES
 
 | Syntax
 a|
 [source, syntax, role=noheader]
 ----
-SHOW SERVER[S]
-  [YIELD { * \| field[, ...] } [ORDER BY field[, ...]] [SKIP n] [LIMIT n]]
-  [WHERE expression]
-  [RETURN field[, ...] [ORDER BY field[, ...]] [SKIP n] [LIMIT n]]
+[DRYRUN] REALLOCATE DATABASE[S]
 ----
 
 | Description
-a| Lists all servers visible to the cluster.
-For more information see xref:clustering/servers.adoc#_listing_servers[Listing servers].
+a| Re-balances databases among the servers in the cluster.
+For more information see xref:clustering/servers.adoc#_hosting_databases_on_added_servers[Hosting databases on added servers].
+
+Note that is a cluster-level command, not a server-level command.
 
 | Required privilege
-a| `GRANT SHOW SERVERS`
+a| `GRANT SERVER MANAGEMENT`
 
 (see xref:authentication-authorization/dbms-administration.adoc#access-control-dbms-administration-privilege-management[SERVER MANAGEMENT privileges])
 |===
 
+
+=== Deallocate databases from a server
+
 [cols="<15s,<85"]
 |===
 | Command
-m| REALLOCATE DATABASES
+m| DEALLOCATE DATABASES
 
 | Syntax
 a|
 [source, syntax, role=noheader]
 ----
-[DRYRUN] REALLOCATE DATABASE[S]
+[DRYRUN] DEALLOCATE DATABASE[S] FROM SERVER[S] 'name'[, ...]
 ----
 
 | Description
-a| Re-balances databases among the servers in the cluster.
-For more information see xref:clustering/servers.adoc#_hosting_databases_on_added_servers[Hosting databases on added servers].
-
-Note that is a cluster-level command, not a server-level command.
+a| Removes all user databases from the given servers.
+For more information see xref:clustering/servers.adoc#_deallocating_databases_from_a_server[Deallocating databases from  server].
 
 | Required privilege
 a| `GRANT SERVER MANAGEMENT`