diff --git a/assets/images/help/pages/click-pages-url-to-preview.png b/assets/images/help/pages/click-pages-url-to-preview.png index 4a3b08555f8c..647ff43b5783 100644 Binary files a/assets/images/help/pages/click-pages-url-to-preview.png and b/assets/images/help/pages/click-pages-url-to-preview.png differ diff --git a/assets/images/help/pages/click-private-pages-url-to-preview.png b/assets/images/help/pages/click-private-pages-url-to-preview.png index 29110612ca78..189baee752b0 100644 Binary files a/assets/images/help/pages/click-private-pages-url-to-preview.png and b/assets/images/help/pages/click-private-pages-url-to-preview.png differ diff --git a/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/sending-enterprise-contributions-to-your-githubcom-profile.md b/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/sending-enterprise-contributions-to-your-githubcom-profile.md index 6cf184cad033..98d2a2d097d9 100644 --- a/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/sending-enterprise-contributions-to-your-githubcom-profile.md +++ b/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/sending-enterprise-contributions-to-your-githubcom-profile.md @@ -28,15 +28,14 @@ For more information about how contributions are calculated, see "[Managing cont {% note %} -**Notes:** -- The connection between your accounts is governed by [GitHub's Privacy Statement](/free-pro-team@latest/github/site-policy/github-privacy-statement/) and users enabling the connection agree to the [GitHub's Terms of Service](/free-pro-team@latest/github/site-policy/github-terms-of-service). - -- Before you can connect your {% ifversion fpt or ghec %}{% data variables.product.prodname_enterprise %}{% else %}{% data variables.product.product_name %}{% endif %} profile to your {% data variables.product.prodname_dotcom_the_website %} profile, your enterprise owner must enable {% data variables.product.prodname_github_connect %} and enable contribution sharing between the environments. For more information, contact your enterprise owner. +**Note:** The connection between your accounts is governed by [GitHub's Privacy Statement](/free-pro-team@latest/github/site-policy/github-privacy-statement/) and users enabling the connection must agree to the [GitHub Terms of Service](/free-pro-team@latest/github/site-policy/github-terms-of-service). {% endnote %} ## Sending your enterprise contributions to your {% data variables.product.prodname_dotcom_the_website %} profile +Before you can connect your {% ifversion fpt or ghec %}{% data variables.product.prodname_enterprise %}{% else %}{% data variables.product.product_name %}{% endif %} profile to your {% data variables.product.prodname_dotcom_the_website %} profile, your enterprise owner must enable {% data variables.product.prodname_github_connect %} and enable contribution sharing between the environments. For more information, contact your enterprise owner. + {% ifversion fpt or ghec %} - To send enterprise contributions from {% data variables.product.prodname_ghe_server %} to your {% data variables.product.prodname_dotcom_the_website %} profile, see "[Sending enterprise contributions to your {% data variables.product.prodname_dotcom_the_website %} profile](/enterprise-server/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/sending-enterprise-contributions-to-your-githubcom-profile)" in the {% data variables.product.prodname_ghe_server %} documentation. diff --git a/content/admin/policies/enforcing-policies-for-your-enterprise/restricting-email-notifications-for-your-enterprise.md b/content/admin/policies/enforcing-policies-for-your-enterprise/restricting-email-notifications-for-your-enterprise.md index 4d5b6738f361..459417492676 100644 --- a/content/admin/policies/enforcing-policies-for-your-enterprise/restricting-email-notifications-for-your-enterprise.md +++ b/content/admin/policies/enforcing-policies-for-your-enterprise/restricting-email-notifications-for-your-enterprise.md @@ -36,6 +36,8 @@ If email restrictions are enabled for an enterprise, organization owners cannot Before you can restrict email notifications for your enterprise, you must verify or approve at least one domain for the enterprise. {% ifversion ghec %} For more information, see "[Verifying or approving a domain for your enterprise](/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise)."{% endif %} +Users will not be notified when you enable email restrictions. It is your responsibility to inform users that, in the future, they will only receive email notifications related to your enterprise if they've added an email address belonging to a verified or approved domain to their account settings. + {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.verified-domains-tab %} diff --git a/content/admin/policies/enforcing-policy-with-pre-receive-hooks/about-pre-receive-hooks.md b/content/admin/policies/enforcing-policy-with-pre-receive-hooks/about-pre-receive-hooks.md index d72c609a0d66..8317b5e9276f 100644 --- a/content/admin/policies/enforcing-policy-with-pre-receive-hooks/about-pre-receive-hooks.md +++ b/content/admin/policies/enforcing-policy-with-pre-receive-hooks/about-pre-receive-hooks.md @@ -13,9 +13,11 @@ topics: - Policies - Pre-receive hooks --- + +## About pre-receive hooks + When a push occurs, each script runs in an isolated environment and can perform checks on the content of the push. The scripts will cause the push to be accepted if the exit status is 0, or rejected if the exit status is non-zero. -## Usage scenarios Use pre-receive hooks to satisfy business rules, enforce regulatory compliance, and prevent certain common mistakes. Examples of how you can use pre-receive hooks: @@ -25,7 +27,10 @@ Examples of how you can use pre-receive hooks: - Prevent sensitive data from being added to the repository by blocking keywords, patterns or file types. - Prevent a PR author from merging their own changes. +{% data reusables.enterprise_site_admin_settings.pre-receive-hook-examples %} + ## Impact on performance and workflows + Impact to developers and their workflows can be significant and must be considered carefully. Pre-receive hooks that are based on business needs and implemented thoughtfully will provide the most benefit to the organization as a whole. Pre-receive hooks can have unintended effects on the performance of {% data variables.location.product_location %} and should be carefully implemented and reviewed. diff --git a/content/admin/policies/enforcing-policy-with-pre-receive-hooks/creating-a-pre-receive-hook-script.md b/content/admin/policies/enforcing-policy-with-pre-receive-hooks/creating-a-pre-receive-hook-script.md index 90a486650333..f321f1d97e6c 100644 --- a/content/admin/policies/enforcing-policy-with-pre-receive-hooks/creating-a-pre-receive-hook-script.md +++ b/content/admin/policies/enforcing-policy-with-pre-receive-hooks/creating-a-pre-receive-hook-script.md @@ -15,7 +15,8 @@ topics: - Pre-receive hooks shortTitle: Pre-receive hook scripts --- -You can see examples of pre-receive hooks for {% data variables.product.prodname_ghe_server %} in the [`github/platform-samples` repository](https://github.com/github/platform-samples/tree/master/pre-receive-hooks). + +{% data reusables.enterprise_site_admin_settings.pre-receive-hook-examples %} ## Writing a pre-receive hook script A pre-receive hook script executes in a pre-receive hook environment on {% data variables.location.product_location %}. When you create a pre-receive hook script, consider the available input, output, exit status, and environment variables. diff --git a/content/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md b/content/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md index a2fc87e410a5..20dd5135831c 100644 --- a/content/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md +++ b/content/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md @@ -1,6 +1,6 @@ --- title: Inviting people to manage your enterprise -intro: 'You can {% ifversion ghec %}invite people to become enterprise owners or billing managers for{% elsif ghes %}add enterprise owners to{% endif %} your enterprise account. You can also remove enterprise owners {% ifversion ghec %}or billing managers {% endif %}who no longer need access to the enterprise account.' +intro: 'You can {% ifversion ghec %}invite{% else %}add{% endif %} and remove enterprise owners{% ifversion ghec %} and billing managers{% endif %} for your enterprise account.' permissions: 'Enterprise owners can {% ifversion ghec %}invite other people to become{% elsif ghes %}add{% endif %} additional enterprise administrators.' redirect_from: - /github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise diff --git a/content/billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise.md b/content/billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise.md index a48523abbd0e..bcd0e668b5a0 100644 --- a/content/billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise.md +++ b/content/billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise.md @@ -12,7 +12,9 @@ topics: ## About invoices for your enterprise -{% data reusables.billing.about-invoices-for-enterprises %} For more information, see "[About billing for your enterprise](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)." +For invoiced {% data variables.product.prodname_enterprise %} customers, {% data variables.product.company_short %} bills through an enterprise account on {% data variables.product.prodname_dotcom_the_website %}. Each invoice includes a single bill charge for all of your paid {% data variables.product.prodname_dotcom_the_website %} services and any {% data variables.product.prodname_ghe_server %} instances. For more information, see "[About billing for your enterprise](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)." + +Only invoiced customers can view invoices on {% data variables.product.prodname_dotcom %}. If you pay automatically via credit card or PayPal, you can view receipts and payment history instead. For more information, see "[Viewing your payment history and receipts](/billing/managing-your-github-billing-settings/viewing-your-payment-history-and-receipts)." For more information about viewing the subscription and usage for your enterprise account, see "[Viewing the subscription and usage for your enterprise account](/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)." diff --git a/content/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization.md b/content/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization.md index 7cb2d4729ecf..9a337595d97b 100644 --- a/content/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization.md +++ b/content/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization.md @@ -13,16 +13,16 @@ shortTitle: View organization insights permissions: Organization members can view organization insights. --- -## About organization insights - -You can use organization activity insights to help you better understand how members of your organization are using {% data variables.product.product_name %} to collaborate and work on code. Dependency insights can help you track, report, and act on your organization's open source usage. - {% note %} **Note:** To view organization insights, your organization must use {% data variables.product.prodname_ghe_cloud %}. {% data reusables.enterprise.link-to-ghec-trial %} {% endnote %} +## About organization insights + +You can use organization activity insights to help you better understand how members of your organization are using {% data variables.product.product_name %} to collaborate and work on code. Dependency insights can help you track, report, and act on your organization's open source usage. + ## Viewing organization activity insights {% note %} diff --git a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/accessing-compliance-reports-for-your-organization.md b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/accessing-compliance-reports-for-your-organization.md index 93e9e813c983..58e594cbce26 100644 --- a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/accessing-compliance-reports-for-your-organization.md +++ b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/accessing-compliance-reports-for-your-organization.md @@ -17,6 +17,7 @@ You can access {% data variables.product.company_short %}'s compliance reports i {% data reusables.security.compliance-report-list %} +## Accessing compliance reports for your organization {% note %} @@ -24,8 +25,6 @@ You can access {% data variables.product.company_short %}'s compliance reports i {% endnote %} -## Accessing compliance reports for your organization - {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} {% data reusables.organizations.compliance %} diff --git a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/restricting-email-notifications-for-your-organization.md b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/restricting-email-notifications-for-your-organization.md index 17d74b6e6e0e..a4df1e3f1c83 100644 --- a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/restricting-email-notifications-for-your-organization.md +++ b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/restricting-email-notifications-for-your-organization.md @@ -40,9 +40,9 @@ If your organization is owned by an enterprise account, organization members wil ## Restricting email notifications -Before you can restrict email notifications for your organization, you must verify or approve at least one domain for the organization, or an enterprise owner must have verified or approved at least one domain for the enterprise account. +Before you can restrict email notifications for your organization, you must verify or approve at least one domain for the organization, or an enterprise owner must have verified or approved at least one domain for the enterprise account. For more information about verifying and approving domains for an organization, see "[Verifying or approving a domain for your organization](/organizations/managing-organization-settings/verifying-or-approving-a-domain-for-your-organization)." -For more information about verifying and approving domains for an organization, see "[Verifying or approving a domain for your organization](/organizations/managing-organization-settings/verifying-or-approving-a-domain-for-your-organization)." +Users will not be notified when you enable email restrictions. It is your responsibility to inform users that, in the future, they will only receive email notifications related to your organization if they've added an email address belonging to a verified or approved domain to their account settings. {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} diff --git a/content/pages/getting-started-with-github-pages/changing-the-visibility-of-your-github-pages-site.md b/content/pages/getting-started-with-github-pages/changing-the-visibility-of-your-github-pages-site.md index a6bfddb0d8f1..1dbd8c822b6a 100644 --- a/content/pages/getting-started-with-github-pages/changing-the-visibility-of-your-github-pages-site.md +++ b/content/pages/getting-started-with-github-pages/changing-the-visibility-of-your-github-pages-site.md @@ -11,7 +11,7 @@ shortTitle: Change visibility of site ## About access control for {% data variables.product.prodname_pages %} sites -With access control for {% data variables.product.prodname_pages %}, you can restrict access to your project site by publishing the site privately. A privately published site can only be accessed by people with read access to the repository the site is published from. You can use privately published sites to share your internal documentation or knowledge base with members of your enterprise. +With access control for {% data variables.product.prodname_pages %}, you can restrict access to your project site by publishing the site privately. A privately published site can only be accessed by people with read access to the repository the site is published from. You can use privately published sites to share your internal documentation or knowledge base with members of your enterprise. {% data reusables.pages.privately-publish-ghec-only %} @@ -39,8 +39,8 @@ To use a shorter and more memorable domain for your privately published site, yo {% data reusables.pages.sidebar-pages %} 3. Under "{% data variables.product.prodname_pages %}", select the **{% data variables.product.prodname_pages %} visibility** drop-down menu, then click a visibility. ![Drop-down to choose a visibility for your site](/assets/images/help/pages/public-or-private-visibility.png) -4. To see your published site, under "{% data variables.product.prodname_pages %}", click your site's URL. -![URL of your privately published site](/assets/images/help/pages/click-private-pages-url-to-preview.png) +4. To see your published site, under "{% data variables.product.prodname_pages %}", click **{% octicon "link-external" aria-label="The external link icon" %} Visit site**. + ![Screenshot of the "Visit site" button next to the URL of a privately published site](/assets/images/help/pages/click-private-pages-url-to-preview.png) {% note %} diff --git a/data/reusables/billing/about-invoices-for-enterprises.md b/data/reusables/billing/about-invoices-for-enterprises.md deleted file mode 100644 index 87b56d3b141f..000000000000 --- a/data/reusables/billing/about-invoices-for-enterprises.md +++ /dev/null @@ -1 +0,0 @@ -For invoiced {% data variables.product.prodname_enterprise %} customers, {% data variables.product.company_short %} bills through an enterprise account on {% data variables.product.prodname_dotcom_the_website %}. Each invoice includes a single bill charge for all of your paid {% data variables.product.prodname_dotcom_the_website %} services and any {% data variables.product.prodname_ghe_server %} instances. diff --git a/data/reusables/enterprise_site_admin_settings/pre-receive-hook-examples.md b/data/reusables/enterprise_site_admin_settings/pre-receive-hook-examples.md new file mode 100644 index 000000000000..4f44c4190103 --- /dev/null +++ b/data/reusables/enterprise_site_admin_settings/pre-receive-hook-examples.md @@ -0,0 +1 @@ +You can see examples of pre-receive hooks for {% data variables.product.prodname_ghe_server %} in the [`github/platform-samples` repository](https://github.com/github/platform-samples/tree/master/pre-receive-hooks). diff --git a/data/reusables/pages/visit-site.md b/data/reusables/pages/visit-site.md index 1e94e6817b3e..892197631970 100644 --- a/data/reusables/pages/visit-site.md +++ b/data/reusables/pages/visit-site.md @@ -1,5 +1,5 @@ -1. To see your published site, under "{% data variables.product.prodname_pages %}", click your site's URL. -![URL of your published site](/assets/images/help/pages/click-pages-url-to-preview.png) +1. To see your published site, under "{% data variables.product.prodname_pages %}", click **{% octicon "link-external" aria-label="The external link icon" %} Visit site**. +![Screenshot of the "Visit site" button next to the URL of a published site](/assets/images/help/pages/click-pages-url-to-preview.png) {% note %}