Skip to content

Commit 95ec665

Browse files
authored
Merge pull request #27372 from github/repo-sync
Repo sync
2 parents 4a28bb7 + 2e0e81b commit 95ec665

File tree

8 files changed

+31
-3
lines changed

8 files changed

+31
-3
lines changed

content/admin/administering-your-instance/command-line-utilities.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -962,6 +962,7 @@ ghe-repl-start
962962
This utility displays the status of replication on a node, returning an `OK`, `WARNING` or `CRITICAL` status for each datastore's replication stream. For more information, see "[AUTOTITLE](/admin/enterprise-management/configuring-high-availability/monitoring-a-high-availability-configuration)."
963963
964964
- If any of the replication channels are in a `WARNING` state, the command will exit with code `1`.
965+
- If you have not started replication, the command will exit with code `1`.
965966
- If any of the channels are in a `CRITICAL` state, the command will exit with code `2`.
966967
- The output conforms to the expectations of Nagios' check_by_ssh plugin. For more information, see the [check_by_ssh plugin](https://nagios-plugins.org/doc/man/check_by_ssh.html) on the official Nagios plugins page.
967968

content/admin/configuration/hardening-security-for-your-enterprise/restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ To ensure seamless use of the OIDC CAP while still applying the policy to OAuth
7373
{% data reusables.identity-and-permissions.about-adding-ip-allow-list-entries %}
7474

7575
{% data reusables.identity-and-permissions.ipv6-allow-lists %}
76+
{% data reusables.identity-and-permissions.ip-address-add-or-remove-caching %}
7677

7778
{% data reusables.enterprise-accounts.access-enterprise %}
7879
{% data reusables.enterprise-accounts.settings-tab %}
@@ -110,6 +111,8 @@ To ensure seamless use of the OIDC CAP while still applying the policy to OAuth
110111

111112
### Deleting an allowed IP address
112113

114+
{% data reusables.identity-and-permissions.ip-address-add-or-remove-caching %}
115+
113116
{% data reusables.enterprise-accounts.access-enterprise %}
114117
{% data reusables.enterprise-accounts.settings-tab %}
115118
{% data reusables.enterprise-accounts.security-tab %}
@@ -184,6 +187,8 @@ To ensure seamless use of the OIDC CAP while still applying the policy to OAuth
184187

185188
## Deleting an allowed IP address
186189

190+
{% data reusables.identity-and-permissions.ip-address-add-or-remove-caching %}
191+
187192
{% data reusables.enterprise-accounts.access-enterprise %}
188193
{% data reusables.enterprise-accounts.settings-tab %}
189194
{% data reusables.enterprise-accounts.security-tab %}

content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/exporting-membership-information-for-your-enterprise.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,15 @@ You can export aggregated information about your enterprise's members as a membe
1717

1818
The membership information report includes the following information.
1919

20+
{% note %}
21+
22+
**Note:** You can only export the datetime of the user's last activity at the organization level. For more information, see "[AUTOTITLE](/organizations/managing-membership-in-your-organization/exporting-member-information-for-your-organization#about-export-of-membership-information)."
23+
24+
{% endnote %}
25+
2026
- Username and display name details
2127
- Whether the user has two-factor authentication enabled {% ifversion mandatory-2fa-required-overview %}or is required to enable it{% endif %}
2228
- Whether the user is an organization owner or member
23-
- Datetime of the user's last activity (for a full list of relevant activity, see "[AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users)")
2429
- Organizations with pending invitations
2530
- Optionally, additional information that depends on the enterprise's configuration:
2631
- The user's email addresses for a verified domain

content/apps/maintaining-github-apps/managing-allowed-ip-addresses-for-a-github-app.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ When an organization has an allow list, third-party applications that connect vi
2626
## Adding an IP address allow list to a {% data variables.product.prodname_github_app %} registration
2727

2828
{% data reusables.identity-and-permissions.ipv6-allow-lists %}
29+
{% data reusables.identity-and-permissions.ip-address-add-or-remove-caching %}
2930

3031
{% data reusables.apps.settings-step %}
3132
{% data reusables.user-settings.developer_settings %}

content/billing/managing-your-github-billing-settings/redeeming-a-coupon.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ redirect_from:
1010
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/redeeming-a-coupon
1111
versions:
1212
fpt: '*'
13-
ghec: '*'
1413
type: how_to
1514
topics:
1615
- Discounts
@@ -22,7 +21,13 @@ topics:
2221

2322
{% data reusables.dotcom_billing.coupon-expires %}
2423

25-
You cannot apply coupons to paid plans for {% data variables.product.prodname_marketplace %} apps.
24+
{% note %}
25+
26+
**Notes:**
27+
- You cannot apply coupons to paid plans for {% data variables.product.prodname_marketplace %} apps.
28+
- You cannot use coupons to pay for {% data variables.product.prodname_ghe_cloud %}. For more information, see "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise#about-billing-for-your-enterprise)."
29+
30+
{% endnote %}
2631

2732
## Redeeming a coupon for your personal account
2833

content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ You can also configure allowed IP addresses at the enterprise account level, and
4444
{% data reusables.identity-and-permissions.about-adding-ip-allow-list-entries %}
4545

4646
{% data reusables.identity-and-permissions.ipv6-allow-lists %}
47+
{% data reusables.identity-and-permissions.ip-address-add-or-remove-caching %}
4748

4849
{% data reusables.profile.access_org %}
4950
{% data reusables.profile.org_settings %}
@@ -103,6 +104,8 @@ For more information about how to create an allow list for a {% data variables.p
103104

104105
## Deleting an allowed IP address
105106

107+
{% data reusables.identity-and-permissions.ip-address-add-or-remove-caching %}
108+
106109
{% data reusables.profile.access_org %}
107110
{% data reusables.profile.org_settings %}
108111
{% data reusables.organizations.security %}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{% note %}
2+
3+
**Note:** Due to caching, adding or removing IP addresses can take a few minutes to fully take effect.
4+
5+
{% endnote %}

src/redirects/lib/static/redirect-exceptions.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,6 @@
3737

3838
/github-ae@latest/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-advanced-setup-for-code-scanning
3939
- /github-ae@latest/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning-for-a-repository
40+
41+
/billing/managing-your-github-billing-settings/redeeming-a-coupon
42+
- /enterprise-cloud@latest/billing/managing-your-github-billing-settings/redeeming-a-coupon

0 commit comments

Comments
 (0)