Skip to content

Commit da7e8b7

Browse files
authored
Merge branch 'main' into patch-2
2 parents 762b945 + 258486a commit da7e8b7

95 files changed

Lines changed: 241 additions & 225 deletions

File tree

Some content is hidden

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

.github/workflows/create-translation-batch-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128
- name: Check parsing
129129
run: |
130130
node script/i18n/lint-translation-files.js --check parsing
131-
git add . && git commit -m "Run script/i18n/lint-translation-files.js --check parsin" || echo "Nothing to commit"
131+
git add . && git commit -m "Run script/i18n/lint-translation-files.js --check parsing" || echo "Nothing to commit"
132132
133133
# step 8b in docs-engineering/crowdin.md
134134
- name: Check rendering

.github/workflows/site-policy-sync.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ on:
1919
jobs:
2020
sync:
2121
name: Get the latest docs
22-
if: >-
23-
github.event.pull_request.merged == true &&
24-
github.repository == 'github/docs-internal'
22+
if: github.event_name == 'workflow_dispatch' || (github.event.pull_request.merged == true && github.repository == 'github/docs-internal')
2523
runs-on: ubuntu-latest
2624
permissions:
2725
contents: write
@@ -49,6 +47,7 @@ jobs:
4947
git checkout -b automated-sync-$GITHUB_RUN_ID
5048
git add .
5149
PR_TITLE=${{ github.event.pull_request.title }}
50+
echo PR_TITLE: $PR_TITLE
5251
[[ ! -z $PR_TITLE ]] && DESCRIPTION="${PR_TITLE}" || DESCRIPTION="Update manually triggered by workflow"
5352
echo "DESCRIPTION=$DESCRIPTION" >> $GITHUB_ENV
5453
git commit -m "$(echo $DESCRIPTION)"

.github/workflows/transfer-to-localization-repo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
OLD_ISSUE: ${{ github.event.issue.html_url }}
6161

