diff --git a/assets/images/help/organizations/org-insights-dependencies-my-orgs-button.png b/assets/images/help/organizations/org-insights-dependencies-my-orgs-button.png index 3e60245955..6789cd273b 100644 Binary files a/assets/images/help/organizations/org-insights-dependencies-my-orgs-button.png and b/assets/images/help/organizations/org-insights-dependencies-my-orgs-button.png differ diff --git a/assets/images/help/organizations/org-nav-insights-tab.png b/assets/images/help/organizations/org-nav-insights-tab.png index f844f518a0..5202673710 100644 Binary files a/assets/images/help/organizations/org-nav-insights-tab.png and b/assets/images/help/organizations/org-nav-insights-tab.png differ diff --git a/assets/images/help/organizations/organization-people-tab.png b/assets/images/help/organizations/organization-people-tab.png index 26e3395292..2917d395a5 100644 Binary files a/assets/images/help/organizations/organization-people-tab.png and b/assets/images/help/organizations/organization-people-tab.png differ diff --git a/assets/images/help/organizations/organization-projects-tab-table.png b/assets/images/help/organizations/organization-projects-tab-table.png index ddf4983765..8ea51ac3b9 100644 Binary files a/assets/images/help/organizations/organization-projects-tab-table.png and b/assets/images/help/organizations/organization-projects-tab-table.png differ diff --git a/assets/images/help/organizations/organization-security-tab.png b/assets/images/help/organizations/organization-security-tab.png index 75b1d0406c..bc6bcfec67 100644 Binary files a/assets/images/help/organizations/organization-security-tab.png and b/assets/images/help/organizations/organization-security-tab.png differ diff --git a/assets/images/help/organizations/organization-teams-tab.png b/assets/images/help/organizations/organization-teams-tab.png index 078c54303c..a1e882044f 100644 Binary files a/assets/images/help/organizations/organization-teams-tab.png and b/assets/images/help/organizations/organization-teams-tab.png differ diff --git a/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/managing-the-default-branch-name-for-your-repositories.md b/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/managing-the-default-branch-name-for-your-repositories.md index 8da635849a..2ecae3dbed 100644 --- a/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/managing-the-default-branch-name-for-your-repositories.md +++ b/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/managing-the-default-branch-name-for-your-repositories.md @@ -24,12 +24,9 @@ When you create a new repository on {% data variables.location.product_location {% data reusables.user-settings.access_settings %} {% data reusables.user-settings.repo-tab %} -3. Under "Repository default branch", click **Change default branch name now**. - ![Override button](/assets/images/help/settings/repo-default-name-button.png) -4. Type the default name that you would like to use for new branches. - ![Text box for entering default name](/assets/images/help/settings/repo-default-name-text.png) -5. Click **Update**. - ![Update button](/assets/images/help/settings/repo-default-name-update.png) +1. Under "Repository default branch", click **Change default branch name now**. +1. In the text field, type the default name that you would like to use for new branches. +1. Click **Update**. ## Further reading diff --git a/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/exporting-audit-log-activity-for-your-enterprise.md b/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/exporting-audit-log-activity-for-your-enterprise.md index 357abab154..6842f58c55 100644 --- a/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/exporting-audit-log-activity-for-your-enterprise.md +++ b/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/exporting-audit-log-activity-for-your-enterprise.md @@ -15,7 +15,7 @@ topics: You can export the audit log by downloading a JSON or CSV file from your enterprise on {% data variables.product.product_name %}. When you export audit log events, you can query by one or more of these supported qualifiers to filter for specific log events to export. For more information about search qualifiers, see "[AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/searching-the-audit-log-for-your-enterprise#search-based-on-the-action-performed)." -You can export Git events data by downloading a JSON file from your enterprise audit log. Unlike audit log data, you cannot query for specific Git events to filter and export in the audit log user interface. +You can export Git events data by downloading a JSON file from your enterprise audit log. Unlike audit log data, you cannot query for specific Git events to filter and export in the audit log user interface. {% data reusables.audit_log.git-events-export-limited %} @@ -29,9 +29,7 @@ As an alternative to exporting log events, you can use the API to retrieve audit {% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.audit-log-tab %} 1. Optionally, to only export filtered results, search by one or more supported qualifiers or log filters. -2. Select the {% octicon "download" aria-label="The Download icon" %} **Export** dropdown menu, and choose the file format (JSON or CSV) to export log events in. - - ![Export button](/assets/images/help/organizations/org-audit-log-export.png) +1. Select the {% octicon "download" aria-hidden="true" %} **Export** dropdown menu, and click a file format. ## Exporting Git events data @@ -40,10 +38,8 @@ You can also export Git events data by date range. {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.audit-log-tab %} -1. Select the {% octicon "download" aria-label="The Download icon" %} **Export Git Events** dropdown menu and choose a date range to export log events for. - - ![Export Git events button](/assets/images/help/organizations/org-audit-log-export-git-events.png) -1. Click {% octicon "file-zip" aria-label="The File-zip icon" %} **Download Results** to download the file. +1. Select the {% octicon "download" aria-hidden="true" %} **Export Git Events** dropdown menu and choose a date range to export log events for. +1. Click {% octicon "file-zip" aria-hidden="true" %} **Download Results**. 1. The data is exported as a compressed JSON file. To extract the JSON data, uncompress the file using an archive utility client or command. For example: ``` diff --git a/content/admin/user-management/managing-organizations-in-your-enterprise/adding-people-to-teams.md b/content/admin/user-management/managing-organizations-in-your-enterprise/adding-people-to-teams.md deleted file mode 100644 index fd439bbd52..0000000000 --- a/content/admin/user-management/managing-organizations-in-your-enterprise/adding-people-to-teams.md +++ /dev/null @@ -1,41 +0,0 @@ ---- -title: Adding people to teams -redirect_from: - - /enterprise/admin/articles/adding-teams - - /enterprise/admin/articles/adding-or-inviting-people-to-teams - - /enterprise/admin/guides/user-management/adding-or-inviting-people-to-teams - - /enterprise/admin/user-management/adding-people-to-teams - - /admin/user-management/adding-people-to-teams -intro: 'Once a team has been created, organization admins can add users from {% data variables.location.product_location %} to the team and determine which repositories they have access to.' -versions: - ghes: '*' - ghae: '*' -type: how_to -topics: - - Access management - - Enterprise - - Teams - - User account ---- -Each team has its own individually defined [access permissions for repositories owned by your organization](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization). - -- Members with the owner role can add or remove existing organization members from all teams. -- Members of teams that give admin permissions can only modify team membership and repositories for that team. - -## Setting up a team - -{% data reusables.profile.access_org %} -{% data reusables.user-settings.access_org %} -{% data reusables.organizations.specific_team %} -{% data reusables.organizations.invite_to_team %} -{% data reusables.organizations.review-team-repository-access %} - -{% ifversion ghes %} - -## Mapping teams to LDAP groups (for instances using LDAP Sync for user authentication) - -{% data reusables.enterprise_management_console.badge_indicator %} - -To add a new member to a team synced to an LDAP group, add the user as a member of the LDAP group, or contact your LDAP administrator. - -{% endif %} diff --git a/content/admin/user-management/managing-organizations-in-your-enterprise/creating-teams.md b/content/admin/user-management/managing-organizations-in-your-enterprise/creating-teams.md deleted file mode 100644 index e603e6625e..0000000000 --- a/content/admin/user-management/managing-organizations-in-your-enterprise/creating-teams.md +++ /dev/null @@ -1,66 +0,0 @@ ---- -title: Creating teams -intro: 'Teams give organizations the ability to create groups of members and control access to repositories. Team members can be granted read, write, or admin permissions to specific repositories.' -redirect_from: - - /enterprise/admin/user-management/creating-teams - - /admin/user-management/creating-teams -versions: - ghes: '*' - ghae: '*' -type: how_to -topics: - - Access management - - Enterprise - - Teams - - User account ---- -Teams are central to many of {% data variables.product.prodname_dotcom %}'s collaborative features, such as team @mentions to notify appropriate parties that you'd like to request their input or attention. For more information, see "[AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)." - -A team can represent a group within your company or include people with certain interests or expertise. For example, a team of accessibility experts on {% data variables.location.product_location %} could comprise of people from several different departments. Teams can represent functional concerns that complement a company's existing divisional hierarchy. - -Organizations can create multiple levels of nested teams to reflect a company or group's hierarchy structure. For more information, see "[AUTOTITLE](/organizations/organizing-members-into-teams/about-teams#nested-teams)." - -## Creating a team - -A prudent combination of teams is a powerful way to control repository access. For example, if your organization allows only your release engineering team to push code to the default branch of any repository, you could give only the release engineering team **admin** permissions to your organization's repositories and give all other teams **read** permissions. - -{% data reusables.profile.access_org %} -{% data reusables.user-settings.access_org %} -{% data reusables.organizations.new_team %} -{% data reusables.organizations.team_name %} -{% data reusables.organizations.team_description %} -{% data reusables.organizations.team_visibility %} -{% data reusables.organizations.create-team-choose-parent %} -{% data reusables.organizations.create_team %} - -{% ifversion ghes %} - -## Creating teams with LDAP Sync enabled - -Instances using LDAP for user authentication can use LDAP Sync to manage a team's members. Setting the group's **Distinguished Name** (DN) in the **LDAP group** field will map a team to an LDAP group on your LDAP server. If you use LDAP Sync to manage a team's members, you won't be able to manage your team within {% data variables.location.product_location %}. The mapped team will sync its members in the background and periodically at the interval configured when LDAP Sync is enabled. For more information, see "[AUTOTITLE](/admin/identity-and-access-management/using-ldap-for-enterprise-iam/using-ldap#enabling-ldap-sync)." - -You must be a site admin and an organization owner to create a team with LDAP sync enabled. - -{% data reusables.enterprise_user_management.ldap-sync-nested-teams %} - -{% warning %} - -**Notes:** -- LDAP Sync only manages the team's member list. You must manage the team's repositories and permissions from within {% data variables.product.prodname_ghe_server %}. -- If an LDAP group mapping to a DN is removed, such as if the LDAP group is deleted, then every member is removed from the synced {% data variables.product.prodname_ghe_server %} team. To fix this, map the team to a new DN, add the team members back, and [manually sync the mapping](/admin/identity-and-access-management/using-ldap-for-enterprise-iam/using-ldap#manually-syncing-ldap-accounts). -- When LDAP Sync is enabled, if a person is removed from a repository, they will lose access but their forks will not be deleted. If the person is added to a team with access to the original organization repository within three months, their access to the forks will be automatically restored on the next sync. - -{% endwarning %} - -1. Ensure that [LDAP Sync is enabled](/admin/identity-and-access-management/using-ldap-for-enterprise-iam/using-ldap#enabling-ldap-sync). -{% data reusables.profile.access_org %} -{% data reusables.user-settings.access_org %} -{% data reusables.organizations.new_team %} -{% data reusables.organizations.team_name %} -6. Under "LDAP group", search for an LDAP group's DN to map the team to. If you don't know the DN, type the LDAP group's name. {% data variables.product.prodname_ghe_server %} will search for and autocomplete any matches. -{% data reusables.organizations.team_description %} -{% data reusables.organizations.team_visibility %} -{% data reusables.organizations.create-team-choose-parent %} -{% data reusables.organizations.create_team %} - -{% endif %} diff --git a/content/admin/user-management/managing-organizations-in-your-enterprise/index.md b/content/admin/user-management/managing-organizations-in-your-enterprise/index.md index 4767e79b14..7b04ec0f6b 100644 --- a/content/admin/user-management/managing-organizations-in-your-enterprise/index.md +++ b/content/admin/user-management/managing-organizations-in-your-enterprise/index.md @@ -25,10 +25,7 @@ children: - /configuring-visibility-for-organization-membership - /preventing-users-from-creating-organizations - /requiring-two-factor-authentication-for-an-organization - - /creating-teams - - /adding-people-to-teams - /managing-your-role-in-an-organization-owned-by-your-enterprise - - /removing-users-from-teams-and-organizations - /removing-organizations-from-your-enterprise - /restoring-a-deleted-organization - /managing-projects-using-jira diff --git a/content/admin/user-management/managing-organizations-in-your-enterprise/removing-users-from-teams-and-organizations.md b/content/admin/user-management/managing-organizations-in-your-enterprise/removing-users-from-teams-and-organizations.md deleted file mode 100644 index dfd316d260..0000000000 --- a/content/admin/user-management/managing-organizations-in-your-enterprise/removing-users-from-teams-and-organizations.md +++ /dev/null @@ -1,60 +0,0 @@ ---- -title: Removing users from teams and organizations -intro: 'If a member of your organization no longer requires access to certain repositories, you can remove them from the team that allows that access. If a member of your organization no longer requires access to any repositories owned by the organization, you can remove them from the organization.' -redirect_from: - - /enterprise/admin/user-management/removing-users-from-teams-and-organizations - - /admin/user-management/removing-users-from-teams-and-organizations -versions: - ghes: '*' - ghae: '*' -type: how_to -topics: - - Access management - - Accounts - - Enterprise - - Teams -shortTitle: Remove user membership ---- -Only owners or team admins can remove organization members. When a user is removed from a team or organization, their issues, pull requests, and comments in the organization's repositories remain intact and are still attributed to the user. - -{% warning %} - -**Warning**: When you remove a user from an organization, they will lose access to any private forks they have of your organization's **private repositories**. They may still have local copies of those forks. However, they will be unable to sync them with your organization's repositories. You are responsible for ensuring that people who have lost access to a repository delete any confidential information or intellectual property. If the user removed from your organization was an organization member, their access to private forks of organization repositories can be restored if the user is [reinstated as an organization member](/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization) within three months of being removed from an organization. - -{% endwarning %} - -## Removing a team member - -{% ifversion ghes %} - -{% warning %} - -**Note:** {% data reusables.enterprise_management_console.badge_indicator %} - -To remove an existing member of a team synced to an LDAP group, contact your LDAP administrator. - -{% endwarning %} - -{% endif %} - -{% data reusables.profile.access_org %} -{% data reusables.user-settings.access_org %} -{% data reusables.organizations.specific_team %} -1. Select the person or people you'd like to remove. - - ![Screenshot of the first user in a list of team members. To the left of the user, a checkbox is checked and outlined in dark orange.](/assets/images/help/teams/team-member-check-box.png) -1. Above the list of team members, select the **X members selected** dropdown menu and click **Remove from team**. - - {% data reusables.organizations.bulk-edit-team-members %} - -## Removing a user from an organization - -{% data reusables.profile.access_org %} -{% data reusables.user-settings.access_org %} -{% data reusables.organizations.people %} -4. Next to the name of the users you want to remove from the organization, click the check box. -![Remove user checkbox](/assets/images/help/organizations/Organization-remove-user.png) -5. At the top of the page, under the organization name, click **Remove from organization**. -![Remove from organization button](/assets/images/help/organizations/Organization-remove-from-organization-button.png) - -{% data reusables.organizations.data_saved_for_reinstating_a_former_org_member %} diff --git a/content/communities/maintaining-your-safety-on-github/blocking-a-user-from-your-organization.md b/content/communities/maintaining-your-safety-on-github/blocking-a-user-from-your-organization.md index 769c226323..f663cbb58a 100644 --- a/content/communities/maintaining-your-safety-on-github/blocking-a-user-from-your-organization.md +++ b/content/communities/maintaining-your-safety-on-github/blocking-a-user-from-your-organization.md @@ -43,16 +43,13 @@ In your organization's repositories, blocked users also cannot: ## Blocking a user in a comment 1. Navigate to the comment whose author you would like to block. -2. In the upper-right corner of the comment, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Block user**. -![The horizontal kebab icon and comment moderation menu showing the block user option](/assets/images/help/repository/comment-menu-block-user.png) -3. If you'd like to set a time limit for the block, use the Block user drop-down menu, and select the amount of time you'd like to block the user. -![Block time limit in the block user drop-down menu](/assets/images/help/organizations/org-block-options-menu-from-comment.png) -4. If you'd like to hide all of the comments the user has made in the organization, select **Hide this user's comments** and choose a reason. -![Send a notification in the block user drop-down menu](/assets/images/help/organizations/org-block-options-menu-hide-user-comments.png) -5. If you'd like to notify the user why they're being blocked, select **Send a notification to this user**. -![Send a notification in the block user drop-down menu](/assets/images/help/organizations/org-block-options-menu-send-notification.png) -6. To block the user, click **Block user from organization** or **Block user from organization and send message**. -![Block user button](/assets/images/help/organizations/org-block-user-button-in-comment.png) +1. In the upper-right corner of the comment, click {% octicon "kebab-horizontal" aria-label="Show options" %}, then click **Block user**. + + ![The horizontal kebab icon and comment moderation menu showing the block user option](/assets/images/help/repository/comment-menu-block-user.png) +1. If you'd like to set a time limit for the block, select the **Block user** dropdown menu, and click the amount of time you'd like to block the user. +1. If you'd like to hide all of the comments the user has made in the organization, select **Hide this user's comments** and choose a reason. +1. If you'd like to notify the user why they're being blocked, select **Send a notification to this user**. +1. To block the user, click **Block user from organization** or **Block user from organization and send message**. ## Blocking a user in the organization settings @@ -61,12 +58,9 @@ In your organization's repositories, blocked users also cannot: {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} {% data reusables.organizations.block_users %} -6. Under "Block a user", type the username of the user you'd like to block. -![Username field](/assets/images/help/organizations/org-block-username-field.png) -7. If you'd like to set a time limit for the block, use the Block options drop-down menu, and select the amount of time you'd like to block the user. -![Block options drop-down menu](/assets/images/help/organizations/org-block-options-menu.png) -8. Click **Block user**. -![Block button](/assets/images/help/organizations/org-block-user-button.png) +1. Under "Block a user", in the text field, type the username of the user you'd like to block. +1. If you'd like to set a time limit for the block, next to the text field, select the **Block options** dropdown menu, and click the amount of time you'd like to block the user. +1. Click **Block user**. ## Further reading diff --git a/content/communities/maintaining-your-safety-on-github/unblocking-a-user-from-your-organization.md b/content/communities/maintaining-your-safety-on-github/unblocking-a-user-from-your-organization.md index 44e7d792f3..eddcff6b27 100644 --- a/content/communities/maintaining-your-safety-on-github/unblocking-a-user-from-your-organization.md +++ b/content/communities/maintaining-your-safety-on-github/unblocking-a-user-from-your-organization.md @@ -25,9 +25,10 @@ If you selected a specific amount of time to block the user, they will be automa ## Unblocking a user in a comment 1. Navigate to the comment whose author you would like to unblock. -2. In the upper-right corner of the comment, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Unblock user**. -![The horizontal kebab icon and comment moderation menu showing the unblock user option](/assets/images/help/repository/comment-menu-unblock-user.png) -3. To confirm you would like to unblock the user, click **OK**. +1. In the upper-right corner of the comment, click {% octicon "kebab-horizontal" aria-label="Show options" %}, then click **Unblock user**. + + ![The horizontal kebab icon and comment moderation menu showing the unblock user option](/assets/images/help/repository/comment-menu-unblock-user.png) +1. To confirm you would like to unblock the user, click **OK**. ## Unblocking a user in the organization settings @@ -36,7 +37,6 @@ If you selected a specific amount of time to block the user, they will be automa {% data reusables.profile.org_settings %} {% data reusables.organizations.block_users %} 1. Under "Blocked users", next to the user you'd like to unblock, click **Unblock**. -![Unblock user button](/assets/images/help/organizations/org-unblock-user-button.png) ## Further reading diff --git a/content/communities/maintaining-your-safety-on-github/unblocking-a-user-from-your-personal-account.md b/content/communities/maintaining-your-safety-on-github/unblocking-a-user-from-your-personal-account.md index d0ca2b8593..3733e59a3a 100644 --- a/content/communities/maintaining-your-safety-on-github/unblocking-a-user-from-your-personal-account.md +++ b/content/communities/maintaining-your-safety-on-github/unblocking-a-user-from-your-personal-account.md @@ -22,16 +22,15 @@ You can unblock a user in your account settings or from the user's profile page. {% data reusables.user-settings.access_settings %} {% data reusables.user-settings.blocked_users %} -3. Under "Blocked users", next to the user you'd like to unblock, click **Unblock**. -![Unblock user button](/assets/images/help/organizations/org-unblock-user-button.png) +1. Under "Blocked users", next to the user you'd like to unblock, click **Unblock**. ## Unblocking a user from their profile page {% data reusables.profile.user_profile_page_navigation %} -2. In the left sidebar, below the user's profile information, click **Unblock or report user**. +1. In the left sidebar, below the user's profile information, click **Unblock or report user**. ![Screenshot of the sidebar of a user's profile page. A link, labeled "Unblock or report", is outlined in dark orange.](/assets/images/help/profile/profile-unblock-or-report-user.png) -3. Click **Unblock user**. +1. Click **Unblock user**. {% tip %} diff --git a/content/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization.md b/content/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization.md index 97c14cc8fd..c5089e09ad 100644 --- a/content/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization.md +++ b/content/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization.md @@ -35,18 +35,15 @@ With organization activity insights you can view weekly, monthly, and yearly dat {% data reusables.profile.access_org %} {% data reusables.user-settings.access_org %} -3. Under your organization name, click {% octicon "graph" aria-label="The bar graph icon" %} **Insights**. - ![Click the organization insights tab](/assets/images/help/organizations/org-nav-insights-tab.png) -4. Optionally, in the upper-right corner of the page, choose to view data for the last **1 week**, **1 month**, or **1 year**. - ![Choose time period to view org insights](/assets/images/help/organizations/org-insights-time-period.png) -5. Optionally, in the upper-right corner of the page, choose to view data for up to three repositories and click **Apply**. - ![Choose repositories to view org insights](/assets/images/help/organizations/org-insights-repos.png) +{% data reusables.organizations.insights %} +1. Optionally, to view data for the last 1 week, 1 month, or 1 year, in the upper-right corner of the page, select the **Period** dropdown menu, then click a period. +1. Optionally, to filter by repositories, in the upper-right corner of the page, select the **Repositories** dropdown menu, click up to three repositories, then click **Apply**. ## Viewing organization dependency insights {% note %} -**Note:** Please make sure you have enabled the [Dependency Graph](/code-security/supply-chain-security/understanding-your-software-supply-chain/configuring-the-dependency-graph). +**Note:** Please make sure you have enabled the [Dependency Graph](/code-security/supply-chain-security/understanding-your-software-supply-chain/configuring-the-dependency-graph). {% endnote %} @@ -54,16 +51,13 @@ With dependency insights you can view vulnerabilities, licenses, and other impor {% data reusables.profile.access_org %} {% data reusables.user-settings.access_org %} -3. Under your organization name, click {% octicon "graph" aria-label="The bar graph icon" %} **Insights**. - ![Insights tab in the main organization navigation bar](/assets/images/help/organizations/org-nav-insights-tab.png) -4. To view dependencies for this organization, click **Dependencies**. - ![Dependencies tab under the main organization navigation bar](/assets/images/help/organizations/org-insights-dependencies-tab.png) -5. To view dependency insights for all your {% data variables.product.prodname_ghe_cloud %} organizations, click **My organizations**. - ![My organizations button under dependencies tab](/assets/images/help/organizations/org-insights-dependencies-my-orgs-button.png) -6. You can click the results in the **Open security advisories** and **Licenses** graphs to filter by a vulnerability status, a license, or a combination of the two. - ![My organizations vulnerabilities and licenses graphs](/assets/images/help/organizations/org-insights-dependencies-graphs.png) -7. You can click on {% octicon "package" aria-label="The package icon" %} **dependents** next to each vulnerability to see which dependents in your organization are using each library. - ![My organizations vulnerable dependents](/assets/images/help/organizations/org-insights-dependencies-vulnerable-item.png) +{% data reusables.organizations.insights %} +1. In the "Insights" sidebar, click **Dependencies**. +1. Optionally, to view dependency insights for all your organizations, click **My organizations**. + + ![Screenshot of the "Dependency insights" page. A button, labeled "My organizations," is outlined in dark orange.](/assets/images/help/organizations/org-insights-dependencies-my-orgs-button.png) +1. To filter by a vulnerability status, a license, or a combination of the two, click the results in the **Open security advisories** and **Licenses** graphs. +1. To see which dependents in your organization are using each library, next to a vulnerability, click {% octicon "package" aria-hidden-"true" %} **X dependents**. ## Further reading - "[AUTOTITLE](/organizations/collaborating-with-groups-in-organizations/about-organizations)" diff --git a/content/organizations/collaborating-with-your-team/about-team-discussions.md b/content/organizations/collaborating-with-your-team/about-team-discussions.md index 451899377a..ef5281f47a 100644 --- a/content/organizations/collaborating-with-your-team/about-team-discussions.md +++ b/content/organizations/collaborating-with-your-team/about-team-discussions.md @@ -21,12 +21,8 @@ topics: Any organization member can post on your team's page or participate in a public discussion. {% data reusables.organizations.team-discussions-permissions %} -![Discussions tab of team page with public and private discussions](/assets/images/help/organizations/team-page-discussions-tab.png) - You can link to any team discussion to reference it elsewhere. You can pin important posts to your team's page for quick reference later. For more information, see "[AUTOTITLE](/organizations/collaborating-with-your-team/pinning-a-team-discussion)." -![Pinned discussions tab of team page with pinned discussion](/assets/images/help/organizations/team-discussions-pinned.png) - {% data reusables.organizations.team-discussions-default %} Owners can disable team discussions for the entire organization. For more information, see "[AUTOTITLE](/organizations/organizing-members-into-teams/disabling-team-discussions-for-your-organization)." ## Notifications for team discussions diff --git a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md index 68410dc644..54641b0a79 100644 --- a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md +++ b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md @@ -79,9 +79,9 @@ You can enable or disable features for all repositories. 1. Go to the security and analysis settings for your organization. For more information, see "[Displaying the security and analysis settings](#displaying-the-security-and-analysis-settings)." 2. Under "Code security and analysis", to the right of the feature, click **Disable all** or **Enable all** to display a confirmation dialog box. {% ifversion ghes or ghec %}The control for "{% data variables.product.prodname_GH_advanced_security %}" is disabled if you have no available {% ifversion ghas-billing-UI-update %}licenses{% else %}seats{% endif %} for {% data variables.product.prodname_GH_advanced_security %}.{% endif %} -1. Review the information in the dialog box. +1. Review the information in the dialog box. 1. Optionally, if you are enabling a feature, select **Enable by default for new {% ifversion fpt or ghec %}private {% endif %}repositories**. - + ![Screenshot of the "Enable FEATURE" modal dialog, with the "Enable by default for new private repositories" option highlighted with a dark orange outline.](/assets/images/help/organizations/security-and-analysis-enable-by-default-in-modal.png) 1. When you are ready to make the changes, click **Disable FEATURE** or **Enable FEATURE** to disable or enable the feature for all the repositories in your organization. @@ -109,7 +109,7 @@ To allow {% data variables.product.prodname_dependabot %} to access a private {% 1. Go to the security and analysis settings for your organization. For more information, see "[Displaying the security and analysis settings](#displaying-the-security-and-analysis-settings)." 1. Under "Grant {% data variables.product.prodname_dependabot %} private repository access", click **Add private repositories** or **Add internal and private repositories** to display a repository search field. - + ![Screenshot of the dropdown that you can use to search for repositories. As you type, repositories whose name matches your search criteria will appear in the list. The search text field is highlighted with a dark orange outline.](/assets/images/help/organizations/dependabot-private-repo-choose.png) 1. Start typing the name of the repository you want to grant {% data variables.product.prodname_dependabot %} access to. @@ -126,7 +126,7 @@ You can manage access to {% data variables.product.prodname_GH_advanced_security 1. Go to the security and analysis settings for your organization. For more information, see "[Displaying the security and analysis settings](#displaying-the-security-and-analysis-settings)." 1. To see a list of all the repositories in your organization with {% data variables.product.prodname_GH_advanced_security %} enabled, scroll to the "{% data variables.product.prodname_GH_advanced_security %} repositories" section. - ![{% data variables.product.prodname_GH_advanced_security %} repositories section](/assets/images/help/organizations/settings-security-analysis-ghas-repos-list.png) + The table lists the number of unique committers for each repository. This is the number of {% ifversion ghas-billing-UI-update %}licenses{% else %}seats{% endif %} you could free up by removing access to {% data variables.product.prodname_GH_advanced_security %}. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)." 1. To remove access to {% data variables.product.prodname_GH_advanced_security %} from a repository and free up {% ifversion ghas-billing-UI-update %}licenses{% else %}seats{% endif %} used by any active committers that are unique to the repository, click the adjacent {% octicon "x" aria-label="X symbol" %}. 1. In the confirmation dialog, click **Remove repository** to remove access to the features of {% data variables.product.prodname_GH_advanced_security %}. diff --git a/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md b/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md index ab92e44cda..82765040b0 100644 --- a/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md +++ b/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md @@ -4,6 +4,9 @@ intro: 'If members of your organization no longer require access to any reposito redirect_from: - /articles/removing-a-member-from-your-organization - /github/setting-up-and-managing-organizations-and-teams/removing-a-member-from-your-organization + - /enterprise/admin/user-management/removing-users-from-teams-and-organizations + - /admin/user-management/removing-users-from-teams-and-organizations + - /admin/user-management/managing-organizations-in-your-enterprise/removing-users-from-teams-and-organizations versions: fpt: '*' ghes: '*' @@ -57,13 +60,13 @@ To help the person you're removing from your organization transition and help en {% data reusables.profile.access_org %} {% data reusables.user-settings.access_org %} {% data reusables.organizations.people %} -4. Select the member or members you'd like to remove from the organization. +1. Select the member or members you'd like to remove from the organization. ![Screenshot of the first two users in a list of organization members. To the left of each member, a checkbox is checked and outlined in dark orange.](/assets/images/help/teams/list-of-members-selected-bulk.png) -5. Above the list of members, select the **X members selected...** dropdown menu, and click **Remove from organization**. +1. Above the list of members, select the **X members selected...** dropdown menu, and click **Remove from organization**. ![Screenshot of the list of organization members. Above the list, a dropdown menu, labeled "2 members selected..." is outlined in dark orange.](/assets/images/help/teams/user-bulk-management-options.png) -6. Review the member or members who will be removed from the organization, then click **Remove members**. +1. Review the member or members who will be removed from the organization, then click **Remove members**. ## Further reading diff --git a/content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md b/content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md index b199d24456..74b7b497de 100644 --- a/content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md +++ b/content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md @@ -9,25 +9,23 @@ versions: ghae: '*' shortTitle: Integrate Jira --- + {% ifversion ghes > 3.4 or ghae > 3.4 %} {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} -1. In the left sidebar, select **{% octicon "code" aria-label="The code icon" %} Developer settings**, then click **OAuth Apps**. - ![OAuth applications tab in the left sidebar](/assets/images/help/organizations/org-oauth-applications-ghe.png) +1. In the left sidebar, select **{% octicon "code" aria-hidden="true" %} Developer settings**, then click **OAuth Apps**. 1. Click **New OAuth App**. {% else %} {% data reusables.user-settings.access_settings %} 1. In the left sidebar under **Organization settings**, click the name of your organization. -![Sidebar organization name](/assets/images/help/settings/organization-settings-from-sidebar.png) 1. In the left sidebar under **Developer settings**, click **OAuth applications**. - ![OAuth applications tab in the left sidebar](/assets/images/help/organizations/org-oauth-applications-ghe.png) 1. Click **Register a new application**. {% endif %} 1. Under **Application name**, type "Jira". -2. Under **Homepage URL**, type the full URL to your Jira instance. -3. Under **Authorization callback URL**, type the full URL to your Jira instance. -4. Click **Register application**. -9. Under **Organization owned applications**, note the "Client ID" and "Client Secret" values. +1. Under **Homepage URL**, type the full URL to your Jira instance. +1. Under **Authorization callback URL**, type the full URL to your Jira instance. +1. Click **Register application**. +1. Under **Organization owned applications**, note the "Client ID" and "Client Secret" values. {% data reusables.user-settings.jira_help_docs %} ## Further reading diff --git a/content/organizations/managing-organization-settings/managing-scheduled-reminders-for-your-organization.md b/content/organizations/managing-organization-settings/managing-scheduled-reminders-for-your-organization.md index b0d993cbf1..31cdd6c34a 100644 --- a/content/organizations/managing-organization-settings/managing-scheduled-reminders-for-your-organization.md +++ b/content/organizations/managing-organization-settings/managing-scheduled-reminders-for-your-organization.md @@ -30,8 +30,7 @@ Organization owners can schedule a reminder for one or more teams in their organ {% data reusables.reminders.days-dropdown %} {% data reusables.reminders.times-dropdowns %} {% data reusables.reminders.tracked-repos %} -1. Under "Filter by team assigned to review code", click the **Add a team** dropdown and choose one or more teams. You can add up to 100 teams. If the team you select doesn't have access to the "Tracked repositories" selected above, you won't be able to create the scheduled reminder. -![Add a team dropdown](/assets/images/help/organizations/scheduled-reminders-add-teams.png) +1. Under "Filter by team assigned to review code", select the **Add a team** dropdown menu and click one or more teams. You can add up to 100 teams. If the team you select doesn't have access to the "Tracked repositories" selected above, you won't be able to create the scheduled reminder. {% data reusables.reminders.ignore-drafts %} {% data reusables.reminders.no-review-requests %} {% data reusables.reminders.author-reviews %} diff --git a/content/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization.md b/content/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization.md index ca1dc44413..8f9c33145e 100644 --- a/content/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization.md +++ b/content/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization.md @@ -28,12 +28,9 @@ If an enterprise owner has enforced a policy for the default branch name for you {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} {% data reusables.organizations.repository-defaults %} -3. Under "Repository default branch", click **Change default branch name now**. - ![Override button](/assets/images/help/organizations/repo-default-name-button.png) -4. Type the default name that you would like to use for new branches. - ![Text box for entering default name](/assets/images/help/organizations/repo-default-name-text.png) -5. Click **Update**. - ![Update button](/assets/images/help/organizations/repo-default-name-update.png) +1. Under "Repository default branch", click **Change default branch name now**. +1. In the text field, type the default name that you would like to use for new branches. +1. Click **Update**. ## Further reading diff --git a/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md b/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md index 247d74755a..ab48dcab83 100644 --- a/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md +++ b/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md @@ -17,7 +17,7 @@ shortTitle: Restrict repository creation You can choose whether members can create repositories in your organization. {% ifversion ghec or ghes or ghae %}If you allow members to create repositories, you can choose which types of repositories members can create.{% elsif fpt %}If you allow members to create repositories, you can choose whether members can create both public and private repositories or public repositories only.{% endif %} Organization owners can always create any type of repository. -{% ifversion fpt %} +{% ifversion fpt %} Organizations using {% data variables.product.prodname_ghe_cloud %} can also restrict members to creating private repositories only. For more information, see [the {% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization). {% endif %} @@ -34,14 +34,8 @@ Enterprise owners can restrict the options you have available for your organizat {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} {% data reusables.organizations.member-privileges %} -5. Under "Repository creation", select one or more options. +1. Under "Repository creation", select one or more options. - {%- ifversion ghes or ghec or ghae %} - ![Repository creation options](/assets/images/help/organizations/repo-creation-perms-radio-buttons.png) - {%- elsif fpt %} - ![Repository creation options](/assets/images/help/organizations/repo-creation-perms-radio-buttons-fpt.png) - {%- endif %} - {% ifversion fpt or ghec %} {% note %} @@ -50,4 +44,4 @@ Enterprise owners can restrict the options you have available for your organizat {% endnote %} {%- endif %} -6. Click **Save**. +1. Click **Save**. diff --git a/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-security-managers-in-your-organization.md b/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-security-managers-in-your-organization.md index b316a9e50d..72eed7b101 100644 --- a/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-security-managers-in-your-organization.md +++ b/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-security-managers-in-your-organization.md @@ -30,8 +30,6 @@ Additional functionality, including a security overview for the organization, is If a team has the security manager role, people with admin access to the team and a specific repository can change the team's level of access to that repository but cannot remove the access. For more information, see "[AUTOTITLE](/organizations/managing-user-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository)" and "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository)." - ![Manage repository access UI with security managers](/assets/images/help/organizations/repo-access-security-managers.png) - ## Assigning the security manager role to a team in your organization You can assign the security manager role to a maximum of 10 teams in your organization. diff --git a/content/organizations/organizing-members-into-teams/about-teams.md b/content/organizations/organizing-members-into-teams/about-teams.md index 2c921c1074..b106ae4107 100644 --- a/content/organizations/organizing-members-into-teams/about-teams.md +++ b/content/organizations/organizing-members-into-teams/about-teams.md @@ -47,8 +47,6 @@ Each team has its own page within an organization. On a team's page, you can vie Organization members can create and participate in discussions with the team. For more information, see "[AUTOTITLE](/organizations/collaborating-with-your-team/about-team-discussions)." -![Team page listing team members and discussions](/assets/images/help/organizations/team-page-discussions-tab.png) - ## Nested teams You can reflect your group or company's hierarchy within your {% data variables.product.product_name %} organization with multiple levels of nested teams. A parent team can have multiple child teams, while each child team only has one parent team. You cannot nest secret teams. diff --git a/content/organizations/organizing-members-into-teams/adding-organization-members-to-a-team.md b/content/organizations/organizing-members-into-teams/adding-organization-members-to-a-team.md index a43a824880..7f79bdaef7 100644 --- a/content/organizations/organizing-members-into-teams/adding-organization-members-to-a-team.md +++ b/content/organizations/organizing-members-into-teams/adding-organization-members-to-a-team.md @@ -5,6 +5,12 @@ redirect_from: - /articles/adding-organization-members-to-a-team-early-access-program - /articles/adding-organization-members-to-a-team - /github/setting-up-and-managing-organizations-and-teams/adding-organization-members-to-a-team + - /enterprise/admin/articles/adding-teams + - /enterprise/admin/articles/adding-or-inviting-people-to-teams + - /enterprise/admin/guides/user-management/adding-or-inviting-people-to-teams + - /enterprise/admin/user-management/adding-people-to-teams + - /admin/user-management/adding-people-to-teams + - /admin/user-management/managing-organizations-in-your-enterprise/adding-people-to-teams versions: fpt: '*' ghes: '*' @@ -22,7 +28,7 @@ shortTitle: Add members to a team {% data reusables.user-settings.access_org %} {% data reusables.organizations.specific_team %} {% data reusables.organizations.team_members_tab %} -6. Above the list of team members, click **Add a member**. +1. Above the list of team members, click **Add a member**. {% data reusables.organizations.invite_to_team %} {% data reusables.organizations.review-team-repository-access %} diff --git a/content/organizations/organizing-members-into-teams/creating-a-team.md b/content/organizations/organizing-members-into-teams/creating-a-team.md index ad0ada9270..0e282bbd13 100644 --- a/content/organizations/organizing-members-into-teams/creating-a-team.md +++ b/content/organizations/organizing-members-into-teams/creating-a-team.md @@ -5,6 +5,9 @@ redirect_from: - /articles/creating-a-team-early-access-program - /articles/creating-a-team - /github/setting-up-and-managing-organizations-and-teams/creating-a-team + - /enterprise/admin/user-management/creating-teams + - /admin/user-management/creating-teams + - /admin/user-management/managing-organizations-in-your-enterprise/creating-teams versions: fpt: '*' ghes: '*' diff --git a/data/reusables/audit_log/audit_log_sidebar_for_org_admins.md b/data/reusables/audit_log/audit_log_sidebar_for_org_admins.md index c59c70a94f..1f7fe457b6 100644 --- a/data/reusables/audit_log/audit_log_sidebar_for_org_admins.md +++ b/data/reusables/audit_log/audit_log_sidebar_for_org_admins.md @@ -1,6 +1,5 @@ {% ifversion fpt or ghec or ghes > 3.4 or ghae > 3.4 %} -1. In the "Archives" section of the sidebar, click {% octicon "log" aria-label="The log icon" %} **Logs**, then click **Audit log**. +1. In the "Archives" section of the sidebar, click {% octicon "log" aria-hidden="true" %} **Logs**, then click **Audit log**. {% else %} 1. In the Settings sidebar, click **Audit log**. -![Org audit log settings in sidebar](/assets/images/help/organizations/org-settings-audit-log.png) {% endif %} diff --git a/data/reusables/audit_log/export-log.md b/data/reusables/audit_log/export-log.md index 9346247c72..e84d132bf3 100644 --- a/data/reusables/audit_log/export-log.md +++ b/data/reusables/audit_log/export-log.md @@ -1,7 +1,5 @@ -You can export the log as JSON data or a comma-separated value (CSV) file. +You can export the log as JSON data or a comma-separated value (CSV) file with the **Export** dropdown menu. -![Export button](/assets/images/help/organizations/org-audit-log-export.png) - -To filter the results in your export, search by one or more of these supported qualifiers before using the **Export** drop-down menu. +To filter the results in your export, search by one or more of these supported qualifiers before using the **Export** dropdown menu. {% data reusables.audit_log.keys-and-example-values %} diff --git a/data/reusables/organizations/insights.md b/data/reusables/organizations/insights.md new file mode 100644 index 0000000000..4abcfbc9b3 --- /dev/null +++ b/data/reusables/organizations/insights.md @@ -0,0 +1,3 @@ +1. Under your organization name, click {% octicon "graph" aria-hidden="true" %} **Insights**. + + ![Screenshot of the horizontal navigation bar for an organization. A tab, labeled with a graph icon and "Insights," is outlined in dark orange.](/assets/images/help/organizations/org-nav-insights-tab.png) \ No newline at end of file diff --git a/data/reusables/organizations/invite_member_from_people_tab.md b/data/reusables/organizations/invite_member_from_people_tab.md index 8bf0457303..d38ae0617a 100644 --- a/data/reusables/organizations/invite_member_from_people_tab.md +++ b/data/reusables/organizations/invite_member_from_people_tab.md @@ -1,5 +1,5 @@ {% ifversion fpt or ghec %} -1. On the People tab, click **Invite member**. - ![Invite member button](/assets/images/help/organizations/people-tab-invite-member.png){% else %} -1. On the People tab, click **Add member**. - ![Add member button](/assets/images/help/organizations/people-tab-invite-member-ghe.png){% endif %} +1. Click **Invite member**. +{% else %} +1. Click **Add member**. +{% endif %} diff --git a/data/reusables/organizations/new_team.md b/data/reusables/organizations/new_team.md index 40e4dc2c67..7246db6452 100644 --- a/data/reusables/organizations/new_team.md +++ b/data/reusables/organizations/new_team.md @@ -1,7 +1,2 @@ -1. Under your organization name, click {% octicon "people" aria-hidden="true" %} **Teams**. - {% ifversion fpt or ghes or ghec %} - ![Teams tab](/assets/images/help/organizations/organization-teams-tab-with-overview.png) - {% else %} - ![Teams tab](/assets/images/help/organizations/organization-teams-tab.png) - {% endif %} +{% data reusables.organizations.teams %} 1. At the top of the page, click **New team**. diff --git a/data/reusables/organizations/organization-wide-project.md b/data/reusables/organizations/organization-wide-project.md index 3be3edb9d0..4a819a7c41 100644 --- a/data/reusables/organizations/organization-wide-project.md +++ b/data/reusables/organizations/organization-wide-project.md @@ -1,2 +1,5 @@ -1. Under your organization name, click {% ifversion projects-v2 %}{% octicon "table" aria-label="The Projects icon" %}{% else %}{% octicon "project" aria-label="The Projects icon" %}{% endif %} **Projects**. - {% ifversion projects-v2 %}![Projects tab for your organization](/assets/images/help/organizations/organization-projects-tab-table.png){% else %}![Projects tab for your organization](/assets/images/help/organizations/organization-projects-tab-with-overview-tab.png){% endif %} +1. Under your organization name, click {% ifversion projects-v2 %}{% octicon "table" aria-hidden="true" %}{% else %}{% octicon "project" aria-hidden="true" %}{% endif %} **Projects**. + + {% ifversion projects-v2 %} + ![Screenshot of the horizontal navigation bar for an organization. A tab, labeled with a table icon and "Projects," is outlined in dark orange.](/assets/images/help/organizations/organization-projects-tab-table.png) + {% endif %} diff --git a/data/reusables/organizations/owners-team.md b/data/reusables/organizations/owners-team.md index 9f61e8d8fd..e34bd69caa 100644 --- a/data/reusables/organizations/owners-team.md +++ b/data/reusables/organizations/owners-team.md @@ -1,7 +1,2 @@ -1. Under your organization name, click {% octicon "people" aria-label="The people icon" %} **Teams**. - {% ifversion fpt or ghes or ghec %} - ![Teams tab](/assets/images/help/organizations/organization-teams-tab-with-overview.png) - {% else %} - ![Teams tab](/assets/images/help/organizations/organization-teams-tab.png) - {% endif %} +{% data reusables.organizations.teams %} 1. In the list of teams, click **Owners**. diff --git a/data/reusables/organizations/people-export.md b/data/reusables/organizations/people-export.md index 9fa841e865..1093b4fd13 100644 --- a/data/reusables/organizations/people-export.md +++ b/data/reusables/organizations/people-export.md @@ -1,2 +1 @@ -1. To the right of the search bar, select the Export drop-down menu and click the desired export format. - ![Screenshot of the export button.](/assets/images/help/organizations/people-tab-export.png) +1. To the right of the search bar, select the **Export** dropdown menu and click the desired export format. diff --git a/data/reusables/organizations/people.md b/data/reusables/organizations/people.md index 190cefc88b..15736d9334 100644 --- a/data/reusables/organizations/people.md +++ b/data/reusables/organizations/people.md @@ -1,4 +1,3 @@ -1. Under your organization name, click {% octicon "person" aria-label="The Person icon" %} **People**. - {% ifversion fpt or ghes or ghec %} - ![The People tab](/assets/images/help/organizations/organization-people-tab-with-overview-tab.png){% else %} - ![The People tab](/assets/images/help/organizations/organization-people-tab.png){% endif %} +1. Under your organization name, click {% octicon "person" aria-hidden="true" %} **People**. + + ![Screenshot of the horizontal navigation bar for an organization. A tab, labeled with a person icon and "People," is outlined in dark orange.](/assets/images/help/organizations/organization-people-tab.png) diff --git a/data/reusables/organizations/repository-defaults.md b/data/reusables/organizations/repository-defaults.md index bb34fffba4..4a9fedbf10 100644 --- a/data/reusables/organizations/repository-defaults.md +++ b/data/reusables/organizations/repository-defaults.md @@ -1,6 +1,5 @@ {% ifversion fpt or ghec or ghes > 3.4 or ghae > 3.4 %} -1. In the "Code, planning, and automation" section of the sidebar, select **{% octicon "repo" aria-label="The repo icon" %} Repository**, then click **Repository defaults**. +1. In the "Code, planning, and automation" section of the sidebar, select **{% octicon "repo" aria-hidden="true" %} Repository**, then click **Repository defaults**. {% else %} 1. In the left sidebar, click **Repository defaults**. - ![Repository defaults tab](/assets/images/help/organizations/repo-defaults-tab.png) {% endif %} diff --git a/data/reusables/organizations/restrict-email-notifications.md b/data/reusables/organizations/restrict-email-notifications.md index d709fdd774..f10d036ea4 100644 --- a/data/reusables/organizations/restrict-email-notifications.md +++ b/data/reusables/organizations/restrict-email-notifications.md @@ -1,2 +1 @@ 1. Under "Notification preferences", select **Restrict email notifications to only approved or verified domains**. - ![Checkbox to restrict email notifications to verified domain emails](/assets/images/help/organizations/restrict-email-notifications-to-domain.png) diff --git a/data/reusables/organizations/security-and-analysis.md b/data/reusables/organizations/security-and-analysis.md index 8786556e06..cde6f3bb86 100644 --- a/data/reusables/organizations/security-and-analysis.md +++ b/data/reusables/organizations/security-and-analysis.md @@ -2,5 +2,4 @@ 1. In the "Security" section of the sidebar, click **{% octicon "codescan" aria-hidden="true" %} Code security and analysis**. {% else %} 1. In the left sidebar, click **Security & analysis**. - !["Security & analysis" tab in organization settings](/assets/images/help/organizations/org-settings-security-and-analysis.png) {% endif %} diff --git a/data/reusables/organizations/security-overview.md b/data/reusables/organizations/security-overview.md index 613e5206c9..f5c3dff5da 100644 --- a/data/reusables/organizations/security-overview.md +++ b/data/reusables/organizations/security-overview.md @@ -1,2 +1,3 @@ 1. Under your organization name, click **{% octicon "shield" aria-hidden="true" %} Security**. -![Organization security button](/assets/images/help/organizations/organization-security-tab.png) + + ![Screenshot of the horizontal navigation bar for an organization. A tab, labeled with a shield icon and "Security," is outlined in dark orange.](/assets/images/help/organizations/organization-security-tab.png) diff --git a/data/reusables/organizations/security.md b/data/reusables/organizations/security.md index ac736ecebb..b0b42af031 100644 --- a/data/reusables/organizations/security.md +++ b/data/reusables/organizations/security.md @@ -1,7 +1,5 @@ {% ifversion fpt or ghec or ghes > 3.4 or ghae > 3.4 %} -1. In the "Security" section of the sidebar, click **{% octicon "shield-lock" aria-label="The shield-lock icon" %} Authentication security**. +1. In the "Security" section of the sidebar, click **{% octicon "shield-lock" aria-hidden="true" %} Authentication security**. {% else %} 1. In the left sidebar, click **Organization security**. - - ![Organization security settings](/assets/images/help/organizations/org-security-settings-tab.png) {% endif %} diff --git a/data/reusables/organizations/specific_team.md b/data/reusables/organizations/specific_team.md index 1d2011ffb9..14ad960a46 100644 --- a/data/reusables/organizations/specific_team.md +++ b/data/reusables/organizations/specific_team.md @@ -1,7 +1,2 @@ -1. Under your organization name, click {% octicon "people" aria-label="The people icon" %} **Teams**. - {% ifversion fpt or ghes or ghec %} - ![Teams tab](/assets/images/help/organizations/organization-teams-tab-with-overview.png) - {% else %} - ![Teams tab](/assets/images/help/organizations/organization-teams-tab.png) - {% endif %} +{% data reusables.organizations.teams %} 1. Click the name of the team. diff --git a/data/reusables/organizations/teams.md b/data/reusables/organizations/teams.md index 55600311cf..9a0a82e425 100644 --- a/data/reusables/organizations/teams.md +++ b/data/reusables/organizations/teams.md @@ -1,6 +1,3 @@ -1. Under your organization name, click {% octicon "people" aria-label="The people icon" %} **Teams**. - {% ifversion fpt or ghes or ghec %} - ![Teams tab on the organization page](/assets/images/help/organizations/organization-teams-tab-with-overview.png) - {% else %} - ![Teams tab on the organization page](/assets/images/help/organizations/organization-teams-tab.png) - {% endif %} +1. Under your organization name, click {% octicon "people" aria-hidden="true" %} **Teams**. + + ![Screenshot of the horizontal navigation bar for an organization. A tab, labeled with the people icon and "Teams," is outlined in dark orange.](/assets/images/help/organizations/organization-teams-tab.png) \ No newline at end of file diff --git a/data/reusables/user-settings/access_org.md b/data/reusables/user-settings/access_org.md index 58530b14d7..43608b35e1 100644 --- a/data/reusables/user-settings/access_org.md +++ b/data/reusables/user-settings/access_org.md @@ -1,2 +1 @@ -2. Click the name of your organization. - ![Organization name in list of organizations](/assets/images/help/organizations/org-settings-link.png) +1. Click the name of your organization.