Merge branch 'lciutacu-master-patch-5478' into 'master'

Edit note about member promotion management

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/167740



Merged-by: Suraj Tripathi <stripathi@gitlab.com>
Approved-by: Suraj Tripathi <stripathi@gitlab.com>
Co-authored-by: Lorena Ciutacu <lciutacu@gitlab.com>

doc/api/invitations.md

@@ -74,11 +74,12 @@ When there was any error sending the email:
 ```
 
 NOTE:
+When the setting **Manage non-billable promotions** is enabled, new invited members with billable roles must be approved by an administrator.
 
-When the ability to **Manage Non-Billable Promotions** is enabled, the newly invited member will be pending administrator approval if the role is billable. To enable **Manage Non-Billable Promotions**:
+To enable **Manage non-billable promotions**:
 
-1. Enable `enable_member_promotion_management` Application Setting
-1. Enable `member_promotion_management` Feature Flag
+1. Enable the `enable_member_promotion_management` application setting.
+1. Enable the `member_promotion_management` feature flag.
 
 Example response:
 

doc/api/members.md

@@ -627,11 +627,12 @@ Example response:
 ```
 
 NOTE:
+When the setting **Manage non-billable promotions** is enabled, new invited members with billable roles must be approved by an administrator.
 
-When the ability to **Manage Non-Billable Promotions** is enabled, the newly added member will be pending administrator approval if the role is billable. To enable **Manage Non-Billable Promotions**:
+To enable **Manage Non-Billable Promotions**:
 
-1. Enable `enable_member_promotion_management` Application Setting
-1. Enable `member_promotion_management` Feature Flag
+1. Enable the `enable_member_promotion_management` application setting.
+1. Enable the `member_promotion_management` feature flag.
 
 Example of queueing a single user:
 
@@ -718,11 +719,12 @@ Example response:
 ```
 
 NOTE:
+When the setting **Manage non-billable promotions** is enabled, new invited users with billable roles must be approved by an administrator.
 
-When the ability to **Manage Non-Billable Promotions** is enabled, if the role is changed to a billable one, the request will be sent to administrator approval. To enable **Manage Non-Billable Promotions**:
+To enable **Manage non-billable promotions**:
 
-1. Enable `enable_member_promotion_management` Application Setting
-1. Enable `member_promotion_management` Feature Flag
+1. Enable the `enable_member_promotion_management` application setting.
+1. Enable the `member_promotion_management` feature flag.
 
 Example response: