Skip to content

Commit cff6b8c

Browse files
authoredJul 9, 2021
Merge pull request reactjs#300 from reactjs/sync-0bb0303f
Sync with reactjs.org @ 0bb0303
2 parents 7dce473 + 1d7bf66 commit cff6b8c

File tree

54 files changed

+120
-118
lines changed

Some content is hidden

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

54 files changed

+120
-118
lines changed
 

Diff for: ‎.github/PULL_REQUEST_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Thank you for the PR! Contributors like you keep React awesome!
44
55
Please see the Contribution Guide for guidelines:
66
7-
https://github.com/reactjs/reactjs.org/blob/master/CONTRIBUTING.md
7+
https://github.com/reactjs/reactjs.org/blob/main/CONTRIBUTING.md
88
99
If your PR references an existing issue, please add the issue number below
1010

Diff for: ‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ This repo contains the source code and documentation powering [it.reactjs.org](h
3636

3737
### Guidelines
3838

39-
The documentation is divided into several sections with a different tone and purpose. If you plan to write more than a few sentences, you might find it helpful to get familiar with the [contributing guidelines](https://github.com/reactjs/reactjs.org/blob/master/CONTRIBUTING.md#guidelines-for-text) for the appropriate sections.
39+
The documentation is divided into several sections with a different tone and purpose. If you plan to write more than a few sentences, you might find it helpful to get familiar with the [contributing guidelines](https://github.com/reactjs/reactjs.org/blob/main/CONTRIBUTING.md#guidelines-for-text) for the appropriate sections.
4040

4141
### Create a branch
4242

43-
1. `git checkout master` from any folder in your local `reactjs.org` repository
44-
1. `git pull origin master` to ensure you have the latest main code
43+
1. `git checkout main` from any folder in your local `reactjs.org` repository
44+
1. `git pull origin main` to ensure you have the latest main code
4545
1. `git checkout -b the-name-of-my-branch` (replacing `the-name-of-my-branch` with a suitable name) to create a branch
4646

4747
### Make the change
@@ -77,4 +77,4 @@ If your language does not have a translation and you would like to create one, p
7777
- `yarn reset` to clear the local cache
7878

7979
## License
80-
Content submitted to [reactjs.org](https://reactjs.org/) is CC-BY-4.0 licensed, as found in the [LICENSE-DOCS.md](https://github.com/open-source-explorer/reactjs.org/blob/master/LICENSE-DOCS.md) file.
80+
Content submitted to [reactjs.org](https://reactjs.org/) is CC-BY-4.0 licensed, as found in the [LICENSE-DOCS.md](https://github.com/open-source-explorer/reactjs.org/blob/main/LICENSE-DOCS.md) file.

0 commit comments

Comments
 (0)
Please sign in to comment.