Skip to content

Commit 10bc5e4

Browse files
authored
Merge pull request #22620 from github/repo-sync
repo sync
2 parents 60ad453 + 954e13b commit 10bc5e4

File tree

15 files changed

+30
-22
lines changed

15 files changed

+30
-22
lines changed
-6.64 KB
Loading
7.92 KB
Loading

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,14 @@ For more information about how contributions are calculated, see "[Managing cont
2828

2929
{% note %}
3030

31-
**Notes:**
32-
- 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).
33-
34-
- 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.
31+
**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).
3532

3633
{% endnote %}
3734

3835
## Sending your enterprise contributions to your {% data variables.product.prodname_dotcom_the_website %} profile
3936

37+
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.
38+
4039
{% ifversion fpt or ghec %}
4140

4241
- 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.

content/admin/policies/enforcing-policies-for-your-enterprise/restricting-email-notifications-for-your-enterprise.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ If email restrictions are enabled for an enterprise, organization owners cannot
3636

3737
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 %}
3838

39+
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.
40+
3941
{% data reusables.enterprise-accounts.access-enterprise %}
4042
{% data reusables.enterprise-accounts.settings-tab %}
4143
{% data reusables.enterprise-accounts.verified-domains-tab %}

content/admin/policies/enforcing-policy-with-pre-receive-hooks/about-pre-receive-hooks.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ topics:
1313
- Policies
1414
- Pre-receive hooks
1515
---
16+
17+
## About pre-receive hooks
18+
1619
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.
1720

18-
## Usage scenarios
1921
Use pre-receive hooks to satisfy business rules, enforce regulatory compliance, and prevent certain common mistakes.
2022

2123
Examples of how you can use pre-receive hooks:
@@ -25,7 +27,10 @@ Examples of how you can use pre-receive hooks:
2527
- Prevent sensitive data from being added to the repository by blocking keywords, patterns or file types.
2628
- Prevent a PR author from merging their own changes.
2729

30+
{% data reusables.enterprise_site_admin_settings.pre-receive-hook-examples %}
31+
2832
## Impact on performance and workflows
33+
2934
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.
3035

3136
Pre-receive hooks can have unintended effects on the performance of {% data variables.location.product_location %} and should be carefully implemented and reviewed.

content/admin/policies/enforcing-policy-with-pre-receive-hooks/creating-a-pre-receive-hook-script.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ topics:
1515
- Pre-receive hooks
1616
shortTitle: Pre-receive hook scripts
1717
---
18-
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).
18+
19+
{% data reusables.enterprise_site_admin_settings.pre-receive-hook-examples %}
1920

2021
## Writing a pre-receive hook script
2122
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.

content/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Inviting people to manage your enterprise
3-
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.'
3+
intro: 'You can {% ifversion ghec %}invite{% else %}add{% endif %} and remove enterprise owners{% ifversion ghec %} and billing managers{% endif %} for your enterprise account.'
44
permissions: 'Enterprise owners can {% ifversion ghec %}invite other people to become{% elsif ghes %}add{% endif %} additional enterprise administrators.'
55
redirect_from:
66
- /github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise

content/billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ topics:
1212

1313
## About invoices for your enterprise
1414

15-
{% 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)."
15+
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)."
16+
17+
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)."
1618

1719
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)."
1820

content/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ shortTitle: View organization insights
1313
permissions: Organization members can view organization insights.
1414
---
1515

16-
## About organization insights
17-
18-
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.
19-
2016
{% note %}
2117

2218
**Note:** To view organization insights, your organization must use {% data variables.product.prodname_ghe_cloud %}. {% data reusables.enterprise.link-to-ghec-trial %}
2319

2420
{% endnote %}
2521

22+
## About organization insights
23+
24+
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.
25+
2626
## Viewing organization activity insights
2727

2828
{% note %}

content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/accessing-compliance-reports-for-your-organization.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@ You can access {% data variables.product.company_short %}'s compliance reports i
1717

1818
{% data reusables.security.compliance-report-list %}
1919

20+
## Accessing compliance reports for your organization
2021

2122
{% note %}
2223

2324
**Note:** To view compliance reports, your organization must use {% data variables.product.prodname_ghe_cloud %}. {% data reusables.enterprise.link-to-ghec-trial %}
2425

2526
{% endnote %}
2627

27-
## Accessing compliance reports for your organization
28-
2928
{% data reusables.profile.access_org %}
3029
{% data reusables.profile.org_settings %}
3130
{% data reusables.organizations.compliance %}

0 commit comments

Comments
 (0)