Skip to content

Commit 551d31c

Browse files
authored
Merge pull request #37959 from github/repo-sync
Repo sync
2 parents a42a389 + 0af4954 commit 551d31c

File tree

104 files changed

+217
-524
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+217
-524
lines changed

content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ For example, on your "Notification settings" page:
8989

9090
{% else %}
9191

92-
If you do not enable watching or participating notifications for web{% ifversion ghes %} and mobile{% endif %}, then your notifications inbox will not have any updates.{% endif %}
92+
If you do not enable watching or participating notifications for web and mobile, then your notifications inbox will not have any updates.{% endif %}
9393

9494
## Customizing your email notifications
9595

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/viewing-peoples-roles-in-an-organization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ You can also view whether an enterprise owner has a specific role in the organiz
4747
| Enterprise owner | Organization owner | Able to configure organization settings and manage access to the organization's resources through teams, etc. |
4848
| Enterprise owner | Organization member | Able to access organization resources and content, such as repositories, without access to the organization's settings. |
4949

50-
To review all roles in an organization, see [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization). {% ifversion ghec or ghes %} An organization member can also have a custom role for a specific repository. For more information, see [AUTOTITLE](/organizations/managing-user-access-to-your-organizations-repositories/managing-repository-roles/managing-custom-repository-roles-for-an-organization).{% endif %}
50+
To review all roles in an organization, see [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization). An organization member can also have a custom role for a specific repository. For more information, see [AUTOTITLE](/organizations/managing-user-access-to-your-organizations-repositories/managing-repository-roles/managing-custom-repository-roles-for-an-organization).
5151

5252
For more information about the enterprise owner role, see [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise#enterprise-owner).
5353

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/best-practices-for-leaving-your-company.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Before you leave your company, make sure you update the following information in
2727

2828
If you've been working with repositories that belong to an organization, you'll want to [remove yourself as a member of the organization](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/removing-yourself-from-an-organization). Note that if you are the organization owner, you should first [transfer ownership of the organization](/organizations/managing-organization-settings/transferring-organization-ownership) to another person.
2929

30-
Unless you're using a {% data variables.enterprise.prodname_managed_user %}, you'll still be able to access your personal account, even after leaving the organization. For more information about {% data variables.product.prodname_emus %}, see [About {% data variables.product.prodname_emus %}]({% ifversion not ghec %}/enterprise-cloud@latest{% endif %}/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-enterprise-managed-users){% ifversion not ghec %} in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}
30+
Unless you're using a {% data variables.enterprise.prodname_managed_user %}, you'll still be able to access your personal account, even after leaving the organization. For more information about {% data variables.product.prodname_emus %}, see [About {% data variables.product.prodname_emus %}]({% ifversion fpt %}/enterprise-cloud@latest{% endif %}/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-enterprise-managed-users){% ifversion fpt %} in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}
3131

3232
## Removing professional associations with personal repositories
3333

