Skip to content

Commit 4bd025c

Browse files
authored
Merge branch 'main' into patch-1
2 parents db651da + 56eb33f commit 4bd025c

File tree

117 files changed

+1137
-285
lines changed

Some content is hidden

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

117 files changed

+1137
-285
lines changed

.github/workflows/index-general-search.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,19 @@ jobs:
180180
181181
ls -lh /tmp/records
182182
183+
- name: Check for scraping failures
184+
id: check-failures
185+
run: |
186+
if [ -f /tmp/records/failures-summary.json ]; then
187+
FAILED_PAGES=$(jq -r '.totalFailedPages' /tmp/records/failures-summary.json)
188+
echo "failed_pages=$FAILED_PAGES" >> $GITHUB_OUTPUT
189+
echo "has_failures=true" >> $GITHUB_OUTPUT
190+
echo "⚠️ Warning: $FAILED_PAGES page(s) failed to scrape"
191+
else
192+
echo "has_failures=false" >> $GITHUB_OUTPUT
193+
echo "✅ All pages scraped successfully"
194+
fi
195+
183196
- name: Check that Elasticsearch is accessible
184197
run: |
185198
curl --fail --retry-connrefused --retry 5 -I ${{ env.ELASTICSEARCH_URL }}
@@ -211,6 +224,19 @@ jobs:
211224
FASTLY_SURROGATE_KEY: api-search:${{ matrix.language }}
212225
run: npm run purge-fastly-edge-cache
213226

227+
- name: Alert on scraping failures
228+
if: ${{ steps.check-failures.outputs.has_failures == 'true' && github.event_name != 'workflow_dispatch' }}
229+
uses: ./.github/actions/slack-alert
230+
with:
231+
slack_channel_id: ${{ secrets.DOCS_ALERTS_SLACK_CHANNEL_ID }}
232+
slack_token: ${{ secrets.SLACK_DOCS_BOT_TOKEN }}
233+
message: |
234+
:warning: ${{ steps.check-failures.outputs.failed_pages }} page(s) failed to scrape for general search indexing (language: ${{ matrix.language }})
235+
236+
The indexing completed but some pages could not be scraped. This may affect search results for those pages.
237+
238+
Workflow: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
239+
214240
- uses: ./.github/actions/slack-alert
215241
if: ${{ failure() && github.event_name != 'workflow_dispatch' }}
216242
with:

.github/workflows/sync-openapi.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ jobs:
5757
env:
5858
# Needed for gh
5959
GITHUB_TOKEN: ${{ secrets.DOCS_BOT_PAT_BASE }}
60+
NODE_OPTIONS: '--max-old-space-size=8192'
6061
run: |
6162
npm run sync-rest -- \
6263
--source-repos rest-api-description models-gateway \

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# ---------------------------------------------------------------
99
# To update the sha:
1010
# https://github.com/github/gh-base-image/pkgs/container/gh-base-image%2Fgh-base-noble
11-
FROM ghcr.io/github/gh-base-image/gh-base-noble:20251010-155737-g547a87a71 AS base
11+
FROM ghcr.io/github/gh-base-image/gh-base-noble:20251016-101023-g0e97a15f4 AS base
1212

1313
# Install curl for Node install and determining the early access branch
1414
# Install git for cloning docs-early-access & translations repos

README.md