6262
- name: Comment on the old issue
63-
run: gh issue comment $OLD_ISSUE --body "Thank you for opening this issue! Updates to translated content must be made internally. I have copied your issue to an internal issue, so I will close this issue."
63+
run: gh issue comment $OLD_ISSUE --body "Thanks for opening this issue! Unfortunately, we are not able to accept issues for translated content. Our translation process involves an integration with an external service at crowdin.com, where all translation activity happens. We hope to eventually open up the translation process to the open-source community, but we're not there yet.See https://github.com/github/docs/blob/main/contributing/types-of-contributions.md#earth_asia-translations for more information."
6464
env:
6565
GITHUB_TOKEN: ${{secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES}}
6666
OLD_ISSUE: ${{ github.event.issue.html_url }}

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/actions/hosting-your-own-runners/about-self-hosted-runners.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,8 @@ Some extra configuration might be required to use actions from {% data variables
128128

129129
The self-hosted runner polls {% data variables.product.product_name %} to retrieve application updates and to check if any jobs are queued for processing. The self-hosted runner uses a HTTPS _long poll_ that opens a connection to {% data variables.product.product_name %} for 50 seconds, and if no response is received, it then times out and creates a new long poll. The application must be running on the machine to accept and run {% data variables.product.prodname_actions %} jobs.
130130

131+
{% data reusables.actions.self-hosted-runner-ports-protocols %}
132+
131133
{% ifversion ghae %}
132134
You must ensure that the self-hosted runner has appropriate network access to communicate with the {% data variables.product.prodname_ghe_managed %} URL and its subdomains.
133135
For example, if your instance name is `octoghae`, then you will need to allow the self-hosted runner to access `octoghae.githubenterprise.com`, `api.octoghae.githubenterprise.com`, and `codeload.octoghae.githubenterprise.com`.
@@ -187,7 +189,7 @@ If you use an IP address allow list for your {% data variables.product.prodname_
187189

188190
{% else %}
189191

190-
You must ensure that the machine has the appropriate network access to communicate with {% data variables.product.product_location %}.
192+
You must ensure that the machine has the appropriate network access to communicate with {% data variables.product.product_location %}.{% ifversion ghes %} Self-hosted runners connect directly to {% data variables.product.product_location %} and 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.product_location %}. For example, you can assign a private IP address to your self-hosted runner and configure routing to send traffic to {% data variables.product.product_location %}, with no need for traffic to traverse a public network.{% endif %}
191193

192194
{% endif %}
193195

content/actions/hosting-your-own-runners/using-a-proxy-server-with-self-hosted-runners.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ The proxy environment variables are read when the self-hosted runner application
3737

3838
On Windows machines, the proxy environment variable names are not case-sensitive. On Linux and macOS machines, we recommend that you use all lowercase environment variables. If you have an environment variable in both lowercase and uppercase on Linux or macOS, for example `https_proxy` and `HTTPS_PROXY`, the self-hosted runner application uses the lowercase environment variable.
3939

40+
{% data reusables.actions.self-hosted-runner-ports-protocols %}
41+
4042
## Using a .env file to set the proxy configuration
4143

4244
If setting environment variables is not practical, you can set the proxy configuration variables in a file named _.env_ in the self-hosted runner application directory. For example, this might be necessary if you want to configure the runner application as a service under a system account. When the runner application starts, it reads the variables set in _.env_ for the proxy configuration.

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/admin/configuration/managing-connections-between-your-enterprise-accounts/enabling-unified-search-between-your-enterprise-account-and-githubcom.md

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

2626
When you enable unified search, users can view search results from public and private content on {% data variables.product.prodname_dotcom_the_website %} when searching from {% data variables.product.product_location %}{% ifversion ghae %} on {% data variables.product.prodname_ghe_managed %}{% endif %}.
2727

28-
Users will not be able to search {% data variables.product.product_location %} from {% data variables.product.prodname_dotcom_the_website %}, even if they have access to both environments. Users can only search private repositories you've enabled {% data variables.product.prodname_unified_search %} for and that they have access to in the connected {% data variables.product.prodname_ghe_cloud %} organizations. For more information, see "[About searching on {% data variables.product.prodname_dotcom %}](/search-github/getting-started-with-searching-on-github/about-searching-on-github/#searching-across-github-enterprise-and-githubcom-simultaneously)" and "[Enabling private {% data variables.product.prodname_dotcom_the_website %} repository search in your enterprise account](/search-github/getting-started-with-searching-on-github/enabling-githubcom-repository-search-from-your-private-enterprise-environment)."
28+
After you enable unified search for {% data variables.product.product_location %}, individual users must also connect their user accounts on {% data variables.product.product_name %} with their user accounts on {% data variables.product.prodname_dotcom_the_website %} in order to see search results from {% data variables.product.prodname_dotcom_the_website %} on {% data variables.product.product_location %}. For more information, see "[Enabling {% data variables.product.prodname_dotcom_the_website %} repository search in your private enterprise account](/search-github/getting-started-with-searching-on-github/enabling-githubcom-repository-search-from-your-private-enterprise-environment)."
29+
30+
Users will not be able to search {% data variables.product.product_location %} from {% data variables.product.prodname_dotcom_the_website %}, even if they have access to both environments. Users can only search private repositories you've enabled {% data variables.product.prodname_unified_search %} for and that they have access to in the connected {% data variables.product.prodname_ghe_cloud %} organizations. For more information, see "[About searching on {% data variables.product.prodname_dotcom %}](/search-github/getting-started-with-searching-on-github/about-searching-on-github/#searching-across-github-enterprise-and-githubcom-simultaneously)."
2931

3032
Searching via the REST and GraphQL APIs does not include {% data variables.product.prodname_dotcom_the_website %} search results. Advanced search and searching for wikis in {% data variables.product.prodname_dotcom_the_website %} are not supported.
3133

0 commit comments

Comments
 (0)