content/actions/hosting-your-own-runners/managing-self-hosted-runners/adding-self-hosted-runners.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,8 @@ For more information, see [AUTOTITLE](/actions/hosting-your-own-runners/managing
7676
{% ifversion ghec or ghes %}
7777
New runners are assigned to the default group. You can modify the runner's group after you've registered the runner. For more information, see [AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/managing-access-to-self-hosted-runners-using-groups#moving-a-self-hosted-runner-to-a-group).
7878

79-
{% ifversion ghec or ghes %}
80-
8179
To add a self-hosted runner to an enterprise, you must be an enterprise owner. For information about how to add a self-hosted runner with the REST API, see the enterprise endpoints in the [{% data variables.product.prodname_actions %} REST API](/rest/actions/self-hosted-runners).
8280

83-
{% endif %}
84-
8581
{% data reusables.actions.self-hosted-runner-add-to-enterprise %}
8682

8783
{% data reusables.actions.self-hosted-runner-check-installation-success %}

content/actions/hosting-your-own-runners/managing-self-hosted-runners/communicating-with-self-hosted-runners.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ If you use an IP address allow list for your {% data variables.product.prodname_
5252

5353
{% else %}
5454

55-
{% ifversion ghes %}Self-hosted runners do not require any external internet access in order to function. As a result, you can use network routing to direct communication between the self-hosted runner and {% data variables.product.prodname_ghe_server %}. For example, you can assign a private IP address to your self-hosted runner and configure routing to send traffic to {% data variables.product.prodname_ghe_server %}, with no need for traffic to traverse a public network.{% endif %}
55+
Self-hosted runners do not require any external internet access in order to function. As a result, you can use network routing to direct communication between the self-hosted runner and {% data variables.product.prodname_ghe_server %}. For example, you can assign a private IP address to your self-hosted runner and configure routing to send traffic to {% data variables.product.prodname_ghe_server %}, with no need for traffic to traverse a public network.
5656

5757
{% endif %}
5858

content/actions/hosting-your-own-runners/managing-self-hosted-runners/managing-access-to-self-hosted-runners-using-groups.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,8 @@ type: tutorial
3030

3131
## Creating a self-hosted runner group for an enterprise
3232

33-
{%- ifversion ghec or ghes %}
34-
3533
{% data reusables.actions.self-hosted-runner-security-admonition %}
3634

37-
{%- endif %}
38-
3935
{% data reusables.actions.creating-a-runner-group-for-an-enterprise %}
4036

4137
{% endif %}

content/actions/hosting-your-own-runners/managing-self-hosted-runners/removing-self-hosted-runners.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,11 @@ If you use {% data variables.product.prodname_ghe_cloud %}, you can also remove
6868
To remove a self-hosted runner from an enterprise, you must be an enterprise owner. We recommend that you also have access to the self-hosted runner machine. For information about how to remove a self-hosted runner with the REST API, see the enterprise endpoints in the [{% data variables.product.prodname_actions %} REST API](/rest/actions/self-hosted-runners).
6969

7070
{% data reusables.actions.self-hosted-runner-reusing %}
71-
{% ifversion ghec or ghes %}
7271
{% data reusables.enterprise-accounts.access-enterprise %}
7372
{% data reusables.enterprise-accounts.policies-tab %}
7473
{% data reusables.enterprise-accounts.actions-tab %}
7574
{% data reusables.enterprise-accounts.actions-runners-tab %}
7675
{% data reusables.actions.settings-sidebar-actions-runner-selection %}
7776
{% data reusables.actions.self-hosted-runner-removing-a-runner-updated %}
78-
{% endif %}
77+
7978
{% endif %}

content/actions/use-cases-and-examples/publishing-packages/publishing-docker-images.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ Each time you create a new release on {% data variables.product.github %}, you c
139139
In the example workflow below, we use the Docker `login-action`{% ifversion fpt or ghec %}, `metadata-action`,{% endif %} and `build-push-action` actions to build the Docker image, and if the build succeeds, push the built image to {% data variables.product.prodname_registry %}.
140140

141141
The `login-action` options required for {% data variables.product.prodname_registry %} are:
142-
* `registry`: Must be set to {% ifversion fpt or ghec %}`ghcr.io`{% elsif ghes %}`{% data reusables.package_registry.container-registry-hostname %}`{% else %}`docker.pkg.github.com`{% endif %}.
142+
* `registry`: Must be set to {% ifversion fpt or ghec %}`ghcr.io`{% elsif ghes %}`{% data reusables.package_registry.container-registry-hostname %}`{% endif %}.
143143
* `username`: You can use the {% raw %}`${{ github.actor }}`{% endraw %} context to automatically use the username of the user that triggered the workflow run. For more information, see [AUTOTITLE](/actions/learn-github-actions/contexts#github-context).
144144
* `password`: You can use the automatically-generated `GITHUB_TOKEN` secret for the password. For more information, see [AUTOTITLE](/actions/security-guides/automatic-token-authentication).
145145

@@ -153,11 +153,10 @@ The `build-push-action` options required for {% data variables.product.prodname_
153153
* `context`: Defines the build's context as the set of files located in the specified path.{% endif %}
154154
* `push`: If set to `true`, the image will be pushed to the registry if it is built successfully.{% ifversion fpt or ghec %}
155155
* `tags` and `labels`: These are populated by output from `metadata-action`.{% else %}
156-
* `tags`: Must be set in the format {% ifversion ghes %}`{% data reusables.package_registry.container-registry-hostname %}/OWNER/REPOSITORY/IMAGE_NAME:VERSION`.
156+
* `tags`: Must be set in the format `{% data reusables.package_registry.container-registry-hostname %}/OWNER/REPOSITORY/IMAGE_NAME:VERSION`.
157157

158-
For example, for an image named `octo-image` stored on {% data variables.product.prodname_ghe_server %} at `https://HOSTNAME/octo-org/octo-repo`, the `tags` option should be set to `{% data reusables.package_registry.container-registry-hostname %}/octo-org/octo-repo/octo-image:latest`{% else %}`docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION`.
159-
160-
For example, for an image named `octo-image` stored on {% data variables.product.prodname_dotcom %} at `http://github.com/octo-org/octo-repo`, the `tags` option should be set to `docker.pkg.github.com/octo-org/octo-repo/octo-image:latest`{% endif %}. You can set a single tag as shown below, or specify multiple tags in a list.{% endif %}
158+
For example, for an image named `octo-image` stored on {% data variables.product.prodname_ghe_server %} at `https://HOSTNAME/octo-org/octo-repo`, the `tags` option should be set to `{% data reusables.package_registry.container-registry-hostname %}/octo-org/octo-repo/octo-image:latest`
159+
. You can set a single tag as shown below, or specify multiple tags in a list.{% endif %}
161160

162161
{% data reusables.package_registry.publish-docker-image %}
163162

@@ -206,7 +205,7 @@ jobs:
206205
- name: Log in to the Container registry
207206
uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
208207
with:
209-
registry: {% ifversion fpt or ghec %}ghcr.io{% elsif ghes %}{% data reusables.package_registry.container-registry-hostname %}{% else %}docker.pkg.github.com{% endif %}
208+
registry: {% ifversion fpt or ghec %}ghcr.io{% elsif ghes %}{% data reusables.package_registry.container-registry-hostname %}{% endif %}
210209
username: {% raw %}${{ github.actor }}{% endraw %}
211210
password: {% raw %}${{ secrets.GITHUB_TOKEN }}{% endraw %}
212211

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ $ ghe-config app.github.rate-limiting-exempt-users "hubot github-actions[bot]"
134134

135135
### ghe-config-apply
136136

137-
This utility applies {% data variables.enterprise.management_console %} settings, reloads system services, prepares a storage device, reloads application services, and runs any pending database migrations. It is equivalent to clicking **Save settings** in the {% data variables.enterprise.management_console %}'s web UI or to sending a POST request to {% ifversion management-console-manage-ghes-parity %}[the `/manage/v1/config/apply` endpoint](/rest/enterprise-admin/manage-ghes#trigger-a-ghe-config-apply-run){% else %}[the `/setup/api/configure` endpoint](/rest/enterprise-admin/management-console){% endif %}. {% ifversion ghes > 3.15 %} Starting in version 3.16, this utility applies configuration changes conditionally to relevant settings. You can force it to run unconditionally by using `-f` flag. {% endif %}
137+
This utility applies {% data variables.enterprise.management_console %} settings, reloads system services, prepares a storage device, reloads application services, and runs any pending database migrations. It is equivalent to clicking **Save settings** in the {% data variables.enterprise.management_console %}'s web UI or to sending a POST request to [the `/manage/v1/config/apply` endpoint](/rest/enterprise-admin/manage-ghes#trigger-a-ghe-config-apply-run). {% ifversion ghes > 3.15 %} Starting in version 3.16, this utility applies configuration changes conditionally to relevant settings. You can force it to run unconditionally by using `-f` flag. {% endif %}
138138

139139
```shell
140140
ghe-config-apply
@@ -662,8 +662,6 @@ $ ghe-cluster-maintenance -u
662662
# Unsets maintenance mode
663663
```
664664
665-
{% ifversion cluster-ha-tooling-improvements %}
666-
667665
### ghe-cluster-repl-bootstrap
668666
669667
This utility configures high availability replication to a secondary set of cluster nodes. For more information, see [AUTOTITLE](/admin/monitoring-and-managing-your-instance/configuring-clustering/configuring-high-availability-replication-for-a-cluster).
@@ -680,8 +678,6 @@ This utility disables replication to replica nodes for a cluster in a high avail
680678
ghe-cluster-repl-teardown
681679
```
682680
683-
{% endif %}
684-
685681
### ghe-cluster-status
686682
687683
Check the health of your nodes and services in a cluster deployment of {% data variables.product.prodname_ghe_server %}.
@@ -798,8 +794,6 @@ To evacuate a {% data variables.product.prodname_pages %} storage service before
798794
ghe-dpages evacuate pages-server-UUID
799795
```
800796
801-
{% ifversion cluster-node-removal %}
802-
803797
### ghe-remove-node
804798
805799
This utility removes a node from a cluster. If you're replacing a node, after you've set up a replacement node, you can use this command to take the old node offline. For more information, see [AUTOTITLE](/admin/monitoring-and-managing-your-instance/configuring-clustering/replacing-a-cluster-node).
@@ -826,8 +820,6 @@ Flag | Description
826820
> * This command can only be used to remove a node from a cluster configuration. It cannot be used to remove a node from a high availability configuration.
827821
> * This command does not support parallel execution. To remove multiple nodes, you must wait until this command has finished before running it for another node.
828822
829-
{% endif %}
830-
831823
### ghe-spokesctl
832824
833825
This utility allows you to manage replication of repositories on the distributed Git servers.

content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/managing-access-to-the-management-console.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ topics:
1616

1717
{% data reusables.enterprise_site_admin_settings.management-console-access %} For more information about {% data variables.enterprise.management_console %} access, see [AUTOTITLE](/admin/configuration/administering-your-instance-from-the-management-console).
1818

19-
{% ifversion ghes-manage-api-cli-extension %}You can also use the `gh es` {% data variables.product.prodname_cli %} extension to manage the root site administrator password, which controls access to the Management Console. For more information, see the [GH ES CLI usage documentation](https://github.com/github/gh-es/blob/main/USAGE.md#gh-es-access-set-password) and [AUTOTITLE](/admin/administering-your-instance/administering-your-instance-from-the-command-line/administering-your-instance-using-the-github-cli).{% endif %}
19+
You can also use the `gh es` {% data variables.product.prodname_cli %} extension to manage the root site administrator password, which controls access to the Management Console. For more information, see the [GH ES CLI usage documentation](https://github.com/github/gh-es/blob/main/USAGE.md#gh-es-access-set-password) and [AUTOTITLE](/admin/administering-your-instance/administering-your-instance-from-the-command-line/administering-your-instance-using-the-github-cli).
2020

2121
## Types of {% data variables.enterprise.management_console %} accounts
2222

content/admin/administering-your-instance/configuring-maintenance-mode/enabling-and-scheduling-maintenance-mode.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,12 @@ You can also use a command-line utility to configure the IP exception list. For
7474

7575
You can manage maintenance mode on {% data variables.location.product_location %} using the REST API. For more information, see [AUTOTITLE](/rest/enterprise-admin/manage-ghes#get-the-status-of-maintenance-mode).
7676

77-
{% ifversion ghes-manage-api-cli-extension %}
78-
7977
## Managing maintenance mode using the {% data variables.product.prodname_cli %}
8078

8179
You can manage maintenance mode on {% data variables.location.product_location %} using the {% data variables.product.prodname_cli %} `gh es` extension. For more information, see the GH ES CLI usage documentation for [`gh es maintenance set`](https://github.com/github/gh-es/blob/main/USAGE.md#gh-es-maintenance-set) and [`gh es maintenance get`](https://github.com/github/gh-es/blob/main/USAGE.md#gh-es-maintenance-get).
8280

8381
For more information, see [AUTOTITLE](/admin/administering-your-instance/administering-your-instance-from-the-command-line/administering-your-instance-using-the-github-cli).
8482

85-
{% endif %}
86-
8783
## Managing maintenance mode using SSH
8884

8985
If you have SSH access, you can use the `ghe-maintenance` command line utility to can set or unset maintenance mode for a {% data variables.product.prodname_ghe_server %} instance with one node, or multiple nodes in a high-availability configuration. For more information, see [AUTOTITLE](/admin/administering-your-instance/administering-your-instance-from-the-command-line/accessing-the-administrative-shell-ssh) and [AUTOTITLE](/admin/administering-your-instance/administering-your-instance-from-the-command-line/command-line-utilities#ghe-maintenance).

content/admin/configuring-packages/configuring-package-ecosystem-support-for-your-enterprise.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Configuring package ecosystem support for your enterprise
3-
intro: 'You can configure {% data variables.product.prodname_registry %} for your enterprise by globally enabling or disabling individual package ecosystems on your enterprise, including {% ifversion ghes %}{% data variables.product.prodname_container_registry %}, {% endif %}Docker, and npm. Learn about other configuration requirements to support specific package ecosystems.'
3+
intro: 'You can configure {% data variables.product.prodname_registry %} for your enterprise by globally enabling or disabling individual package ecosystems on your enterprise, including {% data variables.product.prodname_container_registry %}, Docker, and npm. Learn about other configuration requirements to support specific package ecosystems.'
44
permissions: 'Site administrators can enable {% data variables.product.prodname_registry %} and configure enterprise settings.'
55
redirect_from:
66
- /enterprise/admin/packages/configuring-packages-support-for-your-enterprise

content/admin/configuring-settings/configuring-github-connect/about-github-connect.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ After you enable {% data variables.product.prodname_github_connect %}, you can c
2121

2222
## About the connection
2323

24-
To enable {% data variables.product.prodname_github_connect %}, you configure a connection between {% data variables.location.product_location %} and an enterprise account on **{% data variables.product.prodname_dotcom_the_website %}**{% ifversion ghecom-github-connect %} or **{% data variables.enterprise.data_residency_site %}**{% endif %}. {% data reusables.github-connect.connection-port-protocol %}
24+
To enable {% data variables.product.prodname_github_connect %}, you configure a connection between {% data variables.location.product_location %} and an enterprise account on **{% data variables.product.prodname_dotcom_the_website %}** or **{% data variables.enterprise.data_residency_site %}**. {% data reusables.github-connect.connection-port-protocol %}
2525

2626
* {% data variables.product.prodname_github_connect %} does not open {% data variables.location.product_location %} to the public internet.
2727
* None of your enterprise's private data is exposed to {% data variables.product.prodname_ghe_cloud %} users.
@@ -84,15 +84,7 @@ Additional data is transmitted if you enable individual features of {% data vari
8484

8585
## Enabling {% data variables.product.prodname_github_connect %}
8686

87-
{% ifversion ghecom-github-connect %}
88-
8987
To enable {% data variables.product.prodname_github_connect %}, see the article for your {% data variables.product.prodname_ghe_cloud %} environment.
9088

9189
* [AUTOTITLE](/admin/configuring-settings/configuring-github-connect/enabling-github-connect-for-githubcom)
9290
* [AUTOTITLE](/admin/configuring-settings/configuring-github-connect/enabling-github-connect-for-ghecom)
93-
94-
{% else %}
95-
96-
To enable {% data variables.product.prodname_github_connect %}, see [AUTOTITLE](/admin/configuring-settings/configuring-github-connect/enabling-github-connect-for-githubcom).
97-
98-
{% endif %}

0 commit comments

Comments
 (0)