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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 4 additions & 4 deletions
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

Lines changed: 0 additions & 9 deletions
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

Lines changed: 1 addition & 2 deletions
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 () => {

0 commit comments

Comments
 (0)