Skip to content

Commit 13aec25

Browse files
authored
Merge pull request #36420 from github/repo-sync
Repo sync
2 parents 5facf01 + 00db977 commit 13aec25

File tree

23 files changed

+28
-39
lines changed

23 files changed

+28
-39
lines changed

.dockerignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ contributing/
66
docs/
77
node_modules/
88
tests/
9-
# Folder is cloned during the preview + prod workflows, the assets are merged into other locations for use before the build
9+
# Folder is cloned during the Dockerfile build
1010
docs-early-access/
1111
README.md

.github/PULL_REQUEST_TEMPLATE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ If there's _not_ an existing issue, please open one first to make it more likely
1313
### What's being changed (if available, include any code snippets, screenshots, or gifs):
1414

1515
<!-- Let us know what you are changing. Share anything that could provide the most context.
16-
If you made changes to the `content` directory, a table will populate in a comment below with links to the preview and current production articles. -->
16+
If you made changes to the `content` directory, a table will populate in a comment below with links to the review and current production articles. -->
1717

1818
### Check off the following:
1919

2020
- [ ] A subject matter expert (SME) has reviewed the technical accuracy of the content in this PR. In most cases, the author can be the SME. Open source contributions may require an SME review from GitHub staff.
2121
- [ ] The changes in this PR meet [the docs fundamentals that are required for all content](http://docs.github.com/en/contributing/writing-for-github-docs/about-githubs-documentation-fundamentals).
22-
- [ ] All CI checks are passing and the changes look good in the preview environment.
22+
- [ ] All CI checks are passing and the changes look good in the review environment.

content/contributing/setting-up-your-environment-to-work-on-github-docs/creating-a-local-environment.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ npm ci
4949
npm start
5050
```
5151

52-
You should now have a running server. To access your local preview environment, visit [localhost:4000](http://localhost:4000) in your browser.
52+
You should now have a running server. To access your local environment, visit [localhost:4000](http://localhost:4000) in your browser.
5353

5454
When you're ready to stop your local server, type <kbd>Ctrl</kbd>+<kbd>C</kbd> in your terminal window.
5555

contributing/development.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Power users may want to read more about [debugging the docs application](./debug
3434

3535
As an alternative, you can simply use [GitHub Codespaces](https://docs.github.com/en/codespaces/overview). For more information about using a codespace for working on GitHub documentation, see [Working in a codespace](https://github.com/github/docs/blob/main/contributing/codespace.md).
3636

37-
In a matter of minutes, you will be ready to edit, preview and test your changes directly from the comfort of your browser.
37+
In a matter of minutes, you will be ready to edit, review and test your changes directly from the comfort of your browser.
3838

3939
### Using browser shortcuts
4040

data/reusables/contributing/content-linter-rules.md

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
| [search-replace](https://github.com/OnkarRuikar/markdownlint-rule-search-replace) | todocs-placeholder | Catch occurrences of TODOCS placeholder. | error | |
2727
| [search-replace](https://github.com/OnkarRuikar/markdownlint-rule-search-replace) | docs-domain | Catch occurrences of docs.github.com domain. | error | |
2828
| [search-replace](https://github.com/OnkarRuikar/markdownlint-rule-search-replace) | help-domain | Catch occurrences of help.github.com domain. | error | |
29-
| [search-replace](https://github.com/OnkarRuikar/markdownlint-rule-search-replace) | preview-domain | Catch occurrences of preview.ghdocs.com domain. | error | |
3029
| [search-replace](https://github.com/OnkarRuikar/markdownlint-rule-search-replace) | developer-domain | Catch occurrences of developer.github.com domain. | error | |
3130
| [search-replace](https://github.com/OnkarRuikar/markdownlint-rule-search-replace) | deprecated liquid syntax: site.data | Catch occurrences of deprecated liquid data syntax. | error | |
3231
| [search-replace](https://github.com/OnkarRuikar/markdownlint-rule-search-replace) | deprecated liquid syntax: octicon-<icon-name> | The octicon liquid syntax used is deprecated. Use this format instead `octicon "<octicon-name>" aria-label="<Octicon aria label>"` | error | |

src/assets/middleware/dynamic-assets.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ export default async function dynamicAssets(
122122
// likely never be enjoyed by network or human eyes.
123123
effort = 1
124124
} else if (process.env.NODE_ENV === 'development') {
125-
// If you're doing local development (or preview!), the
125+
// If you're doing local development (or review), the
126126
// network is not precious (localhost:4000) and you have no
127127
// CDN to cache it for you. Make it low but not too unrealistically
128128
// low.

src/assets/scripts/validate-asset-images.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
// Generally writers don't check in bogus/corrupt images but mistakes
88
// can happen and it's ideally spotted in other processes such as
9-
// reviewing PR preview environment.
9+
// reviewing PR review environment.
1010
// This script also makes sure that all images really are what they're
1111
// called. For example, an image might be named `screenshot.png` but
1212
// it might actually be something mischievous.

src/bookmarklets/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Bookmarklets
22

3-
The [bookmarklets](https://en.wikipedia.org/wiki/Bookmarklet) in this directory are browser shortcuts that may help with reviewing GitHub documentation. We may eventually build the functionality they provide into Docs preview environments, but these are handy hacks for now.
3+
The [bookmarklets](https://en.wikipedia.org/wiki/Bookmarklet) in this directory are browser shortcuts that may help with reviewing GitHub documentation. We may eventually build the functionality they provide into Docs review environments, but these are handy hacks for now.
44

55
## Installing bookmarklets
66

@@ -17,19 +17,19 @@ Clicking the bookmark will then execute the JavaScript.
1717

1818
[`src/bookmarklets/view-in-development.js`](./view-in-development.js)
1919

20-
When you're looking at a page on docs.github.com or a preview server at preview.ghdocs.com, clicking this bookmarklet will load the same path you're viewing but on your local server running at localhost:4000.
20+
When you're looking at a page on docs.github.com or a review server, clicking this bookmarklet will load the same path you're viewing but on your local server running at localhost:4000.
2121

2222
## "View in production" toggle
2323

2424
[`src/bookmarklets/view-in-production.js`](./view-in-production.js)
2525

26-
When you're looking at a page on a preview server at preview.ghdocs.com or your local server running at localhost:4000, clicking this bookmarklet will load the same path you're viewing but on the live documentation site at docs.github.com.
26+
When you're looking at a page on a review server or your local server running at localhost:4000, clicking this bookmarklet will load the same path you're viewing but on the live documentation site at docs.github.com.
2727

2828
## Open a docs article in VS Code
2929

3030
[`src/bookmarklets/open-in-vscode.js`](./open-in-vscode.js)
3131

32-
When you're looking at a page on either docs.github.com, preview.ghdocs.com, or localhost:4000, clicking this bookmarklet will open the source Markdown file from your local checkout in VS Code.
32+
When you're looking at a page on either docs.github.com, review, or localhost:4000, clicking this bookmarklet will open the source Markdown file from your local checkout in VS Code.
3333

3434
The installation requires a few steps:
3535

src/content-linter/style/github-docs.js

-9
Original file line numberDiff line numberDiff line change
@@ -266,15 +266,6 @@ export const searchReplaceConfig = {
266266
'partial-markdown-files': true,
267267
'yml-files': true,
268268
},
269-
{
270-
name: 'preview-domain',
271-
message: 'Catch occurrences of preview.ghdocs.com domain.',
272-
search: 'preview.ghdocs.com',
273-
searchScope: 'all',
274-
severity: 'error',
275-
'partial-markdown-files': true,
276-
'yml-files': true,
277-
},
278269
{
279270
name: 'developer-domain',
280271
message: 'Catch occurrences of developer.github.com domain.',

src/content-linter/tests/unit/search-replace.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ describe(searchReplace.names.join(' - '), () => {
2727
'docs.github.com',
2828
'- help.github.com',
2929
'[help.github.com](//developer.github.com)',
30-
'![developer.github.com](//preview.ghdocs.com)',
3130
' docs.github.com',
3231
'developer.github.com/enterprise',
3332
'developer.github.com/enterprise/',
@@ -44,7 +43,7 @@ describe(searchReplace.names.join(' - '), () => {
4443
ruleConfig: searchReplaceConfig['search-replace'],
4544
})
4645
const errors = result.markdown
47-
expect(errors.length).toBe(10)
46+
expect(errors.length).toBe(8)
4847
})
4948

5049
test('Deprecated Liquid syntax causes error', async () => {

src/content-render/unified/rewrite-local-links.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ export default function rewriteLocalLinks(context) {
149149
})
150150

151151
if (!isProd) {
152-
// This runs when doing local preview, link checker tests, or
152+
// This runs when doing local review, link checker tests, or
153153
// running a script like `update-internal-links.js`.
154154
visit(tree, matcherAnchorLinks, (node) => {
155155
for (const child of node.children || []) {

src/deployments/staging/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
> [!NOTE]
44
> For internal documentation, please see the `Moda` directory in the internal Docs Engineering repo.
55
6-
When you make a code change and want to preview it in a live environment, you can use a staging server. If your change only touches content files e.g. `content/` and `data/` directories, please use the [review server](../../review-server/README.md) instead.
6+
When you make a code change and want to review it in a live environment, you can use a staging server. If your change only touches content files e.g. `content/` and `data/` directories, please use the [review server](../../review-server/README.md) instead.
77

8-
To preview code changes on a staging server:
8+
To review code changes on a staging server:
99

1010
1. If your changes aren't already in remote, push your branch to `docs-internal` .
1111
2. Open a draft PR with your changes.

src/events/components/experiments/experiment.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ export function initializeExperiments(
185185
experiment.percentOfUsersToGetExperiment,
186186
)
187187

188-
// Even in preview & prod it is useful to see if a given experiment is "on" or "off"
188+
// In any environment, it is useful to see if a given experiment is "on" or "off"
189189
console.log(
190190
`Experiment ${experiment.key} is in the "${controlGroup === TREATMENT_VARIATION ? TREATMENT_VARIATION : CONTROL_VARIATION}" group for this browser.\nCall function window.overrideControlGroup('${experiment.key}', 'treatment' | 'control') to change your group for this session.`,
191191
)

src/fixtures/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Deeper than the product level, the names and directories can be whatever
3333
you want it to be.
3434

3535
Once you've found a place to put some fixture content, before writing
36-
a `vitest` test, you can preview your changes using:
36+
a `vitest` test, you can review your changes using:
3737

3838
```shell
3939
npm run fixture-dev

src/frame/lib/create-tree.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default async function createTree(originalPath, rootPath, previousTree) {
2424
filepath = `${originalPath}/index.md`
2525
// Note, if this throws, that's quite fine. It usually means that
2626
// there's a `index.md` whose `children:` entry lists something that
27-
// doesn't exist on disk. So the writer who tries to preview the
27+
// doesn't exist on disk. So the writer who tries to review the
2828
// page will see the error and it's hopefully clear what's actually
2929
// wrong.
3030
try {

src/frame/lib/get-remote-json.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export default async function getRemoteJSON(url, config) {
7777
}
7878
cache.set(cacheKey, JSON.parse(res.body))
7979

80-
// Only write to disk for testing and local preview.
80+
// Only write to disk for testing and local review.
8181
// In production, we never write to disk. Only in-memory.
8282
if (!inProd) {
8383
fs.mkdirSync(path.dirname(onDisk), { recursive: true })

src/frame/middleware/reload-tree.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* This exists for local previewing. Only.
2+
* This exists for local reviewing. Only.
33
* We load in the entire tree on startup, then that's used for things like
44
* sidebars and breadcrumbs and landing pages and ToC pages (and possibly
55
* more).

src/pageinfo/middleware.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ async function getPageInfoFromCache(page: Page, pathname: string) {
216216
// a HTTP GET request will only happen once per deployment. That's
217217
// because the CDN will cache it until the next deployment (which is
218218
// followed by a CDN purge).
219-
// In development (local preview), the performance doesn't really matter.
219+
// In development (local review), the performance doesn't really matter.
220220
// In CI, we use the caching because the CI runs
221221
// `npm run precompute-pageinfo` right before it runs vitest tests.
222222
}

src/rest/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Our REST pipeline creates autogenerated REST API documentation for docs.github.com/rest from the OpenAPI stored in the open-source repository [`github/rest-api-description`](https://github.com/github/rest-api-description).
44

5-
The pipeline is used to generate data that is used by the docs.github.com site when deployed locally, in preview environments, or in production.
5+
The pipeline is used to generate data that is used by the docs.github.com site when deployed locally, in review environments, or in production.
66

77
## How does it work
88

@@ -77,4 +77,4 @@ Writers can also add an introduction paragraph _above_ the following Markdown co
7777
Slack: `#docs-engineering`
7878
Repo: `github/docs-engineering`
7979

80-
If you have a question about the REST pipeline, you can ask in the `#docs-engineering` Slack channel. If you notice a problem with the REST pipeline, you can open an issue in the `github/docs-engineering` repository.
80+
If you have a question about the REST pipeline, you can ask in the `#docs-engineering` Slack channel. If you notice a problem with the REST pipeline, you can open an issue in the `github/docs-engineering` repository.

src/rest/docs.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const log = console.log
2020

2121
log(
2222
chalk.green.bold(
23-
'\nUse this script to build a local docs preview. You can build specific versions of the REST and Webhook docs.\n',
23+
'\nUse this script to build a local docs review. You can build specific versions of the REST and Webhook docs.\n',
2424
),
2525
)
2626
log(chalk.white.bold(' Versions that can be built: ', openApiVersions, '\n'))

src/search/middleware/search-routes.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ router.get(
5454
searchCacheControl(res)
5555
// We can cache this without purging it after every deploy
5656
// because the API search is only used as a proxy for local
57-
// and preview environments.
57+
// and review environments.
5858
setFastlySurrogateKey(res, SURROGATE_ENUMS.MANUAL)
5959
}
6060

src/shielding/middleware/rate-limit.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export function createRateLimiter(max = MAX) {
3232

3333
keyGenerator: (req) => {
3434
let { ip } = req
35-
// In our preview environments, with the way the proxying works,
35+
// In our review environments, with the way the proxying works,
3636
// the `x-forwarded-for` is always the origin IP with a port number
3737
// attached. E.g. `75.40.90.27:56675, 169.254.129.1`
3838
// This port number portion changes with every request, so we strip it.

src/webhooks/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Our webhooks pipeline creates autogenerated webhooks documentation for docs.github.com/webhooks-and-events/webhooks/webhook-events-and-payloads from the OpenAPI stored in the open-source repository [`github/rest-api-description`](https://github.com/github/rest-api-description).
44

5-
The pipeline is used to generate data that is used by the docs.github.com site when deployed locally, in preview environments, or in production.
5+
The pipeline is used to generate data that is used by the docs.github.com site when deployed locally, in review environments, or in production.
66

77
## How does it work
88

@@ -56,4 +56,4 @@ The content writers can manually update frontmatter and introductory content in
5656
Slack: `#docs-engineering`
5757
Repo: `github/docs-engineering`
5858

59-
If you have a question about the webhooks pipeline, you can ask in the `#docs-engineering` Slack channel. If you notice a problem with the webhooks pipeline, you can open an issue in the `github/docs-engineering` repository.
59+
If you have a question about the webhooks pipeline, you can ask in the `#docs-engineering` Slack channel. If you notice a problem with the webhooks pipeline, you can open an issue in the `github/docs-engineering` repository.

0 commit comments

Comments
 (0)