Lines changed: 16 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,30 @@
11
# GitHub Docs <!-- omit in toc -->
2-
[![Build GitHub Docs On Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new/?repo=github)
32

4-
This repository contains the documentation website code and Markdown source files for [docs.github.com](https://docs.github.com).
3+
Welcome to GitHub Docs! GitHub’s documentation is open source, meaning anyone from inside or outside the company can contribute. For full contributing guidelines, visit our [contributing guide](https://docs.github.com/en/contributing)
54

6-
GitHub's Docs team works on pre-production content in a private repo that regularly syncs with this public repo.
5+
## Quick links by contributor type
76

8-
Use the table of contents icon <img alt="Table of contents icon" src="./contributing/images/table-of-contents.png" width="25" height="25" /> on the top right corner of this document to navigate to a specific section quickly.
7+
* **Hubbers (GitHub employees):** See [CONTRIBUTING.md](https://github.com/github/docs-content/blob/main/CONTRIBUTING.md) in the `docs-content` repository for GitHub-specific processes.
98

10-
## Contributing
9+
* **Open source contributors:** See [CONTRIBUTING.md](https://github.com/github/docs/blob/main/.github/CONTRIBUTING.md) in the `docs` repository for a quick-start summary.
1110

12-
We accept different types of contributions, including some that don't require you to write a single line of code. For detailed instructions on how to get started with our project, see [About contributing to GitHub Docs](https://docs.github.com/en/contributing/collaborating-on-github-docs/about-contributing-to-github-docs).
11+
## How we sync changes across Docs repositories
1312

14-
### Ways to contribute
13+
There are two GitHub Docs repositories:
1514

16-
On the GitHub Docs site, you can contribute by clicking the **Make a contribution** button at the bottom of the page to open a pull request for quick fixes like typos, updates, or link fixes.
15+
- **`github/docs`** (public): Open to external contributions
1716

18-
You can also contribute by creating a local environment or opening a Codespace. For more information, see [Setting up your environment to work on GitHub Docs](https://docs.github.com/en/contributing/setting-up-your-environment-to-work-on-github-docs).
17+
- **`github/docs-internal`** (private): For GitHub employee contributions.
1918

20-
<img alt="Contribution call-to-action" src="./contributing/images/contribution_cta.png" width="400">
19+
The two repositories sync frequently. Content changes in one are reflected in the other. Hubbers might prefer to post in `docs` when working with a customer, but `docs` has limitations on the types of contributions it accepts to safeguard the site and our workflows. Internal contributions should usually go to `docs-internal`.
2120

22-
For more complex contributions, please [open an issue in the docs-content repo](https://github.com/github/docs-content/issues/new/choose) describing the changes you'd like to see.
21+
**Important:** The `docs` repository accepts contributions to content files (`.md` files in `/content` and select `/data` sections like reusables only). Infrastructure files, workflows, and site-building code are not open for external modification.
2322

24-
If you're looking for a way to contribute, you can scan through our [help wanted board](https://github.com/github/docs/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) to find open issues already approved for work.
23+
## New to contributing
2524

26-
### And that's it!
25+
Here are some resources to help you get started with open source contributions:
2726

28-
If you're having trouble with your GitHub account, contact [Support](https://support.github.com).
29-
30-
That's how you can easily become a member of the GitHub Docs community. :sparkles:
31-
32-
## READMEs
33-
34-
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:
35-
36-
- [content/README.md](content/README.md)
37-
- [content/graphql/README.md](content/graphql/README.md)
38-
- [content/rest/README.md](content/rest/README.md)
39-
- [contributing/README.md](contributing/README.md)
40-
- [data/README.md](data/README.md)
41-
- [data/reusables/README.md](data/reusables/README.md)
42-
- [data/variables/README.md](data/variables/README.md)
43-
- [src/README.md](src/README.md)
44-
45-
## License
46-
47-
The GitHub product documentation in the assets, content, and data folders are licensed under a [CC-BY license](LICENSE).
48-
49-
All other code in this repository is licensed under the [MIT license](LICENSE-CODE).
50-
51-
When using the GitHub logos, be sure to follow the [GitHub logo guidelines](https://github.com/logos).
52-
53-
## Thanks :purple_heart:
54-
55-
Thanks for all your contributions and efforts towards improving the GitHub documentation. We thank you for being part of our :sparkles: community :sparkles:!
27+
* [Finding ways to contribute to open source on GitHub](https://docs.github.com/en/get-started/exploring-projects-on-github/finding-ways-to-contribute-to-open-source-on-github)
28+
* [Set up Git](https://docs.github.com/en/get-started/git-basics/set-up-git)
29+
* [GitHub flow](https://docs.github.com/en/get-started/using-github/github-flow)
30+
* [Collaborating with pull requests](https://docs.github.com/en/github/collaborating-with-pull-requests)

content/account-and-profile/concepts/personal-account-management.md renamed to content/account-and-profile/concepts/account-management.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
---
22
title: Personal account management
3-
intro: 'Learn how to manage your personal account on {% data variables.location.product_location %}.'
3+
intro: Learn how to manage your personal account on {% data variables.location.product_location %}.
44
versions:
55
fpt: '*'
66
ghes: '*'
77
ghec: '*'
88
topics:
99
- Accounts
1010
shortTitle: Account management
11+
contentType: concepts
12+
redirect_from:
13+
- /account-and-profile/concepts/personal-account-management
1114
---
1215

1316
## About converting your personal account

content/account-and-profile/concepts/contributions-visible-on-your-profile.md renamed to content/account-and-profile/concepts/contributions-on-your-profile.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
---
2-
title: Contributions visible on your profile
3-
intro: 'Your profile shows off your pinned repositories, Achievements, and a graph of your repository contributions over the past year.'
2+
title: Contributions on your profile
3+
intro: Your profile shows off your pinned repositories, Achievements, and a graph of your repository contributions over the past year.
44
versions:
55
fpt: '*'
66
ghes: '*'
77
ghec: '*'
88
topics:
99
- Profiles
10-
shortTitle: Contributions on your profile
10+
shortTitle: Profile contributions
11+
contentType: concepts
12+
redirect_from:
13+
- /account-and-profile/concepts/contributions-visible-on-your-profile
1114
---
1215

1316
## About your contribution graph

content/account-and-profile/concepts/email-addresses.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Email addresses
3-
intro: 'Learn about the different types of email addresses you can associate with your {% data variables.product.github %} account—primary, backup, commit, and noreply—and how each type is used for account management, security, and commit attribution.'
3+
intro: Learn about the different types of email addresses you can associate with your {% data variables.product.github %} account—primary, backup, commit, and noreply—and how each type is used for account management, security, and commit attribution.
44
versions:
55
fpt: '*'
66
ghes: '*'
@@ -10,6 +10,7 @@ topics:
1010
- Fundamentals
1111
- Profile
1212
shortTitle: Email addresses
13+
contentType: concepts
1314
---
1415

1516
## Adding an email address to your {% data variables.product.github %} account

content/account-and-profile/concepts/index.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@ topics:
1010
- Accounts
1111
- Profiles
1212
children:
13-
- /about-your-profile
14-
- /personal-account-management
15-
- /contributions-visible-on-your-profile
16-
- /about-your-organizations-profile
17-
- /about-organization-membership
13+
- /personal-profile
14+
- /account-management
1815
- /username-changes
1916
- /email-addresses
20-
- /scheduled-reminders
21-
- /personal-repository-access-and-collaboration
17+
- /contributions-on-your-profile
18+
- /organization-membership
19+
- /organization-profile
20+
contentType: concepts
2221
---
2322

content/account-and-profile/concepts/about-organization-membership.md renamed to content/account-and-profile/concepts/organization-membership.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ redirect_from:
77
- /github/setting-up-and-managing-your-github-user-account/managing-your-membership-in-organizations/about-organization-membership
88
- /account-and-profile/setting-up-and-managing-your-github-user-account/managing-your-membership-in-organizations/about-organization-membership
99
- /account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/about-organization-membership
10+
- /account-and-profile/concepts/about-organization-membership
1011
versions:
1112
fpt: '*'
1213
ghes: '*'
1314
ghec: '*'
1415
topics:
1516
- Accounts
1617
shortTitle: Organization membership
18+
contentType: concepts
1719
---
1820
An organization owner can invite you to join their organization as a member, billing manager, or owner. An organization owner or member with admin privileges for a repository can invite you to collaborate in one or more repositories as an outside collaborator. For more information, see [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization).
1921

content/account-and-profile/concepts/about-your-organizations-profile.md renamed to content/account-and-profile/concepts/organization-profile.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
---
2-
title: About your organization's profile
2+
title: Your organization's profile
33
intro: Your organization's profile page shows basic information about your organization.
44
redirect_from:
55
- /articles/about-your-organization-s-profile
66
- /articles/about-your-organizations-profile
77
- /github/setting-up-and-managing-your-github-profile/about-your-organizations-profile
88
- /github/setting-up-and-managing-your-github-profile/customizing-your-profile/about-your-organizations-profile
99
- /account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/about-your-organizations-profile
10+
- /account-and-profile/concepts/about-your-organizations-profile
11+
- /account-and-profile/concepts/organizations-profile
1012
versions:
1113
fpt: '*'
1214
ghes: '*'
1315
ghec: '*'
1416
topics:
1517
- Profiles
1618
shortTitle: Organization profile
19+
contentType: concepts
1720
---
1821

1922
You can customize your organization's profile by adding any of the following:

0 commit comments

Comments
 (0)