Merge branch '324948-aqualls-approval-rules-rewrite' into 'master'

Revise merge request approvals rule page, CTRT

See merge request gitlab-org/gitlab!60759

doc/development/approval_rules.md

@@ -87,7 +87,7 @@ The `ApprovalState` model get these records when approval rules are not
 overwritten.
 
 The `protected_branches` attribute is set and used when a rule is scoped to
-protected branches. See [Scoped to Protected Branch doc](../user/project/merge_requests/approvals/rules.md#scoped-to-protected-branch)
+protected branches. See [Approvals for protected branches](../user/project/merge_requests/approvals/rules.md#approvals-for-protected-branches)
 for more information about the feature.
 
 ### `ApprovalMergeRequestRule`

doc/user/application_security/index.md

@@ -156,7 +156,7 @@ rating.
 
 ### Enabling Security Approvals within a project
 
-To enable the `Vulnerability-Check` or `License-Check` Security Approvals, a [project approval rule](../project/merge_requests/approvals/rules.md#adding--editing-a-default-approval-rule)
+To enable the `Vulnerability-Check` or `License-Check` Security Approvals, a [project approval rule](../project/merge_requests/approvals/rules.md#add-an-approval-rule)
 must be created. A [security scanner job](#security-scanning-tools) must be enabled for
 `Vulnerability-Check`, and a [license scanning](../compliance/license_compliance/index.md#configuration)
 job must be enabled for `License-Check`. When the proper jobs aren't configured, the following

doc/user/project/merge_requests/approvals/index.md

@@ -67,7 +67,7 @@ in your project's settings.
 
 If you enable [approval rule overrides](settings.md#prevent-overriding-default-approvals),
 merge requests created before a change to default approval rules are not affected.
-The only exceptions are changes to the [target branch](rules.md#scoped-to-protected-branch)
+The only exceptions are changes to the [target branch](rules.md#approvals-for-protected-branches)
 of the rule.
 
 ## Optional approvals
@@ -117,6 +117,11 @@ You can modify your external approval rules
 
 The lack of an external approval doesn't block the merging of a merge request.
 
+When [approval rule overrides](settings.md#prevent-overriding-default-approvals) are allowed,
+changes to default approval rules will **not** be applied to existing
+merge requests, except for changes to the [target branch](rules.md#approvals-for-protected-branches)
+of the rule.
+
 To learn more about use cases, feature discovery, and development timelines,
 see the [External API approval rules epic](https://gitlab.com/groups/gitlab-org/-/epics/3869).
 

doc/user/project/merge_requests/approvals/settings.md

@@ -13,7 +13,7 @@ The settings for Merge Request Approvals are found by going to
 ## Prevent overriding default approvals
 
 Regardless of the approval rules you choose for your project, users can edit them in every merge
-request, overriding the [rules you set as default](rules.md#adding--editing-a-default-approval-rule).
+request, overriding the [rules you set as default](rules.md#add-an-approval-rule).
 To prevent that from happening:
 
 1. Select the **Prevent users from modifying MR approval rules in merge requests.** checkbox.