Skip to content

Commit 7caf6ef

Browse files
authored
Merge branch 'main' into fix/merge-conflict-link
2 parents 5168307 + e1f18f2 commit 7caf6ef

21 files changed

Lines changed: 65 additions & 49 deletions

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ That's how you can easily become a member of the GitHub Documentation community.
3333
## READMEs
3434

3535
In addition to the README you're reading right now, this repo includes other READMEs that describe the purpose of each subdirectory in more detail:
36-
YOu can go through among them for specified details regarding the topics listed below.
36+
You can go through among them for specified details regarding the topics listed below.
3737

3838
- [content/README.md](content/README.md)
3939
- [content/graphql/README.md](content/graphql/README.md)
81.4 KB
Loading

components/Search.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@ import React, { useState, useEffect, useRef, ReactNode, RefObject } from 'react'
22
import { useRouter } from 'next/router'
33
import useSWR from 'swr'
44
import cx from 'classnames'
5+
import { ActionList, Label, Overlay } from '@primer/components'
56

67
import { useTranslation } from 'components/hooks/useTranslation'
78
import { sendEvent, EventType } from 'components/lib/events'
89
import { useMainContext } from './context/MainContext'
910
import { useVersion } from 'components/hooks/useVersion'
1011
import { useQuery } from 'components/hooks/useQuery'
12+
import { Link } from 'components/Link'
1113
import { useLanguages } from './context/LanguagesContext'
1214

1315
import styles from './Search.module.scss'
14-
import { ActionList, Label, Link, Overlay } from '@primer/components'
1516

