Skip to content

5.0 cherry-pick of #31 #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 10, 2022
Merged

5.0 cherry-pick of #31 #146

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions modules/ROOT/pages/access-control/built-in-roles.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,11 @@ SHOW ROLE admin PRIVILEGES AS COMMANDS
a|Rows: 13
|===

<<<<<<< HEAD
If the built-in `admin` role has been altered or dropped, and needs to be restored to its original state, see xref:5.0@operations-manual:ROOT:configuration/password-and-user-recovery/index.adoc[Operations Manual -> Password and user recovery].
=======
If the built-in `admin` role has been altered or dropped, and needs to be restored to its original state, see xref:4.4@operations-manual:ROOT:configuration/password-and-user-recovery/index.adoc[Operations Manual -> Password and user recovery].
>>>>>>> 28993c8 (Editorial review of the built in roles for access control section (#31))


[[access-control-built-in-roles-admin-recreate]]
Expand Down