Merge pull request #38831 from github/repo-sync

Repo sync

Author: docs-bot

content/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization.md

@@ -78,9 +78,9 @@ If your organization has a security team, you can use the security manager role
 
 ### {% data variables.product.prodname_github_app %} managers
 
-By default, only organization owners can manage the settings of {% data variables.product.prodname_github_app %} registrations owned by an organization. To allow additional users to manage {% data variables.product.prodname_github_app %} registrations owned by an organization, an owner can grant them {% data variables.product.prodname_github_app %} manager permissions.
+By default, only organization owners can manage the settings of {% data variables.product.prodname_github_app %} registrations owned by an organization. To allow additional users{% ifversion org-app-manager-teams %} or teams{% endif %} to manage {% data variables.product.prodname_github_app %} registrations owned by an organization, an owner can grant them {% data variables.product.prodname_github_app %} manager permissions.
 
-When you designate a user as a {% data variables.product.prodname_github_app %} manager in your organization, you can grant them access to manage the settings of some or all {% data variables.product.prodname_github_app %} registrations owned by the organization. The {% data variables.product.prodname_github_app %} manager role does not grant users access to install and uninstall {% data variables.product.prodname_github_apps %} on an organization. For more information, see [AUTOTITLE](/organizations/managing-programmatic-access-to-your-organization/adding-and-removing-github-app-managers-in-your-organization).
+When you designate a user{% ifversion org-app-manager-teams %} or team{% endif %} as a {% data variables.product.prodname_github_app %} manager in your organization, you can grant them access to manage the settings of some or all {% data variables.product.prodname_github_app %} registrations owned by the organization. The {% data variables.product.prodname_github_app %} manager role does not grant users access to install and uninstall {% data variables.product.prodname_github_apps %} on an organization. For more information, see [AUTOTITLE](/organizations/managing-programmatic-access-to-your-organization/adding-and-removing-github-app-managers-in-your-organization).
 
 ### Outside collaborators{% ifversion repository-collaborators %} or repository collaborators{% endif %}
 

content/organizations/managing-programmatic-access-to-your-organization/adding-and-removing-github-app-managers-in-your-organization.md

@@ -25,34 +25,44 @@ shortTitle: GitHub App managers
 
 {% data reusables.apps.github-app-managers %}
 
-## Giving someone the ability to manage all {% data variables.product.prodname_github_apps %} owned by the organization
+## Granting the ability to manage all {% data variables.product.prodname_github_apps %} owned by the organization
 
+{%- ifversion org-app-manager-teams %}
+To assign the App Manager organization role to a user or team, see [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/using-organization-roles#assigning-an-organization-role).
+
+Use the role assignments page to see who has been granted this and any other organization role. Organization owners can always manage {% data variables.product.prodname_github_apps %} and are not shown in this view.
+{%- else %}
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
 {% data reusables.organizations.github-apps-settings-sidebar %}
 1. At the bottom of the "Management" section, in the search field, type the username of the person you want to designate as a {% data variables.product.prodname_github_app %} manager in the organization, then click **Grant**.
+{%- endif %}
 
-## Giving someone the ability to manage an individual {% data variables.product.prodname_github_app %}
+## Granting the ability to manage an individual {% data variables.product.prodname_github_app %}
 
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
 {% data reusables.organizations.github-apps-settings-sidebar %}
 1. Under "{% data variables.product.prodname_github_apps %}", click on the avatar of the app you'd like to add a {% data variables.product.prodname_github_app %} manager for.
 {% data reusables.organizations.app-managers-settings-sidebar %}
-1. At the bottom of the "App managers" section, in the search field, type the username of the person you want to designate as a GitHub App manager for the app, then click **Grant**.
+1. At the bottom of the "App managers" section, in the search field, type the username of the person{%- ifversion org-app-manager-teams %} or team{%- endif %} you want to designate as a GitHub App manager for the app, then click **Grant**.
 
 ## Removing a {% data variables.product.prodname_github_app %} manager's permissions for the entire organization
 
+{%- ifversion org-app-manager-teams %}
+See [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/using-organization-roles#deleting-an-organization-role-assignment) for directions on removing the App Manager role from a user or team.
+{%- else %}
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
 {% data reusables.organizations.github-apps-settings-sidebar %}
 1. Under "Management", next to the person you want to remove {% data variables.product.prodname_github_app %} manager permissions from, click **Revoke**.
+{%- endif %}
 
-## Removing a {% data variables.product.prodname_github_app %} manager's permissions for an individual {% data variables.product.prodname_github_app %}
+## Removing managers from an individual {% data variables.product.prodname_github_app %}
 
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
 {% data reusables.organizations.github-apps-settings-sidebar %}
 1. Under "{% data variables.product.prodname_github_apps %}", click on the avatar of the app you'd like to remove a {% data variables.product.prodname_github_app %} manager from.
 {% data reusables.organizations.app-managers-settings-sidebar %}
-1. Under "App managers", next to the person you want to remove {% data variables.product.prodname_github_app %} manager permissions from, click **Revoke**.
+1. Under "App managers", next to the person{%- ifversion org-app-manager-teams %} or team{%- endif %} you want to remove {% data variables.product.prodname_github_app %} manager permissions from, click **Revoke**.

data/features/org-app-manager-teams.yml

@@ -0,0 +1,5 @@
+# Issue https://github.com/github/releases/issues/6052
+versions:
+  ghec: '*'
+  fpt: '*'
+  ghes: '>=3.18'

data/reusables/apps/github-app-managers.md

@@ -1,3 +1,3 @@
-Organization owners can designate other users in their organization as {% data variables.product.prodname_github_app %} managers. {% data variables.product.prodname_github_app %} managers can manage the settings of some or all of the {% data variables.product.prodname_github_app %} registrations that are owned by the organization. The {% data variables.product.prodname_github_app %} manager role does not grant users access to install and uninstall {% data variables.product.prodname_github_apps %} on an organization. For more information about the specific app settings that a {% data variables.product.prodname_github_app %} manager can control, see [AUTOTITLE](/apps/maintaining-github-apps/modifying-a-github-app).
+Organization owners can designate other users{% ifversion org-app-manager-teams %} or teams{% endif %} in their organization as {% data variables.product.prodname_github_app %} managers. {% data variables.product.prodname_github_app %} managers can manage the settings of some or all of the {% data variables.product.prodname_github_app %} registrations that are owned by the organization. The {% data variables.product.prodname_github_app %} manager role does not grant recipients access to install and uninstall {% data variables.product.prodname_github_apps %} on an organization. For more information about the specific app settings that {% data variables.product.prodname_github_app %} managers can control, see [AUTOTITLE](/apps/maintaining-github-apps/modifying-a-github-app).
 
 For more information about {% data variables.product.prodname_github_app %} manager permissions, see [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization#github-app-managers).

data/reusables/organizations/pre-defined-organization-roles.md

@@ -11,3 +11,6 @@ The current set of pre-defined roles are:
 * **CI/CD admin:** Grants admin access to manage Actions policies, runners, runner groups, hosted compute network configurations, secrets, variables, and usage metrics for an organization.
 * **Security manager**: Grants the ability to manage security policies, security alerts, and security configurations for an organization and all its repositories.
 {%- endif %}
+{%- ifversion org-app-manager-teams %}
+* **App Manager:**  Grants the ability to create, edit, and delete all GitHub Apps in an organization.
+{%- endif %}