1617
type SearchResult = {
1718
url: string

content/admin/configuration/configuring-your-enterprise/configuring-github-pages-for-your-enterprise.md

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Configuring GitHub Pages for your enterprise
3-
intro: 'You can enable or disable {% data variables.product.prodname_pages %} for your enterprise and choose whether to make sites publicly accessible.'
3+
intro: 'You can enable or disable {% data variables.product.prodname_pages %} for your enterprise{% ifversion ghes %} and choose whether to make sites publicly accessible{% endif %}.'
44
redirect_from:
55
- /enterprise/admin/guides/installation/disabling-github-enterprise-pages/
66
- /enterprise/admin/guides/installation/configuring-github-enterprise-pages/
@@ -18,52 +18,48 @@ topics:
1818
- Pages
1919
shortTitle: Configure GitHub Pages
2020
---
21+
22+
{% ifversion ghes %}
23+
2124
## Enabling public sites for {% data variables.product.prodname_pages %}
2225

23-
{% ifversion ghes %}If private mode is enabled on your enterprise, the {% else %}The {% endif %}public cannot access {% data variables.product.prodname_pages %} sites hosted by your enterprise unless you enable public sites.
26+
If private mode is enabled on your enterprise, the public cannot access {% data variables.product.prodname_pages %} sites hosted by your enterprise unless you enable public sites.
2427

2528
{% warning %}
2629

2730
**Warning:** If you enable public sites for {% data variables.product.prodname_pages %}, every site in every repository on your enterprise will be accessible to the public.
2831

2932
{% endwarning %}
3033

31-
{% ifversion ghes %}
3234
{% data reusables.enterprise_site_admin_settings.access-settings %}
3335
{% data reusables.enterprise_site_admin_settings.management-console %}
3436
{% data reusables.enterprise_management_console.pages-tab %}
3537
4. Select **Public Pages**.
3638
![Checkbox to enable Public Pages](/assets/images/enterprise/management-console/public-pages-checkbox.png)
3739
{% data reusables.enterprise_management_console.save-settings %}
38-
{% elsif ghae %}
39-
{% data reusables.enterprise-accounts.access-enterprise %}
40-
{% data reusables.enterprise-accounts.policies-tab %}
41-
{% data reusables.enterprise-accounts.pages-tab %}
42-
5. Under "Pages policies", select **Public {% data variables.product.prodname_pages %}**.
43-
![Checkbox to enable public {% data variables.product.prodname_pages %}](/assets/images/enterprise/business-accounts/public-github-pages-checkbox.png)
44-
{% data reusables.enterprise-accounts.pages-policies-save %}
45-
{% endif %}
4640

4741
## Disabling {% data variables.product.prodname_pages %} for your enterprise
4842

49-
{% ifversion ghes %}
5043
If subdomain isolation is disabled for your enterprise, you should also disable {% data variables.product.prodname_pages %} to protect yourself from potential security vulnerabilities. For more information, see "[Enabling subdomain isolation](/admin/configuration/enabling-subdomain-isolation)."
51-
{% endif %}
5244

53-
{% ifversion ghes %}
5445
{% data reusables.enterprise_site_admin_settings.access-settings %}
5546
{% data reusables.enterprise_site_admin_settings.management-console %}
5647
{% data reusables.enterprise_management_console.pages-tab %}
5748
4. Unselect **Enable Pages**.
5849
![Checkbox to disable {% data variables.product.prodname_pages %}](/assets/images/enterprise/management-console/pages-select-button.png)
5950
{% data reusables.enterprise_management_console.save-settings %}
60-
{% elsif ghae %}
51+
52+
{% endif %}
53+
54+
{% ifversion ghae %}
55+
6156
{% data reusables.enterprise-accounts.access-enterprise %}
6257
{% data reusables.enterprise-accounts.policies-tab %}
6358
{% data reusables.enterprise-accounts.pages-tab %}
6459
5. Under "Pages policies", deselect **Enable {% data variables.product.prodname_pages %}**.
6560
![Checkbox to disable {% data variables.product.prodname_pages %}](/assets/images/enterprise/business-accounts/enable-github-pages-checkbox.png)
6661
{% data reusables.enterprise-accounts.pages-policies-save %}
62+
6763
{% endif %}
6864

6965
{% ifversion ghes %}

content/repositories/creating-and-managing-repositories/transferring-a-repository.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ Prerequisites for repository transfers:
3030
- When you transfer a repository that you own to another user account, the new owner will receive a confirmation email.{% ifversion fpt or ghec %} The confirmation email includes instructions for accepting the transfer. If the new owner doesn't accept the transfer within one day, the invitation will expire.{% endif %}
3131
- To transfer a repository that you own to an organization, you must have permission to create a repository in the target organization.
3232
- The target account must not have a repository with the same name, or a fork in the same network.
33-
- The original owner of the repository is added as a collaborator on the transferred repository. Other collaborators to the transferred repository remain intact.
33+
- The original owner of the repository is added as a collaborator on the transferred repository. Other collaborators to the transferred repository remain intact.{% ifversion ghec or ghes or ghae %}
34+
- Internal repositories can't be transferred.{% endif %}
3435
- Private forks can't be transferred.
3536

3637
{% ifversion fpt or ghec %}If you transfer a private repository to a {% data variables.product.prodname_free_user %} user or organization account, the repository will lose access to features like protected branches and {% data variables.product.prodname_pages %}. {% data reusables.gated-features.more-info %}{% endif %}

content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ The default permissions can also be configured in the organization settings. If
118118

119119
{% endnote %}
120120

121-
Members of your enterprise can use internal repositories to work on projects without sharing information publicly. For information, see "[About repositories](/repositories/creating-and-managing-repositories/about-repositories#about-internal-repositories)."
121+
Members of your enterprise can use internal repositories to work on projects without sharing information publicly. For information, see "[About repositories](/repositories/creating-and-managing-repositories/about-repositories#about-internal-repositories)."
122122

123123
To configure whether workflows in an internal repository can be accessed from outside the repository:
124124

@@ -128,8 +128,8 @@ To configure whether workflows in an internal repository can be accessed from ou
128128
1. Under **Access**, choose one of the access settings:
129129
![Set the access to Actions components](/assets/images/help/settings/actions-access-settings.png)
130130
* **Not accessible** - Workflows in other repositories can't use workflows in this repository.
131-
* **Accessible by any repository in the organization** - Workflows in other repositories can use workflows in this repository as long as they are part of the same organization.
132-
* **Accessible by any repository in the enterprise** - Workflows in other repositories can use workflows in this repository as long as they are part of the same enterprise.
131+
* **Repositories in the <organization name> organization can access** - Workflows in other repositories can use workflows in this repository if they belong to the same organization and their visibility is private or internal.
132+
* **Repositories in any organization belong to the <enterprise name> enterprise can access** - Workflows in other repositories can use workflows in this repository if they belong to the same enterprise and their visibility is private or internal.
133133
1. Click **Save** to apply the settings.
134134
{% endif %}
135135

data/learning-tracks/admin.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
get_started_with_github_ae:
22
title: 'Get started with {% data variables.product.prodname_ghe_managed %}'
33
description: 'Learn about {% data variables.product.prodname_ghe_managed %} and complete the initial configuration of a new enterprise.'
4+
featured_track: true
5+
versions:
6+
ghae: '*'
47
guides:
58
- /admin/overview/about-github-ae
69
- /admin/overview/about-data-residency
@@ -12,6 +15,8 @@ deploy_an_instance:
1215
title: 'Deploy an instance'
1316
description: 'Install {% data variables.product.prodname_ghe_server %} on your platform of choice and configure SAML authentication.'
1417
featured_track: true
18+
versions:
19+
ghes: '*'
1520
guides:
1621
- /admin/overview/system-overview
1722
- /admin/installation
@@ -23,6 +28,8 @@ deploy_an_instance:
2328
upgrade_your_instance:
2429
title: 'Upgrade your instance'
2530
description: 'Test upgrades in staging, notify users of maintenance, and upgrade your instance for the latest features and security updates.'
31+
versions:
32+
ghes: '*'
2633
guides:
2734
- /admin/enterprise-management/enabling-automatic-update-checks
2835
- /admin/installation/setting-up-a-staging-instance
@@ -46,6 +53,8 @@ adopting_github_actions_for_your_enterprise:
4653
increase_fault_tolerance:
4754
title: 'Increase the fault tolerance of your instance'
4855
description: "Back up your developers' code and configure high availability (HA) to ensure the reliability of {% data variables.product.prodname_ghe_server %} in your environment."
56+
versions:
57+
ghes: '*'
4958
guides:
5059
- /admin/configuration/accessing-the-administrative-shell-ssh
5160
- /admin/configuration/configuring-backups-on-your-appliance
@@ -56,6 +65,8 @@ increase_fault_tolerance:
5665
improve_security_of_your_instance:
5766
title: 'Improve the security of your instance'
5867
description: "Review network configuration and security features, and harden the instance running {% data variables.product.prodname_ghe_server %} to protect your enterprise's data."
68+
versions:
69+
ghes: '*'
5970
guides:
6071
- /admin/configuration/enabling-private-mode
6172
- /admin/guides/installation/configuring-tls
@@ -70,6 +81,8 @@ improve_security_of_your_instance:
7081
configure_github_actions:
7182
title: 'Configure {% data variables.product.prodname_actions %}'
7283
description: 'Allow your developers to create, automate, customize, and execute powerful software development workflows for {% data variables.product.product_location %} with {% data variables.product.prodname_actions %}.'
84+
versions:
85+
ghes: '*'
7386
guides:
7487
- /admin/github-actions/getting-started-with-github-actions-for-github-enterprise-server
7588
- /admin/github-actions/enforcing-github-actions-policies-for-your-enterprise
@@ -81,6 +94,8 @@ configure_github_actions:
8194
configure_github_advanced_security:
8295
title: 'Configure {% data variables.product.prodname_GH_advanced_security %}'
8396
description: "Improve the quality and security of your developers' code with {% data variables.product.prodname_GH_advanced_security %}."
97+
versions:
98+
ghes: '*'
8499
guides:
85100
- /admin/advanced-security/about-licensing-for-github-advanced-security
86101
- /admin/advanced-security/enabling-github-advanced-security-for-your-enterprise
@@ -91,6 +106,9 @@ configure_github_advanced_security:
91106
get_started_with_your_enterprise_account:
92107
title: 'Get started with your enterprise account'
93108
description: 'Get started with your enterprise account to centrally manage multiple organizations on {% data variables.product.product_name %}.'
109+
versions:
110+
ghes: '*'
111+
ghec: '*'
94112
guides:
95113
- /admin/overview/about-enterprise-accounts
96114
- /billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:a4ec88836717ffd36327311347de9876d8d3434a8b10d3e6c6f1fc71336b9d2d
3-
size 940606
2+
oid sha256:c5d4c37458ba4b0d604fb0031550bdb8dc4cbe42a2766e634d76b181deebc09f
3+
size 944786
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:cf5a0db21c9f4353a80d3366bad034baaf5cd3f9fc7d64edac8aab224fa873d3
3-
size 3842456
2+
oid sha256:a88cb6c345f44864db5aac36427daebfa432679cd771060f7c1640f05f43a6e7
3+
size 3858199
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:1cdbf888c16cdf9ab7a8ef34fc193a4b423dce2ec978d70e8afe0ae12f15fe86
3-
size 964308
2+
oid sha256:9d17764c56d2df01d4f9ccb63a170ee92117ef924f97031973240bcc4d909c46
3+
size 969191

0 commit comments

Comments
 (0)