diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 710d011e4ae0..4b2241b81c84 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -100,7 +100,7 @@ Use our "[Self review checklist](https://docs.github.com/en/contributing/collabo - [Link PR to issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) if applicable - Enable [maintainer edits](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork) -A Docs team member will review following our [standard review process](https://docs.github.com/en/contributing). +A Technical Content team member will review following our [standard review process](https://docs.github.com/en/contributing). ### Your PR is merged! diff --git a/content/admin/concepts/enterprise-best-practices/organize-work.md b/content/admin/concepts/enterprise-best-practices/organize-work.md index 9136aba3368d..c7625310d5cf 100644 --- a/content/admin/concepts/enterprise-best-practices/organize-work.md +++ b/content/admin/concepts/enterprise-best-practices/organize-work.md @@ -12,7 +12,7 @@ redirect_from: - /admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/best-practices-for-structuring-organizations-in-your-enterprise - /admin/concepts/best-practices-for-enterprises - /admin/concepts/best-practices - - /enterprise-onboarding/setting-up-organizations-and-teams/best-practices-for-organizations-in-your-enterprise + - /enterprise-onboarding/setting-up-organizations-and-teams/best-practices-for-organizations-in-your-enterprise - /enterprise-onboarding/setting-up-organizations-and-teams/best-practices allowTitleToDifferFromFilename: true category: @@ -60,11 +60,3 @@ We recommend collaborating in organization-owned repositories whenever possible Innersource makes it easy for all employees to discover and reuse work. This allows development teams to learn from each other and avoid duplicating effort to recreate common services. For guidance on setting up effective innersource practices, see [AUTOTITLE](/admin/concepts/enterprise-best-practices/use-innersource). - -{% ifversion ghec %} - -## Next steps - -Learn how to set up your enterprise according to best practices in our [AUTOTITLE](/enterprise-cloud@latest/enterprise-onboarding) journey for {% data variables.product.prodname_ghe_cloud %}. - -{% endif %} diff --git a/content/admin/concepts/enterprise-best-practices/use-innersource.md b/content/admin/concepts/enterprise-best-practices/use-innersource.md index 93470ed98edb..0592f8d190fb 100644 --- a/content/admin/concepts/enterprise-best-practices/use-innersource.md +++ b/content/admin/concepts/enterprise-best-practices/use-innersource.md @@ -65,7 +65,3 @@ Specifically, you may want to hide internal repositories from an external collab Outside collaborators (called **repository collaborators** if you use {% data variables.product.prodname_emus %}) only have access to a specific repository. These users are not full organization members, so they do not receive the base level of access for the organization, and they cannot automatically see internal repositories in the enterprise unless they are a member of another organization. For more information, see {% ifversion ghec %}[AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/enabling-guest-collaborators) and{% endif %} [AUTOTITLE](/organizations/managing-user-access-to-your-organizations-repositories/managing-outside-collaborators/adding-outside-collaborators-to-repositories-in-your-organization). - -## Next steps - -Now that you've set up organizations and teams, learn how to stay compliant and secure by setting up governance policies for your users and repositories. See [AUTOTITLE](/admin/concepts/security-and-compliance/enterprise-policies). diff --git a/content/admin/concepts/enterprise-fundamentals/automations-in-your-enterprise.md b/content/admin/concepts/enterprise-fundamentals/automations-in-your-enterprise.md index a7b16eda1cf6..f62d3c83a040 100644 --- a/content/admin/concepts/enterprise-fundamentals/automations-in-your-enterprise.md +++ b/content/admin/concepts/enterprise-fundamentals/automations-in-your-enterprise.md @@ -130,7 +130,3 @@ Use **{% data variables.product.prodname_github_apps %} and {% data variables.pr * A {% data variables.product.prodname_github_app %} needs to trigger a workflow * External logic orchestrates in-repo execution * Enterprise-wide policies or workflows require both identity and runtime - -## Next steps - -Learn how to design and manage {% data variables.product.prodname_github_apps %} at the enterprise level in [AUTOTITLE](/admin/managing-github-apps-for-your-enterprise/creating-github-apps-for-your-enterprise). diff --git a/content/admin/concepts/enterprise-fundamentals/choose-an-enterprise-type.md b/content/admin/concepts/enterprise-fundamentals/choose-an-enterprise-type.md index 4d3508de106d..efe4ab3d7062 100644 --- a/content/admin/concepts/enterprise-fundamentals/choose-an-enterprise-type.md +++ b/content/admin/concepts/enterprise-fundamentals/choose-an-enterprise-type.md @@ -88,7 +88,3 @@ For a managed user to collaborate outside your enterprise, they must also mainta If you already have an enterprise that uses personal accounts on {% data variables.product.prodname_dotcom_the_website %}, adoption of {% data variables.product.prodname_emus %} requires **migration to a new enterprise account**. To discuss this process, contact [{% data variables.product.prodname_dotcom %}'s Sales team](https://enterprise.github.com/contact). The migration process may require time or cost from your team. Confirm that this migration process is acceptable to your business and your users. If not, an enterprise with personal accounts may be the better choice. - -## Next steps - -When you have chosen an enterprise type, you're ready to create an enterprise account by starting a trial. See [AUTOTITLE](/admin/overview/setting-up-a-trial-of-github-enterprise-cloud). diff --git a/content/admin/concepts/enterprise-fundamentals/roles-in-an-enterprise.md b/content/admin/concepts/enterprise-fundamentals/roles-in-an-enterprise.md index 521307212d67..daea04b8d6bc 100644 --- a/content/admin/concepts/enterprise-fundamentals/roles-in-an-enterprise.md +++ b/content/admin/concepts/enterprise-fundamentals/roles-in-an-enterprise.md @@ -38,7 +38,3 @@ To follow the principle of least privilege access, we recommend using custom rol Enterprise owners can create custom enterprise roles and assign enterprise roles to users and teams. They can also create custom organization roles to be used across organizations, but these roles can only be assigned by organization owners. Organization owners can grant organization roles and create custom organization roles, but cannot edit roles or change role assignments that are defined at the enterprise level. - -## Next steps - -Now that you understand roles, plan which roles will be required for your teams to do their jobs on {% data variables.product.github %}. See [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-roles-in-your-enterprise/identify-role-requirements). diff --git a/content/admin/concepts/enterprise-fundamentals/teams-in-an-enterprise.md b/content/admin/concepts/enterprise-fundamentals/teams-in-an-enterprise.md index 8bd8c54c7179..fd5029dc296c 100644 --- a/content/admin/concepts/enterprise-fundamentals/teams-in-an-enterprise.md +++ b/content/admin/concepts/enterprise-fundamentals/teams-in-an-enterprise.md @@ -83,9 +83,3 @@ However, unlike organization teams, enterprise teams currently do **not** suppor {% data reusables.enterprise.enterprise-teams-limits %} For more information about the capabilities of organization teams, see [AUTOTITLE](/organizations/organizing-members-into-teams/about-teams). - -## Next steps - -If your needs are covered by enterprise teams, create a team. See [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/create-enterprise-teams). - -If you need to create an organization team, an organization owner must do this from the organization settings. See [AUTOTITLE](/organizations/organizing-members-into-teams/creating-a-team). diff --git a/content/admin/enterprise-onboarding.md b/content/admin/enterprise-onboarding.md new file mode 100644 index 000000000000..337dd457f0fc --- /dev/null +++ b/content/admin/enterprise-onboarding.md @@ -0,0 +1,55 @@ +--- +title: Enterprise onboarding +intro: Onboard your company to {% data variables.product.prodname_ghe_cloud %} by following our recommended plan. You will set up teams with the access they need, create a policy framework to ensure compliance, and automate processes securely throughout your enterprise. +layout: journey-landing +journeyTracks: + - id: getting_started + title: Getting started with your enterprise + description: Master the fundamentals of {% data variables.product.prodname_ghe_cloud %} and get started with a trial. + guides: + - href: /admin/concepts/enterprise-fundamentals/choose-an-enterprise-type + - href: /admin/overview/setting-up-a-trial-of-github-enterprise-cloud + - href: /admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/add-users + - href: /billing/concepts/enterprise-billing/billing-for-enterprises + - href: /migrations/overview/planning-your-migration-to-github + - id: setting_up_organizations_and_teams + title: Setting up organizations and teams in your enterprise + description: Organize work effectively and ensure people have the access they need to resources and administrative settings. + guides: + - href: /admin/concepts/enterprise-best-practices/organize-work + - href: /admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise + - href: /admin/concepts/enterprise-fundamentals/roles-in-an-enterprise + - href: /admin/managing-accounts-and-repositories/managing-roles-in-your-enterprise/identify-role-requirements + - href: /admin/managing-accounts-and-repositories/managing-roles-in-your-enterprise/create-custom-roles + - href: /admin/concepts/enterprise-fundamentals/teams-in-an-enterprise + - href: /admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/create-enterprise-teams + - href: /admin/managing-accounts-and-repositories/managing-roles-in-your-enterprise/assign-roles + - href: /admin/concepts/enterprise-best-practices/use-innersource + - id: govern_people_and_repositories + title: Governing people and repositories + description: Implement policies, custom properties, and rulesets to govern users and repositories across your enterprise. + guides: + - href: /admin/concepts/security-and-compliance/enterprise-policies + - href: /admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/managing-custom-properties-for-repositories-in-your-enterprise + - href: /admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/governing-how-people-use-repositories-in-your-enterprise + - href: /admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-governance + - href: /admin/concepts/security-and-compliance/audit-log-for-an-enterprise + - id: github_apps + title: Automating processes with GitHub Apps + description: Create and install apps to automate processes securely in your enterprise and organizations. + guides: + - href: /admin/concepts/enterprise-fundamentals/automations-in-your-enterprise + - href: /admin/managing-github-apps-for-your-enterprise/creating-github-apps-for-your-enterprise + - href: /apps/using-github-apps/installing-a-github-app-on-your-enterprise +versions: + ghec: '*' +redirect_from: + - /enterprise-onboarding/feature-enhancements + - /enterprise-onboarding/getting-started-with-your-enterprise + - /enterprise-onboarding/govern-people-and-repositories + - /enterprise-onboarding +docsTeamMetrics: + - enterprise-onboarding +contentType: other +--- + diff --git a/content/admin/index.md b/content/admin/index.md index 51694b753448..c19dd05d92dc 100644 --- a/content/admin/index.md +++ b/content/admin/index.md @@ -91,6 +91,7 @@ versions: ghec: '*' ghes: '*' children: + - /enterprise-onboarding - /overview - /concepts - /data-residency diff --git a/content/admin/managing-accounts-and-repositories/managing-roles-in-your-enterprise/create-custom-roles.md b/content/admin/managing-accounts-and-repositories/managing-roles-in-your-enterprise/create-custom-roles.md index 4abeb67722a9..4621d3d6bfe7 100644 --- a/content/admin/managing-accounts-and-repositories/managing-roles-in-your-enterprise/create-custom-roles.md +++ b/content/admin/managing-accounts-and-repositories/managing-roles-in-your-enterprise/create-custom-roles.md @@ -42,11 +42,3 @@ Enterprise owners can create and edit custom organization roles, but cannot assi 1. In the left sidebar, select **Organization roles**. 1. Click **Create custom role**. 1. Enter the details, then click **Create role**. - -{% ifversion enterprise-teams %} - -## Next steps - -You can manage role assignments at scale using teams. Learn about teams in your enterprise and organizations in [AUTOTITLE](/admin/concepts/enterprise-fundamentals/teams-in-an-enterprise). - -{% endif %} diff --git a/content/admin/managing-accounts-and-repositories/managing-roles-in-your-enterprise/identify-role-requirements.md b/content/admin/managing-accounts-and-repositories/managing-roles-in-your-enterprise/identify-role-requirements.md index e773b746c2be..a420b8cc431e 100644 --- a/content/admin/managing-accounts-and-repositories/managing-roles-in-your-enterprise/identify-role-requirements.md +++ b/content/admin/managing-accounts-and-repositories/managing-roles-in-your-enterprise/identify-role-requirements.md @@ -85,7 +85,3 @@ Another way to delegate frequent, time-consuming tasks is to assign work to {% d For more information, see [AUTOTITLE](/copilot/how-tos/administer-copilot/manage-for-enterprise/manage-agents/prepare-for-custom-agents). {% endif %} - -## Next steps - -Now that you've planned which roles will help your teams be productive and secure on GitHub, create custom roles for the permissions you need. Later, you will create teams to manage role assignments at scale. See [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-roles-in-your-enterprise/create-custom-roles). diff --git a/content/admin/managing-your-enterprise-account/creating-an-enterprise-account.md b/content/admin/managing-your-enterprise-account/creating-an-enterprise-account.md index 23d2dd5f55ec..77e7e8ced15b 100644 --- a/content/admin/managing-your-enterprise-account/creating-an-enterprise-account.md +++ b/content/admin/managing-your-enterprise-account/creating-an-enterprise-account.md @@ -35,10 +35,12 @@ You'll **need help** creating an enterprise account if you require: * {% data variables.product.prodname_ghe_server %} * {% data variables.enterprise.data_residency %} * Invoicing -* A dedicated enterprise for managing {% data variables.copilot.copilot_for_business %} licenses without adopting {% data variables.product.prodname_enterprise %} In these cases, contact {% data variables.contact.contact_enterprise_sales %}. +> [!NOTE] +> {% data variables.product.company_short %} no longer provisions separate "dedicated" enterprise accounts for managing {% data variables.copilot.copilot_for_business %} licenses without adopting {% data variables.product.prodname_enterprise %}. In any enterprise account, you can assign {% data variables.copilot.copilot_for_business %} licenses directly to members who don't belong to an organization, and those members don't consume a {% data variables.product.prodname_enterprise %} license. See [AUTOTITLE](/copilot/how-tos/copilot-on-github/set-up-copilot/enable-copilot/set-up-a-dedicated-enterprise-for-copilot-business). + ## What will happen after I upgrade my organization? The following changes also apply to single organizations that are automatically upgraded to an enterprise account. For details, see [{% data variables.product.prodname_blog %}](https://github.blog/changelog/2024-06-19-upcoming-automatic-upgrade-to-the-enterprise-account-experience/). diff --git a/content/admin/overview/setting-up-a-trial-of-github-enterprise-cloud.md b/content/admin/overview/setting-up-a-trial-of-github-enterprise-cloud.md index be675aceddbf..c8a7076164fe 100644 --- a/content/admin/overview/setting-up-a-trial-of-github-enterprise-cloud.md +++ b/content/admin/overview/setting-up-a-trial-of-github-enterprise-cloud.md @@ -33,6 +33,10 @@ The trial lasts for **{% data reusables.enterprise.ghec-trial-length %} days** a * {% data variables.product.prodname_GH_cs_and_sp %} ({% data variables.product.prodname_dotcom_the_website %} trials only) * Up to 3,000 minutes of standard {% data variables.product.prodname_dotcom %}-hosted runners. +The 50,000 monthly {% data variables.product.prodname_actions %} minutes included with a paid {% data variables.product.prodname_ghe_cloud %} plan do not apply during the trial. The trial includes up to 3,000 minutes of standard {% data variables.product.prodname_dotcom %}-hosted runners. If your trial uses {% data variables.product.prodname_emus %}, you must link an Azure subscription to exceed this limit. If your trial doesn't use {% data variables.product.prodname_emus %}, linking an Azure subscription immediately ends the trial and begins paid usage. For more information, see [AUTOTITLE](/billing/reference/azure-subscription). + +Usage of available AI-powered features consumes {% data variables.product.prodname_ai_credits_short %}. For more information, see [AUTOTITLE](/copilot/concepts/billing/usage-based-billing-for-organizations-and-enterprises). + ## Features not included in the trial * {% data variables.product.prodname_github_codespaces %} diff --git a/content/code-security/tutorials/trialing-github-advanced-security/trial-advanced-security.md b/content/code-security/tutorials/trialing-github-advanced-security/trial-advanced-security.md index 45e9a5e0f883..e81df157fe92 100644 --- a/content/code-security/tutorials/trialing-github-advanced-security/trial-advanced-security.md +++ b/content/code-security/tutorials/trialing-github-advanced-security/trial-advanced-security.md @@ -41,6 +41,18 @@ To set up a trial of {% data variables.product.prodname_GHAS %} using this metho During a trial of {% data variables.product.prodname_GHAS %}, you can add any number of committers and enable {% data variables.product.prodname_GH_cs_and_sp %} for any number of organizations. +## Billing during your trial + +During the trial, you do not pay license fees for {% data variables.product.prodname_GHAS %}. + +{% ifversion fpt or ghec %} + +Usage-based billing continues for features that consume {% data variables.product.prodname_actions %} minutes or {% data variables.product.prodname_ai_credits_short %}. + +For private repositories, minutes used by {% data variables.product.prodname_GHAS %} workflows that run on standard {% data variables.product.prodname_dotcom %}-hosted runners, including code scanning workflows, count toward the 50,000 minutes included each month with your {% data variables.product.prodname_ghe_cloud %} plan. Workflows in public repositories or on self-hosted runners do not consume included minutes. {% data variables.actions.hosted_runners %} are billed separately. Usage beyond the included amount is billed at the standard rate. For more information, see [AUTOTITLE](/billing/reference/product-usage-included). + +{% endif %} + ## Finishing your trial You can finish your trial at any time by purchasing licenses for {% data variables.product.prodname_GH_cs_or_sp %}. If you haven't made a purchase by the end of the 30 days, your trial will expire. diff --git a/content/contributing/collaborating-on-github-docs/using-the-todocs-placeholder-to-leave-notes.md b/content/contributing/collaborating-on-github-docs/using-the-todocs-placeholder-to-leave-notes.md index 0a3760c2acd1..737a37ac5636 100644 --- a/content/contributing/collaborating-on-github-docs/using-the-todocs-placeholder-to-leave-notes.md +++ b/content/contributing/collaborating-on-github-docs/using-the-todocs-placeholder-to-leave-notes.md @@ -13,7 +13,7 @@ category: ## Using the TODOCS placeholder -Sometimes technical writers use placeholders while writing documentation to remind themselves to come back to something later. It's a useful technique, but there's always the possibility that the placeholder will be overlooked and slip into production. At that point, the only way the Docs team will find out about it is if someone sees it and reports it. +Sometimes technical writers use placeholders while writing documentation to remind themselves to come back to something later. It's a useful technique, but there's always the possibility that the placeholder will be overlooked and slip into production. At that point, the only way the Technical Content team will find out about it is if someone sees it and reports it. To prevent slips, use the string `TODOCS` as your placeholder. The Docs test suite includes a [linting test](https://github.com/github/docs/tree/main/src/content-linter) that will fail if it finds this string anywhere in a Markdown or YAML file. diff --git a/content/contributing/writing-for-github-docs/creating-diagrams-for-github-docs.md b/content/contributing/writing-for-github-docs/creating-diagrams-for-github-docs.md index 6ccfe8e99e24..03277df02b25 100644 --- a/content/contributing/writing-for-github-docs/creating-diagrams-for-github-docs.md +++ b/content/contributing/writing-for-github-docs/creating-diagrams-for-github-docs.md @@ -231,7 +231,7 @@ If a diagram is only relevant to some versions and apt to become quickly out of Diagrams are stored in the relevant directory in the `assets/images/help/` directory in the `docs` repository. If you are creating a new diagram, add it to the proper folder. If you are updating an existing diagram, replace the existing diagram with the updated version. -When you create a new diagram, add it to the Diagrams project in the Docs Figma team or provide a copy of the Figma file to a member of the Docs team. If you create a diagram in another program, it can be included in {% data variables.product.prodname_docs %} if it meets the requirements and recommendations in this guide, but it is much more likely to be removed rather than updated if it becomes out of date. +When you create a new diagram, add it to the Diagrams project in the Docs Figma team or provide a copy of the Figma file to a member of the Technical Content team. If you create a diagram in another program, it can be included in {% data variables.product.prodname_docs %} if it meets the requirements and recommendations in this guide, but it is much more likely to be removed rather than updated if it becomes out of date. ## Examples diff --git a/content/contributing/writing-for-github-docs/making-content-findable-in-search.md b/content/contributing/writing-for-github-docs/making-content-findable-in-search.md index 55d68ed21901..ab16f4a06752 100644 --- a/content/contributing/writing-for-github-docs/making-content-findable-in-search.md +++ b/content/contributing/writing-for-github-docs/making-content-findable-in-search.md @@ -48,7 +48,7 @@ Follow guidance in [AUTOTITLE](/contributing/writing-for-github-docs/best-practi Incorporate keywords, or top search terms used by your audience, into page copy and metadata. For example, if you are writing about "billing" but your audience primarily uses "cost" and "payment," use those terms instead. -Google and Bing both offer keyword research tools to help you discover relevant keywords. The Docs team also consults Google Search Console data to understand what search terms lead to pages on {% data variables.product.prodname_docs %}. +Google and Bing both offer keyword research tools to help you discover relevant keywords. The Technical Content team also consults Google Search Console data to understand what search terms lead to pages on {% data variables.product.prodname_docs %}. ### Include metadata diff --git a/content/copilot/concepts/about-enterprise-accounts-for-copilot-business.md b/content/copilot/concepts/about-enterprise-accounts-for-copilot-business.md index 2d26b4a87748..91032e198c1d 100644 --- a/content/copilot/concepts/about-enterprise-accounts-for-copilot-business.md +++ b/content/copilot/concepts/about-enterprise-accounts-for-copilot-business.md @@ -1,6 +1,6 @@ --- title: About enterprise accounts for Copilot Business -intro: 'Learn about the option to create an enterprise account to manage only {% data variables.copilot.copilot_business_short %} licenses without adopting {% data variables.product.prodname_enterprise %}.' +intro: 'An enterprise account lets you manage only {% data variables.copilot.copilot_business_short %} licenses, without consuming {% data variables.product.prodname_ghe_cloud %} licenses.' versions: feature: copilot shortTitle: Copilot-only enterprises @@ -29,6 +29,13 @@ To use {% data variables.product.prodname_copilot %}, a user must authenticate t If you don't already manage users through an organization or enterprise, you can create an enterprise account specifically for allocating {% data variables.copilot.copilot_business_short %} licenses. This gives you access to enterprise-grade integrations with identity providers for authentication and provisioning, without needing to pay for {% data variables.product.prodname_enterprise %} licenses. +You don't need a special type of enterprise account to do this. In any enterprise account, members who don't belong to an organization don't usually consume a {% data variables.product.prodname_ghe_cloud %} license, but they can be added to enterprise teams and be assigned a {% data variables.product.prodname_copilot_short %} license directly from the enterprise. See [AUTOTITLE](/enterprise-cloud@latest/admin/managing-accounts-and-repositories/managing-roles-in-your-enterprise/abilities-of-roles#unaffiliated-users). + +This means that in an enterprise with no organizations, you are only billed for {% data variables.copilot.copilot_business_short %}. As soon as a user joins an organization, that user consumes a {% data variables.product.prodname_ghe_cloud %} license. If your enterprise already contains an organization, its members are already consuming licenses, even if you don't add anyone else. See [AUTOTITLE](/billing/reference/github-license-users#organizations-on-github-enterprise-cloud). + +> [!NOTE] +> {% data variables.product.company_short %} no longer provisions a special kind of enterprise account for {% data variables.copilot.copilot_business_short %}. You can achieve the same result yourself in a standard enterprise account without organizations. + ## How will I manage access for users? When you create your enterprise account, you will choose whether your enterprise members will authenticate using their personal {% data variables.product.company_short %} accounts, or using new accounts that you will create and manage from an external identity management system. The way that you add users to your enterprise and manage license assignment will depend on which you choose. diff --git a/content/copilot/how-tos/copilot-on-github/set-up-copilot/enable-copilot/set-up-a-dedicated-enterprise-for-copilot-business.md b/content/copilot/how-tos/copilot-on-github/set-up-copilot/enable-copilot/set-up-a-dedicated-enterprise-for-copilot-business.md index 5a6ee5d57d4c..3e75591c5602 100644 --- a/content/copilot/how-tos/copilot-on-github/set-up-copilot/enable-copilot/set-up-a-dedicated-enterprise-for-copilot-business.md +++ b/content/copilot/how-tos/copilot-on-github/set-up-copilot/enable-copilot/set-up-a-dedicated-enterprise-for-copilot-business.md @@ -1,6 +1,6 @@ --- -title: Setting up a dedicated enterprise for GitHub Copilot Business -intro: 'Create an enterprise account for managing {% data variables.copilot.copilot_business_short %} licenses without adopting {% data variables.product.prodname_enterprise %}.' +title: Setting up an enterprise for GitHub Copilot Business only +intro: 'Use an enterprise account to manage {% data variables.copilot.copilot_business_short %} licenses without consuming {% data variables.product.prodname_ghe_cloud %} licenses.' allowTitleToDifferFromFilename: true redirect_from: - /admin/copilot-business-only/setting-up-a-dedicated-enterprise-for-copilot-business-personal-accounts @@ -12,39 +12,31 @@ versions: audience: - driver contentType: how-tos -shortTitle: Set up a dedicated enterprise +shortTitle: 'Set up {% data variables.copilot.copilot_business_short %} only' category: - Configure Copilot - Manage Copilot for a team --- -With a dedicated enterprise account, you get enterprise-grade identity provider integrations for authentication and provisioning without paying for {% data variables.product.prodname_enterprise %} licenses. See [AUTOTITLE](/copilot/concepts/about-enterprise-accounts-for-copilot-business). +Before you begin, see [AUTOTITLE](/copilot/concepts/about-enterprise-accounts-for-copilot-business) to understand how to use a standard enterprise account for {% data variables.copilot.copilot_business_short %} without consuming {% data variables.product.prodname_ghe_cloud %} licenses. ## Create an enterprise account -To create an enterprise account, contact {% data variables.product.company_short %}'s [sales team](https://github.com/enterprise/contact?ref_product=copilot&ref_type=purchase&ref_style=text). They will provision you with a standard enterprise account with {% data variables.product.prodname_copilot_short %} enabled. +If you don't have an enterprise account yet, contact {% data variables.product.company_short %}'s [sales team](https://github.com/enterprise/contact?ref_product=copilot&ref_type=purchase&ref_style=text). They will provision you with a standard enterprise account with {% data variables.product.prodname_copilot_short %} enabled. +If you already have an enterprise account, you can use it to assign {% data variables.copilot.copilot_business_short %} licenses. Continue to the next section. ## Add users to your enterprise -Once you have an enterprise account, add the people who will receive {% data variables.copilot.copilot_business_short %} licenses. How you add users depends on your enterprise type. -Once you have an enterprise account, add the people who will receive {% data variables.copilot.copilot_business_short %} licenses. How you add users depends on your enterprise type. +Once you have an enterprise account, add the people who will receive {% data variables.copilot.copilot_business_short %} licenses. How you add users depends on your enterprise type: invite personal accounts directly to the enterprise, or provision {% data variables.enterprise.prodname_managed_users %} from your identity provider (IdP) through SCIM. For detailed steps, see [AUTOTITLE](/enterprise-cloud@latest/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/add-users). -Do not create any organizations during setup. Adding users to organizations assigns {% data variables.product.prodname_enterprise %} licenses, while adding users directly to the enterprise keeps your setup limited to {% data variables.copilot.copilot_business_short %}. -### Enterprise with personal accounts +Add users **directly to the enterprise** so that they remain unaffiliated. Adding users to an organization assigns {% data variables.product.prodname_enterprise %} licenses, while adding users directly to the enterprise keeps your setup limited to {% data variables.copilot.copilot_business_short %}. -Invite users directly to your enterprise. For detailed steps, see [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/invite-users-directly). +Provisioned managed users appear automatically in your enterprise's **People** list. You can then assign {% data variables.copilot.copilot_business_short %} licenses directly to these users or to enterprise teams synced with your IdP. -### Enterprise with managed users +## Create enterprise teams (optional) -If your enterprise uses {% data variables.product.prodname_emus %}, provision user accounts from your identity provider (IdP) through SCIM. -For setup and provisioning guidance, see [AUTOTITLE](/admin/managing-iam/understanding-iam-for-enterprises/getting-started-with-enterprise-managed-users). - -Provisioned users appear automatically in your enterprise's **People** list. You can then assign {% data variables.copilot.copilot_business_short %} licenses directly to these users or to enterprise teams synced with your IdP. - -## Create teams (optional) - -Group users to scale license assignment by creating enterprise teams. See [AUTOTITLE](/enterprise-cloud@latest/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/create-enterprise-teams). +Group users to scale license assignment by creating enterprise teams. Unaffiliated users can be members of enterprise teams, so you can assign {% data variables.copilot.copilot_business_short %} licenses to a whole team without creating an organization. See [AUTOTITLE](/enterprise-cloud@latest/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/create-enterprise-teams). ## Convert your trial to a paid enterprise account @@ -66,10 +58,42 @@ For detailed steps, see [AUTOTITLE](/copilot/how-tos/administer-copilot/manage-f After you assign licenses, you can centrally govern how members use {% data variables.product.prodname_copilot_short %}: * **Policies**. Control feature availability with policies in AI Controls. -* **Enterprise managed settings**. Distribute client governance and extensibility configuration from a centrally defined source. You can apply permission seetings like disabling bypass mode, restrict plugins, and set the default model for new conversations to {% data variables.copilot.copilot_cli_short %} and {% data variables.product.prodname_vscode_shortname %}. See [AUTOTITLE](/copilot/how-tos/administer-copilot/manage-for-enterprise/manage-agents/configure-enterprise-managed-settings). +* **Enterprise managed settings**. Distribute client governance and extensibility configuration from a centrally defined source. For example, you can disable bypass mode, restrict plugins, and set the default model for new conversations. See [AUTOTITLE](/copilot/how-tos/administer-copilot/manage-for-enterprise/manage-agents/configure-enterprise-managed-settings). To use server-managed settings, you need an organization and a `.github-private` repository, which requires a {% data variables.product.prodname_enterprise %} license for the user who creates them. Alternatively, you can deploy managed settings through MDM or a file-based deployment without creating an organization. +## If your enterprise already contains an organization + +If you only need {% data variables.copilot.copilot_business_short %}, but your enterprise already contains an organization, you are consuming {% data variables.product.prodname_ghe_cloud %} licenses and will be billed for them. + +### Step 1: Check your unaffiliated users policy + +If your enterprise uses personal accounts and the unaffiliated users policy is set to remove users, people who no longer have access to any organizations will be removed from the enterprise and lose all privileges and licenses granted from the enterprise, including {% data variables.product.prodname_copilot_short %} licenses. Enterprise owners and billing managers are not affected by this policy. Before you remove any organizations, make sure this policy is set to **Remain in the enterprise**. See [AUTOTITLE](/enterprise-cloud@latest/admin/enforcing-policies/enforcing-policies-for-your-enterprise/control-offboarding). + +### Step 2: Remove the organization + +> [!IMPORTANT] +> Before taking action, make sure you review the effects of removing or deleting an organization in the linked documentation. + +* If your enterprise uses personal accounts, remove the organization from your enterprise. See [AUTOTITLE](/enterprise-cloud@latest/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/removing-organizations-from-your-enterprise). +* If you use {% data variables.product.prodname_emus %}, you can delete the organization. See [AUTOTITLE](/organizations/managing-organization-settings/deleting-an-organization-account). + +If removal or deletion is not an option, you can reduce license consumption by removing most of the organization's members. However, at least one organization owner will need to remain, and some non-members may continue consuming a license. See [AUTOTITLE](/billing/reference/github-license-users#organizations-on-github-enterprise-cloud). + +### Step 3: Confirm your members are unaffiliated + +On your enterprise's **People** page, confirm that the people who need {% data variables.copilot.copilot_business_short %} are still in the enterprise and are now listed as unaffiliated users, and that they still hold their {% data variables.product.prodname_copilot_short %} licenses. + +### Step 4: Update your license count + +Depending on how you are billed, reducing license consumption may not reduce your bill on its own. + +* **Usage-based license billing**: no action needed. You are billed for the licenses you consume. To monitor spending, you can set budgets and alerts. See [AUTOTITLE](/billing/how-tos/set-up-budgets). +* **Volume license billing**: you must reduce your paid license count yourself. See [AUTOTITLE](/billing/how-tos/manage-plan-and-licenses/manage-user-licenses#self-serve-customers-with-volume-licenses). +* **Invoiced billing**: contact your account manager in {% data variables.contact.contact_enterprise_sales %}. + +If you have already been charged for {% data variables.product.prodname_ghe_cloud %} licenses that you did not intend to use, contact {% data variables.contact.contact_support %}. + ## Next steps Help your developers start using {% data variables.product.prodname_copilot_short %} and measure its impact. See [AUTOTITLE](/copilot/tutorials/roll-out-at-scale/enable-developers/drive-adoption). diff --git a/content/copilot/reference/enterprise-administrators/enterprise-managed-settings.md b/content/copilot/reference/enterprise-administrators/enterprise-managed-settings.md index 85e1612e408e..c38a8f497b1c 100644 --- a/content/copilot/reference/enterprise-administrators/enterprise-managed-settings.md +++ b/content/copilot/reference/enterprise-administrators/enterprise-managed-settings.md @@ -32,7 +32,7 @@ In {% data variables.copilot.copilot_cli_short %}, the `sandbox` key is an excep | Key | Purpose | {% data variables.copilot.copilot_cli_short %} | {% data variables.product.prodname_vscode_shortname %} | {% data variables.copilot.github_copilot_app %} | {% data variables.copilot.copilot_cloud_agent %} | {% data variables.product.prodname_jetbrains_ides %} | | --- | --- | --- | --- | --- | --- | --- | | `permissions.disableBypassPermissionsMode` | Disables bypass or YOLO-style allow-all behavior | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | -| `model` | Sets auto model selection as the default for new conversations | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | +| `permissions.model` | Sets auto model selection as the default for new conversations | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | | `enabledPlugins` | Enables or disables specific plugins by key | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | | `extraKnownMarketplaces` | Adds plugin marketplaces that users can access | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | | `strictKnownMarketplaces` | Restricts plugin installation to explicitly listed marketplaces | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | @@ -48,7 +48,7 @@ In {% data variables.copilot.copilot_cli_short %}, the `sandbox` key is an excep For server-managed deployments, the enterprise can apply different governance to groups of users based on their enterprise team membership. The enterprise defines all settings—team membership only determines which users receive a given set of values. -To make a key eligible for team-specific values, mark it as overridable in `{% data variables.copilot.managed_setting_file %}` using the `{ "overridable": }` syntax. An overridable key uses the team's value when set, or falls back to your enterprise default when the team leaves it unset. The `{ "overridable": }` syntax applies to the `model`, `permissions.disableBypassPermissionsMode`, `allowedMcpServers`, and `deniedMcpServers` keys. Keys not marked overridable remain an enterprise-level decision that teams can't modify. +To make a key eligible for team-specific values, mark it as overridable in `{% data variables.copilot.managed_setting_file %}` using the `{ "overridable": }` syntax. An overridable key uses the team's value when set, or falls back to your enterprise default when the team leaves it unset. The `{ "overridable": }` syntax applies to the `permissions.model`, `permissions.disableBypassPermissionsMode`, `allowedMcpServers`, and `deniedMcpServers` keys. Keys not marked overridable remain an enterprise-level decision that teams can't modify. `enabledPlugins` and `extraKnownMarketplaces` work additively. The enterprise `{% data variables.copilot.managed_setting_file %}` sets a baseline, and an enterprise team file can add more plugins and marketplaces on top of it. For the full setup steps, see [AUTOTITLE](/copilot/how-tos/administer-copilot/manage-for-enterprise/manage-agents/configure-enterprise-managed-settings#overriding-settings-for-specific-teams). @@ -58,9 +58,9 @@ The following example shows these keys in one managed settings file. ```json { - "model": "auto", "permissions": { - "disableBypassPermissionsMode": "disable" + "disableBypassPermissionsMode": "disable", + "model": "auto" }, "enabledPlugins": { "my-plugin@agent-skills": true @@ -148,13 +148,6 @@ Restricts plugin installation to only the marketplaces explicitly defined by the * `"hostPattern"` — requires `hostPattern` (regex matching marketplace hosts) * `"pathPattern"` — requires `pathPattern` (regex matching marketplace paths) -## model - -Sets auto model selection as the default for new conversations. See [AUTOTITLE](/copilot/concepts/models/auto-model-selection). - -* When you set `model` to `"auto"`, new sessions use Auto model unless the user specifies a different model on a per-conversation basis. -* This key is overridable by enterprise team mapping. In your `{% data variables.copilot.managed_setting_file %}`, use the `{ "overridable": "auto" }` syntax to specialize the key's configuration on a per-team basis. You can then set `"model": "unmanaged"` in a team settings file, providing a specialization that takes precedence over `{% data variables.copilot.managed_setting_file %}` for members of the subject team. - ## permissions ### disableBypassPermissionsMode @@ -168,6 +161,13 @@ When you set `disableBypassPermissionsMode` to `"disable"`, users cannot turn on * In the {% data variables.copilot.github_copilot_app %}, the "Allow all" setting for "Tool Permissions" is blocked in the sessions settings. * This key is overridable by enterprise team mapping. In your `{% data variables.copilot.managed_setting_file %}`, use the `{ "overridable": "disable" }` syntax to specialize the key's configuration on a per-team basis. You can then set `"disableBypassPermissionsMode": "unmanaged"` in a team settings file, providing a specialization that takes precedence over `{% data variables.copilot.managed_setting_file %}` for members of the subject team. +### model + +Sets auto model selection as the default for new conversations. See [AUTOTITLE](/copilot/concepts/models/auto-model-selection). + +* When you set `permissions.model` to `"auto"`, new sessions use Auto model unless the user specifies a different model on a per-conversation basis. +* This key is overridable by enterprise team mapping. In your `{% data variables.copilot.managed_setting_file %}`, use the `{ "overridable": "auto" }` syntax to specialize the key's configuration on a per-team basis. You can then set `"model": "unmanaged"` in a team settings file, providing a specialization that takes precedence over `{% data variables.copilot.managed_setting_file %}` for members of the subject team. + ## telemetry Configures OpenTelemetry export, routing {% data variables.product.prodname_copilot_short %} usage data to a collector of your choice. diff --git a/content/enterprise-onboarding/index.md b/content/enterprise-onboarding/index.md deleted file mode 100644 index 7a64917b6156..000000000000 --- a/content/enterprise-onboarding/index.md +++ /dev/null @@ -1,53 +0,0 @@ ---- -title: Enterprise onboarding -intro: 'Onboard your company to {% data variables.product.prodname_ghe_cloud %} by following our recommended plan. You will set up teams with the access they need, create a policy framework to ensure compliance, and automate processes securely throughout your enterprise.' -layout: journey-landing -journeyTracks: - - id: 'getting_started' - title: 'Getting started with your enterprise' - description: 'Master the fundamentals of {% data variables.product.prodname_ghe_cloud %} and get started with a trial.' - guides: - - href: '/admin/concepts/enterprise-fundamentals/choose-an-enterprise-type' - - href: '/admin/overview/setting-up-a-trial-of-github-enterprise-cloud' - - href: '/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/add-users' - - href: '/billing/concepts/enterprise-billing/billing-for-enterprises' - - href: '/migrations/overview/planning-your-migration-to-github' - - id: 'setting_up_organizations_and_teams' - title: 'Setting up organizations and teams in your enterprise' - description: 'Organize work effectively and ensure people have the access they need to resources and administrative settings.' - guides: - - href: '/admin/concepts/enterprise-best-practices/organize-work' - - href: '/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise' - - href: '/admin/concepts/enterprise-fundamentals/roles-in-an-enterprise' - - href: '/admin/managing-accounts-and-repositories/managing-roles-in-your-enterprise/identify-role-requirements' - - href: '/admin/managing-accounts-and-repositories/managing-roles-in-your-enterprise/create-custom-roles' - - href: '/admin/concepts/enterprise-fundamentals/teams-in-an-enterprise' - - href: '/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/create-enterprise-teams' - - href: '/admin/managing-accounts-and-repositories/managing-roles-in-your-enterprise/assign-roles' - - href: '/admin/concepts/enterprise-best-practices/use-innersource' - - id: 'govern_people_and_repositories' - title: 'Governing people and repositories' - description: 'Implement policies, custom properties, and rulesets to govern users and repositories across your enterprise.' - guides: - - href: '/admin/concepts/security-and-compliance/enterprise-policies' - - href: '/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/managing-custom-properties-for-repositories-in-your-enterprise' - - href: '/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/governing-how-people-use-repositories-in-your-enterprise' - - href: '/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-governance' - - href: '/admin/concepts/security-and-compliance/audit-log-for-an-enterprise' - - id: 'github_apps' - title: 'Automating processes with GitHub Apps' - description: 'Create and install apps to automate processes securely in your enterprise and organizations.' - guides: - - href: '/admin/concepts/enterprise-fundamentals/automations-in-your-enterprise' - - href: '/admin/managing-github-apps-for-your-enterprise/creating-github-apps-for-your-enterprise' - - href: '/apps/using-github-apps/installing-a-github-app-on-your-enterprise' -versions: - ghec: '*' -children: [] -redirect_from: - - /enterprise-onboarding/feature-enhancements - - /enterprise-onboarding/getting-started-with-your-enterprise - - /enterprise-onboarding/govern-people-and-repositories -docsTeamMetrics: - - enterprise-onboarding ---- diff --git a/content/index.md b/content/index.md index 36ea43f772ac..e79ba7d9a201 100644 --- a/content/index.md +++ b/content/index.md @@ -52,7 +52,6 @@ versions: children: - search - get-started - - enterprise-onboarding - account-and-profile - subscriptions-and-notifications - authentication @@ -148,7 +147,7 @@ childGroups: children: - organizations - code-security/how-tos/secure-at-scale - - enterprise-onboarding + - admin/enterprise-onboarding - admin - name: Developers octicon: CodeSquareIcon diff --git a/content/site-policy/privacy-policies/github-subprocessors.md b/content/site-policy/privacy-policies/github-subprocessors.md index 98df637f9250..a18c9ac215da 100644 --- a/content/site-policy/privacy-policies/github-subprocessors.md +++ b/content/site-policy/privacy-policies/github-subprocessors.md @@ -30,6 +30,7 @@ If you have questions about this list, please contact us at | Anthropic PBC | AI Inference and AI Services | United States | United States | | Cerebras Systems Inc. | AI Inference and AI Services | United States | United States | | Cloudflare | Content delivery service | United States | United States | +| DataDome Solutions, Inc. | Security management | United States, France | United States | | Elasticsearch, Inc. | Cloud Hosted Infrastructure | United States | United States | | Fastly | Content delivery service | United States | United States | | Fireworks AI | AI Inference and AI Services | United States, Germany, Iceland | United States | diff --git a/contributing/types-of-contributions.md b/contributing/types-of-contributions.md index 1d3ae178741f..d2d6e721aa88 100644 --- a/contributing/types-of-contributions.md +++ b/contributing/types-of-contributions.md @@ -1,5 +1,5 @@ # Types of contributions :memo: -You can contribute to the GitHub Docs content and site in several ways. This repo is a place to discuss and collaborate on docs.github.com! Our small, but mighty :muscle: docs team is maintaining this repo; to preserve our bandwidth, off topic conversations will be closed. +You can contribute to the GitHub Docs content and site in several ways. This repo is a place to discuss and collaborate on docs.github.com! Our small, but mighty :muscle: Technical Content team is maintaining this repo; to preserve our bandwidth, off topic conversations will be closed. ### :lady_beetle: Issues [Issues](https://docs.github.com/en/github/managing-your-work-on-github/about-issues) are used to track tasks that contributors can help with. If an issue has a triage label, we haven't reviewed it yet, and you shouldn't begin work on it. diff --git a/data/ui.yml b/data/ui.yml index 49c99e15e9ca..7b4565bf4036 100644 --- a/data/ui.yml +++ b/data/ui.yml @@ -56,7 +56,7 @@ search: no_results_found: No results found no_results_found_announcement: 'Search Docs: No results found' search_docs_with_query: Search docs for "{{query}}" - privacy_disclaimer: For product and service improvement purposes, the GitHub Docs team will retain questions and answers generated in the Docs search function. Please see the GitHub Privacy Statement to review how GitHub collects and uses your data. + privacy_disclaimer: For product and service improvement purposes, GitHub will retain questions and answers generated in the Docs search function. Please see the GitHub Privacy Statement to review how GitHub collects and uses your data. ai: disclaimer: Copilot uses AI. Check for mistakes. references: Copilot Sources diff --git a/src/fixtures/fixtures/data/ui.yml b/src/fixtures/fixtures/data/ui.yml index 49c99e15e9ca..7b4565bf4036 100644 --- a/src/fixtures/fixtures/data/ui.yml +++ b/src/fixtures/fixtures/data/ui.yml @@ -56,7 +56,7 @@ search: no_results_found: No results found no_results_found_announcement: 'Search Docs: No results found' search_docs_with_query: Search docs for "{{query}}" - privacy_disclaimer: For product and service improvement purposes, the GitHub Docs team will retain questions and answers generated in the Docs search function. Please see the GitHub Privacy Statement to review how GitHub collects and uses your data. + privacy_disclaimer: For product and service improvement purposes, GitHub will retain questions and answers generated in the Docs search function. Please see the GitHub Privacy Statement to review how GitHub collects and uses your data. ai: disclaimer: Copilot uses AI. Check for mistakes. references: Copilot Sources