Moving the password page to auth (neo4j#1260)

Co-authored-by: Reneta Popova <reneta.popova@neo4j.com>

Author: lidiazuin

modules/ROOT/content-nav.adoc

@@ -40,8 +40,11 @@
 ** xref:configuration/file-locations.adoc[]
 ** xref:configuration/ports.adoc[]
 ** xref:configuration/set-initial-password.adoc[]
+<<<<<<< HEAD
 ** xref:configuration/password-and-user-recovery.adoc[]
 ** xref:configuration/connectors.adoc[]
+=======
+>>>>>>> 27a31fa (Moving the password page to auth (#1260))
 ** xref:configuration/plugins.adoc[Plugins]
 ** xref:configuration/dynamic-settings.adoc[]
 ** xref:configuration/transaction-logs.adoc[]
@@ -81,6 +84,7 @@
 * xref:authentication-authorization/index.adoc[]
 ** xref:authentication-authorization/introduction.adoc[]
 ** xref:authentication-authorization/built-in-roles.adoc[]
+** xref:authentication-authorization/password-and-user-recovery.adoc[]
 ** xref:authentication-authorization/access-control.adoc[]
 ** xref:authentication-authorization/ldap-integration.adoc[]
 ** xref:authentication-authorization/manage-execute-permissions.adoc[]

modules/ROOT/pages/configuration/password-and-user-recovery.adoc renamed to modules/ROOT/pages/authentication-authorization/password-and-user-recovery.adoc

@@ -1,6 +1,7 @@
 :description: This page describes how to reset a password to recover a user's access when their password is lost. It specifically focuses on how to recover an admin user if all the admin users have been unassigned the admin role, and how to recreate the built-in admin role if it has been dropped.
+:page-aliases: configuration/password-and-user-recovery.adoc
 [[password-and-user-recovery]]
-= Password and user recovery
+=  Recover admin user and password
 
 This page describes how to reset a password to recover a user's access when their password is lost.
 It specifically focuses on how to recover an admin user if all the admin users have been unassigned the admin role, and how to recreate the built-in admin role if it has been dropped.
@@ -100,7 +101,7 @@ You can use a client such as xref:tools/cypher-shell.adoc[Cypher Shell] or the N
 In a cluster deployment, you should complete the steps only on one of the Core servers.
 ====
 
-. Complete the steps in xref:configuration/password-and-user-recovery.adoc#disable-authentication[Disable authentication] as per your deployment.
+. Complete the steps in xref:authentication-authorization/password-and-user-recovery.adoc#disable-authentication[Disable authentication] as per your deployment.
 . Connect to the `system` database using Cypher shell.
 Alternatively, log into Neo4j Browser.
 +
@@ -126,7 +127,7 @@ ALTER USER neo4j SET PASSWORD 'mynewpass'
 ----
 :exit;
 ----
-. Proceed with the xref:configuration/password-and-user-recovery.adoc#post-recovery[post-recovery steps] as per your deployment.
+. Proceed with the xref:authentication-authorization/password-and-user-recovery.adoc#post-recovery[post-recovery steps] as per your deployment.
 
 [[recover-unassigned-admin-role]]
 == Recover an unassigned admin role
@@ -138,7 +139,7 @@ You can use a client such as xref:tools/cypher-shell.adoc[Cypher Shell] or the N
 In a cluster deployment, you should complete the steps only on one of the Core servers.
 ====
 
-. Complete the steps in xref:configuration/password-and-user-recovery.adoc#disable-authentication[Disable authentication] as per your deployment.
+. Complete the steps in xref:authentication-authorization/password-and-user-recovery.adoc#disable-authentication[Disable authentication] as per your deployment.
 . Connect to the `system` database using Cypher shell.
 Alternatively, log into Neo4j Browser.
 +
@@ -164,7 +165,7 @@ GRANT ROLE admin TO neo4j
 ----
 :exit;
 ----
-. Proceed with the xref:configuration/password-and-user-recovery.adoc#post-recovery[post-recovery steps] as per your deployment.
+. Proceed with the xref:authentication-authorization/password-and-user-recovery.adoc#post-recovery[post-recovery steps] as per your deployment.
 
 [[recover-admin-role]]
 == Recover the admin role
@@ -176,7 +177,7 @@ If you have removed the admin role from your system entirely, you can use a clie
 In a cluster deployment, you should complete the steps only on one of the Core servers.
 ====
 
-. Complete the steps in xref:configuration/password-and-user-recovery.adoc#disable-authentication[Disable authentication] as per your deployment.
+. Complete the steps in xref:authentication-authorization/password-and-user-recovery.adoc#disable-authentication[Disable authentication] as per your deployment.
 . Connect to the `system` database using Cypher shell.
 Alternatively, log into Neo4j Browser.
 +
@@ -217,7 +218,7 @@ To grant the role to a user (assuming your existing user is named `neo4j`), you
 ----
 :exit;
 ----
-. Proceed with the xref:configuration/password-and-user-recovery.adoc#post-recovery[post-recovery steps] as per your deployment.
+. Proceed with the xref:authentication-authorization/password-and-user-recovery.adoc#post-recovery[post-recovery steps] as per your deployment.
 
 [[post-recovery]]
 == Post-recovery steps
@@ -233,7 +234,7 @@ To grant the role to a user (assuming your existing user is named `neo4j`), you
 ----
 $ bin/neo4j stop
 ----
-. Enable the authentication and restore your Neo4j to its original configuration (See xref:configuration/password-and-user-recovery.adoc#disable-authentication[Disable authentication]).
+. Enable the authentication and restore your Neo4j to its original configuration (See xref:authentication-authorization/password-and-user-recovery.adoc#disable-authentication[Disable authentication]).
 . Start Neo4j:
 +
 [source, shell]

modules/ROOT/pages/configuration/index.adoc

@@ -8,10 +8,8 @@ The topics described are:
 * xref:configuration/file-locations.adoc[File locations] -- An overview of where files are stored in the different Neo4j distributions and the necessary file permissions for running Neo4j.
 * xref:configuration/ports.adoc[Ports] -- An overview of the ports relevant to a Neo4j installation.
 * xref:configuration/set-initial-password.adoc[Set initial password] -- How to set an initial password.
-* xref:configuration/password-and-user-recovery.adoc[Password and user recovery]  -- How to recover after a lost admin password.
-* xref:configuration/connectors.adoc[Configure Neo4j connectors] -- How to configure Neo4j connectors.
-* xref:configuration/dynamic-settings.adoc[Configure dynamic settings] -- How to configure certain Neo4j parameters while Neo4j is running.
-* xref:configuration/transaction-logs.adoc[Transaction logs] -- The transaction logs record all write operations in the database.
+* xref:configuration/dynamic-settings.adoc[Update dynamic settings] -- How to configure certain Neo4j parameters while Neo4j is running.
+* xref:configuration/configuration-settings.adoc[Configuration settings] -- A complete reference of all configuration settings.
 
 For a complete reference of Neo4j configuration settings, see xref:reference/configuration-settings.adoc[Configuration settings].