diff --git a/.pa11yci b/.pa11yci index d037f96c79..0c0c506c8a 100644 --- a/.pa11yci +++ b/.pa11yci @@ -59,7 +59,7 @@ "http://localhost:4001/en/packages", "http://localhost:4001/en/actions/configuring-and-managing-workflows/configuring-a-workflow", "http://localhost:4001/en/github/authenticating-to-github/managing-commit-signature-verification", - "http://localhost:4001/en/github/setting-up-and-managing-organizations-and-teams/about-oauth-app-access-restrictions", + "http://localhost:4001/en/organizations/restricting-access-to-your-organizations-data/about-oauth-app-access-restrictions", "http://localhost:4001/en/github/managing-files-in-a-repository/adding-a-file-to-a-repository-using-the-command-line", "http://localhost:4001/en/github/getting-started-with-github/access-permissions-on-github", "http://localhost:4001/en/github/getting-started-with-github/githubs-products", diff --git a/content/actions/hosting-your-own-runners/about-self-hosted-runners.md b/content/actions/hosting-your-own-runners/about-self-hosted-runners.md index 1c76fa56cf..7a3c715b25 100644 --- a/content/actions/hosting-your-own-runners/about-self-hosted-runners.md +++ b/content/actions/hosting-your-own-runners/about-self-hosted-runners.md @@ -123,7 +123,7 @@ The self-hosted runner polls {% data variables.product.product_name %} to retrie You must ensure that the self-hosted runner has appropriate network access to communicate with the {% data variables.product.prodname_ghe_managed %} URL. For example, if your instance name is `octoghae`, then you will need to allow the self-hosted runner to access `octoghae.github.com`. -If you use an IP address allow list for your {% data variables.product.prodname_dotcom %} organization or enterprise account, you must add your self-hosted runner's IP address to the allow list. For more information, see "[Managing allowed IP addresses for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization#using-github-actions-with-an-ip-allow-list)." +If you use an IP address allow list for your {% data variables.product.prodname_dotcom %} organization or enterprise account, you must add your self-hosted runner's IP address to the allow list. For more information, see "[Managing allowed IP addresses for your organization](/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization#using-github-actions-with-an-ip-allow-list)." {% endif %} {% if currentVersion == "free-pro-team@latest" %} @@ -143,7 +143,7 @@ pkg-containers.githubusercontent.com pkg-containers-az.githubusercontent.com ``` -If you use an IP address allow list for your {% data variables.product.prodname_dotcom %} organization or enterprise account, you must add your self-hosted runner's IP address to the allow list. For more information, see "[Managing allowed IP addresses for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization#using-github-actions-with-an-ip-allow-list)" or "[Enforcing security settings in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account#using-github-actions-with-an-ip-allow-list)". +If you use an IP address allow list for your {% data variables.product.prodname_dotcom %} organization or enterprise account, you must add your self-hosted runner's IP address to the allow list. For more information, see "[Managing allowed IP addresses for your organization](/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization#using-github-actions-with-an-ip-allow-list)" or "[Enforcing security settings in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account#using-github-actions-with-an-ip-allow-list)". {% else %} diff --git a/content/actions/learn-github-actions/security-hardening-for-github-actions.md b/content/actions/learn-github-actions/security-hardening-for-github-actions.md index 9e6ea648c4..c35f549564 100644 --- a/content/actions/learn-github-actions/security-hardening-for-github-actions.md +++ b/content/actions/learn-github-actions/security-hardening-for-github-actions.md @@ -121,7 +121,7 @@ For example, you can use the audit log to track the `org.update_actions_secret` ![Audit log entries](/assets/images/help/repository/audit-log-entries.png) The following tables describe the {% data variables.product.prodname_actions %} events that you can find in the audit log. For more information on using the audit log, see -"[Reviewing the audit log for your organization](/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization#searching-the-audit-log)." +"[Reviewing the audit log for your organization](/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization#searching-the-audit-log)." {% if currentVersion == "free-pro-team@latest" %} #### Events for environments @@ -157,7 +157,7 @@ The following tables describe the {% data variables.product.prodname_actions %} | `enterprise.register_self_hosted_runner` | Triggered when a new self-hosted runner is registered. For more information, see "[Adding a self-hosted runner to an enterprise](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-an-enterprise)." | `enterprise.remove_self_hosted_runner` | Triggered when a self-hosted runner is removed. | `enterprise.runner_group_runners_updated` | Triggered when a runner group's list of members is updated. For more information, see "[Set self-hosted runners in a group for an organization](/rest/reference/actions#set-self-hosted-runners-in-a-group-for-an-organization)." -| `enterprise.self_hosted_runner_updated` | Triggered when the runner application is updated. Can be viewed using the REST API and the UI. This event is not included when you export the audit log as JSON data or a CSV file. For more information, see "[About self-hosted runners](/actions/hosting-your-own-runners/about-self-hosted-runners#about-self-hosted-runners)" and "[Reviewing the audit log for your organization](/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization#exporting-the-audit-log)."{% endif %} +| `enterprise.self_hosted_runner_updated` | Triggered when the runner application is updated. Can be viewed using the REST API and the UI. This event is not included when you export the audit log as JSON data or a CSV file. For more information, see "[About self-hosted runners](/actions/hosting-your-own-runners/about-self-hosted-runners#about-self-hosted-runners)" and "[Reviewing the audit log for your organization](/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization#exporting-the-audit-log)."{% endif %} | `org.register_self_hosted_runner` | Triggered when a new self-hosted runner is registered. For more information, see "[Adding a self-hosted runner to an organization](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-an-organization)." | `org.remove_self_hosted_runner` | Triggered when a self-hosted runner is removed. For more information, see [Removing a runner from an organization](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-an-organization). | `org.runner_group_runners_updated` | Triggered when a runner group's list of members is updated. For more information, see "[Set self-hosted runners in a group for an organization](/rest/reference/actions#set-self-hosted-runners-in-a-group-for-an-organization)." diff --git a/content/actions/reference/usage-limits-billing-and-administration.md b/content/actions/reference/usage-limits-billing-and-administration.md index 2ab089a0ed..ef87f6ebc6 100644 --- a/content/actions/reference/usage-limits-billing-and-administration.md +++ b/content/actions/reference/usage-limits-billing-and-administration.md @@ -67,7 +67,7 @@ You can configure the artifact and log retention period for your repository, org For more information, see: - [Configuring the retention period for {% data variables.product.prodname_actions %} for artifacts and logs in your repository](/github/administering-a-repository/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-repository) -- [Configuring the retention period for {% data variables.product.prodname_actions %} for artifacts and logs in your organization](/github/setting-up-and-managing-organizations-and-teams/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization) +- [Configuring the retention period for {% data variables.product.prodname_actions %} for artifacts and logs in your organization](/organizations/managing-organization-settings/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization) - [Configuring the retention period for {% data variables.product.prodname_actions %} for artifacts and logs in your enterprise](/github/setting-up-and-managing-your-enterprise/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account) {% endif %} @@ -77,7 +77,7 @@ For more information, see: For more information, see: - "[Disabling or limiting {% data variables.product.prodname_actions %} for a repository](/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository)" -- "[Disabling or limiting {% data variables.product.prodname_actions %} for your organization](/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization)"{% if currentVersion == "free-pro-team@latest" %} +- "[Disabling or limiting {% data variables.product.prodname_actions %} for your organization](/organizations/managing-organization-settings/disabling-or-limiting-github-actions-for-your-organization)"{% if currentVersion == "free-pro-team@latest" %} - "[Enforcing {% data variables.product.prodname_actions %} policies in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account)" for {% data variables.product.prodname_ghe_cloud %}{% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %} diff --git a/content/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md b/content/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md index a4c0796611..043e79414a 100644 --- a/content/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md +++ b/content/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md @@ -21,7 +21,7 @@ After you enable SAML SSO and SCIM for {% data variables.product.prodname_ghe_ma * Assign the {% data variables.product.prodname_ghe_managed %} application to an IdP group on Azure AD to automatically create and grant access to user accounts on {% data variables.product.product_name %} for all members of the IdP group. In addition, the IdP group is available on {% data variables.product.prodname_ghe_managed %} for connection to a team and its parent organization. * Unassign the {% data variables.product.prodname_ghe_managed %} application from an IdP group to deactivate the {% data variables.product.product_name %} user accounts of all IdP users who had access only through that IdP group and remove the users from the parent organization. The IdP group will be disconnected from any teams on {% data variables.product.product_name %}. -For more information about managing identity and access for your enterprise on {% data variables.product.product_location %}, see "[Managing identity and access for your enterprise](/admin/authentication/managing-identity-and-access-for-your-enterprise)." For more information about synchronizing teams with IdP groups, see "[Synchronizing a team with an identity provider group](/github/setting-up-and-managing-organizations-and-teams/synchronizing-a-team-with-an-identity-provider-group)." +For more information about managing identity and access for your enterprise on {% data variables.product.product_location %}, see "[Managing identity and access for your enterprise](/admin/authentication/managing-identity-and-access-for-your-enterprise)." For more information about synchronizing teams with IdP groups, see "[Synchronizing a team with an identity provider group](/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group)." ### Prerequisites diff --git a/content/admin/authentication/configuring-user-provisioning-for-your-enterprise.md b/content/admin/authentication/configuring-user-provisioning-for-your-enterprise.md index a0bd008285..6e936006e1 100644 --- a/content/admin/authentication/configuring-user-provisioning-for-your-enterprise.md +++ b/content/admin/authentication/configuring-user-provisioning-for-your-enterprise.md @@ -28,7 +28,7 @@ The provisioning application on your IdP communicates with {% data variables.pro {% data reusables.scim.supported-idps %} -When you set up user provisioning with a supported IdP, you can also assign or unassign the application for {% data variables.product.product_name %} to groups of users. These groups are then available to organization owners and team maintainers in {% data variables.product.product_location %} to map to {% data variables.product.product_name %} teams. For more information, see "[Synchronizing a team with an identity provider group](/github/setting-up-and-managing-organizations-and-teams/synchronizing-a-team-with-an-identity-provider-group)." +When you set up user provisioning with a supported IdP, you can also assign or unassign the application for {% data variables.product.product_name %} to groups of users. These groups are then available to organization owners and team maintainers in {% data variables.product.product_location %} to map to {% data variables.product.product_name %} teams. For more information, see "[Synchronizing a team with an identity provider group](/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group)." ### Prerequisites diff --git a/content/admin/configuration/restricting-network-traffic-to-your-enterprise.md b/content/admin/configuration/restricting-network-traffic-to-your-enterprise.md index 7edc128771..fb9bf6d64d 100644 --- a/content/admin/configuration/restricting-network-traffic-to-your-enterprise.md +++ b/content/admin/configuration/restricting-network-traffic-to-your-enterprise.md @@ -13,7 +13,7 @@ By default, authorized users can access your enterprise from any IP address. Ent {% data reusables.identity-and-permissions.ip-allow-lists-enable %} -You can also configure allowed IP addresses for an individual organization. For more information, see "[Managing allowed IP addresses for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization)." +You can also configure allowed IP addresses for an individual organization. For more information, see "[Managing allowed IP addresses for your organization](/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization)." By default, Azure network security group (NSG) rules leave all inbound traffic open on ports 22, 80, 443, and 25. Enterprise owners can contact {% data variables.contact.github_support %} to configure access restrictions for your instance. diff --git a/content/admin/github-actions/manually-syncing-actions-from-githubcom.md b/content/admin/github-actions/manually-syncing-actions-from-githubcom.md index 3f8f07e6ba..3f46dfaac6 100644 --- a/content/admin/github-actions/manually-syncing-actions-from-githubcom.md +++ b/content/admin/github-actions/manually-syncing-actions-from-githubcom.md @@ -28,7 +28,7 @@ The `actions-sync` tool can only download actions from {% data variables.product ### Prerequisites -* Before using the `actions-sync` tool, you must ensure that all destination organizations already exist on your enterprise instance. The following example demonstrates how to sync actions to an organization named `synced-actions` on an enterprise instance. For more information, see "[Creating a new organization from scratch](/github/setting-up-and-managing-organizations-and-teams/creating-a-new-organization-from-scratch)." +* Before using the `actions-sync` tool, you must ensure that all destination organizations already exist on your enterprise instance. The following example demonstrates how to sync actions to an organization named `synced-actions` on an enterprise instance. For more information, see "[Creating a new organization from scratch](/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch)." * You must create a personal access token (PAT) on your enterprise instance that can create and write to repositories in the destination organizations. For more information, see "[Creating a personal access token](/github/authenticating-to-github/creating-a-personal-access-token)." ### Example: Using the `actions-sync` tool diff --git a/content/admin/overview/github-ae-release-notes.md b/content/admin/overview/github-ae-release-notes.md index ec75725972..dbd6bc961a 100644 --- a/content/admin/overview/github-ae-release-notes.md +++ b/content/admin/overview/github-ae-release-notes.md @@ -29,7 +29,7 @@ During this beta, {% data variables.product.prodname_advanced_security %} featur #### Manage teams from your identity provider (IdP) -Customers using SCIM (System for Cross-domain Identity Management) can now sync security groups in Azure Active Directory with {% data variables.product.company_short %} teams. Once a team has been linked to a security group, membership will be automatically updated in {% data variables.product.product_name %} when a user is added or removed from their assigned security group. For more information, see "[Synchronizing a team with an identity provider group](/github/setting-up-and-managing-organizations-and-teams/synchronizing-a-team-with-an-identity-provider-group)." +Customers using SCIM (System for Cross-domain Identity Management) can now sync security groups in Azure Active Directory with {% data variables.product.company_short %} teams. Once a team has been linked to a security group, membership will be automatically updated in {% data variables.product.product_name %} when a user is added or removed from their assigned security group. For more information, see "[Synchronizing a team with an identity provider group](/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group)." #### IP allow lists beta @@ -37,7 +37,7 @@ Enterprise and organization owners can now use IP allow lists to restrict traffi This functionality is provided in addition to the ability to request network security group changes that filter traffic to the entirety of the {% data variables.product.product_name %} tenant. -For more information, see "[Restricting network traffic to your enterprise](/admin/configuration/restricting-network-traffic-to-your-enterprise)" and "[Managing allowed IP addresses for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization)." +For more information, see "[Restricting network traffic to your enterprise](/admin/configuration/restricting-network-traffic-to-your-enterprise)" and "[Managing allowed IP addresses for your organization](/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization)." #### Pull request auto-merge @@ -47,7 +47,7 @@ With auto-merge, pull requests can be set to merge automatically when all merge #### Developer changes -- [Organization owners can now disable publication](/github/setting-up-and-managing-organizations-and-teams/managing-the-publication-of-github-pages-sites-for-your-organization) of {% data variables.product.prodname_pages %} sites from repositories in the organization. This will not unpublish existing sites. +- [Organization owners can now disable publication](/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization) of {% data variables.product.prodname_pages %} sites from repositories in the organization. This will not unpublish existing sites. - Repositories that use {% data variables.product.prodname_pages %} can now [build and deploy from any branch](/pages/getting-started-with-github-pages/about-github-pages#publishing-sources-for-github-pages-sites). - When writing an issue or pull request, the list syntax for bullets, numbers, and tasks will now be autocompleted after you press `return` or `enter`. - You can now delete a directory in a repository from the repository page. When navigating to a directory, a new kebab button next to the "Add file" button gives the option to delete the directory. @@ -65,7 +65,7 @@ With auto-merge, pull requests can be set to merge automatically when all merge ##### Default branch renaming -Enterprise and organization owners can now set the default branch name for new repositories. Enterprise owners can also enforce their choice of default branch name across all organizations or allow individual organizations to choose their own. For more information, see "[Enforcing repository management policies in your enterprise](/admin/policies/enforcing-repository-management-policies-in-your-enterprise#enforcing-a-policy-on-the-default-branch-name)" and "[Managing the default branch name for repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization)." +Enterprise and organization owners can now set the default branch name for new repositories. Enterprise owners can also enforce their choice of default branch name across all organizations or allow individual organizations to choose their own. For more information, see "[Enforcing repository management policies in your enterprise](/admin/policies/enforcing-repository-management-policies-in-your-enterprise#enforcing-a-policy-on-the-default-branch-name)" and "[Managing the default branch name for repositories in your organization](/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization)." Existing repositories are unaffected by these settings, and their default branch name will not be changed. diff --git a/content/code-security/secret-security/about-secret-scanning.md b/content/code-security/secret-security/about-secret-scanning.md index 68b1598540..1915cbf242 100644 --- a/content/code-security/secret-security/about-secret-scanning.md +++ b/content/code-security/secret-security/about-secret-scanning.md @@ -45,7 +45,7 @@ When {% data variables.product.prodname_secret_scanning %} detects a set of cred {% data variables.product.prodname_secret_scanning_caps %} is available on all organization-owned repositories as part of {% data variables.product.prodname_GH_advanced_security %}. It is not available on user-owned repositories. {% endif %} -If you're a repository administrator or an organization owner, you can enable {% data variables.product.prodname_secret_scanning %} for {% if currentVersion == "free-pro-team@latest" %} private{% endif %} repositories that are owned by organizations. You can enable {% data variables.product.prodname_secret_scanning %} for all your repositories, or for all new repositories within your organization.{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_secret_scanning_caps %} is not available for user-owned private repositories.{% endif %} For more information, see "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)" and "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +If you're a repository administrator or an organization owner, you can enable {% data variables.product.prodname_secret_scanning %} for {% if currentVersion == "free-pro-team@latest" %} private{% endif %} repositories that are owned by organizations. You can enable {% data variables.product.prodname_secret_scanning %} for all your repositories, or for all new repositories within your organization.{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_secret_scanning_caps %} is not available for user-owned private repositories.{% endif %} For more information, see "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)" and "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." When you push commits to a{% if currentVersion == "free-pro-team@latest" %} private{% endif %} repository with {% data variables.product.prodname_secret_scanning %} enabled, {% data variables.product.prodname_dotcom %} scans the contents of the commits for secrets. diff --git a/content/code-security/secret-security/configuring-secret-scanning-for-your-repositories.md b/content/code-security/secret-security/configuring-secret-scanning-for-your-repositories.md index ff7cd65eb8..de5374ce76 100644 --- a/content/code-security/secret-security/configuring-secret-scanning-for-your-repositories.md +++ b/content/code-security/secret-security/configuring-secret-scanning-for-your-repositories.md @@ -77,4 +77,4 @@ You can also ignore individual alerts from {% data variables.product.prodname_se ### Further reading -- "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)" +- "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)" diff --git a/content/code-security/secure-coding/setting-up-code-scanning-for-a-repository.md b/content/code-security/secure-coding/setting-up-code-scanning-for-a-repository.md index 91b9a5c7b3..9058dabf56 100644 --- a/content/code-security/secure-coding/setting-up-code-scanning-for-a-repository.md +++ b/content/code-security/secure-coding/setting-up-code-scanning-for-a-repository.md @@ -32,7 +32,7 @@ You decide how to generate {% data variables.product.prodname_code_scanning %} a {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-security %} -3. To the right of "{% data variables.product.prodname_code_scanning_capc %} alerts", click **Set up {% data variables.product.prodname_code_scanning %}**. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}If {% data variables.product.prodname_code_scanning %} is missing, you need to ask an organization owner or repository administrator to enable {% data variables.product.prodname_GH_advanced_security %}. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)" or "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)."{% endif %} +3. To the right of "{% data variables.product.prodname_code_scanning_capc %} alerts", click **Set up {% data variables.product.prodname_code_scanning %}**. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}If {% data variables.product.prodname_code_scanning %} is missing, you need to ask an organization owner or repository administrator to enable {% data variables.product.prodname_GH_advanced_security %}. For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)" or "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)."{% endif %} !["Set up {% data variables.product.prodname_code_scanning %}" button to the right of "{% data variables.product.prodname_code_scanning_capc %}" in the Security Overview](/assets/images/help/security/overview-set-up-code-scanning.png) 4. Under "Get started with {% data variables.product.prodname_code_scanning %}", click **Set up this workflow** on the {% data variables.product.prodname_codeql_workflow %} or on a third-party workflow. !["Set up this workflow" button under "Get started with {% data variables.product.prodname_code_scanning %}" heading](/assets/images/help/repository/code-scanning-set-up-this-workflow.png){% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %}Workflows are only displayed if they are relevant for the programming languages detected in the repository. The {% data variables.product.prodname_codeql_workflow %} is always displayed, but the "Set up this workflow" button is only enabled if {% data variables.product.prodname_codeql %} analysis supports the languages present in the repository.{% endif %} diff --git a/content/code-security/security-overview/exploring-security-alerts.md b/content/code-security/security-overview/exploring-security-alerts.md index 3e9d077fe4..45c7c67a68 100644 --- a/content/code-security/security-overview/exploring-security-alerts.md +++ b/content/code-security/security-overview/exploring-security-alerts.md @@ -11,7 +11,7 @@ versions: ### About the security overview -You can use the security overview for a high-level view of the security status of your organization or to identify problematic repositories that require intervention. At the organization-level, the security overview displays aggregate and repository-specific security information for repositories owned by your organization. At the team-level, the security overview displays repository-specific security information for repositories that the team has admin privileges for. For more information, see "[Managing team access to an organization repository](/github/setting-up-and-managing-organizations-and-teams/managing-team-access-to-an-organization-repository)." +You can use the security overview for a high-level view of the security status of your organization or to identify problematic repositories that require intervention. At the organization-level, the security overview displays aggregate and repository-specific security information for repositories owned by your organization. At the team-level, the security overview displays repository-specific security information for repositories that the team has admin privileges for. For more information, see "[Managing team access to an organization repository](/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository)." The security overview indicates whether {% data variables.product.prodname_GH_advanced_security %} features are enabled for repositories owned by your organization and consolidates alerts from {% data variables.product.prodname_advanced_security %} features, including {% data variables.product.prodname_code_scanning %} alerts, {% data variables.product.prodname_dependabot_alerts %}, and {% data variables.product.prodname_secret_scanning %} alerts. For more information, see "[About securing your repository](/code-security/getting-started/about-securing-your-repository)." diff --git a/content/code-security/supply-chain-security/about-alerts-for-vulnerable-dependencies.md b/content/code-security/supply-chain-security/about-alerts-for-vulnerable-dependencies.md index 6e385e03eb..3076bdc6bb 100644 --- a/content/code-security/supply-chain-security/about-alerts-for-vulnerable-dependencies.md +++ b/content/code-security/supply-chain-security/about-alerts-for-vulnerable-dependencies.md @@ -48,9 +48,9 @@ For a list of the ecosystems that {% data variables.product.product_name %} can {% if currentVersion == "free-pro-team@latest" %}{% data variables.product.prodname_dotcom %} detects vulnerable dependencies in _public_ repositories and generates {% data variables.product.prodname_dependabot_alerts %} by default. Owners of private repositories, or people with admin access, can enable {% data variables.product.prodname_dependabot_alerts %} by enabling the dependency graph and {% data variables.product.prodname_dependabot_alerts %} for their repositories. -You can also enable or disable {% data variables.product.prodname_dependabot_alerts %} for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +You can also enable or disable {% data variables.product.prodname_dependabot_alerts %} for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." -For information about permission requirements for actions related to {% data variables.product.prodname_dependabot_alerts %}, see "[Repository permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization#permission-requirements-for-security-features)." +For information about permission requirements for actions related to {% data variables.product.prodname_dependabot_alerts %}, see "[Repository permission levels for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization#permission-requirements-for-security-features)." {% data variables.product.product_name %} starts generating the dependency graph immediately and generates alerts for any vulnerable dependencies as soon as they are identified. The graph is usually populated within minutes but this may take longer for repositories with many dependencies. For more information, see "[Managing data use settings for your private repository](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository)." {% endif %} diff --git a/content/code-security/supply-chain-security/about-the-dependency-graph.md b/content/code-security/supply-chain-security/about-the-dependency-graph.md index 3f516de9cb..237dcd1106 100644 --- a/content/code-security/supply-chain-security/about-the-dependency-graph.md +++ b/content/code-security/supply-chain-security/about-the-dependency-graph.md @@ -89,6 +89,6 @@ The recommended formats explicitly define which versions are used for all direct - "[Dependency graph](https://en.wikipedia.org/wiki/Dependency_graph)" on Wikipedia - "[Exploring the dependencies of a repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository)"{% if currentVersion == "free-pro-team@latest" %} -- "[Viewing insights for your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization)" +- "[Viewing insights for your organization](/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization)" - "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)" - "[Troubleshooting the detection of vulnerable dependencies](/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies)"{% endif %} diff --git a/content/code-security/supply-chain-security/configuration-options-for-dependency-updates.md b/content/code-security/supply-chain-security/configuration-options-for-dependency-updates.md index d4debc6b6c..600d4e8c7f 100644 --- a/content/code-security/supply-chain-security/configuration-options-for-dependency-updates.md +++ b/content/code-security/supply-chain-security/configuration-options-for-dependency-updates.md @@ -321,7 +321,7 @@ updates: {% note %} -**Note**: {% data variables.product.prodname_dependabot %} can only run version updates on manifest or lock files if it can access all of the dependencies in the file, even if you add inaccessible dependencies to the `ignore` option of your configuration file. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization#allowing-dependabot-to-access-private-dependencies)" and "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors#dependabot-cant-resolve-your-dependency-files)." +**Note**: {% data variables.product.prodname_dependabot %} can only run version updates on manifest or lock files if it can access all of the dependencies in the file, even if you add inaccessible dependencies to the `ignore` option of your configuration file. For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization#allowing-dependabot-to-access-private-dependencies)" and "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors#dependabot-cant-resolve-your-dependency-files)." {% endnote %} diff --git a/content/code-security/supply-chain-security/configuring-dependabot-security-updates.md b/content/code-security/supply-chain-security/configuring-dependabot-security-updates.md index 83bf346c37..391fdce78b 100644 --- a/content/code-security/supply-chain-security/configuring-dependabot-security-updates.md +++ b/content/code-security/supply-chain-security/configuring-dependabot-security-updates.md @@ -48,7 +48,7 @@ If security updates are not enabled for your repository and you don't know why, You can enable or disable {% data variables.product.prodname_dependabot_security_updates %} for an individual repository (see below). -You can also enable or disable {% data variables.product.prodname_dependabot_security_updates %} for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +You can also enable or disable {% data variables.product.prodname_dependabot_security_updates %} for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." {% data variables.product.prodname_dependabot_security_updates %} require specific repository settings. For more information, see "[Supported repositories](#supported-repositories)." diff --git a/content/code-security/supply-chain-security/configuring-notifications-for-vulnerable-dependencies.md b/content/code-security/supply-chain-security/configuring-notifications-for-vulnerable-dependencies.md index 182e15babb..3dbe53430e 100644 --- a/content/code-security/supply-chain-security/configuring-notifications-for-vulnerable-dependencies.md +++ b/content/code-security/supply-chain-security/configuring-notifications-for-vulnerable-dependencies.md @@ -16,7 +16,7 @@ topics: {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.prodname_dependabot %} detects vulnerable dependencies in your repositories, we generate a {% data variables.product.prodname_dependabot %} alert and display it on the Security tab for the repository. {% data variables.product.product_name %} notifies the maintainers of affected repositories about the new alert according to their notification preferences.{% else %}When {% data variables.product.product_name %} detects vulnerable dependencies in your repositories, it sends security alerts.{% endif %}{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_dependabot %} is enabled by default on all public repositories. For {% data variables.product.prodname_dependabot_alerts %}, by default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability. {% endif %} -{% if currentVersion == "free-pro-team@latest" %}If you're an organization owner, you can enable or disable {% data variables.product.prodname_dependabot_alerts %} for all repositories in your organization with one click. You can also set whether the detection of vulnerable dependencies will be enabled or disabled for newly-created repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization#enabling-or-disabling-a-feature-for-all-new-repositories-when-they-are-added)." +{% if currentVersion == "free-pro-team@latest" %}If you're an organization owner, you can enable or disable {% data variables.product.prodname_dependabot_alerts %} for all repositories in your organization with one click. You can also set whether the detection of vulnerable dependencies will be enabled or disabled for newly-created repositories. For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization#enabling-or-disabling-a-feature-for-all-new-repositories-when-they-are-added)." {% endif %} {% if enterpriseServerVersions contains currentVersion and currentVersion == "enterprise-server@2.21" %} diff --git a/content/code-security/supply-chain-security/exploring-the-dependencies-of-a-repository.md b/content/code-security/supply-chain-security/exploring-the-dependencies-of-a-repository.md index 5bdea0f321..44e8ae34c2 100644 --- a/content/code-security/supply-chain-security/exploring-the-dependencies-of-a-repository.md +++ b/content/code-security/supply-chain-security/exploring-the-dependencies-of-a-repository.md @@ -75,7 +75,7 @@ For public repositories, the dependents view shows how the repository is used by Repository administrators can enable or disable the dependency graph for private repositories. -You can also enable or disable the dependency graph for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +You can also enable or disable the dependency graph for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} @@ -117,7 +117,7 @@ If a manifest or lock file is not processed, its dependencies are omitted from t ### Further reading - "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)"{% if currentVersion == "free-pro-team@latest" %} -- "[Viewing insights for your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization)" +- "[Viewing insights for your organization](/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization)" - "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)" - "[Understanding how {% data variables.product.product_name %} uses and protects your data](/github/understanding-how-github-uses-and-protects-your-data)" {% endif %} diff --git a/content/developers/github-marketplace/about-marketplace-badges.md b/content/developers/github-marketplace/about-marketplace-badges.md index 11e6b80de5..d9bf33689a 100644 --- a/content/developers/github-marketplace/about-marketplace-badges.md +++ b/content/developers/github-marketplace/about-marketplace-badges.md @@ -13,7 +13,7 @@ Certain apps on the {% data variables.product.prodname_marketplace %} have the { - Verified ownership of their domain and has a verified badge on their profile - Confirmed their email address so {% data variables.product.prodname_dotcom %} Support can reach the organization -- Required two-factor authentication for their organization. For more information, see "[Requiring two-factor authentication in your organization](/github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization)." +- Required two-factor authentication for their organization. For more information, see "[Requiring two-factor authentication in your organization](/organizations/keeping-your-organization-secure/requiring-two-factor-authentication-in-your-organization)." ![Marketplace badge for GitHub Apps](/assets/images/marketplace/apps-with-verified-publisher-badge-tooltip.png) diff --git a/content/developers/github-marketplace/applying-for-publisher-verification-for-your-organization.md b/content/developers/github-marketplace/applying-for-publisher-verification-for-your-organization.md index 77342b3bd8..d811ada581 100644 --- a/content/developers/github-marketplace/applying-for-publisher-verification-for-your-organization.md +++ b/content/developers/github-marketplace/applying-for-publisher-verification-for-your-organization.md @@ -24,8 +24,8 @@ To offer paid plans for your app, the app must be owned by an organization and y ![Publisher verification option in the organization settings sidebar](/assets/images/marketplace/publisher-verification-settings-option.png) 1. Under "Publisher Verification", complete the information in the checklist: - Ensure that your basic profile information is present and accurate. Also, make sure that you've included the best email address for support and updates from {% data variables.product.company_short %}. - - Ensure that Two-factor authentication is enabled for your organization. For more information, see "[Requiring two-factor authentication in your organization](/github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization)." - - Submit a verified domain and ensure that a "Verified" badge displays on your organization's profile page. For related information, see "[Verifying your organization's domain](/github/setting-up-and-managing-organizations-and-teams/verifying-your-organizations-domain)." + - Ensure that Two-factor authentication is enabled for your organization. For more information, see "[Requiring two-factor authentication in your organization](/organizations/keeping-your-organization-secure/requiring-two-factor-authentication-in-your-organization)." + - Submit a verified domain and ensure that a "Verified" badge displays on your organization's profile page. For related information, see "[Verifying your organization's domain](/organizations/managing-organization-settings/verifying-your-organizations-domain)." ![Publisher Verification checklist](/assets/images/marketplace/publisher-verification-checklist.png) diff --git a/content/discussions/collaborating-with-your-community-using-discussions/about-discussions.md b/content/discussions/collaborating-with-your-community-using-discussions/about-discussions.md index 9e1768ab20..c11bfa475c 100644 --- a/content/discussions/collaborating-with-your-community-using-discussions/about-discussions.md +++ b/content/discussions/collaborating-with-your-community-using-discussions/about-discussions.md @@ -19,7 +19,7 @@ With {% data variables.product.prodname_discussions %}, the community for your p You don't need to close a discussion like you close an issue or a pull request. -If a repository administrator or project maintainer enables discussions for a repository, anyone who visits the repository can create and participate in discussions for the repository. Repository administrators and project maintainers can manage discussions and discussion categories in a repository, and pin discussions to increase the visibility of the discussion. Moderators and collaborators can mark comments as answers, lock discussions, and convert issues to discussions. For more information, see "[Repository permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization)." +If a repository administrator or project maintainer enables discussions for a repository, anyone who visits the repository can create and participate in discussions for the repository. Repository administrators and project maintainers can manage discussions and discussion categories in a repository, and pin discussions to increase the visibility of the discussion. Moderators and collaborators can mark comments as answers, lock discussions, and convert issues to discussions. For more information, see "[Repository permission levels for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization)." For more information about management of discussions for your repository, see "[Managing discussions in your repository](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository)." diff --git a/content/discussions/guides/best-practices-for-community-conversations-on-github.md b/content/discussions/guides/best-practices-for-community-conversations-on-github.md index 37c0347541..ee63e656d2 100644 --- a/content/discussions/guides/best-practices-for-community-conversations-on-github.md +++ b/content/discussions/guides/best-practices-for-community-conversations-on-github.md @@ -29,7 +29,7 @@ You can use {% data variables.product.prodname_discussions %} to discuss big pic Issues are useful for discussing specific details of a project such as bug reports and planned improvements. For more information, see "[About issues](/articles/about-issues)." Pull requests allow you to comment directly on proposed changes. For more information, see "[About pull requests](/articles/about-pull-requests)" and "[Commenting on a pull request](/articles/commenting-on-a-pull-request)." -{% data reusables.organizations.team-discussions-purpose %} For more information, see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)." +{% data reusables.organizations.team-discussions-purpose %} For more information, see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)." ### Following contributing guidelines diff --git a/content/discussions/guides/granting-higher-permissions-to-top-contributors.md b/content/discussions/guides/granting-higher-permissions-to-top-contributors.md index 8ded0aaa3a..6c12ee38c7 100644 --- a/content/discussions/guides/granting-higher-permissions-to-top-contributors.md +++ b/content/discussions/guides/granting-higher-permissions-to-top-contributors.md @@ -21,7 +21,7 @@ The most helpful contributors for the past 30 days are highlighted on the {% dat People with triage permissions for a repository can help moderate a project's discussions by marking comments as answers, locking discussions that are not longer useful or are damaging to the community, and converting issues to discussions when an idea is still in the early stages of development. For more information, see "[Moderating discussions](/discussions/managing-discussions-for-your-community/moderating-discussions)." -For more information about repository permission levels and {% data variables.product.prodname_discussions %}, see "[Repository permissions levels for an organization](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization)." +For more information about repository permission levels and {% data variables.product.prodname_discussions %}, see "[Repository permissions levels for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization)." ### Step 3: Change permissions levels for top contributors diff --git a/content/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository.md b/content/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository.md index 4c77f71e2c..2d14f8ed52 100644 --- a/content/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository.md +++ b/content/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository.md @@ -12,7 +12,7 @@ versions: {% data reusables.discussions.about-discussions %} For more information about discussions, see "[About discussions](/discussions/collaborating-with-your-community-using-discussions/about-discussions)." -Organization owners can choose the permissions required to create a discussion for repositories owned by the organization. For more information, see "[Managing discussion creation for repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/managing-discussion-creation-for-repositories-in-your-organization)." +Organization owners can choose the permissions required to create a discussion for repositories owned by the organization. For more information, see "[Managing discussion creation for repositories in your organization](/organizations/managing-organization-settings/managing-discussion-creation-for-repositories-in-your-organization)." As a discussions maintainer, you can create community resources to encourage discussions that are aligned with the overall project goal and maintain a friendly open forum for collaborators. Creating a code of conduct or contribution guidelines for collaborators to follow will help facilitate a collaborative and productive forum. For more information on creating community resources, see "[Adding a code of conduct to your project](/communities/setting-up-your-project-for-healthy-contributions/adding-a-code-of-conduct-to-your-project)," and "[Setting guidelines for repository contributors](/communities/setting-up-your-project-for-healthy-contributions/setting-guidelines-for-repository-contributors)." diff --git a/content/education/manage-coursework-with-github-classroom/create-a-group-assignment.md b/content/education/manage-coursework-with-github-classroom/create-a-group-assignment.md index 45df283ef9..95fdfc6fe1 100644 --- a/content/education/manage-coursework-with-github-classroom/create-a-group-assignment.md +++ b/content/education/manage-coursework-with-github-classroom/create-a-group-assignment.md @@ -17,7 +17,7 @@ When a student accepts a group assignment, the student can create a new team or {% data reusables.classroom.about-assignments %} -You can decide how many teams one assignment can have, and how many members each team can have. Each team that a student creates for an assignment is a team within your organization on {% data variables.product.product_name %}. The visibility of the team is secret. Teams that you create on {% data variables.product.product_name %} will not appear in {% data variables.product.prodname_classroom %}. For more information, see "[About teams](/github/setting-up-and-managing-organizations-and-teams/about-teams)." +You can decide how many teams one assignment can have, and how many members each team can have. Each team that a student creates for an assignment is a team within your organization on {% data variables.product.product_name %}. The visibility of the team is secret. Teams that you create on {% data variables.product.product_name %} will not appear in {% data variables.product.prodname_classroom %}. For more information, see "[About teams](/organizations/organizing-members-into-teams/about-teams)." For a video demonstration of the creation of a group assignment, see "[Basics of setting up {% data variables.product.prodname_classroom %}](/education/manage-coursework-with-github-classroom/basics-of-setting-up-github-classroom)." diff --git a/content/education/manage-coursework-with-github-classroom/manage-classrooms.md b/content/education/manage-coursework-with-github-classroom/manage-classrooms.md index 845faf1938..4ad2ceef98 100644 --- a/content/education/manage-coursework-with-github-classroom/manage-classrooms.md +++ b/content/education/manage-coursework-with-github-classroom/manage-classrooms.md @@ -20,7 +20,7 @@ redirect_from: After you create a classroom, {% data variables.product.prodname_classroom %} will prompt you to invite teaching assistants (TAs) and admins to the classroom. Each classroom can have one or more admins. Admins can be teachers, TAs, or any other course administrator who you'd like to have control over your classrooms on {% data variables.product.prodname_classroom %}. -Invite TAs and admins to your classroom by inviting the user accounts on {% data variables.product.product_name %} to your organization as organization owners and sharing the URL for your classroom. Organization owners can administer any classroom for the organization. For more information, see "[Permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization)" and "[Inviting users to join your organization](/github/setting-up-and-managing-organizations-and-teams/inviting-users-to-join-your-organization)." +Invite TAs and admins to your classroom by inviting the user accounts on {% data variables.product.product_name %} to your organization as organization owners and sharing the URL for your classroom. Organization owners can administer any classroom for the organization. For more information, see "[Permission levels for an organization](/organizations/managing-peoples-access-to-your-organization-with-roles/permission-levels-for-an-organization)" and "[Inviting users to join your organization](/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization)." When you're done using a classroom, you can archive the classroom and refer to the classroom, roster, and assignments later, or you can delete the classroom if you no longer need the classroom. @@ -34,7 +34,7 @@ When you first share the URL for an assignment with a student, the student must ### Prerequisites -You must have an organization account on {% data variables.product.product_name %} to manage classrooms on {% data variables.product.prodname_classroom %}. For more information, see "[Types of {% data variables.product.company_short %} accounts](/github/getting-started-with-github/types-of-github-accounts#organization-accounts)" and "[Creating a new organization from scratch](/github/setting-up-and-managing-organizations-and-teams/creating-a-new-organization-from-scratch)." +You must have an organization account on {% data variables.product.product_name %} to manage classrooms on {% data variables.product.prodname_classroom %}. For more information, see "[Types of {% data variables.product.company_short %} accounts](/github/getting-started-with-github/types-of-github-accounts#organization-accounts)" and "[Creating a new organization from scratch](/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch)." You must authorize the OAuth app for {% data variables.product.prodname_classroom %} for your organization to manage classrooms for your organization account. For more information, see "[Authorizing OAuth Apps](/github/authenticating-to-github/authorizing-oauth-apps)." diff --git a/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md b/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md index d7afb49e30..68990facf8 100644 --- a/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md +++ b/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md @@ -26,7 +26,7 @@ Alternatively, you can enable {% data variables.product.prodname_actions %} in y {% note %} -**Note:** You might not be able to manage these settings if your organization has an overriding policy or is managed by an enterprise that has overriding policy. For more information, see "[Disabling or limiting {% data variables.product.prodname_actions %} for your organization](/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization)" or {% if currentVersion == "free-pro-team@latest" %}"[Enforcing {% data variables.product.prodname_actions %} policies in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account)."{% elsif currentVersion ver_gt "enterprise-server@2.21"%}"[Enforcing {% data variables.product.prodname_actions %} policies for your enterprise](/enterprise/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise)."{% endif %} +**Note:** You might not be able to manage these settings if your organization has an overriding policy or is managed by an enterprise that has overriding policy. For more information, see "[Disabling or limiting {% data variables.product.prodname_actions %} for your organization](/organizations/managing-organization-settings/disabling-or-limiting-github-actions-for-your-organization)" or {% if currentVersion == "free-pro-team@latest" %}"[Enforcing {% data variables.product.prodname_actions %} policies in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account)."{% elsif currentVersion ver_gt "enterprise-server@2.21"%}"[Enforcing {% data variables.product.prodname_actions %} policies for your enterprise](/enterprise/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise)."{% endif %} {% endnote %} @@ -48,7 +48,7 @@ You can disable all workflows for a repository or set a policy that configures w {% note %} -**Note:** You might not be able to manage these settings if your organization has an overriding policy or is managed by an enterprise that has overriding policy. For more information, see "[Disabling or limiting {% data variables.product.prodname_actions %} for your organization](/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization)" or {% if currentVersion == "free-pro-team@latest" %}"[Enforcing {% data variables.product.prodname_actions %} policies in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account)."{% elsif currentVersion ver_gt "enterprise-server@2.21" %}"[Enforcing {% data variables.product.prodname_actions %} policies for your enterprise](/enterprise/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise)." +**Note:** You might not be able to manage these settings if your organization has an overriding policy or is managed by an enterprise that has overriding policy. For more information, see "[Disabling or limiting {% data variables.product.prodname_actions %} for your organization](/organizations/managing-organization-settings/disabling-or-limiting-github-actions-for-your-organization)" or {% if currentVersion == "free-pro-team@latest" %}"[Enforcing {% data variables.product.prodname_actions %} policies in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account)."{% elsif currentVersion ver_gt "enterprise-server@2.21" %}"[Enforcing {% data variables.product.prodname_actions %} policies for your enterprise](/enterprise/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise)." {% endif %} diff --git a/content/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository.md b/content/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository.md index 4eed68ffc8..9d6fd613cc 100644 --- a/content/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository.md +++ b/content/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository.md @@ -103,4 +103,4 @@ Organization owners and repository administrators can only grant access to view ### Further reading - "[About securing your repository](/github/administering-a-repository/about-securing-your-repository)" -- "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)" +- "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)" diff --git a/content/github/administering-a-repository/managing-teams-and-people-with-access-to-your-repository.md b/content/github/administering-a-repository/managing-teams-and-people-with-access-to-your-repository.md index fc4dac0766..8bd8f523fd 100644 --- a/content/github/administering-a-repository/managing-teams-and-people-with-access-to-your-repository.md +++ b/content/github/administering-a-repository/managing-teams-and-people-with-access-to-your-repository.md @@ -16,7 +16,7 @@ For each repository that you administer on {% data variables.product.prodname_do This overview can help you audit access to your repository, onboard or off-board contractors or employees, and effectively respond to security incidents. -For more information about repository permission levels, see "[Permission levels for a user account repository](/github/setting-up-and-managing-your-github-user-account/permission-levels-for-a-user-account-repository)" and "[Repository permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization)." +For more information about repository permission levels, see "[Permission levels for a user account repository](/github/setting-up-and-managing-your-github-user-account/permission-levels-for-a-user-account-repository)" and "[Repository permission levels for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization)." ![Access management overview](/assets/images/help/repository/manage-access-overview.png) @@ -58,4 +58,4 @@ For more information about repository permission levels, see "[Permission levels ### Further reading - "[Setting repository visibility](/github/administering-a-repository/setting-repository-visibility)" -- "[Setting base permissions for an organization](/github/setting-up-and-managing-organizations-and-teams/setting-base-permissions-for-an-organization)" +- "[Setting base permissions for an organization](/organizations/managing-access-to-your-organizations-repositories/setting-base-permissions-for-an-organization)" diff --git a/content/github/administering-a-repository/managing-the-forking-policy-for-your-repository.md b/content/github/administering-a-repository/managing-the-forking-policy-for-your-repository.md index 6d6be04cd2..1aa967f98b 100644 --- a/content/github/administering-a-repository/managing-the-forking-policy-for-your-repository.md +++ b/content/github/administering-a-repository/managing-the-forking-policy-for-your-repository.md @@ -13,7 +13,7 @@ topics: - repositories --- -An organization owner must allow forks of private{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.19" %} and internal{% endif %} repositories on the organization level before you can allow or disallow forks for a specific repository. For more information, see "[Managing the forking policy for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization)." +An organization owner must allow forks of private{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.19" %} and internal{% endif %} repositories on the organization level before you can allow or disallow forks for a specific repository. For more information, see "[Managing the forking policy for your organization](/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization)." {% data reusables.organizations.internal-repos-enterprise %} diff --git a/content/github/administering-a-repository/setting-repository-visibility.md b/content/github/administering-a-repository/setting-repository-visibility.md index 587bf86a29..e356187e86 100644 --- a/content/github/administering-a-repository/setting-repository-visibility.md +++ b/content/github/administering-a-repository/setting-repository-visibility.md @@ -16,7 +16,7 @@ topics: ### About repository visibility changes -Organization owners can restrict the ability to change repository visibility to organization owners only. For more information, see "[Restricting repository visibility changes in your organization](/github/setting-up-and-managing-organizations-and-teams/restricting-repository-visibility-changes-in-your-organization)." +Organization owners can restrict the ability to change repository visibility to organization owners only. For more information, see "[Restricting repository visibility changes in your organization](/organizations/managing-organization-settings/restricting-repository-visibility-changes-in-your-organization)." We recommend reviewing the following caveats before you change the visibility of a repository. diff --git a/content/github/authenticating-to-github/about-authentication-with-saml-single-sign-on.md b/content/github/authenticating-to-github/about-authentication-with-saml-single-sign-on.md index c7f6ff6491..010d673100 100644 --- a/content/github/authenticating-to-github/about-authentication-with-saml-single-sign-on.md +++ b/content/github/authenticating-to-github/about-authentication-with-saml-single-sign-on.md @@ -51,5 +51,5 @@ After an enterprise or organization owner enables or enforces SAML SSO for an or ### Further reading -{% if currentVersion == "free-pro-team@latest" %}- "[About identity and access management with SAML single sign-on](/github/setting-up-and-managing-organizations-and-teams/about-identity-and-access-management-with-saml-single-sign-on)"{% endif %} +{% if currentVersion == "free-pro-team@latest" %}- "[About identity and access management with SAML single sign-on](/organizations/managing-saml-single-sign-on-for-your-organization/about-identity-and-access-management-with-saml-single-sign-on)"{% endif %} {% if currentVersion == "github-ae@latest" %}- "[About identity and access management for your enterprise](/admin/authentication/about-identity-and-access-management-for-your-enterprise)"{% endif %} diff --git a/content/github/authenticating-to-github/creating-a-strong-password.md b/content/github/authenticating-to-github/creating-a-strong-password.md index 11fb184df2..757915ebfc 100644 --- a/content/github/authenticating-to-github/creating-a-strong-password.md +++ b/content/github/authenticating-to-github/creating-a-strong-password.md @@ -20,7 +20,7 @@ To keep your account secure, we recommend you follow these best practices: - Use a password manager, such as [LastPass](https://lastpass.com/) or [1Password](https://1password.com/), to generate a password of at least 15 characters. - Generate a unique password for {% data variables.product.product_name %}. If you use your {% data variables.product.product_name %} password elsewhere and that service is compromised, then attackers or other malicious actors could use that information to access your {% data variables.product.product_name %} account. - Configure two-factor authentication for your personal account. For more information, see "[About two-factor authentication](/articles/about-two-factor-authentication)." -- Never share your password, even with a potential collaborator. Each person should use their own personal account on {% data variables.product.product_name %}. For more information on ways to collaborate, see: "[Inviting collaborators to a personal repository](/articles/inviting-collaborators-to-a-personal-repository)," "[About collaborative development models](/articles/about-collaborative-development-models/)," or "[Collaborating with groups in organizations](/articles/collaborating-with-groups-in-organizations/)." +- Never share your password, even with a potential collaborator. Each person should use their own personal account on {% data variables.product.product_name %}. For more information on ways to collaborate, see: "[Inviting collaborators to a personal repository](/articles/inviting-collaborators-to-a-personal-repository)," "[About collaborative development models](/articles/about-collaborative-development-models/)," or "[Collaborating with groups in organizations](/organizations/collaborating-with-groups-in-organizations/)." {% data reusables.repositories.blocked-passwords %} diff --git a/content/github/collaborating-with-issues-and-pull-requests/about-conversations-on-github.md b/content/github/collaborating-with-issues-and-pull-requests/about-conversations-on-github.md index c5d427757e..056544366e 100644 --- a/content/github/collaborating-with-issues-and-pull-requests/about-conversations-on-github.md +++ b/content/github/collaborating-with-issues-and-pull-requests/about-conversations-on-github.md @@ -18,7 +18,7 @@ You can create and participate in issues, pull requests, and team discussions, d Issues are useful for discussing specific details of a project such as bug reports and planned improvements. For more information, see "[About issues](/articles/about-issues)." Pull requests allow you to comment directly on proposed changes. For more information, see "[About pull requests](/articles/about-pull-requests)" and "[Commenting on a pull request](/articles/commenting-on-a-pull-request)." -{% data reusables.organizations.team-discussions-purpose %} For more information, see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)." +{% data reusables.organizations.team-discussions-purpose %} For more information, see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)." ### Reacting to ideas in comments diff --git a/content/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews.md b/content/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews.md index 93a6a0374d..b96273574f 100644 --- a/content/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews.md +++ b/content/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews.md @@ -15,7 +15,7 @@ topics: After a pull request is opened, anyone with *read* access can review and comment on the changes it proposes. You can also suggest specific changes to lines of code, which the author can apply directly from the pull request. For more information, see "[Reviewing proposed changes in a pull request](/articles/reviewing-proposed-changes-in-a-pull-request)." -Repository owners and collaborators can request a pull request review from a specific person. Organization members can also request a pull request review from a team with read access to the repository. For more information, see "[Requesting a pull request review](/articles/requesting-a-pull-request-review)." {% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.19" %}You can specify a subset of team members to be automatically assigned in the place of the whole team. For more information, see "[Managing code review assignment for your team](/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team)."{% endif %} +Repository owners and collaborators can request a pull request review from a specific person. Organization members can also request a pull request review from a team with read access to the repository. For more information, see "[Requesting a pull request review](/articles/requesting-a-pull-request-review)." {% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.19" %}You can specify a subset of team members to be automatically assigned in the place of the whole team. For more information, see "[Managing code review assignment for your team](/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team)."{% endif %} Reviews allow for discussion of proposed changes and help ensure that the changes meet the repository's contributing guidelines and other quality standards. You can define which individuals or teams own certain types or areas of code in a CODEOWNERS file. When a pull request modifies code that has a defined owner, that individual or team will automatically be requested as a reviewer. For more information, see "[About code owners](/articles/about-code-owners/)." diff --git a/content/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review.md b/content/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review.md index 72ba7b1693..76413a4df8 100644 --- a/content/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review.md +++ b/content/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review.md @@ -13,7 +13,7 @@ topics: Owners and collaborators on a repository owned by a user account can assign pull request reviews. Organization members with triage permissions to a repository can assign a pull request review. -Owners or collaborators can assign a pull request review to any person that has been explicitly granted [read access](/articles/access-permissions-on-github) to a user-owned repository. Organization members can assign a pull request review to any person or team with read access to a repository. The requested reviewer or team will receive a notification that you asked them to review the pull request. {% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.19" %}If you request a review from a team and code review assignment is enabled, specific members will be requested and the team will be removed as a reviewer. For more information, see "[Managing code review assignment for your team](/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team)."{% endif %} +Owners or collaborators can assign a pull request review to any person that has been explicitly granted [read access](/articles/access-permissions-on-github) to a user-owned repository. Organization members can assign a pull request review to any person or team with read access to a repository. The requested reviewer or team will receive a notification that you asked them to review the pull request. {% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.19" %}If you request a review from a team and code review assignment is enabled, specific members will be requested and the team will be removed as a reviewer. For more information, see "[Managing code review assignment for your team](/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team)."{% endif %} {% note %} diff --git a/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md b/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md index 563ad76cfb..97604c7b7e 100644 --- a/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md +++ b/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md @@ -79,5 +79,5 @@ If you change the visibility of an internal repository and then delete the repos - "[Setting repository visibility](/articles/setting-repository-visibility)" - "[About forks](/articles/about-forks)" - "[Managing the forking policy for your repository](/github/administering-a-repository/managing-the-forking-policy-for-your-repository)" -- "[Managing the forking policy for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization)" +- "[Managing the forking policy for your organization](/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization)" - "{% if currentVersion == "free-pro-team@latest" %}[Enforcing repository management policies in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-repository-management-policies-in-your-enterprise-account#enforcing-a-policy-on-forking-private-or-internal-repositories){% else %}[Enforcing repository management policies in your enterprise](/admin/policies/enforcing-repository-management-policies-in-your-enterprise#enforcing-a-policy-on-forking-private-or-internal-repositories){% endif %}" diff --git a/content/github/creating-cloning-and-archiving-repositories/about-code-owners.md b/content/github/creating-cloning-and-archiving-repositories/about-code-owners.md index c65f2577a1..f6944dd4c2 100644 --- a/content/github/creating-cloning-and-archiving-repositories/about-code-owners.md +++ b/content/github/creating-cloning-and-archiving-repositories/about-code-owners.md @@ -23,7 +23,7 @@ Code owners are automatically requested for review when someone opens a pull req When someone with admin or owner permissions has enabled required reviews, they also can optionally require approval from a code owner before the author can merge a pull request in the repository. For more information, see "[About protected branches](/github/administering-a-repository/about-protected-branches#require-pull-request-reviews-before-merging)." -{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.19" %}If a team has enabled code review assignments, the individual approvals won't satisfy the requirement for code owner approval in a protected branch. For more information, see "[Managing code review assignment for your team](/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team)."{% endif %} +{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.19" %}If a team has enabled code review assignments, the individual approvals won't satisfy the requirement for code owner approval in a protected branch. For more information, see "[Managing code review assignment for your team](/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team)."{% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.22" %} If a file has a code owner, you can see who the code owner is before you open a pull request. In the repository, you can browse to the file and hover over {% octicon "shield-lock" aria-label="The edit icon" %}. diff --git a/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md b/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md index 722ababce5..453fac1bfa 100644 --- a/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md +++ b/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md @@ -21,7 +21,7 @@ Private repositories are only accessible to you, people you explicitly share acc Public repositories are accessible to everyone on the internet. Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, certain organization members. Internal repositories are accessible to enterprise members. For more information, see "[About internal repositories](#about-internal-repositories)." {% endif %} -Organization owners always have access to every repository created in an organization. For more information, see "[Repository permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization)." +Organization owners always have access to every repository created in an organization. For more information, see "[Repository permission levels for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization)." People with admin permissions for a repository can change an existing repository's visibility. For more information, see "[Setting repository visibility](/github/administering-a-repository/setting-repository-visibility)." diff --git a/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md b/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md index 4754cfb3d8..5158be272e 100644 --- a/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md +++ b/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md @@ -42,7 +42,7 @@ $ ssh -T git@{% data variables.command_line.codeblock %} > provide shell access. ``` -If the repository belongs to an organization and you're using an SSH key generated by an OAuth App, OAuth App access may have been restricted by an organization owner. For more information, see "About OAuth App access restrictions." +If the repository belongs to an organization and you're using an SSH key generated by an OAuth App, OAuth App access may have been restricted by an organization owner. For more information, see "About OAuth App access restrictions." For more information, see [Adding a new SSH key to your GitHub account](/articles/adding-a-new-ssh-key-to-your-github-account). diff --git a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/setting-up-code-scanning-for-a-repository.md b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/setting-up-code-scanning-for-a-repository.md index 96eddbb33b..79f3e92091 100644 --- a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/setting-up-code-scanning-for-a-repository.md +++ b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/setting-up-code-scanning-for-a-repository.md @@ -25,7 +25,7 @@ You decide how to generate {% data variables.product.prodname_code_scanning %} a {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-security %} -3. To the right of "{% data variables.product.prodname_code_scanning_capc %} alerts", click **Set up {% data variables.product.prodname_code_scanning %}**. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}If {% data variables.product.prodname_code_scanning %} is missing, you need to ask an organization owner or repository administrator to enable {% data variables.product.prodname_GH_advanced_security %}. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)" or "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)."{% endif %} +3. To the right of "{% data variables.product.prodname_code_scanning_capc %} alerts", click **Set up {% data variables.product.prodname_code_scanning %}**. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}If {% data variables.product.prodname_code_scanning %} is missing, you need to ask an organization owner or repository administrator to enable {% data variables.product.prodname_GH_advanced_security %}. For more information, see "[Managing security and analysis settings for your organization](/organizations/collaborating-with-groups-in-organizations/managing-security-and-analysis-settings-for-your-organization)" or "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)."{% endif %} !["Set up {% data variables.product.prodname_code_scanning %}" button to the right of "{% data variables.product.prodname_code_scanning_capc %}" in the Security Overview](/assets/images/help/security/overview-set-up-code-scanning.png) 4. Under "Get started with {% data variables.product.prodname_code_scanning %}", click **Set up this workflow** on the {% data variables.product.prodname_codeql_workflow %} or on a third-party workflow. !["Set up this workflow" button under "Get started with {% data variables.product.prodname_code_scanning %}" heading](/assets/images/help/repository/code-scanning-set-up-this-workflow.png){% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %}Workflows are only displayed if they are relevant for the programming languages detected in the repository. The {% data variables.product.prodname_codeql_workflow %} is always displayed, but the "Set up this workflow" button is only enabled if {% data variables.product.prodname_codeql %} analysis supports the languages present in the repository.{% endif %} diff --git a/content/github/getting-started-with-github/about-github-advanced-security.md b/content/github/getting-started-with-github/about-github-advanced-security.md index 27e3ce3e96..5b61b99b3f 100644 --- a/content/github/getting-started-with-github/about-github-advanced-security.md +++ b/content/github/getting-started-with-github/about-github-advanced-security.md @@ -37,7 +37,7 @@ For information about {% data variables.product.prodname_advanced_security %} fe The site administrator must enable {% data variables.product.prodname_advanced_security %} for {% data variables.product.product_location %} before you can use these features. For more information, see "[Configuring Advanced Security features](/admin/configuration/configuring-advanced-security-features)." {% endif %} -Once your system is set up, you can enable and disable these features at the organization or repository level. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)" and "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)." +Once your system is set up, you can enable and disable these features at the organization or repository level. For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)" and "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)." {% endif %} @@ -46,7 +46,7 @@ Once your system is set up, you can enable and disable these features at the org For public repositories on {% data variables.product.prodname_dotcom_the_website %}, these features are permanently on and can only be disabled if you change the visibility of the project so that the code is no longer public. -For other repositories, once you have a license for your enterprise account, you can enable and disable these features at the organization or repository level. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)" and "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)."{% endif %} +For other repositories, once you have a license for your enterprise account, you can enable and disable these features at the organization or repository level. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)" and "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)."{% endif %} {% endif %} diff --git a/content/github/index.md b/content/github/index.md index e7848587f1..d97b60cc5d 100644 --- a/content/github/index.md +++ b/content/github/index.md @@ -23,7 +23,7 @@ versions: {% link_in_list /managing-subscriptions-and-notifications-on-github %} -{% link_in_list /setting-up-and-managing-organizations-and-teams %} + {% link_in_list /setting-up-and-managing-your-enterprise %} {% link_in_list /setting-up-and-managing-billing-and-payments-on-github %} diff --git a/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md b/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md index a690af654c..f3df430d42 100644 --- a/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md +++ b/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md @@ -42,9 +42,9 @@ For a list of the ecosystems that {% data variables.product.product_name %} can {% if currentVersion == "free-pro-team@latest" %}{% data variables.product.prodname_dotcom %} detects vulnerable dependencies in _public_ repositories and generates {% data variables.product.prodname_dependabot_alerts %} by default. Owners of private repositories, or people with admin access, can enable {% data variables.product.prodname_dependabot_alerts %} by enabling the dependency graph and {% data variables.product.prodname_dependabot_alerts %} for their repositories. -You can also enable or disable {% data variables.product.prodname_dependabot_alerts %} for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +You can also enable or disable {% data variables.product.prodname_dependabot_alerts %} for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](/organizations/collaborating-with-groups-in-organizations/managing-security-and-analysis-settings-for-your-organization)." -For information about permission requirements for actions related to {% data variables.product.prodname_dependabot_alerts %}, see "[Repository permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization#permission-requirements-for-security-features)." +For information about permission requirements for actions related to {% data variables.product.prodname_dependabot_alerts %}, see "[Repository permission levels for an organization](/organizations/collaborating-with-groups-in-organizations/repository-permission-levels-for-an-organization#permission-requirements-for-security-features)." {% data variables.product.product_name %} starts generating the dependency graph immediately and generates alerts for any vulnerable dependencies as soon as they are identified. The graph is usually populated within minutes but this may take longer for repositories with many dependencies. For more information, see "[Managing data use settings for your private repository](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository)." {% endif %} diff --git a/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md b/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md index e90aa74955..c3e58dc041 100644 --- a/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md +++ b/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md @@ -13,7 +13,7 @@ topics: {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.prodname_dependabot %} detects vulnerable dependencies in your repositories, we generate a {% data variables.product.prodname_dependabot %} alert and display it on the Security tab for the repository. {% data variables.product.product_name %} notifies the maintainers of affected repositories about the new alert according to their notification preferences.{% else %}When {% data variables.product.product_name %} detects vulnerable dependencies in your repositories, it sends security alerts.{% endif %}{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_dependabot %} is enabled by default on all public repositories. For {% data variables.product.prodname_dependabot_alerts %}, by default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability. {% endif %} -{% if currentVersion == "free-pro-team@latest" %}If you're an organization owner, you can enable or disable {% data variables.product.prodname_dependabot_alerts %} for all repositories in your organization with one click. You can also set whether the detection of vulnerable dependencies will be enabled or disabled for newly-created repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization#enabling-or-disabling-a-feature-for-all-new-repositories-when-they-are-added)." +{% if currentVersion == "free-pro-team@latest" %}If you're an organization owner, you can enable or disable {% data variables.product.prodname_dependabot_alerts %} for all repositories in your organization with one click. You can also set whether the detection of vulnerable dependencies will be enabled or disabled for newly-created repositories. For more information, see "[Managing security and analysis settings for your organization](/organizations/collaborating-with-groups-in-organizations/managing-security-and-analysis-settings-for-your-organization#enabling-or-disabling-a-feature-for-all-new-repositories-when-they-are-added)." {% endif %} {% if enterpriseServerVersions contains currentVersion and currentVersion == "enterprise-server@2.21" %} diff --git a/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md b/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md index 4dc7aad673..23f8c2387a 100644 --- a/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md +++ b/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md @@ -65,7 +65,7 @@ Email notifications also allow flexibility with the types of notifications you r ### About participating and watching notifications -When you watch a repository, you're subscribing to updates for activity in that repository. Similarly, when you watch a specific team's discussions, you're subscribing to all conversation updates on that team's page. For more information, see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)." +When you watch a repository, you're subscribing to updates for activity in that repository. Similarly, when you watch a specific team's discussions, you're subscribing to all conversation updates on that team's page. For more information, see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)." To see repositories that you're watching, go to your [watching page](https://github.com/watching). For more information, see "[Managing subscriptions and notifications on GitHub](/github/managing-subscriptions-and-notifications-on-github/managing-subscriptions-for-activity-on-github)." {% if currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.20" %} diff --git a/content/github/setting-up-and-managing-billing-and-payments-on-github/upgrading-your-github-subscription.md b/content/github/setting-up-and-managing-billing-and-payments-on-github/upgrading-your-github-subscription.md index 848bdc0cf1..cf968f72ed 100644 --- a/content/github/setting-up-and-managing-billing-and-payments-on-github/upgrading-your-github-subscription.md +++ b/content/github/setting-up-and-managing-billing-and-payments-on-github/upgrading-your-github-subscription.md @@ -58,7 +58,7 @@ You can upgrade your organization from {% data variables.product.prodname_free_t #### Next steps for organizations using {% data variables.product.prodname_ghe_cloud %} -If you upgraded your organization to {% data variables.product.prodname_ghe_cloud %}, you can set up identity and access management for your organization. For more information, see "[Managing SAML single sign-on for your organization](/articles/managing-saml-single-sign-on-for-your-organization)." +If you upgraded your organization to {% data variables.product.prodname_ghe_cloud %}, you can set up identity and access management for your organization. For more information, see "[Managing SAML single sign-on for your organization](/organizations/managing-saml-single-sign-on-for-your-organization)." If you'd like to use an enterprise account with {% data variables.product.prodname_ghe_cloud %}, contact {% data variables.contact.contact_enterprise_sales %}. For more information, see "[About enterprise accounts](/articles/about-enterprise-accounts)." diff --git a/content/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-advanced-security-usage.md b/content/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-advanced-security-usage.md index 3e9d1d052a..d4c7b9fea7 100644 --- a/content/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-advanced-security-usage.md +++ b/content/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-advanced-security-usage.md @@ -29,5 +29,5 @@ You can check how many seats your license includes and how many of them are curr ![Owned organization in {% data variables.product.prodname_GH_advanced_security %} section of enterprise billing settings](/assets/images/help/billing/ghas-orgs-list-enterprise-click-org.png) 6. On the "Security & analysis" settings page, scroll to the "{% data variables.product.prodname_GH_advanced_security %} repositories" section to see a detailed breakdown of usage by repository for this organization. ![{% data variables.product.prodname_GH_advanced_security %} repositories section](/assets/images/help/enterprises/settings-security-analysis-ghas-repos-list.png) - For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." + For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." diff --git a/content/github/setting-up-and-managing-organizations-and-teams/collaborating-with-groups-in-organizations.md b/content/github/setting-up-and-managing-organizations-and-teams/collaborating-with-groups-in-organizations.md deleted file mode 100644 index 6e4d1b4eed..0000000000 --- a/content/github/setting-up-and-managing-organizations-and-teams/collaborating-with-groups-in-organizations.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -title: Collaborating with groups in organizations -intro: Groups of people can collaborate across many projects at the same time in organization accounts. -redirect_from: - - /articles/creating-a-new-organization-account/ - - /articles/collaborating-with-groups-in-organizations -mapTopic: true -versions: - free-pro-team: '*' - enterprise-server: '*' - github-ae: '*' -topics: - - organizations - - teams ---- - diff --git a/content/github/setting-up-and-managing-organizations-and-teams/index.md b/content/github/setting-up-and-managing-organizations-and-teams/index.md deleted file mode 100644 index 70a9607bb9..0000000000 --- a/content/github/setting-up-and-managing-organizations-and-teams/index.md +++ /dev/null @@ -1,145 +0,0 @@ ---- -title: Setting up and managing organizations and teams -shortTitle: Organizations and teams -intro: Collaborate across many projects while managing access to projects and data and customizing settings for your organization. -redirect_from: - - /articles/about-improved-organization-permissions/ - - /categories/setting-up-and-managing-organizations-and-teams -versions: - free-pro-team: '*' - enterprise-server: '*' - github-ae: '*' -topics: - - organizations - - teams ---- - - -### Table of Contents - -{% topic_link_in_list /collaborating-with-groups-in-organizations %} - {% link_in_list /about-organizations %} - {% link_in_list /about-your-organization-dashboard %} - {% link_in_list /creating-a-new-organization-from-scratch %} - {% link_in_list /accessing-your-organizations-settings %} - {% link_in_list /about-your-organizations-news-feed %} - {% link_in_list /viewing-insights-for-your-organization %} -{% topic_link_in_list /managing-membership-in-your-organization %} - {% link_in_list /inviting-users-to-join-your-organization %} - {% link_in_list /canceling-or-editing-an-invitation-to-join-your-organization %} - - {% link_in_list /adding-people-to-your-organization %} - {% link_in_list /removing-a-member-from-your-organization %} - {% link_in_list /reinstating-a-former-member-of-your-organization %} - {% link_in_list /can-i-create-accounts-for-people-in-my-organization %} -{% topic_link_in_list /managing-peoples-access-to-your-organization-with-roles %} - {% link_in_list /permission-levels-for-an-organization %} - {% link_in_list /maintaining-ownership-continuity-for-your-organization %} - {% link_in_list /giving-team-maintainer-permissions-to-an-organization-member %} - {% link_in_list /adding-a-billing-manager-to-your-organization %} - {% link_in_list /removing-a-billing-manager-from-your-organization %} -{% topic_link_in_list /organizing-members-into-teams %} - {% link_in_list /about-teams %} - {% link_in_list /creating-a-team %} - {% link_in_list /setting-your-teams-profile-picture %} - {% link_in_list /adding-organization-members-to-a-team %} - {% link_in_list /managing-code-review-assignment-for-your-team %} - {% link_in_list /renaming-a-team %} - {% link_in_list /changing-team-visibility %} - {% link_in_list /synchronizing-a-team-with-an-identity-provider-group %} - {% link_in_list /moving-a-team-in-your-organizations-hierarchy %} - {% link_in_list /requesting-to-add-a-child-team %} - {% link_in_list /requesting-to-add-or-change-a-parent-team %} - {% link_in_list /removing-organization-members-from-a-team %} - {% link_in_list /disabling-team-discussions-for-your-organization %} - {% link_in_list /managing-scheduled-reminders-for-your-team %} - {% link_in_list /deleting-a-team %} -{% topic_link_in_list /collaborating-with-your-team %} - {% link_in_list /about-team-discussions %} - {% link_in_list /creating-a-team-discussion %} - {% link_in_list /editing-or-deleting-a-team-discussion %} - {% link_in_list /pinning-a-team-discussion %} -{% topic_link_in_list /managing-access-to-your-organizations-repositories %} - {% link_in_list /repository-permission-levels-for-an-organization %} - {% link_in_list /setting-base-permissions-for-an-organization %} - {% link_in_list /viewing-people-with-access-to-your-repository %} - {% link_in_list /managing-an-individuals-access-to-an-organization-repository %} - {% link_in_list /managing-team-access-to-an-organization-repository %} - {% link_in_list /adding-outside-collaborators-to-repositories-in-your-organization %} - {% link_in_list /canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization %} - {% link_in_list /removing-an-outside-collaborator-from-an-organization-repository %} - {% link_in_list /converting-an-organization-member-to-an-outside-collaborator %} - {% link_in_list /converting-an-outside-collaborator-to-an-organization-member %} - {% link_in_list /reinstating-a-former-outside-collaborators-access-to-your-organization %} -{% topic_link_in_list /managing-access-to-your-organizations-project-boards %} - {% link_in_list /project-board-permissions-for-an-organization %} - {% link_in_list /managing-access-to-a-project-board-for-organization-members %} - {% link_in_list /managing-team-access-to-an-organization-project-board %} - {% link_in_list /managing-an-individuals-access-to-an-organization-project-board %} - {% link_in_list /adding-an-outside-collaborator-to-a-project-board-in-your-organization %} - {% link_in_list /removing-an-outside-collaborator-from-an-organization-project-board %} -{% topic_link_in_list /managing-access-to-your-organizations-apps %} - {% link_in_list /adding-github-app-managers-in-your-organization %} - {% link_in_list /removing-github-app-managers-from-your-organization %} -{% topic_link_in_list /managing-organization-settings %} - {% link_in_list /verifying-your-organizations-domain %} - {% link_in_list /renaming-an-organization %} - {% link_in_list /transferring-organization-ownership %} - {% link_in_list /restricting-repository-creation-in-your-organization %} - {% link_in_list /setting-permissions-for-deleting-or-transferring-repositories %} - {% link_in_list /restricting-repository-visibility-changes-in-your-organization %} - {% link_in_list /managing-the-forking-policy-for-your-organization %} - {% link_in_list /disabling-or-limiting-github-actions-for-your-organization %} - {% link_in_list /configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization %} - {% link_in_list /setting-permissions-for-adding-outside-collaborators %} - {% link_in_list /allowing-people-to-delete-issues-in-your-organization %}{% if currentVersion == "free-pro-team@latest" %} - {% link_in_list /managing-discussion-creation-for-repositories-in-your-organization %}{% endif %} - {% link_in_list /setting-team-creation-permissions-in-your-organization %} - {% link_in_list /managing-scheduled-reminders-for-your-organization %} - {% link_in_list /managing-the-default-branch-name-for-repositories-in-your-organization %} - {% link_in_list /managing-default-labels-for-repositories-in-your-organization %} - {% link_in_list /changing-the-visibility-of-your-organizations-dependency-insights %} - {% link_in_list /managing-the-display-of-member-names-in-your-organization %} - {% link_in_list /managing-updates-from-accounts-your-organization-sponsors %} - {% link_in_list /managing-the-publication-of-github-pages-sites-for-your-organization %} - {% link_in_list /deleting-an-organization-account %} - {% link_in_list /converting-an-organization-into-a-user %} - {% link_in_list /integrating-jira-with-your-organization-project-board %} - {% link_in_list /upgrading-to-the-corporate-terms-of-service %} -{% topic_link_in_list /migrating-to-improved-organization-permissions %} - {% link_in_list /converting-an-owners-team-to-improved-organization-permissions %} - {% link_in_list /converting-an-admin-team-to-improved-organization-permissions %} - {% link_in_list /migrating-admin-teams-to-improved-organization-permissions %} -{% topic_link_in_list /restricting-access-to-your-organizations-data %} - {% link_in_list /about-oauth-app-access-restrictions %} - {% link_in_list /enabling-oauth-app-access-restrictions-for-your-organization %} - {% link_in_list /disabling-oauth-app-access-restrictions-for-your-organization %} - {% link_in_list /approving-oauth-apps-for-your-organization %} - {% link_in_list /denying-access-to-a-previously-approved-oauth-app-for-your-organization %} -{% topic_link_in_list /keeping-your-organization-secure %} - {% link_in_list /viewing-whether-users-in-your-organization-have-2fa-enabled %} - {% link_in_list /preparing-to-require-two-factor-authentication-in-your-organization %} - {% link_in_list /requiring-two-factor-authentication-in-your-organization %} - {% link_in_list /managing-security-and-analysis-settings-for-your-organization %} - {% link_in_list /managing-allowed-ip-addresses-for-your-organization %} - {% link_in_list /restricting-email-notifications-to-an-approved-domain %} - {% link_in_list /reviewing-the-audit-log-for-your-organization %} - {% link_in_list /reviewing-your-organizations-installed-integrations %} -{% topic_link_in_list /managing-saml-single-sign-on-for-your-organization %} - {% link_in_list /about-identity-and-access-management-with-saml-single-sign-on %} - {% link_in_list /about-scim %} - {% link_in_list /connecting-your-identity-provider-to-your-organization %} - {% link_in_list /configuring-saml-single-sign-on-and-scim-using-okta %} - {% link_in_list /enabling-and-testing-saml-single-sign-on-for-your-organization %} - {% link_in_list /preparing-to-enforce-saml-single-sign-on-in-your-organization %} - {% link_in_list /enforcing-saml-single-sign-on-for-your-organization %} - {% link_in_list /downloading-your-organizations-saml-single-sign-on-recovery-codes %} - {% link_in_list /managing-team-synchronization-for-your-organization %} - {% link_in_list /accessing-your-organization-if-your-identity-provider-is-unavailable %} -{% topic_link_in_list /granting-access-to-your-organization-with-saml-single-sign-on %} - {% link_in_list /managing-bots-and-service-accounts-with-saml-single-sign-on %} - {% link_in_list /viewing-and-managing-a-members-saml-access-to-your-organization %} - {% link_in_list /about-two-factor-authentication-and-saml-single-sign-on %} -{% topic_link_in_list /managing-git-access-to-your-organizations-repositories %} - {% link_in_list /about-ssh-certificate-authorities %} - {% link_in_list /managing-your-organizations-ssh-certificate-authorities %} diff --git a/content/github/setting-up-and-managing-organizations-and-teams/keeping-your-organization-secure.md b/content/github/setting-up-and-managing-organizations-and-teams/keeping-your-organization-secure.md deleted file mode 100644 index 62b65b07ce..0000000000 --- a/content/github/setting-up-and-managing-organizations-and-teams/keeping-your-organization-secure.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -title: Keeping your organization secure -redirect_from: - - /articles/preventing-unauthorized-access-to-organization-information/ - - /articles/keeping-your-organization-secure -intro: 'Organization owners have several features to help them keep their projects and data secure. If you''re the owner of an organization, you should regularly review your organization''s audit log{% if currentVersion != "github-ae@latest" %}, member 2FA status,{% endif %} and application settings to ensure that no unauthorized or malicious activity has occurred.' -mapTopic: true -versions: - free-pro-team: '*' - enterprise-server: '*' - github-ae: '*' -topics: - - organizations - - teams ---- - diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-access-to-your-organizations-project-boards.md b/content/github/setting-up-and-managing-organizations-and-teams/managing-access-to-your-organizations-project-boards.md deleted file mode 100644 index 2bdeee3631..0000000000 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-access-to-your-organizations-project-boards.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -title: Managing access to your organization’s project boards -intro: 'As an organization owner or project board admin, you can give organization members, teams, and outside collaborators different levels of access to project boards owned by your organization.' -redirect_from: - - /articles/managing-access-to-your-organization-s-project-boards - - /articles/managing-access-to-your-organizations-project-boards -mapTopic: true -versions: - free-pro-team: '*' - enterprise-server: '*' - github-ae: '*' -topics: - - organizations - - teams ---- - diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-access-to-your-organizations-repositories.md b/content/github/setting-up-and-managing-organizations-and-teams/managing-access-to-your-organizations-repositories.md deleted file mode 100644 index ed1fe22a09..0000000000 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-access-to-your-organizations-repositories.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -title: Managing access to your organization's repositories -intro: Organization owners can manage individual and team access to the organization's repositories. Team maintainers can also manage a team's repository access. -redirect_from: - - /articles/permission-levels-for-an-organization-repository/ - - /articles/managing-access-to-your-organization-s-repositories - - /articles/managing-access-to-your-organizations-repositories -mapTopic: true -versions: - free-pro-team: '*' - enterprise-server: '*' - github-ae: '*' -topics: - - organizations - - teams ---- - diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-organization-settings.md b/content/github/setting-up-and-managing-organizations-and-teams/managing-organization-settings.md deleted file mode 100644 index 64b002f6bf..0000000000 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-organization-settings.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -title: Managing organization settings -intro: 'Organization administrators can change several settings, including the names of repositories that belong to the organization and Owners team membership. In addition, organization admins can delete the organization and all of its repositories.' -mapTopic: true -redirect_from: - - /articles/managing-organization-settings -versions: - free-pro-team: '*' - enterprise-server: '*' - github-ae: '*' -topics: - - organizations - - teams ---- - diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-saml-single-sign-on-for-your-organization.md b/content/github/setting-up-and-managing-organizations-and-teams/managing-saml-single-sign-on-for-your-organization.md deleted file mode 100644 index f39fa938c3..0000000000 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-saml-single-sign-on-for-your-organization.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -title: Managing SAML single sign-on for your organization -intro: Organization administrators can manage organization members' identities and access to the organization with SAML single sign-on (SSO). -mapTopic: true -redirect_from: - - /articles/managing-member-identity-and-access-in-your-organization-with-saml-single-sign-on/ - - /articles/managing-saml-single-sign-on-for-your-organization -versions: - free-pro-team: '*' -topics: - - organizations - - teams ---- - diff --git a/content/github/setting-up-and-managing-organizations-and-teams/organizing-members-into-teams.md b/content/github/setting-up-and-managing-organizations-and-teams/organizing-members-into-teams.md deleted file mode 100644 index b820de8bd8..0000000000 --- a/content/github/setting-up-and-managing-organizations-and-teams/organizing-members-into-teams.md +++ /dev/null @@ -1,23 +0,0 @@ ---- -title: Organizing members into teams -intro: You can group organization members into teams that reflect your company or group's structure with cascading access permissions and mentions. -redirect_from: - - /articles/setting-up-teams-improved-organization-permissions/ - - /articles/setting-up-teams-for-accessing-organization-repositories/ - - /articles/creating-teams/ - - /articles/adding-people-to-teams-in-an-organization/ - - /articles/removing-a-member-from-a-team-in-your-organization/ - - /articles/setting-up-teams/ - - /articles/maintaining-teams-improved-organization-permissions/ - - /articles/maintaining-teams/ - - /articles/organizing-members-into-teams -mapTopic: true -versions: - free-pro-team: '*' - enterprise-server: '*' - github-ae: '*' -topics: - - organizations - - teams ---- - diff --git a/content/github/setting-up-and-managing-your-enterprise/enabling-saml-single-sign-on-for-organizations-in-your-enterprise-account.md b/content/github/setting-up-and-managing-your-enterprise/enabling-saml-single-sign-on-for-organizations-in-your-enterprise-account.md index 4743ba484e..f41af1c1b1 100644 --- a/content/github/setting-up-and-managing-your-enterprise/enabling-saml-single-sign-on-for-organizations-in-your-enterprise-account.md +++ b/content/github/setting-up-and-managing-your-enterprise/enabling-saml-single-sign-on-for-organizations-in-your-enterprise-account.md @@ -11,7 +11,7 @@ topics: ### About SAML single sign-on for enterprise accounts -{% data reusables.saml.dotcom-saml-explanation %} For more information, see "[About identity and access management with SAML single sign-on](/github/setting-up-and-managing-organizations-and-teams/about-identity-and-access-management-with-saml-single-sign-on)." +{% data reusables.saml.dotcom-saml-explanation %} For more information, see "[About identity and access management with SAML single sign-on](/organizations/managing-saml-single-sign-on-for-your-organization/about-identity-and-access-management-with-saml-single-sign-on)." {% data reusables.saml.about-saml-enterprise-accounts %} diff --git a/content/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account.md b/content/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account.md index 8271ab0077..c3b98b6c68 100644 --- a/content/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account.md +++ b/content/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account.md @@ -51,7 +51,7 @@ Enterprise owners can restrict access to assets owned by organizations in an ent {% data reusables.identity-and-permissions.ip-allow-lists-enable %} -You can also configure allowed IP addresses for an individual organization. For more information, see "[Managing allowed IP addresses for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization)." +You can also configure allowed IP addresses for an individual organization. For more information, see "[Managing allowed IP addresses for your organization](/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization)." #### Adding an allowed IP address diff --git a/content/github/setting-up-and-managing-your-enterprise/enforcing-team-policies-in-your-enterprise-account.md b/content/github/setting-up-and-managing-your-enterprise/enforcing-team-policies-in-your-enterprise-account.md index cbe70eef28..5ad2d70c34 100644 --- a/content/github/setting-up-and-managing-your-enterprise/enforcing-team-policies-in-your-enterprise-account.md +++ b/content/github/setting-up-and-managing-your-enterprise/enforcing-team-policies-in-your-enterprise-account.md @@ -15,7 +15,7 @@ topics: ### Enforcing a policy for team discussions -Across all organizations owned by your enterprise account, you can enable or disable team discussions, or allow owners to administer the setting on the organization level. For more information, see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions/)." +Across all organizations owned by your enterprise account, you can enable or disable team discussions, or allow owners to administer the setting on the organization level. For more information, see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions/)." {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.policies-tab %} diff --git a/content/github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md b/content/github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md index 6596a04d44..6b98fa4dff 100644 --- a/content/github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md +++ b/content/github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md @@ -39,7 +39,7 @@ Organization owners can invite new members to an organization by email address. While not required, we recommend that organization owners send an invitation to the same email address used for the {% data variables.product.prodname_vs %} subscriber's User Primary Name (UPN). When the email address on {% data variables.product.product_name %} matches the subscriber's UPN, you can ensure that another member of the organization does not claim the subscriber's license. -For more information, see "[Inviting users to join your organization](/github/setting-up-and-managing-organizations-and-teams/inviting-users-to-join-your-organization)," "[Signing up for {% data variables.product.prodname_dotcom %}](/github/getting-started-with-github/signing-up-for-github)," and "[Managing email preferences](/github/setting-up-and-managing-your-github-user-account/managing-email-preferences)." +For more information, see "[Inviting users to join your organization](/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization)," "[Signing up for {% data variables.product.prodname_dotcom %}](/github/getting-started-with-github/signing-up-for-github)," and "[Managing email preferences](/github/setting-up-and-managing-your-github-user-account/managing-email-preferences)." ### Viewing {% data variables.product.prodname_enterprise %} licensing diff --git a/content/github/setting-up-and-managing-your-enterprise/managing-team-synchronization-for-organizations-in-your-enterprise-account.md b/content/github/setting-up-and-managing-your-enterprise/managing-team-synchronization-for-organizations-in-your-enterprise-account.md index ef3f0b988a..7c5e14291d 100644 --- a/content/github/setting-up-and-managing-your-enterprise/managing-team-synchronization-for-organizations-in-your-enterprise-account.md +++ b/content/github/setting-up-and-managing-your-enterprise/managing-team-synchronization-for-organizations-in-your-enterprise-account.md @@ -19,7 +19,7 @@ If you use Azure AD as your IdP, you can enable team synchronization for your en {% data reusables.identity-and-permissions.team-sync-disable %} -You can also configure and manage team synchronization for an individual organization. For more information, see "[Managing team synchronization for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-team-synchronization-for-your-organization)." +You can also configure and manage team synchronization for an individual organization. For more information, see "[Managing team synchronization for your organization](/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization)." ### Prerequisites diff --git a/content/github/setting-up-and-managing-your-enterprise/restricting-email-notifications-for-your-enterprise-account-to-approved-domains.md b/content/github/setting-up-and-managing-your-enterprise/restricting-email-notifications-for-your-enterprise-account-to-approved-domains.md index 651e15af7b..3a60254b42 100644 --- a/content/github/setting-up-and-managing-your-enterprise/restricting-email-notifications-for-your-enterprise-account-to-approved-domains.md +++ b/content/github/setting-up-and-managing-your-enterprise/restricting-email-notifications-for-your-enterprise-account-to-approved-domains.md @@ -11,7 +11,7 @@ topics: ### About email restrictions for your enterprise account -When you restrict email notifications to verified domains, enterprise members can only use an email address associated with a verified domain to receive email notifications about activity in organizations owned by your enterprise account. The domains can be inherited from the enterprise account or configured for the specific organization. For more information about email restrictions for organizations, see "[Restricting email notifications to an approved domain](/github/setting-up-and-managing-organizations-and-teams/restricting-email-notifications-to-an-approved-domain)." +When you restrict email notifications to verified domains, enterprise members can only use an email address associated with a verified domain to receive email notifications about activity in organizations owned by your enterprise account. The domains can be inherited from the enterprise account or configured for the specific organization. For more information about email restrictions for organizations, see "[Restricting email notifications to an approved domain](/organizations/keeping-your-organization-secure/restricting-email-notifications-to-an-approved-domain)." If email restrictions are enabled for an enterprise account, organization owners cannot disable email restrictions for any organization owned by the enterprise account. If changes occur that result in an organization having no verified domains, either inherited from an enterprise account that owns the organization or for the specific organization, email restrictions will be disabled for the organization. diff --git a/content/github/setting-up-and-managing-your-enterprise/verifying-your-enterprise-accounts-domain.md b/content/github/setting-up-and-managing-your-enterprise/verifying-your-enterprise-accounts-domain.md index 96714ca44c..0baf3c1664 100644 --- a/content/github/setting-up-and-managing-your-enterprise/verifying-your-enterprise-accounts-domain.md +++ b/content/github/setting-up-and-managing-your-enterprise/verifying-your-enterprise-accounts-domain.md @@ -14,7 +14,7 @@ topics: ### About domain verification -You can confirm that the websites and email addresses listed on the profiles of any organization owned by your enterprise account are controlled by your enterprise by verifying the domains. Verified domains for an enterprise account apply to every organization owned by the enterprise account, and organization owners can verify additional domains for their organizations. For more information, see "[Verifying your organization's domain](/github/setting-up-and-managing-organizations-and-teams/verifying-your-organizations-domain)." +You can confirm that the websites and email addresses listed on the profiles of any organization owned by your enterprise account are controlled by your enterprise by verifying the domains. Verified domains for an enterprise account apply to every organization owned by the enterprise account, and organization owners can verify additional domains for their organizations. For more information, see "[Verifying your organization's domain](/organizations/managing-organization-settings/verifying-your-organizations-domain)." After you verify ownership of your enterprise account's domains, a "Verified" badge will display on the profile of each organization that has the domain listed on its profile. {% data reusables.organizations.verified-domains-details %} @@ -22,7 +22,7 @@ Organization owners will be able to verify the identity of organization members After you verify domains for your enterprise account, you can restrict email notifications to verified domains for all the organizations owned by your enterprise account. For more information, see "[Restricting email notifications for your enterprise account to approved domains](/github/setting-up-and-managing-your-enterprise/restricting-email-notifications-for-your-enterprise-account-to-approved-domains)." -Even if you don't restrict email notifications for the enterprise account, if an organization owner has restricted email notifications for the organization, organization members will be able to receive notifications from any domains verified for the enterprise account, in addition to any domains verified for the organization. For more information about restricting notifications for an organization, see "[Restricting email notifications to an approved domain](/github/setting-up-and-managing-organizations-and-teams/restricting-email-notifications-to-an-approved-domain)." +Even if you don't restrict email notifications for the enterprise account, if an organization owner has restricted email notifications for the organization, organization members will be able to receive notifications from any domains verified for the enterprise account, in addition to any domains verified for the organization. For more information about restricting notifications for an organization, see "[Restricting email notifications to an approved domain](/organizations/keeping-your-organization-secure/restricting-email-notifications-to-an-approved-domain)." ### Verifying your enterprise account's domain diff --git a/content/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md b/content/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md index 79372cb903..fceae001bb 100644 --- a/content/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md +++ b/content/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md @@ -53,4 +53,4 @@ When you enable SAML single sign-on for your enterprise account, each enterprise ### Further reading -- "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization)" +- "[Viewing and managing a member's SAML access to your organization](/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization)" diff --git a/content/github/setting-up-and-managing-your-github-profile/about-your-organizations-profile.md b/content/github/setting-up-and-managing-your-github-profile/about-your-organizations-profile.md index 0a158f8e14..14c6d1b4f4 100644 --- a/content/github/setting-up-and-managing-your-github-profile/about-your-organizations-profile.md +++ b/content/github/setting-up-and-managing-your-github-profile/about-your-organizations-profile.md @@ -14,7 +14,7 @@ topics: You can optionally choose to add a description, location, website, and email address for your organization, and pin important repositories to the top of the page. -{% if currentVersion == "free-pro-team@latest" %}To confirm your organization's identity and display a "Verified" badge on your organization profile page, you must verify your organization's domains with {% data variables.product.product_name %}. For more information, see "[Verifying your organization's domain](/github/setting-up-and-managing-organizations-and-teams/verifying-your-organizations-domain)." +{% if currentVersion == "free-pro-team@latest" %}To confirm your organization's identity and display a "Verified" badge on your organization profile page, you must verify your organization's domains with {% data variables.product.product_name %}. For more information, see "[Verifying your organization's domain](/organizations/managing-organization-settings/verifying-your-organizations-domain)." ![Sample verified organization profile page](/assets/images/help/profile/org_profile_verified.png) {% else %} @@ -23,4 +23,4 @@ You can optionally choose to add a description, location, website, and email add ### Further reading -- "[About organizations](/github/setting-up-and-managing-organizations-and-teams/about-organizations)" +- "[About organizations](/organizations/collaborating-with-groups-in-organizations/about-organizations)" diff --git a/content/github/setting-up-and-managing-your-github-user-account/converting-a-user-into-an-organization.md b/content/github/setting-up-and-managing-your-github-user-account/converting-a-user-into-an-organization.md index 73250f620d..7f6721362f 100644 --- a/content/github/setting-up-and-managing-your-github-user-account/converting-a-user-into-an-organization.md +++ b/content/github/setting-up-and-managing-your-github-user-account/converting-a-user-into-an-organization.md @@ -55,7 +55,7 @@ You can also convert your personal user account directly into an organization. C {% tip %} -**Tip**: When you convert a user account into an organization, we'll add collaborators on repositories that belong to the account to the new organization as *outside collaborators*. You can then invite *outside collaborators* to become members of your new organization if you wish. For more information, see "[Permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization#outside-collaborators)." +**Tip**: When you convert a user account into an organization, we'll add collaborators on repositories that belong to the account to the new organization as *outside collaborators*. You can then invite *outside collaborators* to become members of your new organization if you wish. For more information, see "[Permission levels for an organization](/organizations/managing-peoples-access-to-your-organization-with-roles/permission-levels-for-an-organization#outside-collaborators)." {% endtip %} diff --git a/content/github/setting-up-and-managing-your-github-user-account/inviting-collaborators-to-a-personal-repository.md b/content/github/setting-up-and-managing-your-github-user-account/inviting-collaborators-to-a-personal-repository.md index ce6539cb9d..aabf30b994 100644 --- a/content/github/setting-up-and-managing-your-github-user-account/inviting-collaborators-to-a-personal-repository.md +++ b/content/github/setting-up-and-managing-your-github-user-account/inviting-collaborators-to-a-personal-repository.md @@ -60,4 +60,4 @@ Repositories owned by an organization can grant more granular access. For more i - "[Permission levels for a user account repository](/articles/permission-levels-for-a-user-account-repository/#collaborator-access-for-a-repository-owned-by-a-user-account)" - "[Removing a collaborator from a personal repository](/articles/removing-a-collaborator-from-a-personal-repository)" - "[Removing yourself from a collaborator's repository](/articles/removing-yourself-from-a-collaborator-s-repository)" -- "[Organizing members into teams](/articles/organizing-members-into-teams)" +- "[Organizing members into teams](/organizations/organizing-members-into-teams)" diff --git a/content/github/setting-up-and-managing-your-github-user-account/managing-the-default-branch-name-for-your-repositories.md b/content/github/setting-up-and-managing-your-github-user-account/managing-the-default-branch-name-for-your-repositories.md index b199768a7b..e69c10b10b 100644 --- a/content/github/setting-up-and-managing-your-github-user-account/managing-the-default-branch-name-for-your-repositories.md +++ b/content/github/setting-up-and-managing-your-github-user-account/managing-the-default-branch-name-for-your-repositories.md @@ -28,4 +28,4 @@ When you create a new repository on {% data variables.product.product_location % ### Further reading -- "[Managing the default branch name for repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization)" +- "[Managing the default branch name for repositories in your organization](/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization)" diff --git a/content/github/setting-up-and-managing-your-github-user-account/managing-your-scheduled-reminders.md b/content/github/setting-up-and-managing-your-github-user-account/managing-your-scheduled-reminders.md index 2284aaf647..b4fc8c5a9c 100644 --- a/content/github/setting-up-and-managing-your-github-user-account/managing-your-scheduled-reminders.md +++ b/content/github/setting-up-and-managing-your-github-user-account/managing-your-scheduled-reminders.md @@ -13,7 +13,7 @@ Scheduled reminders are used to make sure that users focus on the most important For certain events, you can also enable real-time alerts for scheduled reminders. Real-time alerts get sent to your Slack channel as soon as an important event, such as when you are assigned a review, takes place. -You can set scheduled reminders for personal or team-level review requests for pull requests in organizations you are a member of. Before you can create a scheduled reminder for yourself, an organization owner must authorize your Slack workspace. For more information, see "[Managing scheduled reminders for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-organization)." +You can set scheduled reminders for personal or team-level review requests for pull requests in organizations you are a member of. Before you can create a scheduled reminder for yourself, an organization owner must authorize your Slack workspace. For more information, see "[Managing scheduled reminders for your organization](/organizations/managing-organization-settings/managing-scheduled-reminders-for-your-organization)." {% data reusables.reminders.scheduled-reminders-limitations %} @@ -55,5 +55,5 @@ You can set scheduled reminders for personal or team-level review requests for p ### Further reading -- "[Managing scheduled reminders for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-organization)" -- "[Managing scheduled reminders for your team](/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-team)" +- "[Managing scheduled reminders for your organization](/organizations/managing-organization-settings/managing-scheduled-reminders-for-your-organization)" +- "[Managing scheduled reminders for your team](/organizations/organizing-members-into-teams/managing-scheduled-reminders-for-your-team)" diff --git a/content/github/site-policy/github-privacy-statement.md b/content/github/site-policy/github-privacy-statement.md index 974137d38e..50fe4dd423 100644 --- a/content/github/site-policy/github-privacy-statement.md +++ b/content/github/site-policy/github-privacy-statement.md @@ -192,7 +192,7 @@ Similarly, projects on GitHub may include publicly available User Personal Infor #### Organizations -You may indicate, through your actions on GitHub, that you are willing to share your User Personal Information. If you collaborate on or become a member of an Organization, then its Account owners may receive your User Personal Information. When you accept an invitation to an Organization, you will be notified of the types of information owners may be able to see (for more information, see [About Organization Membership](/github/setting-up-and-managing-your-github-user-account/about-organization-membership)). If you accept an invitation to an Organization with a [verified domain](/github/setting-up-and-managing-organizations-and-teams/verifying-your-organizations-domain), then the owners of that Organization will be able to see your full email address(es) within that Organization's verified domain(s). +You may indicate, through your actions on GitHub, that you are willing to share your User Personal Information. If you collaborate on or become a member of an Organization, then its Account owners may receive your User Personal Information. When you accept an invitation to an Organization, you will be notified of the types of information owners may be able to see (for more information, see [About Organization Membership](/github/setting-up-and-managing-your-github-user-account/about-organization-membership)). If you accept an invitation to an Organization with a [verified domain](/organizations/managing-organization-settings/verifying-your-organizations-domain), then the owners of that Organization will be able to see your full email address(es) within that Organization's verified domain(s). Please note, GitHub may share your username, [Usage Information](#usage-information), and [Device Information](#device-information) with the owner(s) of the Organization you are a member of, to the extent that your User Personal Information is provided only to investigate or respond to a security incident that affects or compromises the security of that particular Organization. diff --git a/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md b/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md index 8715b60c43..8ed3c8b13b 100644 --- a/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md +++ b/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md @@ -88,6 +88,6 @@ The recommended formats explicitly define which versions are used for all direct - "[Dependency graph](https://en.wikipedia.org/wiki/Dependency_graph)" on Wikipedia - "[Exploring the dependencies of a repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository)"{% if currentVersion == "free-pro-team@latest" %} -- "[Viewing insights for your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization)" +- "[Viewing insights for your organization](/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization)" - "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)" - "[Troubleshooting the detection of vulnerable dependencies](/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies)"{% endif %} diff --git a/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md b/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md index 56d82c7dea..56bb2af5bf 100644 --- a/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md +++ b/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md @@ -67,7 +67,7 @@ For public repositories, the dependents view shows how the repository is used by Repository administrators can enable or disable the dependency graph for private repositories. -You can also enable or disable the dependency graph for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +You can also enable or disable the dependency graph for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](//organizations/collaborating-with-groups-in-organizations/managing-security-and-analysis-settings-for-your-organization)." {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} @@ -109,7 +109,7 @@ If a manifest or lock file is not processed, its dependencies are omitted from t ### Further reading - "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)"{% if currentVersion == "free-pro-team@latest" %} -- "[Viewing insights for your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization)" +- "[Viewing insights for your organization](/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization)" - "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)" - "[Understanding how {% data variables.product.product_name %} uses and protects your data](/github/understanding-how-github-uses-and-protects-your-data)" {% endif %} diff --git a/content/index.md b/content/index.md index bb6415e8cb..82990b3fbb 100644 --- a/content/index.md +++ b/content/index.md @@ -16,7 +16,7 @@ versions: '*' children: - github - admin - - discussions + - organizations - code-security - actions - packages @@ -24,6 +24,7 @@ children: - rest - graphql - insights + - discussions - communities - pages - education diff --git a/content/github/setting-up-and-managing-organizations-and-teams/about-organizations.md b/content/organizations/collaborating-with-groups-in-organizations/about-organizations.md similarity index 89% rename from content/github/setting-up-and-managing-organizations-and-teams/about-organizations.md rename to content/organizations/collaborating-with-groups-in-organizations/about-organizations.md index 9b777b5eee..f2dda89e95 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/about-organizations.md +++ b/content/organizations/collaborating-with-groups-in-organizations/about-organizations.md @@ -3,6 +3,7 @@ title: About organizations intro: Organizations are shared accounts where businesses and open-source projects can collaborate across many projects at once. Owners and administrators can manage member access to the organization's data and projects with sophisticated security and administrative features. redirect_from: - /articles/about-organizations + - /github/setting-up-and-managing-organizations-and-teams/about-organizations versions: free-pro-team: '*' enterprise-server: '*' @@ -23,7 +24,7 @@ For organizations that belong to an enterprise account, billing is managed at th {% data reusables.gated-features.enterprise-accounts %} -{% data reusables.organizations.org-ownership-recommendation %} For more information, see "[Maintaining ownership continuity for your organization](/github/setting-up-and-managing-organizations-and-teams/maintaining-ownership-continuity-for-your-organization)." +{% data reusables.organizations.org-ownership-recommendation %} For more information, see "[Maintaining ownership continuity for your organization](/organizations/managing-peoples-access-to-your-organization-with-roles/maintaining-ownership-continuity-for-your-organization)." ### Terms of service and data protection for organizations diff --git a/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md b/content/organizations/collaborating-with-groups-in-organizations/about-your-organization-dashboard.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md rename to content/organizations/collaborating-with-groups-in-organizations/about-your-organization-dashboard.md index c2c416383a..6b42ae2b62 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md +++ b/content/organizations/collaborating-with-groups-in-organizations/about-your-organization-dashboard.md @@ -3,6 +3,7 @@ title: About your organization dashboard intro: 'As an organization member, you can visit your organization''s dashboard throughout the day to stay updated on recent activity and keep track of issues and pull requests you''re working on or following in the organization.' redirect_from: - /articles/about-your-organization-dashboard + - /github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/about-your-organizations-news-feed.md b/content/organizations/collaborating-with-groups-in-organizations/about-your-organizations-news-feed.md similarity index 94% rename from content/github/setting-up-and-managing-organizations-and-teams/about-your-organizations-news-feed.md rename to content/organizations/collaborating-with-groups-in-organizations/about-your-organizations-news-feed.md index daa42f63eb..0716148ce9 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/about-your-organizations-news-feed.md +++ b/content/organizations/collaborating-with-groups-in-organizations/about-your-organizations-news-feed.md @@ -5,6 +5,7 @@ redirect_from: - /articles/news-feed/ - /articles/about-your-organization-s-news-feed - /articles/about-your-organizations-news-feed + - /github/setting-up-and-managing-organizations-and-teams/about-your-organizations-news-feed versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/accessing-your-organizations-settings.md b/content/organizations/collaborating-with-groups-in-organizations/accessing-your-organizations-settings.md similarity index 92% rename from content/github/setting-up-and-managing-organizations-and-teams/accessing-your-organizations-settings.md rename to content/organizations/collaborating-with-groups-in-organizations/accessing-your-organizations-settings.md index cbddd686f4..77c054c4be 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/accessing-your-organizations-settings.md +++ b/content/organizations/collaborating-with-groups-in-organizations/accessing-your-organizations-settings.md @@ -8,6 +8,7 @@ redirect_from: - /articles/managing-an-organization-s-settings/ - /articles/accessing-your-organization-s-settings - /articles/accessing-your-organizations-settings + - /github/setting-up-and-managing-organizations-and-teams/accessing-your-organizations-settings intro: 'The organization account settings page provides several ways to manage the account, such as billing, team membership, and repository settings.' versions: free-pro-team: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/creating-a-new-organization-from-scratch.md b/content/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch.md similarity index 92% rename from content/github/setting-up-and-managing-organizations-and-teams/creating-a-new-organization-from-scratch.md rename to content/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch.md index db638bafff..160442e4f7 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/creating-a-new-organization-from-scratch.md +++ b/content/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch.md @@ -8,6 +8,7 @@ versions: redirect_from: - /articles/creating-a-new-organization-from-scratch - /admin/user-management/creating-organizations + - /github/setting-up-and-managing-organizations-and-teams/creating-a-new-organization-from-scratch topics: - organizations - teams diff --git a/content/organizations/collaborating-with-groups-in-organizations/index.md b/content/organizations/collaborating-with-groups-in-organizations/index.md new file mode 100644 index 0000000000..1cff1af763 --- /dev/null +++ b/content/organizations/collaborating-with-groups-in-organizations/index.md @@ -0,0 +1,22 @@ +--- +title: Collaborating with groups in organizations +intro: Groups of people can collaborate across many projects at the same time in organization accounts. +redirect_from: + - /articles/creating-a-new-organization-account/ + - /articles/collaborating-with-groups-in-organizations + - /github/setting-up-and-managing-organizations-and-teams/collaborating-with-groups-in-organizations +versions: + free-pro-team: '*' + enterprise-server: '*' + github-ae: '*' +topics: + - organizations + - teams +--- + +{% link_in_list /about-organizations %} +{% link_in_list /about-your-organization-dashboard %} +{% link_in_list /creating-a-new-organization-from-scratch %} +{% link_in_list /accessing-your-organizations-settings %} +{% link_in_list /about-your-organizations-news-feed %} +{% link_in_list /viewing-insights-for-your-organization %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization.md b/content/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization.md similarity index 82% rename from content/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization.md rename to content/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization.md index ff36847928..d5302d7056 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization.md +++ b/content/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization.md @@ -4,6 +4,7 @@ intro: 'Organization insights provide data about your organization''s activity, product: '{% data reusables.gated-features.org-insights %}' redirect_from: - /articles/viewing-insights-for-your-organization + - /github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization versions: free-pro-team: '*' topics: @@ -50,9 +51,8 @@ With dependency insights you can view vulnerabilities, licenses, and other impor 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) - ### Further reading - - - "[About organizations](/github/setting-up-and-managing-organizations-and-teams/about-organizations)" - - "[Exploring the dependencies of a repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository)" - - "[Changing the visibility of your organization's dependency insights](/github/setting-up-and-managing-organizations-and-teams/changing-the-visibility-of-your-organizations-dependency-insights)" - - "[Enforcing a policy on dependency insights in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account)" +### Further reading + - "[About organizations](/organizations/collaborating-with-groups-in-organizations/about-organizations)" + - "[Exploring the dependencies of a repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository)" + - "[Changing the visibility of your organization's dependency insights](/organizations/managing-organization-settings/changing-the-visibility-of-your-organizations-dependency-insights)" + - "[Enforcing a policy on dependency insights in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account)" diff --git a/content/github/setting-up-and-managing-organizations-and-teams/about-team-discussions.md b/content/organizations/collaborating-with-your-team/about-team-discussions.md similarity index 90% rename from content/github/setting-up-and-managing-organizations-and-teams/about-team-discussions.md rename to content/organizations/collaborating-with-your-team/about-team-discussions.md index d95bfccf08..fd015fd529 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/about-team-discussions.md +++ b/content/organizations/collaborating-with-your-team/about-team-discussions.md @@ -4,6 +4,7 @@ intro: 'Your team can plan together, update one another, or talk about any topic redirect_from: - /articles/about-team-discussions - /github/building-a-strong-community/about-team-discussions + - /github/setting-up-and-managing-organizations-and-teams/about-team-discussions versions: free-pro-team: '*' enterprise-server: '*' @@ -18,7 +19,7 @@ Any organization member can post on your team's page or participate in a public ![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 "[Pinning a team discussion](/github/setting-up-and-managing-organizations-and-teams/pinning-a-team-discussion)." +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 "[Pinning a team discussion](/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) @@ -44,5 +45,5 @@ For more information, see {% if currentVersion == "free-pro-team@latest" or curr - "[About conversations on {% data variables.product.prodname_dotcom %}](/articles/about-conversations-on-github)" - "[About teams](/articles/about-teams)" -- "[Creating a team discussion](/github/setting-up-and-managing-organizations-and-teams/creating-a-team-discussion)" -- "[Editing or deleting a team discussion](/github/setting-up-and-managing-organizations-and-teams/editing-or-deleting-a-team-discussion)" +- "[Creating a team discussion](/organizations/collaborating-with-your-team/creating-a-team-discussion)" +- "[Editing or deleting a team discussion](/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion)" diff --git a/content/github/setting-up-and-managing-organizations-and-teams/creating-a-team-discussion.md b/content/organizations/collaborating-with-your-team/creating-a-team-discussion.md similarity index 69% rename from content/github/setting-up-and-managing-organizations-and-teams/creating-a-team-discussion.md rename to content/organizations/collaborating-with-your-team/creating-a-team-discussion.md index 968a93eef7..db647d762e 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/creating-a-team-discussion.md +++ b/content/organizations/collaborating-with-your-team/creating-a-team-discussion.md @@ -4,6 +4,7 @@ intro: 'Any organization member can create a _public_ team discussion post. To c redirect_from: - /articles/creating-a-team-discussion - /github/building-a-strong-community/creating-a-team-discussion + - /github/setting-up-and-managing-organizations-and-teams/creating-a-team-discussion versions: free-pro-team: '*' enterprise-server: '*' @@ -12,7 +13,7 @@ topics: - community --- -{% data reusables.organizations.team-discussions-permissions %} For more information, see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)." +{% data reusables.organizations.team-discussions-permissions %} For more information, see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)." {% data reusables.profile.access_profile %} {% data reusables.profile.access_org %} @@ -27,6 +28,6 @@ topics: ### Further reading - - "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)" - - "[Editing or deleting a team discussion](/github/setting-up-and-managing-organizations-and-teams/editing-or-deleting-a-team-discussion)" - - "[Pinning a team discussion](/github/setting-up-and-managing-organizations-and-teams/pinning-a-team-discussion)" + - "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)" + - "[Editing or deleting a team discussion](/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion)" + - "[Pinning a team discussion](/organizations/collaborating-with-your-team/pinning-a-team-discussion)" diff --git a/content/github/setting-up-and-managing-organizations-and-teams/editing-or-deleting-a-team-discussion.md b/content/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion.md similarity index 72% rename from content/github/setting-up-and-managing-organizations-and-teams/editing-or-deleting-a-team-discussion.md rename to content/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion.md index 7397639d74..164e1f2abb 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/editing-or-deleting-a-team-discussion.md +++ b/content/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion.md @@ -4,6 +4,7 @@ intro: 'Organization members can edit or delete discussions on a team''s page. I redirect_from: - /articles/editing-or-deleting-a-team-discussion - /github/building-a-strong-community/editing-or-deleting-a-team-discussion + - /github/setting-up-and-managing-organizations-and-teams/editing-or-deleting-a-team-discussion versions: free-pro-team: '*' enterprise-server: '*' @@ -24,6 +25,6 @@ topics: ### Further reading - - "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)" - - "[Creating a team discussion](/github/setting-up-and-managing-organizations-and-teams/creating-a-team-discussion)" - - "[Pinning a team discussion](/github/setting-up-and-managing-organizations-and-teams/pinning-a-team-discussion)" + - "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)" + - "[Creating a team discussion](/organizations/collaborating-with-your-team/creating-a-team-discussion)" + - "[Pinning a team discussion](/organizations/collaborating-with-your-team/pinning-a-team-discussion)" diff --git a/content/github/setting-up-and-managing-organizations-and-teams/collaborating-with-your-team.md b/content/organizations/collaborating-with-your-team/index.md similarity index 56% rename from content/github/setting-up-and-managing-organizations-and-teams/collaborating-with-your-team.md rename to content/organizations/collaborating-with-your-team/index.md index cb4c12309f..a2dcb31f02 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/collaborating-with-your-team.md +++ b/content/organizations/collaborating-with-your-team/index.md @@ -1,10 +1,10 @@ --- title: Collaborating with your team intro: 'Within an organization, your team can work together across projects using team discussions.' -mapTopic: true redirect_from: - /articles/collaborating-with-your-team - /github/building-a-strong-community/collaborating-with-your-team + - /github/setting-up-and-managing-organizations-and-teams/collaborating-with-your-team versions: free-pro-team: '*' enterprise-server: '*' @@ -13,3 +13,7 @@ topics: - community --- +{% link_in_list /about-team-discussions %} +{% link_in_list /creating-a-team-discussion %} +{% link_in_list /editing-or-deleting-a-team-discussion %} +{% link_in_list /pinning-a-team-discussion %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/pinning-a-team-discussion.md b/content/organizations/collaborating-with-your-team/pinning-a-team-discussion.md similarity index 66% rename from content/github/setting-up-and-managing-organizations-and-teams/pinning-a-team-discussion.md rename to content/organizations/collaborating-with-your-team/pinning-a-team-discussion.md index 42459e82a6..e2d8c368ae 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/pinning-a-team-discussion.md +++ b/content/organizations/collaborating-with-your-team/pinning-a-team-discussion.md @@ -4,6 +4,7 @@ intro: 'You can pin important discussions to your organization''s team pages for redirect_from: - /articles/pinning-a-team-discussion - /github/building-a-strong-community/pinning-a-team-discussion + - /github/setting-up-and-managing-organizations-and-teams/pinning-a-team-discussion versions: free-pro-team: '*' enterprise-server: '*' @@ -21,6 +22,6 @@ topics: ### Further reading - - "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)" - - "[Creating a team discussion](/github/setting-up-and-managing-organizations-and-teams/creating-a-team-discussion)" - - "[Editing or deleting a team discussion](/github/setting-up-and-managing-organizations-and-teams/editing-or-deleting-a-team-discussion)" + - "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)" + - "[Creating a team discussion](/organizations/collaborating-with-your-team/creating-a-team-discussion)" + - "[Editing or deleting a team discussion](/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion)" diff --git a/content/github/setting-up-and-managing-organizations-and-teams/about-two-factor-authentication-and-saml-single-sign-on.md b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/about-two-factor-authentication-and-saml-single-sign-on.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/about-two-factor-authentication-and-saml-single-sign-on.md rename to content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/about-two-factor-authentication-and-saml-single-sign-on.md index d061e78d3a..b2449806a3 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/about-two-factor-authentication-and-saml-single-sign-on.md +++ b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/about-two-factor-authentication-and-saml-single-sign-on.md @@ -4,6 +4,7 @@ intro: Organizations administrators can enable both SAML single sign-on and two- product: '{% data reusables.gated-features.saml-sso %}' redirect_from: - /articles/about-two-factor-authentication-and-saml-single-sign-on + - /github/setting-up-and-managing-organizations-and-teams/about-two-factor-authentication-and-saml-single-sign-on versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/granting-access-to-your-organization-with-saml-single-sign-on.md b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/index.md similarity index 53% rename from content/github/setting-up-and-managing-organizations-and-teams/granting-access-to-your-organization-with-saml-single-sign-on.md rename to content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/index.md index 80c5ff6848..9406a2c559 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/granting-access-to-your-organization-with-saml-single-sign-on.md +++ b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/index.md @@ -1,9 +1,9 @@ --- title: Granting access to your organization with SAML single sign-on intro: 'Organization administrators can grant access to their organization with SAML single sign-on. This access can be granted to organization members, bots, and service accounts.' -mapTopic: true redirect_from: - /articles/granting-access-to-your-organization-with-saml-single-sign-on + - /github/setting-up-and-managing-organizations-and-teams/granting-access-to-your-organization-with-saml-single-sign-on versions: free-pro-team: '*' topics: @@ -11,3 +11,6 @@ topics: - teams --- +{% link_in_list /managing-bots-and-service-accounts-with-saml-single-sign-on %} +{% link_in_list /viewing-and-managing-a-members-saml-access-to-your-organization %} +{% link_in_list /about-two-factor-authentication-and-saml-single-sign-on %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-bots-and-service-accounts-with-saml-single-sign-on.md b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/managing-bots-and-service-accounts-with-saml-single-sign-on.md similarity index 91% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-bots-and-service-accounts-with-saml-single-sign-on.md rename to content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/managing-bots-and-service-accounts-with-saml-single-sign-on.md index f16c843a4e..a55b5ad411 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-bots-and-service-accounts-with-saml-single-sign-on.md +++ b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/managing-bots-and-service-accounts-with-saml-single-sign-on.md @@ -4,6 +4,7 @@ intro: Organizations that have enabled SAML single sign-on can retain access for product: '{% data reusables.gated-features.saml-sso %}' redirect_from: - /articles/managing-bots-and-service-accounts-with-saml-single-sign-on + - /github/setting-up-and-managing-organizations-and-teams/managing-bots-and-service-accounts-with-saml-single-sign-on versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization.md b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization.md rename to content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md index 484baa617a..d1e9d2dd81 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization.md +++ b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md @@ -6,6 +6,7 @@ product: '{% data reusables.gated-features.saml-sso %}' redirect_from: - /articles/viewing-and-revoking-organization-members-authorized-access-tokens - /github/setting-up-and-managing-organizations-and-teams/viewing-and-revoking-organization-members-authorized-access-tokens + - /github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization versions: free-pro-team: '*' topics: diff --git a/content/organizations/index.md b/content/organizations/index.md new file mode 100644 index 0000000000..0cfd817912 --- /dev/null +++ b/content/organizations/index.md @@ -0,0 +1,32 @@ +--- +title: Organizations and teams +shortTitle: Organizations +intro: Collaborate across many projects while managing access to projects and data and customizing settings for your organization. +redirect_from: + - /articles/about-improved-organization-permissions/ + - /categories/setting-up-and-managing-organizations-and-teams + - /github/setting-up-and-managing-organizations-and-teams +versions: + free-pro-team: '*' + enterprise-server: '*' + github-ae: '*' +topics: + - organizations + - teams +--- + +{% link_with_intro /collaborating-with-groups-in-organizations %} +{% link_with_intro /managing-membership-in-your-organization %} +{% link_with_intro /managing-peoples-access-to-your-organization-with-roles %} +{% link_with_intro /organizing-members-into-teams %} +{% link_with_intro /collaborating-with-your-team %} +{% link_with_intro /managing-access-to-your-organizations-repositories %} +{% link_with_intro /managing-access-to-your-organizations-project-boards %} +{% link_with_intro /managing-access-to-your-organizations-apps %} +{% link_with_intro /managing-organization-settings %} +{% link_with_intro /restricting-access-to-your-organizations-data %} +{% link_with_intro /keeping-your-organization-secure %} +{% link_with_intro /managing-saml-single-sign-on-for-your-organization %} +{% link_with_intro /granting-access-to-your-organization-with-saml-single-sign-on %} +{% link_with_intro /managing-git-access-to-your-organizations-repositories %} +{% link_with_intro /migrating-to-improved-organization-permissions %} diff --git a/content/organizations/keeping-your-organization-secure/index.md b/content/organizations/keeping-your-organization-secure/index.md new file mode 100644 index 0000000000..f3cdc109bd --- /dev/null +++ b/content/organizations/keeping-your-organization-secure/index.md @@ -0,0 +1,24 @@ +--- +title: Keeping your organization secure +intro: 'Organization owners have several features to help them keep their projects and data secure. If you''re the owner of an organization, you should regularly review your organization''s audit log{% if currentVersion != "github-ae@latest" %}, member 2FA status,{% endif %} and application settings to ensure that no unauthorized or malicious activity has occurred.' +redirect_from: + - /articles/preventing-unauthorized-access-to-organization-information/ + - /articles/keeping-your-organization-secure + - /github/setting-up-and-managing-organizations-and-teams/keeping-your-organization-secure +versions: + free-pro-team: '*' + enterprise-server: '*' + github-ae: '*' +topics: + - organizations + - teams +--- + +{% link_in_list /viewing-whether-users-in-your-organization-have-2fa-enabled %} +{% link_in_list /preparing-to-require-two-factor-authentication-in-your-organization %} +{% link_in_list /requiring-two-factor-authentication-in-your-organization %} +{% link_in_list /managing-security-and-analysis-settings-for-your-organization %} +{% link_in_list /managing-allowed-ip-addresses-for-your-organization %} +{% link_in_list /restricting-email-notifications-to-an-approved-domain %} +{% link_in_list /reviewing-the-audit-log-for-your-organization %} +{% link_in_list /reviewing-your-organizations-installed-integrations %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization.md b/content/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization.md rename to content/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization.md index 7b77503d4f..07f45a891f 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization.md +++ b/content/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization.md @@ -2,6 +2,8 @@ title: Managing allowed IP addresses for your organization intro: You can restrict access to your organization's assets by configuring a list of IP addresses that are allowed to connect. product: '{% data reusables.gated-features.allowed-ip-addresses %}' +redirect_from: + - /github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization versions: free-pro-team: '*' github-ae: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization.md b/content/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization.md similarity index 99% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization.md rename to content/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization.md index 2bb4b4ebc4..76c750732d 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization.md +++ b/content/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization.md @@ -4,6 +4,7 @@ intro: 'You can control features that secure and analyze the code in your organi permissions: Organization owners can manage security and analysis settings for repositories in the organization. redirect_from: - /github/setting-up-and-managing-organizations-and-teams/managing-secret-scanning-for-your-organization + - /github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization versions: free-pro-team: '*' enterprise-server: '>=3.0' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/preparing-to-require-two-factor-authentication-in-your-organization.md b/content/organizations/keeping-your-organization-secure/preparing-to-require-two-factor-authentication-in-your-organization.md similarity index 92% rename from content/github/setting-up-and-managing-organizations-and-teams/preparing-to-require-two-factor-authentication-in-your-organization.md rename to content/organizations/keeping-your-organization-secure/preparing-to-require-two-factor-authentication-in-your-organization.md index 8c14803057..6f803db18c 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/preparing-to-require-two-factor-authentication-in-your-organization.md +++ b/content/organizations/keeping-your-organization-secure/preparing-to-require-two-factor-authentication-in-your-organization.md @@ -3,6 +3,7 @@ title: Preparing to require two-factor authentication in your organization intro: 'Before requiring two-factor authentication (2FA), you can notify users about the upcoming change and verify who already uses 2FA.' redirect_from: - /articles/preparing-to-require-two-factor-authentication-in-your-organization + - /github/setting-up-and-managing-organizations-and-teams/preparing-to-require-two-factor-authentication-in-your-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization.md b/content/organizations/keeping-your-organization-secure/requiring-two-factor-authentication-in-your-organization.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization.md rename to content/organizations/keeping-your-organization-secure/requiring-two-factor-authentication-in-your-organization.md index cb8e427fcf..282a76b677 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization.md +++ b/content/organizations/keeping-your-organization-secure/requiring-two-factor-authentication-in-your-organization.md @@ -3,6 +3,7 @@ title: Requiring two-factor authentication in your organization intro: 'Organization owners can require {% if currentVersion == "free-pro-team@latest" %}organization members, outside collaborators, and billing managers{% else %}organization members and outside collaborators{% endif %} to enable two-factor authentication for their personal accounts, making it harder for malicious actors to access an organization''s repositories and settings.' redirect_from: - /articles/requiring-two-factor-authentication-in-your-organization + - /github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization versions: free-pro-team: '*' enterprise-server: '*' @@ -37,7 +38,7 @@ You can also require two-factor authentication for organizations in an enterpris Before you can require {% if currentVersion == "free-pro-team@latest" %}organization members, outside collaborators, and billing managers{% else %}organization members and outside collaborators{% endif %} to use two-factor authentication, you must enable two-factor authentication for your account on {% data variables.product.product_name %}. For more information, see "[Securing your account with two-factor authentication (2FA)](/github/authenticating-to-github/securing-your-account-with-two-factor-authentication-2fa)." -Before you require use of two-factor authentication, we recommend notifying {% if currentVersion == "free-pro-team@latest" %}organization members, outside collaborators, and billing managers{% else %}organization members and outside collaborators{% endif %} and asking them to set up 2FA for their accounts. You can see if members and outside collaborators already use 2FA. For more information, see "[Viewing whether users in your organization have 2FA enabled](/github/setting-up-and-managing-organizations-and-teams/viewing-whether-users-in-your-organization-have-2fa-enabled)." +Before you require use of two-factor authentication, we recommend notifying {% if currentVersion == "free-pro-team@latest" %}organization members, outside collaborators, and billing managers{% else %}organization members and outside collaborators{% endif %} and asking them to set up 2FA for their accounts. You can see if members and outside collaborators already use 2FA. For more information, see "[Viewing whether users in your organization have 2FA enabled](/organizations/keeping-your-organization-secure/viewing-whether-users-in-your-organization-have-2fa-enabled)." ### Requiring two-factor authentication in your organization diff --git a/content/github/setting-up-and-managing-organizations-and-teams/restricting-email-notifications-to-an-approved-domain.md b/content/organizations/keeping-your-organization-secure/restricting-email-notifications-to-an-approved-domain.md similarity index 88% rename from content/github/setting-up-and-managing-organizations-and-teams/restricting-email-notifications-to-an-approved-domain.md rename to content/organizations/keeping-your-organization-secure/restricting-email-notifications-to-an-approved-domain.md index 75f20036b2..d4e2d5c231 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/restricting-email-notifications-to-an-approved-domain.md +++ b/content/organizations/keeping-your-organization-secure/restricting-email-notifications-to-an-approved-domain.md @@ -5,6 +5,7 @@ product: '{% data reusables.gated-features.restrict-email-domain %}' redirect_from: - /articles/restricting-email-notifications-about-organization-activity-to-an-approved-email-domain/ - /articles/restricting-email-notifications-to-an-approved-domain + - /github/setting-up-and-managing-organizations-and-teams/restricting-email-notifications-to-an-approved-domain versions: free-pro-team: '*' topics: @@ -16,7 +17,7 @@ topics: When restricted email notifications are enabled in an organization, members can only use an email address associated with the organization's verified domains to receive email notifications about organization activity. For more information, see "[Verifying your organization's domain](/articles/verifying-your-organization-s-domain)." -Outside collaborators are not subject to restrictions on email notifications for verified domains. For more information on outside collaborators, see "[Permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization#outside-collaborators)." +Outside collaborators are not subject to restrictions on email notifications for verified domains. For more information on outside collaborators, see "[Permission levels for an organization](/organizations/managing-peoples-access-to-your-organization-with-roles/permission-levels-for-an-organization#outside-collaborators)." If your organization is owned by an enterprise account, organization members will be able to receive notifications from any domains verified for the enterprise account, in addition to any domains verified for the organization. For more information, see "[Verifying your enterprise account's domain](/github/setting-up-and-managing-your-enterprise/verifying-your-enterprise-accounts-domain)." diff --git a/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md b/content/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md rename to content/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization.md index efdac5011d..960beced2f 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md +++ b/content/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization.md @@ -4,6 +4,7 @@ intro: 'The audit log allows organization admins to quickly review the actions p miniTocMaxHeadingLevel: 4 redirect_from: - /articles/reviewing-the-audit-log-for-your-organization + - /github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization versions: free-pro-team: '*' enterprise-server: '*' @@ -48,7 +49,7 @@ To search for specific events, use the `action` qualifier in your query. Actions | [`issue`](#issue-category-actions) | Contains activities related to deleting an issue. {% if currentVersion == "free-pro-team@latest" %} | [`marketplace_agreement_signature`](#marketplace_agreement_signature-category-actions) | Contains all activities related to signing the {% data variables.product.prodname_marketplace %} Developer Agreement. | [`marketplace_listing`](#marketplace_listing-category-actions) | Contains all activities related to listing apps in {% data variables.product.prodname_marketplace %}.{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %} -| [`members_can_create_pages`](#members_can_create_pages-category-actions) | Contains all activities related to managing the publication of {% data variables.product.prodname_pages %} sites for repositories in the organization. For more information, see "[Managing the publication of {% data variables.product.prodname_pages %} sites for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-publication-of-github-pages-sites-for-your-organization)." | {% endif %} +| [`members_can_create_pages`](#members_can_create_pages-category-actions) | Contains all activities related to managing the publication of {% data variables.product.prodname_pages %} sites for repositories in the organization. For more information, see "[Managing the publication of {% data variables.product.prodname_pages %} sites for your organization](/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization)." | {% endif %} | [`org`](#org-category-actions) | Contains activities related to organization membership.{% if currentVersion == "free-pro-team@latest" %} | [`org_credential_authorization`](#org_credential_authorization-category-actions) | Contains all activities related to authorizing credentials for use with SAML single sign-on.{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" or currentVersion == "github-ae@latest" %} | [`organization_label`](#organization_label-category-actions) | Contains all activities related to default labels for repositories in your organization.{% endif %} @@ -193,42 +194,42 @@ An overview of some of the most common actions that are recorded as events in th | Action | Description |------------------|------------------- -| `disable` | Triggered when an organization owner disables {% data variables.product.prodname_dependabot_alerts %} for all existing {% if currentVersion == "free-pro-team@latest" %}private {% endif %}repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +| `disable` | Triggered when an organization owner disables {% data variables.product.prodname_dependabot_alerts %} for all existing {% if currentVersion == "free-pro-team@latest" %}private {% endif %}repositories. For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." | `enable` | Triggered when an organization owner enables {% data variables.product.prodname_dependabot_alerts %} for all existing {% if currentVersion == "free-pro-team@latest" %}private {% endif %}repositories. #### `dependabot_alerts_new_repos` category actions | Action | Description |------------------|------------------- -| `disable` | Triggered when an organization owner disables {% data variables.product.prodname_dependabot_alerts %} for all new {% if currentVersion == "free-pro-team@latest" %}private {% endif %}repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +| `disable` | Triggered when an organization owner disables {% data variables.product.prodname_dependabot_alerts %} for all new {% if currentVersion == "free-pro-team@latest" %}private {% endif %}repositories. For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." | `enable` | Triggered when an organization owner enables {% data variables.product.prodname_dependabot_alerts %} for all new {% if currentVersion == "free-pro-team@latest" %}private {% endif %}repositories. #### `dependabot_security_updates` category actions | Action | Description |------------------|------------------- -| `disable` | Triggered when an organization owner disables {% data variables.product.prodname_dependabot_security_updates %} for all existing repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +| `disable` | Triggered when an organization owner disables {% data variables.product.prodname_dependabot_security_updates %} for all existing repositories. For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." | `enable` | Triggered when an organization owner enables {% data variables.product.prodname_dependabot_security_updates %} for all existing repositories. #### `dependabot_security_updates_new_repos` category actions | Action | Description |------------------|------------------- -| `disable` | Triggered when an organization owner disables {% data variables.product.prodname_dependabot_security_updates %} for all new repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +| `disable` | Triggered when an organization owner disables {% data variables.product.prodname_dependabot_security_updates %} for all new repositories. For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." | `enable` | Triggered when an organization owner enables {% data variables.product.prodname_dependabot_security_updates %} for all new repositories. #### `dependency_graph` category actions | Action | Description |------------------|------------------- -| `disable` | Triggered when an organization owner disables the dependency graph for all existing repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +| `disable` | Triggered when an organization owner disables the dependency graph for all existing repositories. For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." | `enable` | Triggered when an organization owner enables the dependency graph for all existing repositories. #### `dependency_graph_new_repos` category actions | Action | Description |------------------|------------------- -| `disable` | Triggered when an organization owner disables the dependency graph for all new repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +| `disable` | Triggered when an organization owner disables the dependency graph for all new repositories. For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." | `enable` | Triggered when an organization owner enables the dependency graph for all new repositories. {% endif %} @@ -330,7 +331,7 @@ An overview of some of the most common actions that are recorded as events in th #### `members_can_create_pages` category actions -For more information, see "[Managing the publication of {% data variables.product.prodname_pages %} sites for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-publication-of-github-pages-sites-for-your-organization)." +For more information, see "[Managing the publication of {% data variables.product.prodname_pages %} sites for your organization](/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization)." | Action | Description | | :- | :- | @@ -367,8 +368,8 @@ For more information, see "[Managing the publication of {% data variables.produc | `remove_member` | Triggered when an [owner removes a member from an organization](/articles/removing-a-member-from-your-organization/){% if currentVersion != "github-ae@latest" %} or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and an organization member doesn't use 2FA or disables 2FA{% endif %}. Also triggered when an [organization member removes themselves](/articles/removing-yourself-from-an-organization/) from an organization.| | `remove_outside_collaborator` | Triggered when an owner removes an outside collaborator from an organization{% if currentVersion != "github-ae@latest" %} or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and an outside collaborator does not use 2FA or disables 2FA{% endif %}. |{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} | `remove_self_hosted_runner` | Triggered when a self-hosted runner is removed. For more information, see "[Removing a runner from an organization](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-an-organization)." {% endif %}{% if currentVersion == "free-pro-team@latest" %} -| `revoke_external_identity` | Triggered when an organization owner revokes a member's linked identity. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." -| `revoke_sso_session` | Triggered when an organization owner revokes a member's SAML session. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." {% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `revoke_external_identity` | Triggered when an organization owner revokes a member's linked identity. For more information, see "[Viewing and managing a member's SAML access to your organization](/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." +| `revoke_sso_session` | Triggered when an organization owner revokes a member's SAML session. For more information, see "[Viewing and managing a member's SAML access to your organization](/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." {% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} | `runner_group_created` | Triggered when a self-hosted runner group is created. For more information, see "[Creating a self-hosted runner group for an organization](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#creating-a-self-hosted-runner-group-for-an-organization)." | `runner_group_removed` | Triggered when a self-hosted runner group is removed. For more information, see "[Removing a self-hosted runner group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#removing-a-self-hosted-runner-group)." | `runner_group_updated` | Triggered when the configuration of a self-hosted runner group is changed. For more information, see "[Changing the access policy of a self-hosted runner group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#changing-the-access-policy-of-a-self-hosted-runner-group)." @@ -378,7 +379,7 @@ For more information, see "[Managing the publication of {% data variables.produc | `self_hosted_runner_updated` | Triggered when the runner application is updated. Can be viewed using the REST API and the UI; not visible in the JSON/CSV export. For more information, see "[About self-hosted runners](/actions/hosting-your-own-runners/about-self-hosted-runners#about-self-hosted-runners)."{% endif %} | `unblock_user` | Triggered when an organization owner [unblocks a user from an organization](/communities/maintaining-your-safety-on-github/unblocking-a-user-from-your-organization).{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} | `update_actions_secret` |Triggered when a {% data variables.product.prodname_actions %} secret is updated.{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %} -| `update_new_repository_default_branch_setting` | Triggered when an owner changes the name of the default branch for new repositories in the organization. For more information, see "[Managing the default branch name for repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization)."{% endif %} +| `update_new_repository_default_branch_setting` | Triggered when an owner changes the name of the default branch for new repositories in the organization. For more information, see "[Managing the default branch name for repositories in your organization](/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization)."{% endif %} | `update_default_repository_permission` | Triggered when an owner changes the default repository permission level for organization members. | `update_member` | Triggered when an owner changes a person's role from owner to member or member to owner. | `update_member_repository_creation_permission` | Triggered when an owner changes the create repository permission for organization members.{% if currentVersion == "free-pro-team@latest" %} @@ -392,7 +393,7 @@ For more information, see "[Managing the publication of {% data variables.produc |------------------|------------------- | `grant` | Triggered when a member [authorizes credentials for use with SAML single sign-on](/github/authenticating-to-github/authenticating-with-saml-single-sign-on). | `deauthorized` | Triggered when a member [deauthorizes credentials for use with SAML single sign-on](/github/authenticating-to-github/authenticating-with-saml-single-sign-on). -| `revoke` | Triggered when an owner [revokes authorized credentials](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization). +| `revoke` | Triggered when an owner [revokes authorized credentials](/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization). {% endif %} @@ -617,9 +618,9 @@ For more information, see "[Managing the publication of {% data variables.produc | `change_parent_team` | Triggered when a child team is created or [a child team's parent is changed](/articles/moving-a-team-in-your-organization-s-hierarchy). | `change_privacy` | Triggered when a team's privacy level is changed. | `create` | Triggered when a new team is created.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %} -`demote_maintainer` | Triggered when a user was demoted from a team maintainer to a team member. For more information, see "[Giving "team maintainer" permissions to an organization member](/github/setting-up-and-managing-organizations-and-teams/giving-team-maintainer-permissions-to-an-organization-member)."{% endif %} +`demote_maintainer` | Triggered when a user was demoted from a team maintainer to a team member. For more information, see "[Giving "team maintainer" permissions to an organization member](/organizations/managing-peoples-access-to-your-organization-with-roles/giving-team-maintainer-permissions-to-an-organization-member)."{% endif %} | `destroy` | Triggered when a team is deleted from the organization.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %} -`team.promote_maintainer` | Triggered when a user was promoted from a team member to a team maintainer. For more information, see "[Giving "team maintainer" permissions to an organization member](/github/setting-up-and-managing-organizations-and-teams/giving-team-maintainer-permissions-to-an-organization-member)."{% endif %} +`team.promote_maintainer` | Triggered when a user was promoted from a team member to a team maintainer. For more information, see "[Giving "team maintainer" permissions to an organization member](/organizations/managing-peoples-access-to-your-organization-with-roles/giving-team-maintainer-permissions-to-an-organization-member)."{% endif %} | `remove_member` | Triggered when a member of an organization is [removed from a team](/articles/removing-organization-members-from-a-team). | `remove_repository` | Triggered when a repository is no longer under a team's control. diff --git a/content/github/setting-up-and-managing-organizations-and-teams/reviewing-your-organizations-installed-integrations.md b/content/organizations/keeping-your-organization-secure/reviewing-your-organizations-installed-integrations.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/reviewing-your-organizations-installed-integrations.md rename to content/organizations/keeping-your-organization-secure/reviewing-your-organizations-installed-integrations.md index 9250fa7013..751729a899 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/reviewing-your-organizations-installed-integrations.md +++ b/content/organizations/keeping-your-organization-secure/reviewing-your-organizations-installed-integrations.md @@ -4,6 +4,7 @@ intro: You can review the permission levels for your organization's installed in redirect_from: - /articles/reviewing-your-organization-s-installed-integrations - /articles/reviewing-your-organizations-installed-integrations + - /github/setting-up-and-managing-organizations-and-teams/reviewing-your-organizations-installed-integrations versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/viewing-whether-users-in-your-organization-have-2fa-enabled.md b/content/organizations/keeping-your-organization-secure/viewing-whether-users-in-your-organization-have-2fa-enabled.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/viewing-whether-users-in-your-organization-have-2fa-enabled.md rename to content/organizations/keeping-your-organization-secure/viewing-whether-users-in-your-organization-have-2fa-enabled.md index 3b499d3b26..62c8a59596 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/viewing-whether-users-in-your-organization-have-2fa-enabled.md +++ b/content/organizations/keeping-your-organization-secure/viewing-whether-users-in-your-organization-have-2fa-enabled.md @@ -3,6 +3,7 @@ title: Viewing whether users in your organization have 2FA enabled intro: 'You can see which organization owners, members, and outside collaborators have enabled two-factor authentication.' redirect_from: - /articles/viewing-whether-users-in-your-organization-have-2fa-enabled + - /github/setting-up-and-managing-organizations-and-teams/viewing-whether-users-in-your-organization-have-2fa-enabled versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/adding-github-app-managers-in-your-organization.md b/content/organizations/managing-access-to-your-organizations-apps/adding-github-app-managers-in-your-organization.md similarity index 95% rename from content/github/setting-up-and-managing-organizations-and-teams/adding-github-app-managers-in-your-organization.md rename to content/organizations/managing-access-to-your-organizations-apps/adding-github-app-managers-in-your-organization.md index 3af305e777..6f89ab06d6 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/adding-github-app-managers-in-your-organization.md +++ b/content/organizations/managing-access-to-your-organizations-apps/adding-github-app-managers-in-your-organization.md @@ -3,6 +3,7 @@ title: Adding GitHub App managers in your organization intro: 'Organization owners can grant users the ability to manage some or all {% data variables.product.prodname_github_app %}s owned by the organization.' redirect_from: - /articles/adding-github-app-managers-in-your-organization + - /github/setting-up-and-managing-organizations-and-teams/adding-github-app-managers-in-your-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-access-to-your-organizations-apps.md b/content/organizations/managing-access-to-your-organizations-apps/index.md similarity index 65% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-access-to-your-organizations-apps.md rename to content/organizations/managing-access-to-your-organizations-apps/index.md index 722baa5e9d..07610efc3f 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-access-to-your-organizations-apps.md +++ b/content/organizations/managing-access-to-your-organizations-apps/index.md @@ -4,7 +4,7 @@ intro: 'As an organization owner, you can allow individual organization members redirect_from: - /articles/managing-access-to-your-organization-s-apps - /articles/managing-access-to-your-organizations-apps -mapTopic: true + - /github/setting-up-and-managing-organizations-and-teams/managing-access-to-your-organizations-apps versions: free-pro-team: '*' enterprise-server: '*' @@ -14,3 +14,5 @@ topics: - teams --- +{% link_in_list /adding-github-app-managers-in-your-organization %} +{% link_in_list /removing-github-app-managers-from-your-organization %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/removing-github-app-managers-from-your-organization.md b/content/organizations/managing-access-to-your-organizations-apps/removing-github-app-managers-from-your-organization.md similarity index 95% rename from content/github/setting-up-and-managing-organizations-and-teams/removing-github-app-managers-from-your-organization.md rename to content/organizations/managing-access-to-your-organizations-apps/removing-github-app-managers-from-your-organization.md index a5f65d7e72..d7b5fa1a25 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/removing-github-app-managers-from-your-organization.md +++ b/content/organizations/managing-access-to-your-organizations-apps/removing-github-app-managers-from-your-organization.md @@ -3,6 +3,7 @@ title: Removing GitHub App managers from your organization intro: 'Organization owners can revoke {% data variables.product.prodname_github_app %} manager permissions that were granted to a member of the organization.' redirect_from: - /articles/removing-github-app-managers-from-your-organization + - /github/setting-up-and-managing-organizations-and-teams/removing-github-app-managers-from-your-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/adding-an-outside-collaborator-to-a-project-board-in-your-organization.md b/content/organizations/managing-access-to-your-organizations-project-boards/adding-an-outside-collaborator-to-a-project-board-in-your-organization.md similarity index 91% rename from content/github/setting-up-and-managing-organizations-and-teams/adding-an-outside-collaborator-to-a-project-board-in-your-organization.md rename to content/organizations/managing-access-to-your-organizations-project-boards/adding-an-outside-collaborator-to-a-project-board-in-your-organization.md index 0332b57bcf..74731a14fc 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/adding-an-outside-collaborator-to-a-project-board-in-your-organization.md +++ b/content/organizations/managing-access-to-your-organizations-project-boards/adding-an-outside-collaborator-to-a-project-board-in-your-organization.md @@ -3,6 +3,7 @@ title: Adding an outside collaborator to a project board in your organization intro: 'As an organization owner or project board admin, you can add an outside collaborator and customize their permissions to a project board.' redirect_from: - /articles/adding-an-outside-collaborator-to-a-project-board-in-your-organization + - /github/setting-up-and-managing-organizations-and-teams/adding-an-outside-collaborator-to-a-project-board-in-your-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/organizations/managing-access-to-your-organizations-project-boards/index.md b/content/organizations/managing-access-to-your-organizations-project-boards/index.md new file mode 100644 index 0000000000..22f18b40c8 --- /dev/null +++ b/content/organizations/managing-access-to-your-organizations-project-boards/index.md @@ -0,0 +1,22 @@ +--- +title: Managing access to your organization’s project boards +intro: 'As an organization owner or project board admin, you can give organization members, teams, and outside collaborators different levels of access to project boards owned by your organization.' +redirect_from: + - /articles/managing-access-to-your-organization-s-project-boards + - /articles/managing-access-to-your-organizations-project-boards + - /github/setting-up-and-managing-organizations-and-teams/managing-access-to-your-organizations-project-boards +versions: + free-pro-team: '*' + enterprise-server: '*' + github-ae: '*' +topics: + - organizations + - teams +--- + +{% link_in_list /project-board-permissions-for-an-organization %} +{% link_in_list /managing-access-to-a-project-board-for-organization-members %} +{% link_in_list /managing-team-access-to-an-organization-project-board %} +{% link_in_list /managing-an-individuals-access-to-an-organization-project-board %} +{% link_in_list /adding-an-outside-collaborator-to-a-project-board-in-your-organization %} +{% link_in_list /removing-an-outside-collaborator-from-an-organization-project-board %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-access-to-a-project-board-for-organization-members.md b/content/organizations/managing-access-to-your-organizations-project-boards/managing-access-to-a-project-board-for-organization-members.md similarity index 94% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-access-to-a-project-board-for-organization-members.md rename to content/organizations/managing-access-to-your-organizations-project-boards/managing-access-to-a-project-board-for-organization-members.md index b15db3e0cc..bc492c6b95 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-access-to-a-project-board-for-organization-members.md +++ b/content/organizations/managing-access-to-your-organizations-project-boards/managing-access-to-a-project-board-for-organization-members.md @@ -3,6 +3,7 @@ title: Managing access to a project board for organization members intro: 'As an organization owner or project board admin, you can set a default permission level for a project board for all organization members.' redirect_from: - /articles/managing-access-to-a-project-board-for-organization-members + - /github/setting-up-and-managing-organizations-and-teams/managing-access-to-a-project-board-for-organization-members versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-an-individuals-access-to-an-organization-project-board.md b/content/organizations/managing-access-to-your-organizations-project-boards/managing-an-individuals-access-to-an-organization-project-board.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-an-individuals-access-to-an-organization-project-board.md rename to content/organizations/managing-access-to-your-organizations-project-boards/managing-an-individuals-access-to-an-organization-project-board.md index 3141574194..17aa501e92 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-an-individuals-access-to-an-organization-project-board.md +++ b/content/organizations/managing-access-to-your-organizations-project-boards/managing-an-individuals-access-to-an-organization-project-board.md @@ -4,6 +4,7 @@ intro: 'As an organization owner or project board admin, you can manage an indiv redirect_from: - /articles/managing-an-individual-s-access-to-an-organization-project-board - /articles/managing-an-individuals-access-to-an-organization-project-board + - /github/setting-up-and-managing-organizations-and-teams/managing-an-individuals-access-to-an-organization-project-board versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-team-access-to-an-organization-project-board.md b/content/organizations/managing-access-to-your-organizations-project-boards/managing-team-access-to-an-organization-project-board.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-team-access-to-an-organization-project-board.md rename to content/organizations/managing-access-to-your-organizations-project-boards/managing-team-access-to-an-organization-project-board.md index c1659ebf20..2d4ca65bea 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-team-access-to-an-organization-project-board.md +++ b/content/organizations/managing-access-to-your-organizations-project-boards/managing-team-access-to-an-organization-project-board.md @@ -3,6 +3,7 @@ title: Managing team access to an organization project board intro: 'As an organization owner or project board admin, you can give a team access to a project board owned by your organization.' redirect_from: - /articles/managing-team-access-to-an-organization-project-board + - /github/setting-up-and-managing-organizations-and-teams/managing-team-access-to-an-organization-project-board versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/project-board-permissions-for-an-organization.md b/content/organizations/managing-access-to-your-organizations-project-boards/project-board-permissions-for-an-organization.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/project-board-permissions-for-an-organization.md rename to content/organizations/managing-access-to-your-organizations-project-boards/project-board-permissions-for-an-organization.md index c774786ca2..76290ae69f 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/project-board-permissions-for-an-organization.md +++ b/content/organizations/managing-access-to-your-organizations-project-boards/project-board-permissions-for-an-organization.md @@ -3,6 +3,7 @@ title: Project board permissions for an organization intro: 'Organization owners and people with project board admin permissions can customize who has read, write, and admin permissions to your organization’s project boards.' redirect_from: - /articles/project-board-permissions-for-an-organization + - /github/setting-up-and-managing-organizations-and-teams/project-board-permissions-for-an-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/removing-an-outside-collaborator-from-an-organization-project-board.md b/content/organizations/managing-access-to-your-organizations-project-boards/removing-an-outside-collaborator-from-an-organization-project-board.md similarity index 87% rename from content/github/setting-up-and-managing-organizations-and-teams/removing-an-outside-collaborator-from-an-organization-project-board.md rename to content/organizations/managing-access-to-your-organizations-project-boards/removing-an-outside-collaborator-from-an-organization-project-board.md index 8dfd92496e..4c2d3ff3cf 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/removing-an-outside-collaborator-from-an-organization-project-board.md +++ b/content/organizations/managing-access-to-your-organizations-project-boards/removing-an-outside-collaborator-from-an-organization-project-board.md @@ -3,6 +3,7 @@ title: Removing an outside collaborator from an organization project board intro: 'As an organization owner or project board admin, you can remove an outside collaborator''s access to a project board.' redirect_from: - /articles/removing-an-outside-collaborator-from-an-organization-project-board + - /github/setting-up-and-managing-organizations-and-teams/removing-an-outside-collaborator-from-an-organization-project-board versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/adding-outside-collaborators-to-repositories-in-your-organization.md b/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/adding-outside-collaborators-to-repositories-in-your-organization.md rename to content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md index 66a47afe1f..58569ea263 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/adding-outside-collaborators-to-repositories-in-your-organization.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md @@ -3,6 +3,7 @@ title: Adding outside collaborators to repositories in your organization intro: 'An *outside collaborator* is a person who isn''t explicitly a member of your organization, but who has Read, Write, or Admin permissions to one or more repositories in your organization.' redirect_from: - /articles/adding-outside-collaborators-to-repositories-in-your-organization + - github/setting-up-and-managing-organizations-and-teams/adding-outside-collaborators-to-repositories-in-your-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization.md b/content/organizations/managing-access-to-your-organizations-repositories/canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization.md similarity index 89% rename from content/github/setting-up-and-managing-organizations-and-teams/canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization.md rename to content/organizations/managing-access-to-your-organizations-repositories/canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization.md index 221fd32ac7..fd25a1d7ff 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization.md @@ -2,6 +2,8 @@ title: Canceling an invitation to become an outside collaborator in your organization intro: You can cancel all invitations for a person to become an outside collaborator on repositories owned by your organization. permissions: Organization owners can cancel an invitation to become an outside collaborator in the organization. +redirect_from: + - /github/setting-up-and-managing-organizations-and-teams/canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/converting-an-organization-member-to-an-outside-collaborator.md b/content/organizations/managing-access-to-your-organizations-repositories/converting-an-organization-member-to-an-outside-collaborator.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/converting-an-organization-member-to-an-outside-collaborator.md rename to content/organizations/managing-access-to-your-organizations-repositories/converting-an-organization-member-to-an-outside-collaborator.md index 0d2f02074d..c026e8b1a2 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/converting-an-organization-member-to-an-outside-collaborator.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/converting-an-organization-member-to-an-outside-collaborator.md @@ -3,6 +3,7 @@ title: Converting an organization member to an outside collaborator intro: 'If a current member of your organization only needs access to certain repositories, such as consultants or temporary employees, you can convert them to an *outside collaborator*.' redirect_from: - /articles/converting-an-organization-member-to-an-outside-collaborator + - /github/setting-up-and-managing-organizations-and-teams/converting-an-organization-member-to-an-outside-collaborator versions: free-pro-team: '*' enterprise-server: '*' @@ -23,7 +24,7 @@ After converting an organization member to an outside collaborator, they'll only - @mention any visible team - Be a team maintainer -For more information, see "[Permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization)." +For more information, see "[Permission levels for an organization](/organizations/managing-peoples-access-to-your-organization-with-roles/permission-levels-for-an-organization)." We recommend reviewing the organization member's access to repositories to ensure their access is as you expect. For more information, see "[Managing an individual's access to an organization repository](/articles/managing-an-individual-s-access-to-an-organization-repository)." diff --git a/content/github/setting-up-and-managing-organizations-and-teams/converting-an-outside-collaborator-to-an-organization-member.md b/content/organizations/managing-access-to-your-organizations-repositories/converting-an-outside-collaborator-to-an-organization-member.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/converting-an-outside-collaborator-to-an-organization-member.md rename to content/organizations/managing-access-to-your-organizations-repositories/converting-an-outside-collaborator-to-an-organization-member.md index 81ece0d1b2..3c8419917d 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/converting-an-outside-collaborator-to-an-organization-member.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/converting-an-outside-collaborator-to-an-organization-member.md @@ -3,6 +3,7 @@ title: Converting an outside collaborator to an organization member intro: 'If you would like to give an outside collaborator on your organization''s repositories broader permissions within your organization, you can {% if currentVersion == "free-pro-team@latest" %}invite them to become a member of{% else %}make them a member of{% endif %} the organization.' redirect_from: - /articles/converting-an-outside-collaborator-to-an-organization-member + - /github/setting-up-and-managing-organizations-and-teams/converting-an-outside-collaborator-to-an-organization-member versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/organizations/managing-access-to-your-organizations-repositories/index.md b/content/organizations/managing-access-to-your-organizations-repositories/index.md new file mode 100644 index 0000000000..b8b30ba6d4 --- /dev/null +++ b/content/organizations/managing-access-to-your-organizations-repositories/index.md @@ -0,0 +1,28 @@ +--- +title: Managing access to your organization's repositories +intro: Organization owners can manage individual and team access to the organization's repositories. Team maintainers can also manage a team's repository access. +redirect_from: + - /articles/permission-levels-for-an-organization-repository/ + - /articles/managing-access-to-your-organization-s-repositories + - /articles/managing-access-to-your-organizations-repositories + - /github/setting-up-and-managing-organizations-and-teams/managing-access-to-your-organizations-repositories +versions: + free-pro-team: '*' + enterprise-server: '*' + github-ae: '*' +topics: + - organizations + - teams +--- + +{% link_in_list /repository-permission-levels-for-an-organization %} +{% link_in_list /setting-base-permissions-for-an-organization %} +{% link_in_list /viewing-people-with-access-to-your-repository %} +{% link_in_list /managing-an-individuals-access-to-an-organization-repository %} +{% link_in_list /managing-team-access-to-an-organization-repository %} +{% link_in_list /adding-outside-collaborators-to-repositories-in-your-organization %} +{% link_in_list /canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization %} +{% link_in_list /removing-an-outside-collaborator-from-an-organization-repository %} +{% link_in_list /converting-an-organization-member-to-an-outside-collaborator %} +{% link_in_list /converting-an-outside-collaborator-to-an-organization-member %} +{% link_in_list /reinstating-a-former-outside-collaborators-access-to-your-organization %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-an-individuals-access-to-an-organization-repository.md b/content/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository.md similarity index 95% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-an-individuals-access-to-an-organization-repository.md rename to content/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository.md index f7dcde666d..6f0267fc1d 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-an-individuals-access-to-an-organization-repository.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository.md @@ -5,6 +5,7 @@ redirect_from: - /articles/managing-an-individual-s-access-to-an-organization-repository-early-access-program/ - /articles/managing-an-individual-s-access-to-an-organization-repository - /articles/managing-an-individuals-access-to-an-organization-repository + - /github/setting-up-and-managing-organizations-and-teams/managing-an-individuals-access-to-an-organization-repository versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-team-access-to-an-organization-repository.md b/content/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-team-access-to-an-organization-repository.md rename to content/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository.md index dca7e05e67..a5b068c85a 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-team-access-to-an-organization-repository.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository.md @@ -4,6 +4,7 @@ intro: 'You can give a team access to a repository, remove a team''s access to a redirect_from: - /articles/managing-team-access-to-an-organization-repository-early-access-program/ - /articles/managing-team-access-to-an-organization-repository + - /github/setting-up-and-managing-organizations-and-teams/managing-team-access-to-an-organization-repository versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-outside-collaborators-access-to-your-organization.md b/content/organizations/managing-access-to-your-organizations-repositories/reinstating-a-former-outside-collaborators-access-to-your-organization.md similarity index 97% rename from content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-outside-collaborators-access-to-your-organization.md rename to content/organizations/managing-access-to-your-organizations-repositories/reinstating-a-former-outside-collaborators-access-to-your-organization.md index 042cca36ba..1b5f9e2ac5 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-outside-collaborators-access-to-your-organization.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/reinstating-a-former-outside-collaborators-access-to-your-organization.md @@ -4,6 +4,7 @@ intro: 'You can reinstate a former outside collaborator''s access permissions fo redirect_from: - /articles/reinstating-a-former-outside-collaborator-s-access-to-your-organization - /articles/reinstating-a-former-outside-collaborators-access-to-your-organization + - /github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-outside-collaborators-access-to-your-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/removing-an-outside-collaborator-from-an-organization-repository.md b/content/organizations/managing-access-to-your-organizations-repositories/removing-an-outside-collaborator-from-an-organization-repository.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/removing-an-outside-collaborator-from-an-organization-repository.md rename to content/organizations/managing-access-to-your-organizations-repositories/removing-an-outside-collaborator-from-an-organization-repository.md index 434d773e95..67d232afc6 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/removing-an-outside-collaborator-from-an-organization-repository.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/removing-an-outside-collaborator-from-an-organization-repository.md @@ -3,6 +3,7 @@ title: Removing an outside collaborator from an organization repository intro: Owners and repository admins can remove an outside collaborator's access to a repository. redirect_from: - /articles/removing-an-outside-collaborator-from-an-organization-repository + - /github/setting-up-and-managing-organizations-and-teams/removing-an-outside-collaborator-from-an-organization-repository versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization.md b/content/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization.md rename to content/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization.md index a3c245ff74..8ee588c9be 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization.md @@ -5,6 +5,7 @@ miniTocMaxHeadingLevel: 4 redirect_from: - /articles/repository-permission-levels-for-an-organization-early-access-program/ - /articles/repository-permission-levels-for-an-organization + - /github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization versions: free-pro-team: '*' enterprise-server: '*' @@ -33,7 +34,7 @@ From least access to most access, the permission levels for an organization repo For more information about giving people and teams access to repositories, see "[Managing access to your organization's repositories](/articles/managing-access-to-your-organizations-repositories)." -Organization owners can set base permissions that apply to all members of an organization when accessing any of the organization's repositories. For more information, see "[Setting base permissions for an organization](/github/setting-up-and-managing-organizations-and-teams/setting-base-permissions-for-an-organization#setting-base-permissions)." +Organization owners can set base permissions that apply to all members of an organization when accessing any of the organization's repositories. For more information, see "[Setting base permissions for an organization](/organizations/managing-access-to-your-organizations-repositories/setting-base-permissions-for-an-organization#setting-base-permissions)." Organization owners can also choose to further limit access to certain settings and actions across the organization. For more information on options for specific settings, see "[Managing organization settings](/articles/managing-organization-settings)." @@ -105,7 +106,7 @@ In addition to managing organization-level settings, organization owners have ad | Delete an issue (see "[Deleting an issue](/articles/deleting-an-issue)") | | | | | **X** | | Merge pull requests on protected branches, even if there are no approving reviews | | | | | **X** | | [Define code owners for a repository](/articles/about-code-owners) | | | | | **X** | -| Add a repository to a team (see "[Managing team access to an organization repository](/github/setting-up-and-managing-organizations-and-teams/managing-team-access-to-an-organization-repository#giving-a-team-access-to-a-repository)" for details) | | | | | **X** | +| Add a repository to a team (see "[Managing team access to an organization repository](/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository#giving-a-team-access-to-a-repository)" for details) | | | | | **X** | | [Manage outside collaborator access to a repository](/articles/adding-outside-collaborators-to-repositories-in-your-organization) | | | | | **X** | | [Change a repository's visibility](/articles/restricting-repository-visibility-changes-in-your-organization) | | | | | **X** | | Make a repository a template (see "[Creating a template repository](/articles/creating-a-template-repository)") | | | | | **X** | @@ -144,7 +145,7 @@ In this section, you can find the repository permission levels required for secu | [Dismiss {% data variables.product.prodname_dependabot_alerts %}](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository) | | | | | **X** | | [Designate additional people or teams to receive {% data variables.product.prodname_dependabot_alerts %}](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-security-alerts) for vulnerable dependencies | | | | | **X** | | Create [security advisories](/github/managing-security-vulnerabilities/about-github-security-advisories) | | | | | **X** |{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %} -| Manage access to {% data variables.product.prodname_GH_advanced_security %} features (see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)") | | | | | **X** |{% endif %}{% if currentVersion == "free-pro-team@latest" %} +| Manage access to {% data variables.product.prodname_GH_advanced_security %} features (see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)") | | | | | **X** |{% endif %}{% if currentVersion == "free-pro-team@latest" %} | [Enable the dependency graph](/code-security/supply-chain-security/exploring-the-dependencies-of-a-repository) for a private repository | | | | | **X** | | [View dependency reviews](/code-security/supply-chain-security/about-dependency-review) | **X** | **X** | **X** | **X** | **X** |{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" or currentVersion == "github-ae@latest" %} | [View {% data variables.product.prodname_code_scanning %} alerts on pull requests](/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests) | **X** | **X** | **X** | **X** | **X** | diff --git a/content/github/setting-up-and-managing-organizations-and-teams/setting-base-permissions-for-an-organization.md b/content/organizations/managing-access-to-your-organizations-repositories/setting-base-permissions-for-an-organization.md similarity index 77% rename from content/github/setting-up-and-managing-organizations-and-teams/setting-base-permissions-for-an-organization.md rename to content/organizations/managing-access-to-your-organizations-repositories/setting-base-permissions-for-an-organization.md index 64daf7b01f..2c22db47e3 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/setting-base-permissions-for-an-organization.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/setting-base-permissions-for-an-organization.md @@ -2,6 +2,8 @@ title: Setting base permissions for an organization intro: You can set base permissions for the repositories that an organization owns. permissions: Organization owners can set base permissions for an organization. +redirect_from: + - /github/setting-up-and-managing-organizations-and-teams/setting-base-permissions-for-an-organization versions: free-pro-team: '*' enterprise-server: '*' @@ -32,5 +34,5 @@ If someone with admin permissions to an organization's repository grants a membe ### Further reading -- "[Repository permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization#permission-levels-for-repositories-owned-by-an-organization)" -- "[Adding outside collaborators to repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/adding-outside-collaborators-to-repositories-in-your-organization)" +- "[Repository permission levels for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization#permission-levels-for-repositories-owned-by-an-organization)" +- "[Adding outside collaborators to repositories in your organization](/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization)" diff --git a/content/github/setting-up-and-managing-organizations-and-teams/viewing-people-with-access-to-your-repository.md b/content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md similarity index 94% rename from content/github/setting-up-and-managing-organizations-and-teams/viewing-people-with-access-to-your-repository.md rename to content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md index eda9a879d3..6d7cacd9b6 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/viewing-people-with-access-to-your-repository.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md @@ -3,6 +3,7 @@ title: Viewing people with access to your repository intro: 'Organization owners can view people’s access to a repository within an organization. Owners of organizations using {% data variables.product.prodname_ghe_cloud %} or {% data variables.product.prodname_ghe_server %} can also export a CSV list of people who have access to a repository.' redirect_from: - /articles/viewing-people-with-access-to-your-repository + - /github/setting-up-and-managing-organizations-and-teams/viewing-people-with-access-to-your-repository versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/about-ssh-certificate-authorities.md b/content/organizations/managing-git-access-to-your-organizations-repositories/about-ssh-certificate-authorities.md similarity index 98% rename from content/github/setting-up-and-managing-organizations-and-teams/about-ssh-certificate-authorities.md rename to content/organizations/managing-git-access-to-your-organizations-repositories/about-ssh-certificate-authorities.md index a61f9370d5..7b371b9ae4 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/about-ssh-certificate-authorities.md +++ b/content/organizations/managing-git-access-to-your-organizations-repositories/about-ssh-certificate-authorities.md @@ -4,6 +4,7 @@ intro: 'With an SSH certificate authority, your organization or enterprise accou product: '{% data reusables.gated-features.ssh-certificate-authorities %}' redirect_from: - /articles/about-ssh-certificate-authorities + - /github/setting-up-and-managing-organizations-and-teams/about-ssh-certificate-authorities versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-git-access-to-your-organizations-repositories.md b/content/organizations/managing-git-access-to-your-organizations-repositories/index.md similarity index 71% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-git-access-to-your-organizations-repositories.md rename to content/organizations/managing-git-access-to-your-organizations-repositories/index.md index 0070b8eba7..8bdd4f0224 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-git-access-to-your-organizations-repositories.md +++ b/content/organizations/managing-git-access-to-your-organizations-repositories/index.md @@ -1,11 +1,11 @@ --- title: Managing Git access to your organization's repositories intro: You can add an SSH certificate authority (CA) to your organization and allow members to access the organization's repositories over Git using keys signed by the SSH CA. -mapTopic: true product: '{% data reusables.gated-features.ssh-certificate-authorities %}' redirect_from: - /articles/managing-git-access-to-your-organizations-repositories-using-ssh-certificate-authorities/ - /articles/managing-git-access-to-your-organizations-repositories + - /github/setting-up-and-managing-organizations-and-teams/managing-git-access-to-your-organizations-repositories versions: free-pro-team: '*' enterprise-server: '*' @@ -15,3 +15,5 @@ topics: - teams --- +{% link_in_list /about-ssh-certificate-authorities %} +{% link_in_list /managing-your-organizations-ssh-certificate-authorities %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-your-organizations-ssh-certificate-authorities.md b/content/organizations/managing-git-access-to-your-organizations-repositories/managing-your-organizations-ssh-certificate-authorities.md similarity index 92% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-your-organizations-ssh-certificate-authorities.md rename to content/organizations/managing-git-access-to-your-organizations-repositories/managing-your-organizations-ssh-certificate-authorities.md index 1d363a5cc7..775efdaa45 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-your-organizations-ssh-certificate-authorities.md +++ b/content/organizations/managing-git-access-to-your-organizations-repositories/managing-your-organizations-ssh-certificate-authorities.md @@ -4,6 +4,7 @@ intro: You can add or delete SSH certificate authorities from your organization. product: '{% data reusables.gated-features.ssh-certificate-authorities %}' redirect_from: - /articles/managing-your-organizations-ssh-certificate-authorities + - /github/setting-up-and-managing-organizations-and-teams/managing-your-organizations-ssh-certificate-authorities versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/adding-people-to-your-organization.md b/content/organizations/managing-membership-in-your-organization/adding-people-to-your-organization.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/adding-people-to-your-organization.md rename to content/organizations/managing-membership-in-your-organization/adding-people-to-your-organization.md index dad0eb63df..a152a42a7a 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/adding-people-to-your-organization.md +++ b/content/organizations/managing-membership-in-your-organization/adding-people-to-your-organization.md @@ -3,6 +3,7 @@ title: Adding people to your organization intro: 'You can make anyone a member of your organization using their {% data variables.product.product_name %} username or email address.' redirect_from: - /articles/adding-people-to-your-organization + - /github/setting-up-and-managing-organizations-and-teams/adding-people-to-your-organization versions: enterprise-server: '*' github-ae: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/can-i-create-accounts-for-people-in-my-organization.md b/content/organizations/managing-membership-in-your-organization/can-i-create-accounts-for-people-in-my-organization.md similarity index 91% rename from content/github/setting-up-and-managing-organizations-and-teams/can-i-create-accounts-for-people-in-my-organization.md rename to content/organizations/managing-membership-in-your-organization/can-i-create-accounts-for-people-in-my-organization.md index 27a51a313a..f13fa6a80f 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/can-i-create-accounts-for-people-in-my-organization.md +++ b/content/organizations/managing-membership-in-your-organization/can-i-create-accounts-for-people-in-my-organization.md @@ -1,9 +1,10 @@ --- title: Can I create accounts for people in my organization? +intro: 'While you can add users to an organization you''ve created, you can''t create personal user accounts on behalf of another person.' redirect_from: - /articles/can-i-create-accounts-for-those-in-my-organization/ - /articles/can-i-create-accounts-for-people-in-my-organization -intro: 'While you can add users to an organization you''ve created, you can''t create personal user accounts on behalf of another person.' + - /github/setting-up-and-managing-organizations-and-teams/can-i-create-accounts-for-people-in-my-organization versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/canceling-or-editing-an-invitation-to-join-your-organization.md b/content/organizations/managing-membership-in-your-organization/canceling-or-editing-an-invitation-to-join-your-organization.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/canceling-or-editing-an-invitation-to-join-your-organization.md rename to content/organizations/managing-membership-in-your-organization/canceling-or-editing-an-invitation-to-join-your-organization.md index 2e14f7e102..200cdfdc4b 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/canceling-or-editing-an-invitation-to-join-your-organization.md +++ b/content/organizations/managing-membership-in-your-organization/canceling-or-editing-an-invitation-to-join-your-organization.md @@ -3,6 +3,7 @@ title: Canceling or editing an invitation to join your organization intro: Organization owners can edit or cancel an invitation to become a member of your organization any time before the user accepts. redirect_from: - /articles/canceling-or-editing-an-invitation-to-join-your-organization + - /github/setting-up-and-managing-organizations-and-teams/canceling-or-editing-an-invitation-to-join-your-organization versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-membership-in-your-organization.md b/content/organizations/managing-membership-in-your-organization/index.md similarity index 52% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-membership-in-your-organization.md rename to content/organizations/managing-membership-in-your-organization/index.md index 497c8251f9..f28c95e40d 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-membership-in-your-organization.md +++ b/content/organizations/managing-membership-in-your-organization/index.md @@ -4,7 +4,7 @@ intro: 'After you create your organization, you can {% if currentVersion == "fre redirect_from: - /articles/removing-a-user-from-your-organization/ - /articles/managing-membership-in-your-organization -mapTopic: true + - /github/setting-up-and-managing-organizations-and-teams/managing-membership-in-your-organization versions: free-pro-team: '*' enterprise-server: '*' @@ -14,3 +14,10 @@ topics: - teams --- +{% link_in_list /inviting-users-to-join-your-organization %} +{% link_in_list /canceling-or-editing-an-invitation-to-join-your-organization %} + +{% link_in_list /adding-people-to-your-organization %} +{% link_in_list /removing-a-member-from-your-organization %} +{% link_in_list /reinstating-a-former-member-of-your-organization %} +{% link_in_list /can-i-create-accounts-for-people-in-my-organization %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/inviting-users-to-join-your-organization.md b/content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md similarity index 80% rename from content/github/setting-up-and-managing-organizations-and-teams/inviting-users-to-join-your-organization.md rename to content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md index 7f2c029ce4..abef80d8f6 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/inviting-users-to-join-your-organization.md +++ b/content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md @@ -5,6 +5,7 @@ permissions: Organization owners can invite users to join an organization. redirect_from: - /articles/adding-or-inviting-members-to-a-team-in-an-organization/ - /articles/inviting-users-to-join-your-organization + - /github/setting-up-and-managing-organizations-and-teams/inviting-users-to-join-your-organization versions: free-pro-team: '*' topics: @@ -16,7 +17,7 @@ topics: **Tips**: - If your organization has a paid per-user subscription, an unused license must be available before you can invite a new member to join the organization or reinstate a former organization member. For more information, see "[About per-user pricing](/articles/about-per-user-pricing)." {% data reusables.organizations.org-invite-expiration %} -- If your organization requires members to use two-factor authentication, users that you invite must enable two-factor authentication before accepting the invitation. For more information, see "[Requiring two-factor authentication in your organization](/github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization)" and "[Securing your account with two-factor authentication (2FA)](/github/authenticating-to-github/securing-your-account-with-two-factor-authentication-2fa)." +- If your organization requires members to use two-factor authentication, users that you invite must enable two-factor authentication before accepting the invitation. For more information, see "[Requiring two-factor authentication in your organization](/organizations/keeping-your-organization-secure/requiring-two-factor-authentication-in-your-organization)" and "[Securing your account with two-factor authentication (2FA)](/github/authenticating-to-github/securing-your-account-with-two-factor-authentication-2fa)." {% endtip %} diff --git a/content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-member-of-your-organization.md b/content/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization.md similarity index 97% rename from content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-member-of-your-organization.md rename to content/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization.md index 5df6e4477f..7f78562df3 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-member-of-your-organization.md +++ b/content/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization.md @@ -3,6 +3,7 @@ title: Reinstating a former member of your organization intro: 'Organization owners can {% if currentVersion == "free-pro-team@latest" %}invite former organization members to rejoin{% else %}add former members to{% endif%} your organization, and choose whether to restore the person''s former role, access permissions, forks, and settings.' redirect_from: - /articles/reinstating-a-former-member-of-your-organization + - /github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-member-of-your-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/removing-a-member-from-your-organization.md b/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md similarity index 97% rename from content/github/setting-up-and-managing-organizations-and-teams/removing-a-member-from-your-organization.md rename to content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md index 27a9d304b2..6bdae0a2f8 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/removing-a-member-from-your-organization.md +++ b/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md @@ -3,6 +3,7 @@ title: Removing a member from your organization intro: 'If members of your organization no longer require access to any repositories owned by the organization, you can remove them from the organization.' redirect_from: - /articles/removing-a-member-from-your-organization + - /github/setting-up-and-managing-organizations-and-teams/removing-a-member-from-your-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/allowing-people-to-delete-issues-in-your-organization.md b/content/organizations/managing-organization-settings/allowing-people-to-delete-issues-in-your-organization.md similarity index 92% rename from content/github/setting-up-and-managing-organizations-and-teams/allowing-people-to-delete-issues-in-your-organization.md rename to content/organizations/managing-organization-settings/allowing-people-to-delete-issues-in-your-organization.md index 9c994b1884..203fa34c9d 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/allowing-people-to-delete-issues-in-your-organization.md +++ b/content/organizations/managing-organization-settings/allowing-people-to-delete-issues-in-your-organization.md @@ -3,6 +3,7 @@ title: Allowing people to delete issues in your organization intro: Organization owners can allow certain people to delete issues in repositories owned by your organization. redirect_from: - /articles/allowing-people-to-delete-issues-in-your-organization + - /github/setting-up-and-managing-organizations-and-teams/allowing-people-to-delete-issues-in-your-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/changing-the-visibility-of-your-organizations-dependency-insights.md b/content/organizations/managing-organization-settings/changing-the-visibility-of-your-organizations-dependency-insights.md similarity index 91% rename from content/github/setting-up-and-managing-organizations-and-teams/changing-the-visibility-of-your-organizations-dependency-insights.md rename to content/organizations/managing-organization-settings/changing-the-visibility-of-your-organizations-dependency-insights.md index 790a56e104..353bd29d2e 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/changing-the-visibility-of-your-organizations-dependency-insights.md +++ b/content/organizations/managing-organization-settings/changing-the-visibility-of-your-organizations-dependency-insights.md @@ -4,6 +4,7 @@ intro: You can allow all organization members to view dependency insights for yo product: '{% data reusables.gated-features.org-insights %}' redirect_from: - /articles/changing-the-visibility-of-your-organizations-dependency-insights + - /github/setting-up-and-managing-organizations-and-teams/changing-the-visibility-of-your-organizations-dependency-insights versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization.md b/content/organizations/managing-organization-settings/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization.md similarity index 81% rename from content/github/setting-up-and-managing-organizations-and-teams/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization.md rename to content/organizations/managing-organization-settings/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization.md index 967d47bdf4..a10c0b1708 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization.md +++ b/content/organizations/managing-organization-settings/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization.md @@ -1,6 +1,8 @@ --- title: Configuring the retention period for GitHub Actions artifacts and logs in your organization intro: 'You can configure the retention period for {% data variables.product.prodname_actions %} artifacts and logs in your organization.' +redirect_from: + - /github/setting-up-and-managing-organizations-and-teams/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization versions: free-pro-team: '*' enterprise-server: '>=2.23' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/converting-an-organization-into-a-user.md b/content/organizations/managing-organization-settings/converting-an-organization-into-a-user.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/converting-an-organization-into-a-user.md rename to content/organizations/managing-organization-settings/converting-an-organization-into-a-user.md index f12e2987df..134897705c 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/converting-an-organization-into-a-user.md +++ b/content/organizations/managing-organization-settings/converting-an-organization-into-a-user.md @@ -3,6 +3,7 @@ title: Converting an organization into a user intro: 'It''s not possible to convert an organization into a personal user account, but you can create a new user account and transfer the organization''s repositories to it.' redirect_from: - /articles/converting-an-organization-into-a-user + - /github/setting-up-and-managing-organizations-and-teams/converting-an-organization-into-a-user versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/deleting-an-organization-account.md b/content/organizations/managing-organization-settings/deleting-an-organization-account.md similarity index 94% rename from content/github/setting-up-and-managing-organizations-and-teams/deleting-an-organization-account.md rename to content/organizations/managing-organization-settings/deleting-an-organization-account.md index ab490ccd8f..ba2ac612ec 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/deleting-an-organization-account.md +++ b/content/organizations/managing-organization-settings/deleting-an-organization-account.md @@ -3,6 +3,7 @@ title: Deleting an organization account intro: 'When you delete an organization, all repositories, forks of private repositories, wikis, issues, pull requests, and Project or Organization Pages are deleted as well. {% if currentVersion == "free-pro-team@latest" %}The organization name becomes available for use on a new user or organization account, and your billing will end.{% endif %}' redirect_from: - /articles/deleting-an-organization-account + - /github/setting-up-and-managing-organizations-and-teams/deleting-an-organization-account versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md b/content/organizations/managing-organization-settings/disabling-or-limiting-github-actions-for-your-organization.md similarity index 97% rename from content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md rename to content/organizations/managing-organization-settings/disabling-or-limiting-github-actions-for-your-organization.md index d21c9c8b6f..ca813fdfe1 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md +++ b/content/organizations/managing-organization-settings/disabling-or-limiting-github-actions-for-your-organization.md @@ -1,6 +1,8 @@ --- title: Disabling or limiting GitHub Actions for your organization intro: 'Organization owners can disable, enable, and limit GitHub Actions for an organization.' +redirect_from: + - /github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization versions: free-pro-team: '*' enterprise-server: '>=2.22' diff --git a/content/organizations/managing-organization-settings/index.md b/content/organizations/managing-organization-settings/index.md new file mode 100644 index 0000000000..407237383f --- /dev/null +++ b/content/organizations/managing-organization-settings/index.md @@ -0,0 +1,39 @@ +--- +title: Managing organization settings +intro: 'Organization administrators can change several settings, including the names of repositories that belong to the organization and Owners team membership. In addition, organization admins can delete the organization and all of its repositories.' +redirect_from: + - /articles/managing-organization-settings + - /github/setting-up-and-managing-organizations-and-teams/managing-organization-settings +versions: + free-pro-team: '*' + enterprise-server: '*' + github-ae: '*' +topics: + - organizations + - teams +--- + +{% link_in_list /verifying-your-organizations-domain %} +{% link_in_list /renaming-an-organization %} +{% link_in_list /transferring-organization-ownership %} +{% link_in_list /restricting-repository-creation-in-your-organization %} +{% link_in_list /setting-permissions-for-deleting-or-transferring-repositories %} +{% link_in_list /restricting-repository-visibility-changes-in-your-organization %} +{% link_in_list /managing-the-forking-policy-for-your-organization %} +{% link_in_list /disabling-or-limiting-github-actions-for-your-organization %} +{% link_in_list /configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization %} +{% link_in_list /setting-permissions-for-adding-outside-collaborators %} +{% link_in_list /allowing-people-to-delete-issues-in-your-organization %}{% if currentVersion == "free-pro-team@latest" %} +{% link_in_list /managing-discussion-creation-for-repositories-in-your-organization %}{% endif %} +{% link_in_list /setting-team-creation-permissions-in-your-organization %} +{% link_in_list /managing-scheduled-reminders-for-your-organization %} +{% link_in_list /managing-the-default-branch-name-for-repositories-in-your-organization %} +{% link_in_list /managing-default-labels-for-repositories-in-your-organization %} +{% link_in_list /changing-the-visibility-of-your-organizations-dependency-insights %} +{% link_in_list /managing-the-display-of-member-names-in-your-organization %} +{% link_in_list /managing-updates-from-accounts-your-organization-sponsors %} +{% link_in_list /managing-the-publication-of-github-pages-sites-for-your-organization %} +{% link_in_list /deleting-an-organization-account %} +{% link_in_list /converting-an-organization-into-a-user %} +{% link_in_list /integrating-jira-with-your-organization-project-board %} +{% link_in_list /upgrading-to-the-corporate-terms-of-service %} diff --git a/content/github/setting-up-and-managing-organizations-and-teams/integrating-jira-with-your-organization-project-board.md b/content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/integrating-jira-with-your-organization-project-board.md rename to content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md index 6a3cf2daff..53d4e71637 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/integrating-jira-with-your-organization-project-board.md +++ b/content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md @@ -3,6 +3,7 @@ title: Integrating Jira with your organization project board intro: 'You can integrate Jira Cloud with your organization account to scan commits and pull requests, creating relevant metadata and hyperlinks in any mentioned Jira issues.' redirect_from: - /articles/integrating-jira-with-your-organization-project-board + - /github/setting-up-and-managing-organizations-and-teams/integrating-jira-with-your-organization-project-board versions: enterprise-server: '*' github-ae: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-default-labels-for-repositories-in-your-organization.md b/content/organizations/managing-organization-settings/managing-default-labels-for-repositories-in-your-organization.md similarity index 95% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-default-labels-for-repositories-in-your-organization.md rename to content/organizations/managing-organization-settings/managing-default-labels-for-repositories-in-your-organization.md index 7ec3f9f8c4..6392e569c0 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-default-labels-for-repositories-in-your-organization.md +++ b/content/organizations/managing-organization-settings/managing-default-labels-for-repositories-in-your-organization.md @@ -3,6 +3,7 @@ title: Managing default labels for repositories in your organization intro: You can customize the labels that are included in every new repository in your organization. redirect_from: - /articles/managing-default-labels-for-repositories-in-your-organization + - /github/setting-up-and-managing-organizations-and-teams/managing-default-labels-for-repositories-in-your-organization versions: free-pro-team: '*' enterprise-server: '>=2.20' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-discussion-creation-for-repositories-in-your-organization.md b/content/organizations/managing-organization-settings/managing-discussion-creation-for-repositories-in-your-organization.md similarity index 91% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-discussion-creation-for-repositories-in-your-organization.md rename to content/organizations/managing-organization-settings/managing-discussion-creation-for-repositories-in-your-organization.md index 59557ff8e9..6a193d77a0 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-discussion-creation-for-repositories-in-your-organization.md +++ b/content/organizations/managing-organization-settings/managing-discussion-creation-for-repositories-in-your-organization.md @@ -1,6 +1,8 @@ --- title: Managing discussion creation for repositories in your organization intro: You can choose the permission levels that members require to create discussions in repositories owned by your organization. +redirect_from: + - /github/setting-up-and-managing-organizations-and-teams/managing-discussion-creation-for-repositories-in-your-organization permissions: Organization owners can manage discussion creation for repositories owned by the organization. versions: free-pro-team: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-organization.md b/content/organizations/managing-organization-settings/managing-scheduled-reminders-for-your-organization.md similarity index 91% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-organization.md rename to content/organizations/managing-organization-settings/managing-scheduled-reminders-for-your-organization.md index 1d046ad5ee..40031825db 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-organization.md +++ b/content/organizations/managing-organization-settings/managing-scheduled-reminders-for-your-organization.md @@ -1,6 +1,8 @@ --- title: Managing scheduled reminders for your organization intro: You can get reminders in Slack for all pull requests that teams in your organization have been requested to review. +redirect_from: + - /github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-organization versions: free-pro-team: '*' topics: @@ -62,4 +64,4 @@ Organization owners can schedule a reminder for one or more teams in their organ ### Further reading - "[Managing your scheduled reminders](/github/setting-up-and-managing-your-github-user-account/managing-your-scheduled-reminders)" -- "[Managing scheduled reminders for your team](/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-team)" +- "[Managing scheduled reminders for your team](/organizations/organizing-members-into-teams/managing-scheduled-reminders-for-your-team)" diff --git a/content/github/setting-up-and-managing-organizations-and-teams/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 similarity index 94% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization.md rename to content/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization.md index d0c412bd38..e92f24b39b 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/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 @@ -1,6 +1,8 @@ --- title: Managing the default branch name for repositories in your organization intro: 'You can set the default branch name for repositories that members create in your organization on {% data variables.product.product_location %}.' +redirect_from: + - /github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization permissions: Organization owners can manage the default branch name for new repositories in the organization. versions: free-pro-team: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-the-display-of-member-names-in-your-organization.md b/content/organizations/managing-organization-settings/managing-the-display-of-member-names-in-your-organization.md similarity index 92% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-the-display-of-member-names-in-your-organization.md rename to content/organizations/managing-organization-settings/managing-the-display-of-member-names-in-your-organization.md index 2ea1724010..792d2ee771 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-the-display-of-member-names-in-your-organization.md +++ b/content/organizations/managing-organization-settings/managing-the-display-of-member-names-in-your-organization.md @@ -4,6 +4,7 @@ intro: You can allow members of your organization to see a comment author's prof product: '{% data reusables.gated-features.display-names %}' redirect_from: - /articles/managing-the-display-of-member-names-in-your-organization + - /github/setting-up-and-managing-organizations-and-teams/managing-the-display-of-member-names-in-your-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization.md b/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md similarity index 95% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization.md rename to content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md index d0c4ef8fe6..705fe3f867 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization.md +++ b/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md @@ -4,6 +4,7 @@ intro: 'You can can allow or prevent the forking of any private{% if currentVers redirect_from: - /articles/allowing-people-to-fork-private-repositories-in-your-organization - /github/setting-up-and-managing-organizations-and-teams/allowing-people-to-fork-private-repositories-in-your-organization + - /github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization permissions: Organization owners can manage the forking policy for an organization. versions: free-pro-team: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-the-publication-of-github-pages-sites-for-your-organization.md b/content/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization.md similarity index 95% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-the-publication-of-github-pages-sites-for-your-organization.md rename to content/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization.md index c081293b50..153a8dc7c0 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-the-publication-of-github-pages-sites-for-your-organization.md +++ b/content/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization.md @@ -9,6 +9,7 @@ versions: github-ae: '*' redirect_from: - /github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization + - /github/setting-up-and-managing-organizations-and-teams/managing-the-publication-of-github-pages-sites-for-your-organization topics: - organizations - teams diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-updates-from-accounts-your-organization-sponsors.md b/content/organizations/managing-organization-settings/managing-updates-from-accounts-your-organization-sponsors.md similarity index 92% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-updates-from-accounts-your-organization-sponsors.md rename to content/organizations/managing-organization-settings/managing-updates-from-accounts-your-organization-sponsors.md index d849f0d8b8..a3e01ff5a7 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-updates-from-accounts-your-organization-sponsors.md +++ b/content/organizations/managing-organization-settings/managing-updates-from-accounts-your-organization-sponsors.md @@ -1,6 +1,8 @@ --- title: Managing updates from accounts your organization sponsors intro: You can manage the email address that receives updates from accounts your organization sponsors. +redirect_from: + - /github/setting-up-and-managing-organizations-and-teams/managing-updates-from-accounts-your-organization-sponsors versions: free-pro-team: '*' permissions: Organization owners can manage updates from accounts the organization sponsors. diff --git a/content/github/setting-up-and-managing-organizations-and-teams/renaming-an-organization.md b/content/organizations/managing-organization-settings/renaming-an-organization.md similarity index 97% rename from content/github/setting-up-and-managing-organizations-and-teams/renaming-an-organization.md rename to content/organizations/managing-organization-settings/renaming-an-organization.md index 2afcff2dd2..238a4c1df0 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/renaming-an-organization.md +++ b/content/organizations/managing-organization-settings/renaming-an-organization.md @@ -4,6 +4,7 @@ intro: 'If your project or company has changed names, you can update the name of redirect_from: - /articles/what-happens-when-i-change-my-organization-s-name/ - /articles/renaming-an-organization + - /github/setting-up-and-managing-organizations-and-teams/renaming-an-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/restricting-repository-creation-in-your-organization.md b/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md similarity index 90% rename from content/github/setting-up-and-managing-organizations-and-teams/restricting-repository-creation-in-your-organization.md rename to content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md index 8c3dd0b4e0..330971580a 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/restricting-repository-creation-in-your-organization.md +++ b/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md @@ -3,6 +3,7 @@ title: Restricting repository creation in your organization intro: 'To protect your organization''s data, you can configure permissions for creating repositories in your organization.' redirect_from: - /articles/restricting-repository-creation-in-your-organization + - /github/setting-up-and-managing-organizations-and-teams/restricting-repository-creation-in-your-organization versions: free-pro-team: '*' enterprise-server: '*' @@ -20,7 +21,7 @@ Organization owners can always create any type of repository. {% warning %} -**Warning**: This setting only restricts the visibility options available when repositories are created and does not restrict the ability to change repository visibility at a later time. For more information about restricting changes to existing repositories' visibilities, see "[Restricting repository visibility changes in your organization](/github/setting-up-and-managing-organizations-and-teams/restricting-repository-visibility-changes-in-your-organization)." +**Warning**: This setting only restricts the visibility options available when repositories are created and does not restrict the ability to change repository visibility at a later time. For more information about restricting changes to existing repositories' visibilities, see "[Restricting repository visibility changes in your organization](/organizations/managing-organization-settings/restricting-repository-visibility-changes-in-your-organization)." {% endwarning %} diff --git a/content/github/setting-up-and-managing-organizations-and-teams/restricting-repository-visibility-changes-in-your-organization.md b/content/organizations/managing-organization-settings/restricting-repository-visibility-changes-in-your-organization.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/restricting-repository-visibility-changes-in-your-organization.md rename to content/organizations/managing-organization-settings/restricting-repository-visibility-changes-in-your-organization.md index 0e9ff0ecde..f6beab6468 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/restricting-repository-visibility-changes-in-your-organization.md +++ b/content/organizations/managing-organization-settings/restricting-repository-visibility-changes-in-your-organization.md @@ -3,6 +3,7 @@ title: Restricting repository visibility changes in your organization intro: 'To protect your organization''s data, you can configure permissions for changing repository visibility in your organization.' redirect_from: - /articles/restricting-repository-visibility-changes-in-your-organization + - /github/setting-up-and-managing-organizations-and-teams/restricting-repository-visibility-changes-in-your-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-adding-outside-collaborators.md b/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-adding-outside-collaborators.md rename to content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md index 118d2a24a5..266479e4f3 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-adding-outside-collaborators.md +++ b/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md @@ -5,6 +5,7 @@ product: '{% data reusables.gated-features.restict-add-collaborator %}' redirect_from: - /articles/restricting-the-ability-to-add-outside-collaborators-to-organization-repositories/ - /articles/setting-permissions-for-adding-outside-collaborators + - /github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-adding-outside-collaborators versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-deleting-or-transferring-repositories.md b/content/organizations/managing-organization-settings/setting-permissions-for-deleting-or-transferring-repositories.md similarity index 90% rename from content/github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-deleting-or-transferring-repositories.md rename to content/organizations/managing-organization-settings/setting-permissions-for-deleting-or-transferring-repositories.md index aaa629acd2..ad92065f80 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-deleting-or-transferring-repositories.md +++ b/content/organizations/managing-organization-settings/setting-permissions-for-deleting-or-transferring-repositories.md @@ -4,6 +4,7 @@ intro: 'You can allow organization members with admin permissions to a repositor redirect_from: - /articles/setting-permissions-for-deleting-or-transferring-repositories-in-your-organization/ - /articles/setting-permissions-for-deleting-or-transferring-repositories + - /github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-deleting-or-transferring-repositories versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/setting-team-creation-permissions-in-your-organization.md b/content/organizations/managing-organization-settings/setting-team-creation-permissions-in-your-organization.md similarity index 89% rename from content/github/setting-up-and-managing-organizations-and-teams/setting-team-creation-permissions-in-your-organization.md rename to content/organizations/managing-organization-settings/setting-team-creation-permissions-in-your-organization.md index 522a15d7f5..aef8790320 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/setting-team-creation-permissions-in-your-organization.md +++ b/content/organizations/managing-organization-settings/setting-team-creation-permissions-in-your-organization.md @@ -3,6 +3,7 @@ title: Setting team creation permissions in your organization intro: You can allow all organization members to create teams or limit team creation to organization owners. redirect_from: - /articles/setting-team-creation-permissions-in-your-organization + - /github/setting-up-and-managing-organizations-and-teams/setting-team-creation-permissions-in-your-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/transferring-organization-ownership.md b/content/organizations/managing-organization-settings/transferring-organization-ownership.md similarity index 84% rename from content/github/setting-up-and-managing-organizations-and-teams/transferring-organization-ownership.md rename to content/organizations/managing-organization-settings/transferring-organization-ownership.md index 1fc1cea562..36919bf9d1 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/transferring-organization-ownership.md +++ b/content/organizations/managing-organization-settings/transferring-organization-ownership.md @@ -1,9 +1,10 @@ --- title: Transferring organization ownership +intro: 'To make someone else the owner of an organization account, you must add a new owner{% if currentVersion == "free-pro-team@latest" %}, ensure that the billing information is updated,{% endif %} and then remove yourself from the account.' redirect_from: - /articles/needs-polish-how-do-i-give-ownership-to-an-organization-to-someone-else/ - /articles/transferring-organization-ownership -intro: 'To make someone else the owner of an organization account, you must add a new owner{% if currentVersion == "free-pro-team@latest" %}, ensure that the billing information is updated,{% endif %} and then remove yourself from the account.' + - /github/setting-up-and-managing-organizations-and-teams/transferring-organization-ownership versions: free-pro-team: '*' enterprise-server: '*' @@ -13,7 +14,7 @@ topics: - teams --- -1. If you're the only member with *owner* privileges, give another organization member the owner role. For more information, see "[Appointing an organization owner](/github/setting-up-and-managing-organizations-and-teams/maintaining-ownership-continuity-for-your-organization#appointing-an-organization-owner)." +1. If you're the only member with *owner* privileges, give another organization member the owner role. For more information, see "[Appointing an organization owner](/organizations/managing-peoples-access-to-your-organization-with-roles/maintaining-ownership-continuity-for-your-organization#appointing-an-organization-owner)." 2. Contact the new owner and make sure he or she is able to [access the organization's settings](/articles/accessing-your-organization-s-settings). {% if currentVersion == "free-pro-team@latest" %} 3. If you are currently responsible for paying for GitHub in your organization, you'll also need to have the new owner or a [billing manager](/articles/adding-a-billing-manager-to-your-organization/) update the organization's payment information. For more information, see "[Adding or editing a payment method](/articles/adding-or-editing-a-payment-method)." diff --git a/content/github/setting-up-and-managing-organizations-and-teams/upgrading-to-the-corporate-terms-of-service.md b/content/organizations/managing-organization-settings/upgrading-to-the-corporate-terms-of-service.md similarity index 94% rename from content/github/setting-up-and-managing-organizations-and-teams/upgrading-to-the-corporate-terms-of-service.md rename to content/organizations/managing-organization-settings/upgrading-to-the-corporate-terms-of-service.md index 2d8302bb1d..21875d86ab 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/upgrading-to-the-corporate-terms-of-service.md +++ b/content/organizations/managing-organization-settings/upgrading-to-the-corporate-terms-of-service.md @@ -3,6 +3,7 @@ title: Upgrading to the Corporate Terms of Service intro: Organizations can upgrade from the Standard Terms of Service to the Corporate Terms of Service. redirect_from: - /articles/upgrading-to-the-corporate-terms-of-service + - /github/setting-up-and-managing-organizations-and-teams/upgrading-to-the-corporate-terms-of-service versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/verifying-your-organizations-domain.md b/content/organizations/managing-organization-settings/verifying-your-organizations-domain.md similarity index 97% rename from content/github/setting-up-and-managing-organizations-and-teams/verifying-your-organizations-domain.md rename to content/organizations/managing-organization-settings/verifying-your-organizations-domain.md index 2aaf181720..196904f48c 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/verifying-your-organizations-domain.md +++ b/content/organizations/managing-organization-settings/verifying-your-organizations-domain.md @@ -4,6 +4,7 @@ intro: 'You can verify the domains controlled by your organization to confirm yo redirect_from: - /articles/verifying-your-organization-s-domain - /articles/verifying-your-organizations-domain + - /github/setting-up-and-managing-organizations-and-teams/verifying-your-organizations-domain versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/adding-a-billing-manager-to-your-organization.md b/content/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/adding-a-billing-manager-to-your-organization.md rename to content/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization.md index f9ae9677a0..f8b2075ce9 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/adding-a-billing-manager-to-your-organization.md +++ b/content/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization.md @@ -3,6 +3,7 @@ title: Adding a billing manager to your organization intro: 'A *billing manager* is a user who manages the billing settings for your organization, such as updating payment information. This is a great option if regular members of your organization don''t typically have access to billing resources.' redirect_from: - /articles/adding-a-billing-manager-to-your-organization + - /github/setting-up-and-managing-organizations-and-teams/adding-a-billing-manager-to-your-organization versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/giving-team-maintainer-permissions-to-an-organization-member.md b/content/organizations/managing-peoples-access-to-your-organization-with-roles/giving-team-maintainer-permissions-to-an-organization-member.md similarity index 92% rename from content/github/setting-up-and-managing-organizations-and-teams/giving-team-maintainer-permissions-to-an-organization-member.md rename to content/organizations/managing-peoples-access-to-your-organization-with-roles/giving-team-maintainer-permissions-to-an-organization-member.md index 5153f6a357..8a2a80a2a4 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/giving-team-maintainer-permissions-to-an-organization-member.md +++ b/content/organizations/managing-peoples-access-to-your-organization-with-roles/giving-team-maintainer-permissions-to-an-organization-member.md @@ -4,6 +4,7 @@ intro: 'An organization owner can promote any member of the organization to *tea redirect_from: - /articles/giving-team-maintainer-permissions-to-an-organization-member-early-access-program/ - /articles/giving-team-maintainer-permissions-to-an-organization-member + - /github/setting-up-and-managing-organizations-and-teams/giving-team-maintainer-permissions-to-an-organization-member versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-peoples-access-to-your-organization-with-roles.md b/content/organizations/managing-peoples-access-to-your-organization-with-roles/index.md similarity index 56% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-peoples-access-to-your-organization-with-roles.md rename to content/organizations/managing-peoples-access-to-your-organization-with-roles/index.md index 9d14684e91..a6fedeb7bc 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-peoples-access-to-your-organization-with-roles.md +++ b/content/organizations/managing-peoples-access-to-your-organization-with-roles/index.md @@ -4,7 +4,7 @@ intro: 'A person''s role in your organization defines their level of access to y redirect_from: - /articles/managing-people-s-access-to-your-organization-with-roles - /articles/managing-peoples-access-to-your-organization-with-roles -mapTopic: true + - /github/setting-up-and-managing-organizations-and-teams/managing-peoples-access-to-your-organization-with-roles versions: free-pro-team: '*' enterprise-server: '*' @@ -14,3 +14,8 @@ topics: - teams --- +{% link_in_list /permission-levels-for-an-organization %} +{% link_in_list /maintaining-ownership-continuity-for-your-organization %} +{% link_in_list /giving-team-maintainer-permissions-to-an-organization-member %} +{% link_in_list /adding-a-billing-manager-to-your-organization %} +{% link_in_list /removing-a-billing-manager-from-your-organization %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/maintaining-ownership-continuity-for-your-organization.md b/content/organizations/managing-peoples-access-to-your-organization-with-roles/maintaining-ownership-continuity-for-your-organization.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/maintaining-ownership-continuity-for-your-organization.md rename to content/organizations/managing-peoples-access-to-your-organization-with-roles/maintaining-ownership-continuity-for-your-organization.md index 76c0456caa..9b2edcdcd9 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/maintaining-ownership-continuity-for-your-organization.md +++ b/content/organizations/managing-peoples-access-to-your-organization-with-roles/maintaining-ownership-continuity-for-your-organization.md @@ -5,6 +5,7 @@ redirect_from: - /articles/changing-a-person-s-role-to-owner - /articles/changing-a-persons-role-to-owner - /github/setting-up-and-managing-organizations-and-teams/changing-a-persons-role-to-owner + - /github/setting-up-and-managing-organizations-and-teams/managing-ownership-continuity-for-your-organization permissions: Organization owners can promote any member of an organization to an organization owner. versions: free-pro-team: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md b/content/organizations/managing-peoples-access-to-your-organization-with-roles/permission-levels-for-an-organization.md similarity index 83% rename from content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md rename to content/organizations/managing-peoples-access-to-your-organization-with-roles/permission-levels-for-an-organization.md index ae61a1ad66..818a082bfa 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md +++ b/content/organizations/managing-peoples-access-to-your-organization-with-roles/permission-levels-for-an-organization.md @@ -4,6 +4,7 @@ intro: 'After you [create an organization](/articles/creating-a-new-organization redirect_from: - /articles/permission-levels-for-an-organization-early-access-program/ - /articles/permission-levels-for-an-organization + - /github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization versions: free-pro-team: '*' enterprise-server: '*' @@ -17,7 +18,7 @@ topics: Organization members can have *owner*{% if currentVersion == "free-pro-team@latest" %}, *billing manager*,{% endif %} or *member* roles: -- **Owners** have complete administrative access to your organization. This role should be limited, but to no less than two people, in your organization. For more information, see "[Maintaining ownership continuity for your organization](/github/setting-up-and-managing-organizations-and-teams/maintaining-ownership-continuity-for-your-organization)." +- **Owners** have complete administrative access to your organization. This role should be limited, but to no less than two people, in your organization. For more information, see "[Maintaining ownership continuity for your organization](/organizations/managing-peoples-access-to-your-organization-with-roles/maintaining-ownership-continuity-for-your-organization)." {% if currentVersion == "free-pro-team@latest" %} - **Billing managers** allow a person to manage billing settings. For more information, see "[Adding a billing manager to your organization](/articles/adding-a-billing-manager-to-your-organization)". {% endif %} @@ -36,13 +37,13 @@ Organization members can have *owner*{% if currentVersion == "free-pro-team@late | Reinstate former members to the organization | **X** | | | | Add and remove people from **all teams** | **X** | | | | Promote organization members to *team maintainer* | **X** | | | -| Configure code review assignments (see "[Managing code review assignment for your team](/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team)") | **X** | | | +| Configure code review assignments (see "[Managing code review assignment for your team](/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team)") | **X** | | | | Set scheduled reminders (see "[Managing scheduled reminders for pull requests](/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-pull-requests)") | **X** | | | | Add collaborators to **all repositories** | **X** | | | | Access the organization audit log | **X** | | | | Edit the organization's profile page (see "[About your organization's profile](/articles/about-your-organization-s-profile)" for details) | **X** | | | | Verify the organization's domains (see "[Verifying your organization's domain](/articles/verifying-your-organization-s-domain)" for details) | **X** | | | -| Restrict email notifications to verified domains (see "[Restricting email notifications to an approved domain](/github/setting-up-and-managing-organizations-and-teams/restricting-email-notifications-to-an-approved-domain)" for details) | **X** | | | +| Restrict email notifications to verified domains (see "[Restricting email notifications to an approved domain](/organizations/keeping-your-organization-secure/restricting-email-notifications-to-an-approved-domain)" for details) | **X** | | | | Delete **all teams** | **X** | | | | Delete the organization account, including all repositories | **X** | | | | Create teams (see "[Setting team creation permissions in your organization](/articles/setting-team-creation-permissions-in-your-organization)" for details) | **X** | **X** | | @@ -52,35 +53,35 @@ Organization members can have *owner*{% if currentVersion == "free-pro-team@late | @mention any visible team | **X** | **X** | | | Can be made a *team maintainer* | **X** | **X** | | | View organization insights (see "[Viewing insights for your organization](/articles/viewing-insights-for-your-organization)" for details) | **X** | **X** | | -| View and post public team discussions to **all teams** (see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)" for details) | **X** | **X** | | -| View and post private team discussions to **all teams** (see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)" for details) | **X** | | | +| View and post public team discussions to **all teams** (see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)" for details) | **X** | **X** | | +| View and post private team discussions to **all teams** (see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)" for details) | **X** | | | | Edit and delete team discussions in **all teams** (see "[Managing disruptive comments](/communities/moderating-comments-and-conversations/managing-disruptive-comments)" for details) | **X** | | | | Hide comments on commits, pull requests, and issues (see "[Managing disruptive comments](/communities/moderating-comments-and-conversations/managing-disruptive-comments/#hiding-a-comment)" for details) | **X** | **X** | | | Disable team discussions for an organization (see "[Disabling team discussions for your organization](/articles/disabling-team-discussions-for-your-organization)" for details) | **X** | | | | Manage viewing of organization dependency insights (see "[Changing the visibility of your organization's dependency insights](/articles/changing-the-visibility-of-your-organizations-dependency-insights)" for details) | **X** | | | | Set a team profile picture in **all teams** (see "[Setting your team's profile picture](/articles/setting-your-team-s-profile-picture)" for details) | **X** | | | | Sponsor accounts and manage the organization's sponsorships (see "[Sponsoring open-source contributors](/github/supporting-the-open-source-community-with-github-sponsors/sponsoring-open-source-contributors)" for details) | **X** | **X** | | -| Manage email updates from sponsored accounts (see "[Managing updates from accounts your organization's sponsors](/github/setting-up-and-managing-organizations-and-teams/managing-updates-from-accounts-your-organization-sponsors)" for details) | **X** | | | +| Manage email updates from sponsored accounts (see "[Managing updates from accounts your organization's sponsors](/organizations/managing-organization-settings/managing-updates-from-accounts-your-organization-sponsors)" for details) | **X** | | | | Attribute your sponsorships to another organization (see "[Attributing sponsorships to your organization](/github/supporting-the-open-source-community-with-github-sponsors/attributing-sponsorships-to-your-organization)" for details ) | **X** | | | -| Manage the publication of {% data variables.product.prodname_pages %} sites from repositories in the organization (see "[Managing the publication of {% data variables.product.prodname_pages %} sites for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-publication-of-github-pages-sites-for-your-organization)" for details) | **X** | | | -| Manage security and analysis settings (see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)" for details) | **X** | | | +| Manage the publication of {% data variables.product.prodname_pages %} sites from repositories in the organization (see "[Managing the publication of {% data variables.product.prodname_pages %} sites for your organization](/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization)" for details) | **X** | | | +| Manage security and analysis settings (see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)" for details) | **X** | | | | Enable and enforce [SAML single sign-on](/articles/about-identity-and-access-management-with-saml-single-sign-on) | **X** | | | -| [Manage a user's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization) | **X** | | | +| [Manage a user's SAML access to your organization](/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization) | **X** | | | | Manage an organization's SSH certificate authorities (see "[Managing your organization's SSH certificate authorities](/articles/managing-your-organizations-ssh-certificate-authorities)" for details) | **X** | | | | Transfer repositories | **X** | | | | Purchase, install, manage billing for, and cancel {% data variables.product.prodname_marketplace %} apps | **X** | | | | List apps in {% data variables.product.prodname_marketplace %} | **X** | | | | Receive [{% data variables.product.prodname_dependabot_alerts %} about vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) for all of an organization's repositories | **X** | | | | Manage {% data variables.product.prodname_dependabot_security_updates %} (see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)") | **X** | | | -| [Manage the forking policy](/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization) | **X** | | | +| [Manage the forking policy](/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization) | **X** | | | | [Limit activity in public repositories in an organization](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-organization) | **X** | | | | Pull (read), push (write), and clone (copy) *all repositories* in the organization | **X** | | | | Convert organization members to [outside collaborators](#outside-collaborators) | **X** | | | | [View people with access to an organization repository](/articles/viewing-people-with-access-to-your-repository) | **X** | | | | [Export a list of people with access to an organization repository](/articles/viewing-people-with-access-to-your-repository/#exporting-a-list-of-people-with-access-to-your-repository) | **X** | | | -| Manage the default branch name (see "[Managing the default branch name for repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization)") | **X** | | | +| Manage the default branch name (see "[Managing the default branch name for repositories in your organization](/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization)") | **X** | | | | Manage default labels (see "[Managing default labels for repositories in your organization](/articles/managing-default-labels-for-repositories-in-your-organization)") | **X** | | | -| Enable team synchronization (see "[Managing team synchronization for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-team-synchronization-for-your-organization)" for details) | **X** | | | +| Enable team synchronization (see "[Managing team synchronization for your organization](/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization)" for details) | **X** | | | {% else %} @@ -93,7 +94,7 @@ Organization members can have *owner*{% if currentVersion == "free-pro-team@late | Reinstate former members to the organization | **X** | | | | Add and remove people from **all teams** | **X** | | | Promote organization members to *team maintainer* | **X** | |{% if currentVersion ver_gt "enterprise-server@2.19" or currentVersion == "github-ae@latest" %} -| Configure code review assignments (see "[Managing code review assignment for your team](/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team)") | **X** | |{% endif %} +| Configure code review assignments (see "[Managing code review assignment for your team](/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team)") | **X** | |{% endif %} | Add collaborators to **all repositories** | **X** | | | Access the organization audit log | **X** | | | Edit the organization's profile page (see "[About your organization's profile](/articles/about-your-organization-s-profile)" for details) | **X** | | | @@ -106,13 +107,13 @@ Organization members can have *owner*{% if currentVersion == "free-pro-team@late | Transfer repositories | **X** | | | Manage an organization's SSH certificate authorities (see "[Managing your organization's SSH certificate authorities](/articles/managing-your-organizations-ssh-certificate-authorities)" for details) | **X** | | | Create project boards (see "[Project board permissions for an organization](/articles/project-board-permissions-for-an-organization)" for details) | **X** | **X** | | -| View and post public team discussions to **all teams** (see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)" for details) | **X** | **X** | | -| View and post private team discussions to **all teams** (see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)" for details) | **X** | | | +| View and post public team discussions to **all teams** (see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)" for details) | **X** | **X** | | +| View and post private team discussions to **all teams** (see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)" for details) | **X** | | | | Edit and delete team discussions in **all teams** (for more information, see "[Managing disruptive comments](/communities/moderating-comments-and-conversations/managing-disruptive-comments)) | **X** | | | | Hide comments on commits, pull requests, and issues (see "[Managing disruptive comments](/communities/moderating-comments-and-conversations/managing-disruptive-comments/#hiding-a-comment)" for details) | **X** | **X** | **X** | | Disable team discussions for an organization (see "[Disabling team discussions for your organization](/articles/disabling-team-discussions-for-your-organization)" for details) | **X** | | | | Set a team profile picture in **all teams** (see "[Setting your team's profile picture](/articles/setting-your-team-s-profile-picture)" for details) | **X** | | |{% if currentVersion ver_gt "enterprise-server@3.0" %} -| Manage the publication of {% data variables.product.prodname_pages %} sites from repositories in the organization (see "[Managing the publication of {% data variables.product.prodname_pages %} sites for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-publication-of-github-pages-sites-for-your-organization)" for details) | **X** | |{% endif %} +| Manage the publication of {% data variables.product.prodname_pages %} sites from repositories in the organization (see "[Managing the publication of {% data variables.product.prodname_pages %} sites for your organization](/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization)" for details) | **X** | |{% endif %} | [Move teams in an organization's hierarchy](/articles/moving-a-team-in-your-organization-s-hierarchy) | **X** | | | | Pull (read), push (write), and clone (copy) *all repositories* in the organization | **X** | | | Convert organization members to [outside collaborators](#outside-collaborators) | **X** | | diff --git a/content/github/setting-up-and-managing-organizations-and-teams/removing-a-billing-manager-from-your-organization.md b/content/organizations/managing-peoples-access-to-your-organization-with-roles/removing-a-billing-manager-from-your-organization.md similarity index 89% rename from content/github/setting-up-and-managing-organizations-and-teams/removing-a-billing-manager-from-your-organization.md rename to content/organizations/managing-peoples-access-to-your-organization-with-roles/removing-a-billing-manager-from-your-organization.md index cc855248da..aa6186ab70 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/removing-a-billing-manager-from-your-organization.md +++ b/content/organizations/managing-peoples-access-to-your-organization-with-roles/removing-a-billing-manager-from-your-organization.md @@ -3,6 +3,7 @@ title: Removing a billing manager from your organization intro: 'If a person with the *billing manager* role no longer needs to view or change your organization''s billing information, you can remove their access to the organization.' redirect_from: - /articles/removing-a-billing-manager-from-your-organization + - /github/setting-up-and-managing-organizations-and-teams/removing-a-billing-manager-from-your-organization versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/about-identity-and-access-management-with-saml-single-sign-on.md b/content/organizations/managing-saml-single-sign-on-for-your-organization/about-identity-and-access-management-with-saml-single-sign-on.md similarity index 87% rename from content/github/setting-up-and-managing-organizations-and-teams/about-identity-and-access-management-with-saml-single-sign-on.md rename to content/organizations/managing-saml-single-sign-on-for-your-organization/about-identity-and-access-management-with-saml-single-sign-on.md index 154855ba68..683f583260 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/about-identity-and-access-management-with-saml-single-sign-on.md +++ b/content/organizations/managing-saml-single-sign-on-for-your-organization/about-identity-and-access-management-with-saml-single-sign-on.md @@ -4,6 +4,7 @@ intro: 'If you centrally manage your users'' identities and applications with an product: '{% data reusables.gated-features.saml-sso %}' redirect_from: - /articles/about-identity-and-access-management-with-saml-single-sign-on + - /github/setting-up-and-managing-organizations-and-teams/about-identity-and-access-management-with-saml-single-sign-on versions: free-pro-team: '*' topics: @@ -21,7 +22,7 @@ Organization owners can enforce SAML SSO for an individual organization, or ente {% data reusables.saml.outside-collaborators-exemption %} -Before enabling SAML SSO for your organization, you'll need to connect your IdP to your organization. For more information, see "[Connecting your identity provider to your organization](/github/setting-up-and-managing-organizations-and-teams/connecting-your-identity-provider-to-your-organization)." +Before enabling SAML SSO for your organization, you'll need to connect your IdP to your organization. For more information, see "[Connecting your identity provider to your organization](/organizations/managing-saml-single-sign-on-for-your-organization/connecting-your-identity-provider-to-your-organization)." For an organization, SAML SSO can be disabled, enabled but not enforced, or enabled and enforced. After you enable SAML SSO for your organization and your organization's members successfully authenticate with your IdP, you can enforce the SAML SSO configuration. For more information about enforcing SAML SSO for your {% data variables.product.prodname_dotcom %} organization, see "[Enforcing SAML single sign-on for your organization](/articles/enforcing-saml-single-sign-on-for-your-organization)." @@ -29,7 +30,7 @@ Members must periodically authenticate with your IdP to authenticate and gain ac To access the organization's protected resources using the API and Git on the command line, members must authorize and authenticate with a personal access token or SSH key. For more information, see "[Authorizing a personal access token for use with SAML single sign-on](/github/authenticating-to-github/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on)" and "[Authorizing an SSH key for use with SAML single sign-on](/github/authenticating-to-github/authorizing-an-ssh-key-for-use-with-saml-single-sign-on)." -The first time a member uses SAML SSO to access your organization, {% data variables.product.prodname_dotcom %} automatically creates a record that links your organization, the member's {% data variables.product.prodname_dotcom %} account, and the member's account on your IdP. You can view and revoke the linked SAML identity, active sessions, and authorized credentials for members of your organization or enterprise account. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization)" and "[Viewing and managing a user's SAML access to your enterprise account](/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise-account)." +The first time a member uses SAML SSO to access your organization, {% data variables.product.prodname_dotcom %} automatically creates a record that links your organization, the member's {% data variables.product.prodname_dotcom %} account, and the member's account on your IdP. You can view and revoke the linked SAML identity, active sessions, and authorized credentials for members of your organization or enterprise account. For more information, see "[Viewing and managing a member's SAML access to your organization](/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization)" and "[Viewing and managing a user's SAML access to your enterprise account](/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise-account)." If members are signed in with a SAML SSO session when they create a new repository, the default visibility of that repository is private. Otherwise, the default visibility is public. For more information on repository visibility, see "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)." @@ -41,7 +42,7 @@ Organization members must also have an active SAML session to authorize an {% da {% data reusables.saml.saml-supported-idps %} -Some IdPs support provisioning access to a {% data variables.product.prodname_dotcom %} organization via SCIM. For more information, see "[About SCIM](/github/setting-up-and-managing-organizations-and-teams/about-scim)." +Some IdPs support provisioning access to a {% data variables.product.prodname_dotcom %} organization via SCIM. For more information, see "[About SCIM](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim)." ### Adding members to an organization using SAML SSO @@ -49,7 +50,7 @@ After you enable SAML SSO, there are multiple ways you can add new members to yo To provision new users without an invitation from an organization owner, you can use the URL `https://github.com/orgs/ORGANIZATION/sso/sign_up`, replacing _ORGANIZATION_ with the name of your organization. For example, you can configure your IdP so that anyone with access to the IdP can click a link on the IdP's dashboard to join your {% data variables.product.prodname_dotcom %} organization. -If your IdP supports SCIM, {% data variables.product.prodname_dotcom %} can automatically invite members to join your organization when you grant access on your IdP. If you remove a member's access to your {% data variables.product.prodname_dotcom %} organization on your SAML IdP, the member will be automatically removed from the {% data variables.product.prodname_dotcom %} organization. For more information, see "[About SCIM](/github/setting-up-and-managing-organizations-and-teams/about-scim)." +If your IdP supports SCIM, {% data variables.product.prodname_dotcom %} can automatically invite members to join your organization when you grant access on your IdP. If you remove a member's access to your {% data variables.product.prodname_dotcom %} organization on your SAML IdP, the member will be automatically removed from the {% data variables.product.prodname_dotcom %} organization. For more information, see "[About SCIM](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim)." {% data reusables.organizations.team-synchronization %} diff --git a/content/github/setting-up-and-managing-organizations-and-teams/about-scim.md b/content/organizations/managing-saml-single-sign-on-for-your-organization/about-scim.md similarity index 97% rename from content/github/setting-up-and-managing-organizations-and-teams/about-scim.md rename to content/organizations/managing-saml-single-sign-on-for-your-organization/about-scim.md index 36f06c2387..f2803a2adc 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/about-scim.md +++ b/content/organizations/managing-saml-single-sign-on-for-your-organization/about-scim.md @@ -4,6 +4,7 @@ intro: 'With System for Cross-domain Identity Management (SCIM), administrators product: '{% data reusables.gated-features.saml-sso %}' redirect_from: - /articles/about-scim + - /github/setting-up-and-managing-organizations-and-teams/about-scim versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/accessing-your-organization-if-your-identity-provider-is-unavailable.md b/content/organizations/managing-saml-single-sign-on-for-your-organization/accessing-your-organization-if-your-identity-provider-is-unavailable.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/accessing-your-organization-if-your-identity-provider-is-unavailable.md rename to content/organizations/managing-saml-single-sign-on-for-your-organization/accessing-your-organization-if-your-identity-provider-is-unavailable.md index 6cea7ad0bd..799e031b02 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/accessing-your-organization-if-your-identity-provider-is-unavailable.md +++ b/content/organizations/managing-saml-single-sign-on-for-your-organization/accessing-your-organization-if-your-identity-provider-is-unavailable.md @@ -4,6 +4,7 @@ intro: 'Organization administrators can sign into {% data variables.product.prod product: '{% data reusables.gated-features.saml-sso %}' redirect_from: - /articles/accessing-your-organization-if-your-identity-provider-is-unavailable + - /github/setting-up-and-managing-organizations-and-teams/accessing-your-organization-if-your-identity-provider-is-unavailable versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/configuring-saml-single-sign-on-and-scim-using-okta.md b/content/organizations/managing-saml-single-sign-on-for-your-organization/configuring-saml-single-sign-on-and-scim-using-okta.md similarity index 87% rename from content/github/setting-up-and-managing-organizations-and-teams/configuring-saml-single-sign-on-and-scim-using-okta.md rename to content/organizations/managing-saml-single-sign-on-for-your-organization/configuring-saml-single-sign-on-and-scim-using-okta.md index effe8a36c8..f2cb111b81 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/configuring-saml-single-sign-on-and-scim-using-okta.md +++ b/content/organizations/managing-saml-single-sign-on-for-your-organization/configuring-saml-single-sign-on-and-scim-using-okta.md @@ -1,6 +1,8 @@ --- title: Configuring SAML single sign-on and SCIM using Okta intro: 'You can use Security Assertion Markup Language (SAML) single sign-on (SSO) and System for Cross-domain Identity Management (SCIM) with Okta to automatically manage access to your organization on {% data variables.product.prodname_dotcom %}.' +redirect_from: + - /github/setting-up-and-managing-organizations-and-teams/configuring-saml-single-sign-on-and-scim-using-okta product: '{% data reusables.gated-features.saml-sso %}' permissions: Organization owners can configure SAML SSO and SCIM using Okta for an organization. versions: @@ -14,7 +16,7 @@ topics: You can control access to your {% data variables.product.prodname_dotcom %} organization and other web applications from one central interface by configuring the organization to use SAML SSO and SCIM with Okta, an Identity Provider (IdP). -SAML SSO controls and secures access to organization resources like repositories, issues, and pull requests. SCIM automatically adds, manages, and removes members' access to your {% data variables.product.prodname_dotcom %} organization when you make changes in Okta. For more information, see "[About identity and access management with SAML single sign-on](/github/setting-up-and-managing-organizations-and-teams/about-identity-and-access-management-with-saml-single-sign-on)" and "[About SCIM](/github/setting-up-and-managing-organizations-and-teams/about-scim)." +SAML SSO controls and secures access to organization resources like repositories, issues, and pull requests. SCIM automatically adds, manages, and removes members' access to your {% data variables.product.prodname_dotcom %} organization when you make changes in Okta. For more information, see "[About identity and access management with SAML single sign-on](/organizations/managing-saml-single-sign-on-for-your-organization/about-identity-and-access-management-with-saml-single-sign-on)" and "[About SCIM](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim)." After you enable SCIM, the following provisioning features are available for any users that you assign your {% data variables.product.prodname_ghe_cloud %} application to in Okta. @@ -49,7 +51,7 @@ After you enable SCIM, the following provisioning features are available for any {% data reusables.saml.assign-yourself-to-okta %} {% data reusables.saml.okta-sign-on-tab %} {% data reusables.saml.okta-view-setup-instructions %} -6. Enable and test SAML SSO on {% data variables.product.prodname_dotcom %} using the sign on URL, issuer URL, and public certificates from the "How to Configure SAML 2.0" guide. For more information, see "[Enabling and testing SAML single sign-on for your organization](/github/setting-up-and-managing-organizations-and-teams/enabling-and-testing-saml-single-sign-on-for-your-organization)." +6. Enable and test SAML SSO on {% data variables.product.prodname_dotcom %} using the sign on URL, issuer URL, and public certificates from the "How to Configure SAML 2.0" guide. For more information, see "[Enabling and testing SAML single sign-on for your organization](/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization)." ### Configuring access provisioning with SCIM in Okta @@ -79,6 +81,6 @@ After you enable SCIM, the following provisioning features are available for any ### Further reading - "[Configuring SAML single sign-on and SCIM for your enterprise account using Okta](/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta)" -- "[Managing team synchronization for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-team-synchronization-for-your-organization#enabling-team-synchronization-for-okta)" +- "[Managing team synchronization for your organization](/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization#enabling-team-synchronization-for-okta)" - [Understanding SAML](https://developer.okta.com/docs/concepts/saml/) in the Okta documentation - [Understanding SCIM](https://developer.okta.com/docs/concepts/scim/) in the Okta documentation diff --git a/content/github/setting-up-and-managing-organizations-and-teams/connecting-your-identity-provider-to-your-organization.md b/content/organizations/managing-saml-single-sign-on-for-your-organization/connecting-your-identity-provider-to-your-organization.md similarity index 95% rename from content/github/setting-up-and-managing-organizations-and-teams/connecting-your-identity-provider-to-your-organization.md rename to content/organizations/managing-saml-single-sign-on-for-your-organization/connecting-your-identity-provider-to-your-organization.md index 1196bdc9b3..a8c18184eb 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/connecting-your-identity-provider-to-your-organization.md +++ b/content/organizations/managing-saml-single-sign-on-for-your-organization/connecting-your-identity-provider-to-your-organization.md @@ -4,6 +4,7 @@ intro: 'To use SAML single sign-on and SCIM, you must connect your identity prov product: '{% data reusables.gated-features.saml-sso %}' redirect_from: - /articles/connecting-your-identity-provider-to-your-organization + - /github/setting-up-and-managing-organizations-and-teams/connecting-your-identity-provider-to-your-organization versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/downloading-your-organizations-saml-single-sign-on-recovery-codes.md b/content/organizations/managing-saml-single-sign-on-for-your-organization/downloading-your-organizations-saml-single-sign-on-recovery-codes.md similarity index 94% rename from content/github/setting-up-and-managing-organizations-and-teams/downloading-your-organizations-saml-single-sign-on-recovery-codes.md rename to content/organizations/managing-saml-single-sign-on-for-your-organization/downloading-your-organizations-saml-single-sign-on-recovery-codes.md index fe2af11379..1a5907b496 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/downloading-your-organizations-saml-single-sign-on-recovery-codes.md +++ b/content/organizations/managing-saml-single-sign-on-for-your-organization/downloading-your-organizations-saml-single-sign-on-recovery-codes.md @@ -4,6 +4,7 @@ intro: 'Organization administrators should download their organization''s SAML s redirect_from: - /articles/downloading-your-organization-s-saml-single-sign-on-recovery-codes - /articles/downloading-your-organizations-saml-single-sign-on-recovery-codes + - /github/setting-up-and-managing-organizations-and-teams/downloading-your-organizations-saml-single-sign-on-recovery-codes product: '{% data reusables.gated-features.saml-sso %}' versions: free-pro-team: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/enabling-and-testing-saml-single-sign-on-for-your-organization.md b/content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md similarity index 97% rename from content/github/setting-up-and-managing-organizations-and-teams/enabling-and-testing-saml-single-sign-on-for-your-organization.md rename to content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md index 8f3fc489a1..e5084e8f26 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/enabling-and-testing-saml-single-sign-on-for-your-organization.md +++ b/content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md @@ -4,6 +4,7 @@ intro: Organization owners and admins can enable SAML single sign-on to add an e product: '{% data reusables.gated-features.saml-sso %}' redirect_from: - /articles/enabling-and-testing-saml-single-sign-on-for-your-organization + - /github/setting-up-and-managing-organizations-and-teams/enabling-and-testing-saml-single-sign-on-for-your-organization versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/enforcing-saml-single-sign-on-for-your-organization.md b/content/organizations/managing-saml-single-sign-on-for-your-organization/enforcing-saml-single-sign-on-for-your-organization.md similarity index 95% rename from content/github/setting-up-and-managing-organizations-and-teams/enforcing-saml-single-sign-on-for-your-organization.md rename to content/organizations/managing-saml-single-sign-on-for-your-organization/enforcing-saml-single-sign-on-for-your-organization.md index 08241fc58b..65065df85a 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/enforcing-saml-single-sign-on-for-your-organization.md +++ b/content/organizations/managing-saml-single-sign-on-for-your-organization/enforcing-saml-single-sign-on-for-your-organization.md @@ -4,6 +4,7 @@ intro: Organization owners and admins can enforce SAML SSO so that all organizat product: '{% data reusables.gated-features.saml-sso %}' redirect_from: - /articles/enforcing-saml-single-sign-on-for-your-organization + - /github/setting-up-and-managing-organizations-and-teams/enforcing-saml-single-sign-on-for-your-organization versions: free-pro-team: '*' topics: diff --git a/content/organizations/managing-saml-single-sign-on-for-your-organization/index.md b/content/organizations/managing-saml-single-sign-on-for-your-organization/index.md new file mode 100644 index 0000000000..6dc52297a3 --- /dev/null +++ b/content/organizations/managing-saml-single-sign-on-for-your-organization/index.md @@ -0,0 +1,24 @@ +--- +title: Managing SAML single sign-on for your organization +intro: Organization administrators can manage organization members' identities and access to the organization with SAML single sign-on (SSO). +redirect_from: + - /articles/managing-member-identity-and-access-in-your-organization-with-saml-single-sign-on/ + - /articles/managing-saml-single-sign-on-for-your-organization + - /github/setting-up-and-managing-organizations-and-teams/managing-saml-single-sign-on-for-your-organization +versions: + free-pro-team: '*' +topics: + - organizations + - teams +--- + +{% link_in_list /about-identity-and-access-management-with-saml-single-sign-on %} +{% link_in_list /about-scim %} +{% link_in_list /connecting-your-identity-provider-to-your-organization %} +{% link_in_list /configuring-saml-single-sign-on-and-scim-using-okta %} +{% link_in_list /enabling-and-testing-saml-single-sign-on-for-your-organization %} +{% link_in_list /preparing-to-enforce-saml-single-sign-on-in-your-organization %} +{% link_in_list /enforcing-saml-single-sign-on-for-your-organization %} +{% link_in_list /downloading-your-organizations-saml-single-sign-on-recovery-codes %} +{% link_in_list /managing-team-synchronization-for-your-organization %} +{% link_in_list /accessing-your-organization-if-your-identity-provider-is-unavailable %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-team-synchronization-for-your-organization.md b/content/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization.md similarity index 97% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-team-synchronization-for-your-organization.md rename to content/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization.md index afbdb5dfe0..a12f67af14 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-team-synchronization-for-your-organization.md +++ b/content/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization.md @@ -6,6 +6,7 @@ redirect_from: - /articles/synchronizing-teams-between-your-identity-provider-and-github - /github/setting-up-and-managing-organizations-and-teams/synchronizing-teams-between-your-identity-provider-and-github - /github/articles/synchronizing-teams-between-okta-and-github + - /github/setting-up-and-managing-organizations-and-teams/managing-team-synchronization-for-your-organization permissions: Organization owners can manage team synchronization for an organization. miniTocMaxHeadingLevel: 4 versions: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/preparing-to-enforce-saml-single-sign-on-in-your-organization.md b/content/organizations/managing-saml-single-sign-on-for-your-organization/preparing-to-enforce-saml-single-sign-on-in-your-organization.md similarity index 92% rename from content/github/setting-up-and-managing-organizations-and-teams/preparing-to-enforce-saml-single-sign-on-in-your-organization.md rename to content/organizations/managing-saml-single-sign-on-for-your-organization/preparing-to-enforce-saml-single-sign-on-in-your-organization.md index c94b189833..0e370456c8 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/preparing-to-enforce-saml-single-sign-on-in-your-organization.md +++ b/content/organizations/managing-saml-single-sign-on-for-your-organization/preparing-to-enforce-saml-single-sign-on-in-your-organization.md @@ -4,6 +4,7 @@ intro: 'Before you enforce SAML single sign-on in your organization, you should product: '{% data reusables.gated-features.saml-sso %}' redirect_from: - /articles/preparing-to-enforce-saml-single-sign-on-in-your-organization + - /github/setting-up-and-managing-organizations-and-teams/preparing-to-enforce-saml-single-sign-on-in-your-organization versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/converting-an-admin-team-to-improved-organization-permissions.md b/content/organizations/migrating-to-improved-organization-permissions/converting-an-admin-team-to-improved-organization-permissions.md similarity index 94% rename from content/github/setting-up-and-managing-organizations-and-teams/converting-an-admin-team-to-improved-organization-permissions.md rename to content/organizations/migrating-to-improved-organization-permissions/converting-an-admin-team-to-improved-organization-permissions.md index c706237e94..30f8dcea86 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/converting-an-admin-team-to-improved-organization-permissions.md +++ b/content/organizations/migrating-to-improved-organization-permissions/converting-an-admin-team-to-improved-organization-permissions.md @@ -4,6 +4,7 @@ intro: 'If your organization was created after September 2015, your organization redirect_from: - /articles/converting-your-previous-admin-team-to-the-improved-organization-permissions/ - /articles/converting-an-admin-team-to-improved-organization-permissions + - /github/setting-up-and-managing-organizations-and-teams/converting-an-admin-team-to-improved-organization-permissions versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/converting-an-owners-team-to-improved-organization-permissions.md b/content/organizations/migrating-to-improved-organization-permissions/converting-an-owners-team-to-improved-organization-permissions.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/converting-an-owners-team-to-improved-organization-permissions.md rename to content/organizations/migrating-to-improved-organization-permissions/converting-an-owners-team-to-improved-organization-permissions.md index 1caafa06b9..ea280612e1 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/converting-an-owners-team-to-improved-organization-permissions.md +++ b/content/organizations/migrating-to-improved-organization-permissions/converting-an-owners-team-to-improved-organization-permissions.md @@ -5,6 +5,7 @@ redirect_from: - /articles/converting-your-previous-owners-team-to-the-improved-organization-permissions-early-access-program/ - /articles/converting-your-previous-owners-team-to-the-improved-organization-permissions/ - /articles/converting-an-owners-team-to-improved-organization-permissions + - /github/setting-up-and-managing-organizations-and-teams/converting-an-owners-team-to-improved-organization-permissions versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/migrating-to-improved-organization-permissions.md b/content/organizations/migrating-to-improved-organization-permissions/index.md similarity index 66% rename from content/github/setting-up-and-managing-organizations-and-teams/migrating-to-improved-organization-permissions.md rename to content/organizations/migrating-to-improved-organization-permissions/index.md index ccaaf3494e..5a0539da2a 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/migrating-to-improved-organization-permissions.md +++ b/content/organizations/migrating-to-improved-organization-permissions/index.md @@ -1,12 +1,12 @@ --- title: Migrating to improved organization permissions intro: 'If your organization was created after September 2015, your organization includes improved organization permissions by default. Organizations created before September 2015 may need to migrate older Owners and Admin teams to the improved organization permissions model.' -mapTopic: true redirect_from: - /articles/improved-organization-permissions/ - /articles/github-direct-organization-membership-pre-release-guide/ - /articles/migrating-your-organization-to-improved-organization-permissions/ - /articles/migrating-to-improved-organization-permissions + - /github/setting-up-and-managing-organizations-and-teams/migrating-to-improved-organization-permissions versions: free-pro-team: '*' enterprise-server: '*' @@ -15,3 +15,6 @@ topics: - teams --- +{% link_in_list /converting-an-owners-team-to-improved-organization-permissions %} +{% link_in_list /converting-an-admin-team-to-improved-organization-permissions %} +{% link_in_list /migrating-admin-teams-to-improved-organization-permissions %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/migrating-admin-teams-to-improved-organization-permissions.md b/content/organizations/migrating-to-improved-organization-permissions/migrating-admin-teams-to-improved-organization-permissions.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/migrating-admin-teams-to-improved-organization-permissions.md rename to content/organizations/migrating-to-improved-organization-permissions/migrating-admin-teams-to-improved-organization-permissions.md index 47a3e880a4..b29dc59631 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/migrating-admin-teams-to-improved-organization-permissions.md +++ b/content/organizations/migrating-to-improved-organization-permissions/migrating-admin-teams-to-improved-organization-permissions.md @@ -4,6 +4,7 @@ intro: 'If your organization was created after September 2015, your organization redirect_from: - /articles/migrating-your-previous-admin-teams-to-the-improved-organization-permissions/ - /articles/migrating-admin-teams-to-improved-organization-permissions + - /github/setting-up-and-managing-organizations-and-teams/migrating-admin-teams-to-improved-organization-permissions versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md b/content/organizations/organizing-members-into-teams/about-teams.md similarity index 97% rename from content/github/setting-up-and-managing-organizations-and-teams/about-teams.md rename to content/organizations/organizing-members-into-teams/about-teams.md index aa9b95d1fd..cf887f548a 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md +++ b/content/organizations/organizing-members-into-teams/about-teams.md @@ -3,6 +3,7 @@ title: About teams intro: Teams are groups of organization members that reflect your company or group's structure with cascading access permissions and mentions. redirect_from: - /articles/about-teams + - /github/setting-up-and-managing-organizations-and-teams/about-teams versions: free-pro-team: '*' enterprise-server: '*' @@ -39,7 +40,7 @@ You can also use LDAP Sync to synchronize {% data variables.product.product_loca Each team has its own page within an organization. On a team's page, you can view team members, child teams, and the team's repositories. Organization owners and team maintainers can access team settings and update the team's description and profile picture from the team's page. -Organization members can create and participate in discussions with the team. For more information, see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)." +Organization members can create and participate in discussions with the team. For more information, see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)." ![Team page listing team members and discussions](/assets/images/help/organizations/team-page-discussions-tab.png) diff --git a/content/github/setting-up-and-managing-organizations-and-teams/adding-organization-members-to-a-team.md b/content/organizations/organizing-members-into-teams/adding-organization-members-to-a-team.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/adding-organization-members-to-a-team.md rename to content/organizations/organizing-members-into-teams/adding-organization-members-to-a-team.md index e1152db89d..71f787437d 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/adding-organization-members-to-a-team.md +++ b/content/organizations/organizing-members-into-teams/adding-organization-members-to-a-team.md @@ -4,6 +4,7 @@ intro: 'People with owner or team maintainer permissions can add organization me 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 versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/changing-team-visibility.md b/content/organizations/organizing-members-into-teams/changing-team-visibility.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/changing-team-visibility.md rename to content/organizations/organizing-members-into-teams/changing-team-visibility.md index 262113a3a3..02a93f9013 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/changing-team-visibility.md +++ b/content/organizations/organizing-members-into-teams/changing-team-visibility.md @@ -3,6 +3,7 @@ title: Changing team visibility intro: Team maintainers and organization owners can determine whether a team is *visible* or *secret*. redirect_from: - /articles/changing-team-visibility + - /github/setting-up-and-managing-organizations-and-teams/changing-team-visibility versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/creating-a-team.md b/content/organizations/organizing-members-into-teams/creating-a-team.md similarity index 89% rename from content/github/setting-up-and-managing-organizations-and-teams/creating-a-team.md rename to content/organizations/organizing-members-into-teams/creating-a-team.md index 4bba443eb8..e3884e45df 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/creating-a-team.md +++ b/content/organizations/organizing-members-into-teams/creating-a-team.md @@ -4,6 +4,7 @@ intro: You can create independent or nested teams to manage repository permissio redirect_from: - /articles/creating-a-team-early-access-program/ - /articles/creating-a-team + - /github/setting-up-and-managing-organizations-and-teams/creating-a-team versions: free-pro-team: '*' enterprise-server: '*' @@ -24,7 +25,7 @@ Only organization owners and maintainers of a parent team can create a new child {% data reusables.organizations.team_description %} {% data reusables.organizations.create-team-choose-parent %} {% if currentVersion == "free-pro-team@latest" %} -1. Optionally, if your organization or enterprise account uses team synchronization, to connect an identity provider group to your team, use the "Identity Provider Groups" drop-down menu, and select up to 5 identity provider groups. For more information, see "[Synchronizing a team with an identity provider group](/github/setting-up-and-managing-organizations-and-teams/synchronizing-a-team-with-an-identity-provider-group)." +1. Optionally, if your organization or enterprise account uses team synchronization, to connect an identity provider group to your team, use the "Identity Provider Groups" drop-down menu, and select up to 5 identity provider groups. For more information, see "[Synchronizing a team with an identity provider group](/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group)." ![Drop-down menu to choose identity provider groups](/assets/images/help/teams/choose-an-idp-group.png) {% endif %} {% data reusables.organizations.team_visibility %} diff --git a/content/github/setting-up-and-managing-organizations-and-teams/deleting-a-team.md b/content/organizations/organizing-members-into-teams/deleting-a-team.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/deleting-a-team.md rename to content/organizations/organizing-members-into-teams/deleting-a-team.md index 5509cc6d98..505eca7bb5 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/deleting-a-team.md +++ b/content/organizations/organizing-members-into-teams/deleting-a-team.md @@ -3,6 +3,7 @@ title: Deleting a team intro: Organization owners can delete teams at any time from the team's settings page. redirect_from: - /articles/deleting-a-team + - /github/setting-up-and-managing-organizations-and-teams/deleting-a-team versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/disabling-team-discussions-for-your-organization.md b/content/organizations/organizing-members-into-teams/disabling-team-discussions-for-your-organization.md similarity index 83% rename from content/github/setting-up-and-managing-organizations-and-teams/disabling-team-discussions-for-your-organization.md rename to content/organizations/organizing-members-into-teams/disabling-team-discussions-for-your-organization.md index 99b423896d..105a28d2bb 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/disabling-team-discussions-for-your-organization.md +++ b/content/organizations/organizing-members-into-teams/disabling-team-discussions-for-your-organization.md @@ -3,6 +3,7 @@ title: Disabling team discussions for your organization intro: Organization owners can choose to disable or enable team discussions across the organization. redirect_from: - /articles/disabling-team-discussions-for-your-organization + - /github/setting-up-and-managing-organizations-and-teams/disabling-team-discussions-for-your-organization versions: free-pro-team: '*' enterprise-server: '*' @@ -12,7 +13,7 @@ topics: - teams --- -{% data reusables.organizations.team-discussions-default %} For more information on team discussions, see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)." +{% data reusables.organizations.team-discussions-default %} For more information on team discussions, see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)." {% data reusables.profile.access_profile %} {% data reusables.profile.access_org %} diff --git a/content/organizations/organizing-members-into-teams/index.md b/content/organizations/organizing-members-into-teams/index.md new file mode 100644 index 0000000000..0efd481006 --- /dev/null +++ b/content/organizations/organizing-members-into-teams/index.md @@ -0,0 +1,38 @@ +--- +title: Organizing members into teams +intro: You can group organization members into teams that reflect your company or group's structure with cascading access permissions and mentions. +redirect_from: + - /articles/setting-up-teams-improved-organization-permissions/ + - /articles/setting-up-teams-for-accessing-organization-repositories/ + - /articles/creating-teams/ + - /articles/adding-people-to-teams-in-an-organization/ + - /articles/removing-a-member-from-a-team-in-your-organization/ + - /articles/setting-up-teams/ + - /articles/maintaining-teams-improved-organization-permissions/ + - /articles/maintaining-teams/ + - /articles/organizing-members-into-teams + - /github/setting-up-and-managing-organizations-and-teams/organizing-members-into-teams +versions: + free-pro-team: '*' + enterprise-server: '*' + github-ae: '*' +topics: + - organizations + - teams +--- + +{% link_in_list /about-teams %} +{% link_in_list /creating-a-team %} +{% link_in_list /setting-your-teams-profile-picture %} +{% link_in_list /adding-organization-members-to-a-team %} +{% link_in_list /managing-code-review-assignment-for-your-team %} +{% link_in_list /renaming-a-team %} +{% link_in_list /changing-team-visibility %} +{% link_in_list /synchronizing-a-team-with-an-identity-provider-group %} +{% link_in_list /moving-a-team-in-your-organizations-hierarchy %} +{% link_in_list /requesting-to-add-a-child-team %} +{% link_in_list /requesting-to-add-or-change-a-parent-team %} +{% link_in_list /removing-organization-members-from-a-team %} +{% link_in_list /disabling-team-discussions-for-your-organization %} +{% link_in_list /managing-scheduled-reminders-for-your-team %} +{% link_in_list /deleting-a-team %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team.md b/content/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team.md rename to content/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team.md index 3ba913f229..2d0a1adbf3 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team.md +++ b/content/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team.md @@ -1,6 +1,8 @@ --- title: Managing code review assignment for your team intro: Code review assignments clearly indicate which members of a team are expected to submit a review for a pull request. +redirect_from: + - /github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team product: '{% data reusables.gated-features.code-review-assignment %}' versions: free-pro-team: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-team.md b/content/organizations/organizing-members-into-teams/managing-scheduled-reminders-for-your-team.md similarity index 89% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-team.md rename to content/organizations/organizing-members-into-teams/managing-scheduled-reminders-for-your-team.md index be3b2ef9c0..6ae379265f 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-team.md +++ b/content/organizations/organizing-members-into-teams/managing-scheduled-reminders-for-your-team.md @@ -3,6 +3,7 @@ title: Managing scheduled reminders for your team intro: You can get reminders in Slack when your team has pull requests waiting for review. redirect_from: - /github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-pull-requests + - /github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your team versions: free-pro-team: '*' topics: @@ -14,7 +15,7 @@ topics: {% data reusables.reminders.about-scheduled-reminders-teams-orgs %} -Team maintainers and organization owners can set scheduled reminders for any pull requests that a team has been requested to review. Before you can create a scheduled reminder for your team, an organization owner must authorize your Slack workspace. For more information, see "[Managing scheduled reminders for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-organization)." +Team maintainers and organization owners can set scheduled reminders for any pull requests that a team has been requested to review. Before you can create a scheduled reminder for your team, an organization owner must authorize your Slack workspace. For more information, see "[Managing scheduled reminders for your organization](/organizations/managing-organization-settings/managing-scheduled-reminders-for-your-organization)." {% data reusables.reminders.scheduled-reminders-limitations %} @@ -64,5 +65,5 @@ Team maintainers and organization owners can set scheduled reminders for any pul ### Further reading -- "[Managing scheduled reminders for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-organization)" +- "[Managing scheduled reminders for your organization](/organizations/managing-organization-settings/managing-scheduled-reminders-for-your-organization)" - "[Managing your scheduled reminders](/github/setting-up-and-managing-your-github-user-account/managing-your-scheduled-reminders)" diff --git a/content/github/setting-up-and-managing-organizations-and-teams/moving-a-team-in-your-organizations-hierarchy.md b/content/organizations/organizing-members-into-teams/moving-a-team-in-your-organizations-hierarchy.md similarity index 95% rename from content/github/setting-up-and-managing-organizations-and-teams/moving-a-team-in-your-organizations-hierarchy.md rename to content/organizations/organizing-members-into-teams/moving-a-team-in-your-organizations-hierarchy.md index 7ffab5946c..702d09e94e 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/moving-a-team-in-your-organizations-hierarchy.md +++ b/content/organizations/organizing-members-into-teams/moving-a-team-in-your-organizations-hierarchy.md @@ -5,6 +5,7 @@ redirect_from: - /articles/changing-a-team-s-parent/ - /articles/moving-a-team-in-your-organization-s-hierarchy - /articles/moving-a-team-in-your-organizations-hierarchy + - /github/setting-up-and-managing-organizations-and-teams/moving-a-team-in-your-organizations-hierarchy versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/removing-organization-members-from-a-team.md b/content/organizations/organizing-members-into-teams/removing-organization-members-from-a-team.md similarity index 91% rename from content/github/setting-up-and-managing-organizations-and-teams/removing-organization-members-from-a-team.md rename to content/organizations/organizing-members-into-teams/removing-organization-members-from-a-team.md index 5407d12da3..d26a3f5f88 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/removing-organization-members-from-a-team.md +++ b/content/organizations/organizing-members-into-teams/removing-organization-members-from-a-team.md @@ -4,6 +4,7 @@ intro: 'People with *owner* or *team maintainer* permissions can remove team mem redirect_from: - /articles/removing-organization-members-from-a-team-early-access-program/ - /articles/removing-organization-members-from-a-team + - /github/setting-up-and-managing-organizations-and-teams/removing-organization-members-from-a-team versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/renaming-a-team.md b/content/organizations/organizing-members-into-teams/renaming-a-team.md similarity index 89% rename from content/github/setting-up-and-managing-organizations-and-teams/renaming-a-team.md rename to content/organizations/organizing-members-into-teams/renaming-a-team.md index 333b94a9dc..3161fa210b 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/renaming-a-team.md +++ b/content/organizations/organizing-members-into-teams/renaming-a-team.md @@ -3,6 +3,7 @@ title: Renaming a team intro: Team maintainers and organization owners can edit the name and description of a team. redirect_from: - /articles/renaming-a-team + - /github/setting-up-and-managing-organizations-and-teams/renaming-a-team versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/requesting-to-add-a-child-team.md b/content/organizations/organizing-members-into-teams/requesting-to-add-a-child-team.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/requesting-to-add-a-child-team.md rename to content/organizations/organizing-members-into-teams/requesting-to-add-a-child-team.md index 26a741bfc4..ced4cbafd1 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/requesting-to-add-a-child-team.md +++ b/content/organizations/organizing-members-into-teams/requesting-to-add-a-child-team.md @@ -3,6 +3,7 @@ title: Requesting to add a child team intro: 'If you have maintainer permissions in a team, you can request to nest an existing team under your team in your organization’s hierarchy.' redirect_from: - /articles/requesting-to-add-a-child-team + - /github/setting-up-and-managing-organizations-and-teams/requesting-to-add-a-child-team versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/requesting-to-add-or-change-a-parent-team.md b/content/organizations/organizing-members-into-teams/requesting-to-add-or-change-a-parent-team.md similarity index 95% rename from content/github/setting-up-and-managing-organizations-and-teams/requesting-to-add-or-change-a-parent-team.md rename to content/organizations/organizing-members-into-teams/requesting-to-add-or-change-a-parent-team.md index df965d01f5..d22b063105 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/requesting-to-add-or-change-a-parent-team.md +++ b/content/organizations/organizing-members-into-teams/requesting-to-add-or-change-a-parent-team.md @@ -3,6 +3,7 @@ title: Requesting to add or change a parent team intro: 'If you have maintainer permissions in a team, you can request to nest your team under a parent team in your organization''s hierarchy.' redirect_from: - /articles/requesting-to-add-or-change-a-parent-team + - /github/setting-up-and-managing-organizations-and-teams/requesting-to-add-or-change-a-parent-team versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/setting-your-teams-profile-picture.md b/content/organizations/organizing-members-into-teams/setting-your-teams-profile-picture.md similarity index 91% rename from content/github/setting-up-and-managing-organizations-and-teams/setting-your-teams-profile-picture.md rename to content/organizations/organizing-members-into-teams/setting-your-teams-profile-picture.md index e22599de91..1bade56858 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/setting-your-teams-profile-picture.md +++ b/content/organizations/organizing-members-into-teams/setting-your-teams-profile-picture.md @@ -4,6 +4,7 @@ intro: 'Team maintainers and organization owners can set a profile picture for a redirect_from: - /articles/setting-your-team-s-profile-picture - /articles/setting-your-teams-profile-picture + - /github/setting-up-and-managing-organizations-and-teams/setting-your-teams-profile-picture versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/synchronizing-a-team-with-an-identity-provider-group.md b/content/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group.md similarity index 89% rename from content/github/setting-up-and-managing-organizations-and-teams/synchronizing-a-team-with-an-identity-provider-group.md rename to content/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group.md index b37dc6cb95..d43224e935 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/synchronizing-a-team-with-an-identity-provider-group.md +++ b/content/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group.md @@ -1,6 +1,8 @@ --- title: Synchronizing a team with an identity provider group intro: 'You can synchronize a {% data variables.product.product_name %} team with an identity provider (IdP) group to automatically add and remove team members.' +redirect_from: + - /github/setting-up-and-managing-organizations-and-teams/synchronizing-a-team-with-an-identity-provider-group product: '{% data reusables.gated-features.team-synchronization %}' permissions: 'Organization owners and team maintainers can synchronize a {% data variables.product.prodname_dotcom %} team with an IdP group.' versions: @@ -32,7 +34,7 @@ Connecting a team to an IdP group may remove some team members. For more informa When group membership changes on your IdP, your IdP sends a SCIM request with the changes to {% data variables.product.product_name %} according to the schedule determined by your IdP. Any requests that change {% data variables.product.prodname_dotcom %} team or organization membership will register in the audit log as changes made by the account used to configure user provisioning. For more information about this account, see "[Configuring user provisioning for your enterprise](/admin/authentication/configuring-user-provisioning-for-your-enterprise)." For more information about SCIM request schedules, see "[Check the status of user provisioning](https://docs.microsoft.com/en-us/azure/active-directory/app-provisioning/application-provisioning-when-will-provisioning-finish-specific-user)" in the Microsoft Docs. {% endif %} -Parent teams cannot synchronize with IdP groups. If the team you want to connect to an IdP group is a parent team, we recommend creating a new team or removing the nested relationships that make your team a parent team. For more information, see "[About teams](/articles/about-teams#nested-teams)," "[Creating a team](/github/setting-up-and-managing-organizations-and-teams/creating-a-team)," and "[Moving a team in your organization's hierarchy](/articles/moving-a-team-in-your-organizations-hierarchy)." +Parent teams cannot synchronize with IdP groups. If the team you want to connect to an IdP group is a parent team, we recommend creating a new team or removing the nested relationships that make your team a parent team. For more information, see "[About teams](/articles/about-teams#nested-teams)," "[Creating a team](/organizations/organizing-members-into-teams/creating-a-team)," and "[Moving a team in your organization's hierarchy](/articles/moving-a-team-in-your-organizations-hierarchy)." To manage repository access for any {% data variables.product.prodname_dotcom %} team, including teams connected to an IdP group, you must make changes with {% data variables.product.product_name %}. For more information, see "[About teams](/articles/about-teams)" and "[Managing team access to an organization repository](/articles/managing-team-access-to-an-organization-repository)." @@ -46,7 +48,7 @@ After you connect a team to an IdP group, team synchronization will add each mem - The person has already logged in with their user account on {% data variables.product.product_name %} and authenticated to the organization or enterprise account via SAML single sign-on at least once. - The person's SSO identity is a member of the IdP group. -Existing teams or group members who do not meet these criteria will be automatically removed from the team on {% data variables.product.product_name %} and lose access to repositories. Revoking a user's linked identity will also remove the user from from any teams mapped to IdP groups. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)" and "[Viewing and managing a user's SAML access to your enterprise](/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise#viewing-and-revoking-a-linked-identity)." +Existing teams or group members who do not meet these criteria will be automatically removed from the team on {% data variables.product.product_name %} and lose access to repositories. Revoking a user's linked identity will also remove the user from from any teams mapped to IdP groups. For more information, see "[Viewing and managing a member's SAML access to your organization](/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)" and "[Viewing and managing a user's SAML access to your enterprise](/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise#viewing-and-revoking-a-linked-identity)." A removed team member can be added back to a team automatically once they have authenticated to the organization or enterprise account using SSO and are moved to the connected IdP group. @@ -59,7 +61,7 @@ If your organization is owned by an enterprise account, enabling team synchroniz ### Prerequisites {% if currentVersion == "free-pro-team@latest" %} -Before you can connect a {% data variables.product.product_name %} team with an identity provider group, an organization or enterprise owner must enable team synchronization for your organization or enterprise account. For more information, see "[Managing team synchronization for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-team-synchronization-for-your-organization)" and "[Managing team synchronization for organizations in your enterprise account](/github/setting-up-and-managing-your-enterprise/managing-team-synchronization-for-organizations-in-your-enterprise-account)." +Before you can connect a {% data variables.product.product_name %} team with an identity provider group, an organization or enterprise owner must enable team synchronization for your organization or enterprise account. For more information, see "[Managing team synchronization for your organization](/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization)" and "[Managing team synchronization for organizations in your enterprise account](/github/setting-up-and-managing-your-enterprise/managing-team-synchronization-for-organizations-in-your-enterprise-account)." To avoid unintentionally removing team members, visit the administrative portal for your IdP and confirm that each current team member is also in the IdP groups that you want to connect to this team. If you don't have this access to your identity provider, you can reach out to your IdP administrator. diff --git a/content/github/setting-up-and-managing-organizations-and-teams/about-oauth-app-access-restrictions.md b/content/organizations/restricting-access-to-your-organizations-data/about-oauth-app-access-restrictions.md similarity index 98% rename from content/github/setting-up-and-managing-organizations-and-teams/about-oauth-app-access-restrictions.md rename to content/organizations/restricting-access-to-your-organizations-data/about-oauth-app-access-restrictions.md index 4122072bda..1be3424488 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/about-oauth-app-access-restrictions.md +++ b/content/organizations/restricting-access-to-your-organizations-data/about-oauth-app-access-restrictions.md @@ -4,6 +4,7 @@ intro: 'Organizations can choose which {% data variables.product.prodname_oauth_ redirect_from: - /articles/about-third-party-application-restrictions/ - /articles/about-oauth-app-access-restrictions + - /github/setting-up-and-managing-organizations-and-teams/about-oauth-app-access-restrictions versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/approving-oauth-apps-for-your-organization.md b/content/organizations/restricting-access-to-your-organizations-data/approving-oauth-apps-for-your-organization.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/approving-oauth-apps-for-your-organization.md rename to content/organizations/restricting-access-to-your-organizations-data/approving-oauth-apps-for-your-organization.md index f228264ab7..dba9c81362 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/approving-oauth-apps-for-your-organization.md +++ b/content/organizations/restricting-access-to-your-organizations-data/approving-oauth-apps-for-your-organization.md @@ -4,6 +4,7 @@ intro: 'When an organization member requests {% data variables.product.prodname_ redirect_from: - /articles/approving-third-party-applications-for-your-organization/ - /articles/approving-oauth-apps-for-your-organization + - /github/setting-up-and-managing-organizations-and-teams/approving-oauth-apps-for-your-organization versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/denying-access-to-a-previously-approved-oauth-app-for-your-organization.md b/content/organizations/restricting-access-to-your-organizations-data/denying-access-to-a-previously-approved-oauth-app-for-your-organization.md similarity index 88% rename from content/github/setting-up-and-managing-organizations-and-teams/denying-access-to-a-previously-approved-oauth-app-for-your-organization.md rename to content/organizations/restricting-access-to-your-organizations-data/denying-access-to-a-previously-approved-oauth-app-for-your-organization.md index f83e8694c7..fb80c402af 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/denying-access-to-a-previously-approved-oauth-app-for-your-organization.md +++ b/content/organizations/restricting-access-to-your-organizations-data/denying-access-to-a-previously-approved-oauth-app-for-your-organization.md @@ -4,6 +4,7 @@ intro: 'If an organization no longer requires a previously authorized {% data va redirect_from: - /articles/denying-access-to-a-previously-approved-application-for-your-organization/ - /articles/denying-access-to-a-previously-approved-oauth-app-for-your-organization + - /github/setting-up-and-managing-organizations-and-teams/denying-access-to-a-previously-approved-oauth-app-for-your-organization versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/disabling-oauth-app-access-restrictions-for-your-organization.md b/content/organizations/restricting-access-to-your-organizations-data/disabling-oauth-app-access-restrictions-for-your-organization.md similarity index 92% rename from content/github/setting-up-and-managing-organizations-and-teams/disabling-oauth-app-access-restrictions-for-your-organization.md rename to content/organizations/restricting-access-to-your-organizations-data/disabling-oauth-app-access-restrictions-for-your-organization.md index 0cd8846027..7423d3ee76 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/disabling-oauth-app-access-restrictions-for-your-organization.md +++ b/content/organizations/restricting-access-to-your-organizations-data/disabling-oauth-app-access-restrictions-for-your-organization.md @@ -4,6 +4,7 @@ intro: 'Organization owners can disable restrictions on the {% data variables.pr redirect_from: - /articles/disabling-third-party-application-restrictions-for-your-organization/ - /articles/disabling-oauth-app-access-restrictions-for-your-organization + - /github/setting-up-and-managing-organizations-and-teams/disabling-oauth-app-access-restrictions-for-your-organization versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/enabling-oauth-app-access-restrictions-for-your-organization.md b/content/organizations/restricting-access-to-your-organizations-data/enabling-oauth-app-access-restrictions-for-your-organization.md similarity index 95% rename from content/github/setting-up-and-managing-organizations-and-teams/enabling-oauth-app-access-restrictions-for-your-organization.md rename to content/organizations/restricting-access-to-your-organizations-data/enabling-oauth-app-access-restrictions-for-your-organization.md index adc8f17827..67c0d8748a 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/enabling-oauth-app-access-restrictions-for-your-organization.md +++ b/content/organizations/restricting-access-to-your-organizations-data/enabling-oauth-app-access-restrictions-for-your-organization.md @@ -4,6 +4,7 @@ intro: 'Organization owners can enable {% data variables.product.prodname_oauth_ redirect_from: - /articles/enabling-third-party-application-restrictions-for-your-organization/ - /articles/enabling-oauth-app-access-restrictions-for-your-organization + - /github/setting-up-and-managing-organizations-and-teams/enabling-oauth-app-access-restrictions-for-your-organization versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/restricting-access-to-your-organizations-data.md b/content/organizations/restricting-access-to-your-organizations-data/index.md similarity index 55% rename from content/github/setting-up-and-managing-organizations-and-teams/restricting-access-to-your-organizations-data.md rename to content/organizations/restricting-access-to-your-organizations-data/index.md index e85083f736..9cf976f93a 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/restricting-access-to-your-organizations-data.md +++ b/content/organizations/restricting-access-to-your-organizations-data/index.md @@ -4,7 +4,7 @@ intro: '{% data variables.product.prodname_oauth_app %} access restrictions allo redirect_from: - /articles/restricting-access-to-your-organization-s-data - /articles/restricting-access-to-your-organizations-data -mapTopic: true + - /github/setting-up-and-managing-organizations-and-teams/restricting-access-to-your-organizations-data versions: free-pro-team: '*' topics: @@ -12,3 +12,8 @@ topics: - teams --- +{% link_in_list /about-oauth-app-access-restrictions %} +{% link_in_list /enabling-oauth-app-access-restrictions-for-your-organization %} +{% link_in_list /disabling-oauth-app-access-restrictions-for-your-organization %} +{% link_in_list /approving-oauth-apps-for-your-organization %} +{% link_in_list /denying-access-to-a-previously-approved-oauth-app-for-your-organization %} \ No newline at end of file diff --git a/content/pages/getting-started-with-github-pages/about-github-pages.md b/content/pages/getting-started-with-github-pages/about-github-pages.md index 397ea410bf..205583ffa1 100644 --- a/content/pages/getting-started-with-github-pages/about-github-pages.md +++ b/content/pages/getting-started-with-github-pages/about-github-pages.md @@ -34,7 +34,7 @@ You can host your site on {% data variables.product.prodname_dotcom %}'s `github To get started, see "[Creating a {% data variables.product.prodname_pages %} site](/articles/creating-a-github-pages-site)." {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %} -Organization owners can disable the publication of {% data variables.product.prodname_pages %} sites from the organization's repositories. For more information, see "[Managing the publication of {% data variables.product.prodname_pages %} sites for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-publication-of-github-pages-sites-for-your-organization)." +Organization owners can disable the publication of {% data variables.product.prodname_pages %} sites from the organization's repositories. For more information, see "[Managing the publication of {% data variables.product.prodname_pages %} sites for your organization](/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization)." {% endif %} ### Types of {% data variables.product.prodname_pages %} sites diff --git a/content/rest/reference/enterprise-admin.md b/content/rest/reference/enterprise-admin.md index eca5f8f968..cd3ab0d575 100644 --- a/content/rest/reference/enterprise-admin.md +++ b/content/rest/reference/enterprise-admin.md @@ -103,7 +103,7 @@ The IdP must use `{% data variables.product.api_url_code %}/scim/v2/enterprises/ {% note %} -**Note:** The enterprise SCIM API is only available to enterprises on [{% data variables.product.prodname_ghe_cloud %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-accounts) with [SAML SSO](/rest/overview/other-authentication-methods#authenticating-for-saml-sso) enabled. For more information about SCIM, see "[About SCIM](/github/setting-up-and-managing-organizations-and-teams/about-scim)." +**Note:** The enterprise SCIM API is only available to enterprises on [{% data variables.product.prodname_ghe_cloud %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-accounts) with [SAML SSO](/rest/overview/other-authentication-methods#authenticating-for-saml-sso) enabled. For more information about SCIM, see "[About SCIM](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim)." {% endnote %} diff --git a/content/rest/reference/migrations.md b/content/rest/reference/migrations.md index c75353316f..f7730ab50d 100644 --- a/content/rest/reference/migrations.md +++ b/content/rest/reference/migrations.md @@ -16,7 +16,7 @@ topics: ## Organization -The Migrations API is only available to authenticated organization owners. For more information, see "[Permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization#permission-levels-for-an-organization)" and "[Other authentication methods](/rest/overview/other-authentication-methods)." +The Migrations API is only available to authenticated organization owners. For more information, see "[Permission levels for an organization](/organizations/managing-peoples-access-to-your-organization-with-roles/permission-levels-for-an-organization#permission-levels-for-an-organization)" and "[Other authentication methods](/rest/overview/other-authentication-methods)." {% data variables.migrations.organization_migrations_intro %} diff --git a/content/rest/reference/scim.md b/content/rest/reference/scim.md index df50c65a89..58b0e286bc 100644 --- a/content/rest/reference/scim.md +++ b/content/rest/reference/scim.md @@ -14,7 +14,7 @@ The SCIM API is used by SCIM-enabled Identity Providers (IdPs) to automate provi {% note %} -**Note:** The SCIM API is available only to organizations on [{% data variables.product.prodname_ghe_cloud %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-accounts) with [SAML SSO](/rest/overview/other-authentication-methods#authenticating-for-saml-sso) enabled. For more information about SCIM, see "[About SCIM](/github/setting-up-and-managing-organizations-and-teams/about-scim)." +**Note:** The SCIM API is available only to organizations on [{% data variables.product.prodname_ghe_cloud %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-accounts) with [SAML SSO](/rest/overview/other-authentication-methods#authenticating-for-saml-sso) enabled. For more information about SCIM, see "[About SCIM](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim)." {% endnote %} diff --git a/content/rest/reference/teams.md b/content/rest/reference/teams.md index 7f6b2a3bf4..d98f01e647 100644 --- a/content/rest/reference/teams.md +++ b/content/rest/reference/teams.md @@ -18,7 +18,7 @@ This API is only available to authenticated members of the team's [organization] ## Discussions -The team discussions API allows you to get, create, edit, and delete discussion posts on a team's page. You can use team discussions to have conversations that are not specific to a repository or project. Any member of the team's [organization](/rest/reference/orgs) can create and read public discussion posts. For more details, see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions/)." To learn more about commenting on a discussion post, see the [team discussion comments API](/rest/reference/teams#discussion-comments). This API is only available to authenticated members of the team's organization. +The team discussions API allows you to get, create, edit, and delete discussion posts on a team's page. You can use team discussions to have conversations that are not specific to a repository or project. Any member of the team's [organization](/rest/reference/orgs) can create and read public discussion posts. For more details, see "[About team discussions](//organizations/collaborating-with-your-team/about-team-discussions/)." To learn more about commenting on a discussion post, see the [team discussion comments API](/rest/reference/teams#discussion-comments). This API is only available to authenticated members of the team's organization. {% for operation in currentRestOperations %} {% if operation.subcategory == 'discussions' %}{% include rest_operation %}{% endif %} @@ -26,7 +26,7 @@ The team discussions API allows you to get, create, edit, and delete discussion ## Discussion comments -The team discussion comments API allows you to get, create, edit, and delete discussion comments on a [team discussion](/rest/reference/teams#discussions) post. Any member of the team's [organization](/rest/reference/orgs) can create and read comments on a public discussion. For more details, see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions/)." This API is only available to authenticated members of the team's organization. +The team discussion comments API allows you to get, create, edit, and delete discussion comments on a [team discussion](/rest/reference/teams#discussions) post. Any member of the team's [organization](/rest/reference/orgs) can create and read comments on a public discussion. For more details, see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions/)." This API is only available to authenticated members of the team's organization. {% for operation in currentRestOperations %} {% if operation.subcategory == 'discussion-comments' %}{% include rest_operation %}{% endif %} @@ -39,7 +39,7 @@ This API is only available to authenticated members of the team's organization. {% if currentVersion == "free-pro-team@latest" or enterpriseServerVersions contains currentVersion %} {% note %} -**Note:** When you have team synchronization set up for a team with your organization's identity provider (IdP), you will see an error if you attempt to use the API for making changes to the team's membership. If you have access to manage group membership in your IdP, you can manage GitHub team membership through your identity provider, which automatically adds and removes team members in an organization. For more information, see "Synchronizing teams between your identity provider and GitHub." +**Note:** When you have team synchronization set up for a team with your organization's identity provider (IdP), you will see an error if you attempt to use the API for making changes to the team's membership. If you have access to manage group membership in your IdP, you can manage GitHub team membership through your identity provider, which automatically adds and removes team members in an organization. For more information, see "Synchronizing teams between your identity provider and GitHub." {% endnote %} @@ -54,7 +54,7 @@ This API is only available to authenticated members of the team's organization. The Team Synchronization API allows you to manage connections between {% data variables.product.product_name %} teams and external identity provider (IdP) groups. To use this API, the authenticated user must be a team maintainer or an owner of the organization associated with the team. The token you use to authenticate will also need to be authorized for use with your IdP (SSO) provider. For more information, see "Authorizing a personal access token for use with a SAML single sign-on organization." -You can manage GitHub team members through your IdP with team synchronization. Team synchronization must be enabled to use the Team Synchronization API. For more information, see "Synchronizing teams between your identity provider and GitHub." +You can manage GitHub team members through your IdP with team synchronization. Team synchronization must be enabled to use the Team Synchronization API. For more information, see "Synchronizing teams between your identity provider and GitHub." {% for operation in currentRestOperations %} {% if operation.subcategory == 'team-sync' %}{% include rest_operation %}{% endif %} diff --git a/data/reusables/advanced-security/about-ghas-organization-policy.md b/data/reusables/advanced-security/about-ghas-organization-policy.md index baa32fddac..b6abfe68c7 100644 --- a/data/reusables/advanced-security/about-ghas-organization-policy.md +++ b/data/reusables/advanced-security/about-ghas-organization-policy.md @@ -2,4 +2,4 @@ You can enforce a policy that controls whether repository administrators are allowed to enable features for {% data variables.product.prodname_advanced_security %} in an organization's repositories. You can configure a policy for all organizations owned by your enterprise account, or for individual organizations that you choose. -Disallowing {% data variables.product.prodname_advanced_security %} for an organization prevents repository administrators from enabling {% data variables.product.prodname_advanced_security %} features for additional repositories, but does not disable the features for repositories where the features are already enabled. For more information about configuration of {% data variables.product.prodname_advanced_security %} features, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)" or "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)." +Disallowing {% data variables.product.prodname_advanced_security %} for an organization prevents repository administrators from enabling {% data variables.product.prodname_advanced_security %} features for additional repositories, but does not disable the features for repositories where the features are already enabled. For more information about configuration of {% data variables.product.prodname_advanced_security %} features, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)" or "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)." diff --git a/data/reusables/branches/set-default-branch.md b/data/reusables/branches/set-default-branch.md index 20d94881f6..61c5fb0903 100644 --- a/data/reusables/branches/set-default-branch.md +++ b/data/reusables/branches/set-default-branch.md @@ -1 +1 @@ -You can set the name of the default branch for new repositories. For more information, see "[Managing the default branch for your repositories](/github/setting-up-and-managing-your-github-user-account/managing-the-default-branch-name-for-your-repositories)," "[Managing the default branch name for repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization)," and {% if currentVersion == "free-pro-team@latest" %}"[Enforcing repository management policies in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-repository-management-policies-in-your-enterprise-account#enforcing-a-policy-on-the-default-branch-name)."{% else %}"[Enforcing repository management policies in your enterprise](/admin/policies/enforcing-repository-management-policies-in-your-enterprise#enforcing-a-policy-on-the-default-branch-name)."{% endif %} +You can set the name of the default branch for new repositories. For more information, see "[Managing the default branch for your repositories](/github/setting-up-and-managing-your-github-user-account/managing-the-default-branch-name-for-your-repositories)," "[Managing the default branch name for repositories in your organization](/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization)," and {% if currentVersion == "free-pro-team@latest" %}"[Enforcing repository management policies in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-repository-management-policies-in-your-enterprise-account#enforcing-a-policy-on-the-default-branch-name)."{% else %}"[Enforcing repository management policies in your enterprise](/admin/policies/enforcing-repository-management-policies-in-your-enterprise#enforcing-a-policy-on-the-default-branch-name)."{% endif %} diff --git a/data/reusables/classroom/assignments-guide-choose-visibility.md b/data/reusables/classroom/assignments-guide-choose-visibility.md index 3f4f17e1b2..303bb3669b 100644 --- a/data/reusables/classroom/assignments-guide-choose-visibility.md +++ b/data/reusables/classroom/assignments-guide-choose-visibility.md @@ -1,6 +1,6 @@ The repositories for an assignment can be public or private. If you use private repositories, only the student or team can see the feedback you provide. -You can also decide whether to grant students admin permissions to the repository for an assignment. Grant admin permissions if the student should be able to perform administrative tasks for the assignment repository. For more information, see "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)" and "[Repository permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization)." +You can also decide whether to grant students admin permissions to the repository for an assignment. Grant admin permissions if the student should be able to perform administrative tasks for the assignment repository. For more information, see "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)" and "[Repository permission levels for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization)." Under "Repository visibility", select a visibility. Optionally, select **Grant students admin access to their repository**. diff --git a/data/reusables/classroom/guide-create-new-classroom.md b/data/reusables/classroom/guide-create-new-classroom.md index 1ce37f9c07..9963eb960b 100644 --- a/data/reusables/classroom/guide-create-new-classroom.md +++ b/data/reusables/classroom/guide-create-new-classroom.md @@ -1,4 +1,4 @@ -1. In the list of organizations, click the organization you'd like to use for your classroom. Optionally, you can create a new organization. For more information, see "[Creating a new organization from scratch](/github/setting-up-and-managing-organizations-and-teams/creating-a-new-organization-from-scratch)." +1. In the list of organizations, click the organization you'd like to use for your classroom. Optionally, you can create a new organization. For more information, see "[Creating a new organization from scratch](/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch)." ![Organization in list of organizations for creating new classroom](/assets/images/help/classroom/click-organization.png) 1. Type the name for your classroom. ![Text field for typing name of classroom](/assets/images/help/classroom/type-classroom-name.png) diff --git a/data/reusables/dependabot/private-dependencies-note.md b/data/reusables/dependabot/private-dependencies-note.md index 7dd8f996d0..c3b22f4515 100644 --- a/data/reusables/dependabot/private-dependencies-note.md +++ b/data/reusables/dependabot/private-dependencies-note.md @@ -1 +1 @@ -When running security or version updates, some ecosystems must be able to resolve all dependencies from their source to verify that updates have been successful. If your manifest or lock files contain any private dependencies, {% data variables.product.prodname_dependabot %} must be able to access the location at which those dependencies are hosted. Organization owners can grant {% data variables.product.prodname_dependabot %} access to private repositories containing dependencies for a project within the same organization. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization#allowing-dependabot-to-access-private-dependencies)." You can configure access to private registries in a repository's _dependabot.yml_ configuration file. For more information, see "[Configuration options for dependency updates](/github/administering-a-repository/configuration-options-for-dependency-updates#configuration-options-for-private-registries)." +When running security or version updates, some ecosystems must be able to resolve all dependencies from their source to verify that updates have been successful. If your manifest or lock files contain any private dependencies, {% data variables.product.prodname_dependabot %} must be able to access the location at which those dependencies are hosted. Organization owners can grant {% data variables.product.prodname_dependabot %} access to private repositories containing dependencies for a project within the same organization. For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization#allowing-dependabot-to-access-private-dependencies)." You can configure access to private registries in a repository's _dependabot.yml_ configuration file. For more information, see "[Configuration options for dependency updates](/github/administering-a-repository/configuration-options-for-dependency-updates#configuration-options-for-private-registries)." diff --git a/data/reusables/identity-and-permissions/revoking-identity-team-sync.md b/data/reusables/identity-and-permissions/revoking-identity-team-sync.md index b2c935e893..046848b19c 100644 --- a/data/reusables/identity-and-permissions/revoking-identity-team-sync.md +++ b/data/reusables/identity-and-permissions/revoking-identity-team-sync.md @@ -1,5 +1,5 @@ {% warning %} -**Warning:** If your organization uses team synchronization, revoking a person's SSO identity will remove that person from any teams mapped to IdP groups. For more information, see "[Synchronizing a team with an identity provider](/github/setting-up-and-managing-organizations-and-teams/synchronizing-a-team-with-an-identity-provider-group)." +**Warning:** If your organization uses team synchronization, revoking a person's SSO identity will remove that person from any teams mapped to IdP groups. For more information, see "[Synchronizing a team with an identity provider](/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group)." {% endwarning %} diff --git a/data/reusables/identity-and-permissions/sync-team-with-idp-group.md b/data/reusables/identity-and-permissions/sync-team-with-idp-group.md index 125c285ead..0b4022951d 100644 --- a/data/reusables/identity-and-permissions/sync-team-with-idp-group.md +++ b/data/reusables/identity-and-permissions/sync-team-with-idp-group.md @@ -1 +1 @@ -After you enable team synchronization, team maintainers and organization owners can connect a team to an IdP group on {% data variables.product.prodname_dotcom %} or through the API. For more information, see "[Synchronizing a team with an identity provider group](/github/setting-up-and-managing-organizations-and-teams/synchronizing-a-team-with-an-identity-provider-group)" and "[Team synchronization](/rest/reference/teams#team-sync)." +After you enable team synchronization, team maintainers and organization owners can connect a team to an IdP group on {% data variables.product.prodname_dotcom %} or through the API. For more information, see "[Synchronizing a team with an identity provider group](/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group)" and "[Team synchronization](/rest/reference/teams#team-sync)." diff --git a/data/reusables/identity-and-permissions/team-sync-confirm-saml.md b/data/reusables/identity-and-permissions/team-sync-confirm-saml.md index a0e1a12947..3ebd07b725 100644 --- a/data/reusables/identity-and-permissions/team-sync-confirm-saml.md +++ b/data/reusables/identity-and-permissions/team-sync-confirm-saml.md @@ -1 +1 @@ -3. Confirm that SAML SSO is enabled. For more information, see "[Managing SAML single sign-on for your organization](/articles/managing-saml-single-sign-on-for-your-organization)." +3. Confirm that SAML SSO is enabled. For more information, see "[Managing SAML single sign-on for your organization](/organizations/managing-saml-single-sign-on-for-your-organization/)." diff --git a/data/reusables/identity-and-permissions/team-sync-okta-requirements.md b/data/reusables/identity-and-permissions/team-sync-okta-requirements.md index f8ebbf4246..08aa1fad59 100644 --- a/data/reusables/identity-and-permissions/team-sync-okta-requirements.md +++ b/data/reusables/identity-and-permissions/team-sync-okta-requirements.md @@ -1,5 +1,5 @@ To enable team synchronization for Okta, you or your IdP administrator must: -- Enable SAML SSO and SCIM for your organization using Okta. For more information, see "[Configuring SAML single sign-on and SCIM using Okta](/github/setting-up-and-managing-organizations-and-teams/configuring-saml-single-sign-on-and-scim-using-okta)." +- Enable SAML SSO and SCIM for your organization using Okta. For more information, see "[Configuring SAML single sign-on and SCIM using Okta](/organizations/managing-saml-single-sign-on-for-your-organization/configuring-saml-single-sign-on-and-scim-using-okta)." - Provide the tenant URL for your Okta instance. - Generate a valid SSWS token with read-only admin permissions for your Okta installation as a service user. For more information, see [Create the token](https://developer.okta.com/docs/guides/create-an-api-token/create-the-token/) and [Service users](https://help.okta.com/en/prod/Content/Topics/Adv_Server_Access/docs/service-users.htm) in Okta's documentation. diff --git a/data/reusables/organizations/team-discussions-are-for-orgs.md b/data/reusables/organizations/team-discussions-are-for-orgs.md index cb0f53f8ed..656bb6a3b7 100644 --- a/data/reusables/organizations/team-discussions-are-for-orgs.md +++ b/data/reusables/organizations/team-discussions-are-for-orgs.md @@ -1 +1 @@ -Team discussions are only available on team pages in organizations. For more information, see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)." +Team discussions are only available on team pages in organizations. For more information, see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)." diff --git a/data/reusables/organizations/team-synchronization.md b/data/reusables/organizations/team-synchronization.md index a609ef11b9..94743620fb 100644 --- a/data/reusables/organizations/team-synchronization.md +++ b/data/reusables/organizations/team-synchronization.md @@ -1,3 +1,3 @@ {% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" %} -You can use team synchronization to automatically add and remove organization members to teams through an identity provider. For more information, see "[Synchronizing a team with an identity provider group](/github/setting-up-and-managing-organizations-and-teams/synchronizing-a-team-with-an-identity-provider-group)." +You can use team synchronization to automatically add and remove organization members to teams through an identity provider. For more information, see "[Synchronizing a team with an identity provider group](/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group)." {% endif %} diff --git a/data/reusables/organizations/team_maintainers_can.md b/data/reusables/organizations/team_maintainers_can.md index 586a4657f5..8c68c29077 100644 --- a/data/reusables/organizations/team_maintainers_can.md +++ b/data/reusables/organizations/team_maintainers_can.md @@ -11,5 +11,5 @@ Members with team maintainer permissions can: - [Remove organization members from the team](/articles/removing-organization-members-from-a-team) - [Promote an existing team member to team maintainer](/articles/giving-team-maintainer-permissions-to-an-organization-member) - Remove the team's access to repositories{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" or currentVersion == "github-ae@latest" %} -- [Manage code review assignment for the team](/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team){% endif %}{% if currentVersion == "free-pro-team@latest" %} +- [Manage code review assignment for the team](/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team){% endif %}{% if currentVersion == "free-pro-team@latest" %} - [Manage scheduled reminders for pull requests](/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-pull-requests){% endif %} diff --git a/data/reusables/pages/org-owners-can-restrict-pages-creation.md b/data/reusables/pages/org-owners-can-restrict-pages-creation.md index fc98787aaa..26d5ca7f58 100644 --- a/data/reusables/pages/org-owners-can-restrict-pages-creation.md +++ b/data/reusables/pages/org-owners-can-restrict-pages-creation.md @@ -1,7 +1,7 @@ {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %} {% note %} -**Note:** Organization owners can restrict the publication of {% data variables.product.prodname_pages %} sites from repositories owned by the organization. For more information, see "[Managing the publication of {% data variables.product.prodname_pages %} sites](/github/setting-up-and-managing-organizations-and-teams/managing-the-publication-of-github-pages-sites-for-your-organization)." +**Note:** Organization owners can restrict the publication of {% data variables.product.prodname_pages %} sites from repositories owned by the organization. For more information, see "[Managing the publication of {% data variables.product.prodname_pages %} sites](/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization)." {% endnote %} {% endif %} \ No newline at end of file diff --git a/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md b/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md index 979cf68329..3dc1d84355 100644 --- a/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md +++ b/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md @@ -6,6 +6,6 @@ - When [LDAP Sync is enabled](/enterprise/admin/authentication/using-ldap#enabling-ldap-sync), if you remove a person 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.{% endif %} - You are responsible for ensuring that people who have lost access to a repository delete any confidential information or intellectual property. -- People with admin permissions to a private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" or currentVersion == "github-ae@latest" %} or internal{% endif %} repository can disallow forking of that repository, and organization owners can disallow forking of any private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" or currentVersion == "github-ae@latest" %} or internal{% endif %} repository in an organization. For more information, see "[Managing the forking policy for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization)" and "[Managing the forking policy for your repository](/github/administering-a-repository/managing-the-forking-policy-for-your-repository)." +- People with admin permissions to a private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" or currentVersion == "github-ae@latest" %} or internal{% endif %} repository can disallow forking of that repository, and organization owners can disallow forking of any private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" or currentVersion == "github-ae@latest" %} or internal{% endif %} repository in an organization. For more information, see "[Managing the forking policy for your organization](/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization)" and "[Managing the forking policy for your repository](/github/administering-a-repository/managing-the-forking-policy-for-your-repository)." {% endwarning %} diff --git a/data/reusables/saml/about-linked-identities.md b/data/reusables/saml/about-linked-identities.md index 4f489081c2..f879d16402 100644 --- a/data/reusables/saml/about-linked-identities.md +++ b/data/reusables/saml/about-linked-identities.md @@ -1,3 +1,3 @@ -You can view the single sign-on identity that a member has linked to their {% data variables.product.product_name %} account. When available, the entry will include SCIM data. For more information, see "[About SCIM](/github/setting-up-and-managing-organizations-and-teams/about-scim)." +You can view the single sign-on identity that a member has linked to their {% data variables.product.product_name %} account. When available, the entry will include SCIM data. For more information, see "[About SCIM](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim)." If a member links the wrong identity to their {% data variables.product.product_name %} account, you can revoke the linked identity to allow the member to try again. diff --git a/data/reusables/saml/outside-collaborators-exemption.md b/data/reusables/saml/outside-collaborators-exemption.md index f2936af1c5..598f6e88d5 100644 --- a/data/reusables/saml/outside-collaborators-exemption.md +++ b/data/reusables/saml/outside-collaborators-exemption.md @@ -1,5 +1,5 @@ {% note %} -**Note:** Outside collaborators aren't required to authenticate with an IdP to access the resources in an organization with SAML SSO. For more information on outside collaborators, see "[Permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization#outside-collaborators)." +**Note:** Outside collaborators aren't required to authenticate with an IdP to access the resources in an organization with SAML SSO. For more information on outside collaborators, see "[Permission levels for an organization](/organizations/managing-peoples-access-to-your-organization-with-roles/permission-levels-for-an-organization#outside-collaborators)." {% endnote %} diff --git a/data/reusables/sponsors/manage-updates-for-orgs.md b/data/reusables/sponsors/manage-updates-for-orgs.md index 0cd08d5382..b47ac0599d 100644 --- a/data/reusables/sponsors/manage-updates-for-orgs.md +++ b/data/reusables/sponsors/manage-updates-for-orgs.md @@ -1 +1 @@ -You can designate which email address receives updates from the accounts your organization sponsors. For more information, see "[Managing updates from accounts your organization sponsors](/github/setting-up-and-managing-organizations-and-teams/managing-updates-from-accounts-your-organization-sponsors)." +You can designate which email address receives updates from the accounts your organization sponsors. For more information, see "[Managing updates from accounts your organization sponsors](/organizations/managing-organization-settings/managing-updates-from-accounts-your-organization-sponsors)."