Skip to content

Commit 824c2a4

Browse files
Merge branch 'master' of https://github.com/reactjs/reactjs.org into sync-335d6433
2 parents 2ccd565 + 335d643 commit 824c2a4

File tree

3 files changed

+3
-14
lines changed

3 files changed

+3
-14
lines changed

content/community/external-resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ There are many wonderful curated resources the React community has put together.
1818

1919
- [Awesome React Talks](https://github.com/tiaanduplessis/awesome-react-talks) - A curated list of React talks.
2020

21-
- [Hero35 React Hub](https://hero35.com/stack/react) - A website with _all_ React conferences and talks, categorized & curated.
21+
- [Hero35 React Hub](https://hero35.com/topic/react) - A website with _all_ React conferences and talks, categorized & curated.

content/community/meetups.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
152152
* [Charlotte, NC - ReactJS](https://www.meetup.com/ReactJS-Charlotte/)
153153
* [Charlotte, NC - React Native](https://www.meetup.com/cltreactnative/)
154154
* [Chicago, IL - ReactJS](https://www.meetup.com/React-Chicago/)
155+
* [Cleveland, OH - ReactJS](https://www.meetup.com/Cleveland-React/)
155156
* [Columbus, OH - ReactJS](https://www.meetup.com/ReactJS-Columbus-meetup/)
156157
* [Dallas, TX - ReactJS](https://www.meetup.com/ReactDallas/)
157158
* [Detroit, MI - Detroit React User Group](https://www.meetup.com/Detroit-React-User-Group/)

content/docs/how-to-contribute.md

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ In order to accept your pull request, we need you to submit a CLA. You only need
104104
### Contribution Prerequisites {#contribution-prerequisites}
105105

106106
* You have [Node](https://nodejs.org) installed at v8.0.0+ and [Yarn](https://yarnpkg.com/en/) at v1.2.0+.
107+
* You have [JDK](https://www.oracle.com/technetwork/java/javase/downloads/index.html) installed.
107108
* You have `gcc` installed or are comfortable installing a compiler if needed. Some of our dependencies may require a compilation step. On OS X, the Xcode Command Line Tools will cover this. On Ubuntu, `apt-get install build-essential` will install the required packages. Similar commands should work on other Linux distros. Windows will require some additional steps, see the [`node-gyp` installation instructions](https://github.com/nodejs/node-gyp#installation) for details.
108109
* You are familiar with Git.
109110

@@ -154,19 +155,6 @@ You can check the status of your code styling by simply running `yarn linc`.
154155

155156
However, there are still some styles that the linter cannot pick up. If you are unsure about something, looking at [Airbnb's Style Guide](https://github.com/airbnb/javascript) will guide you in the right direction.
156157

157-
### Introductory Video {#introductory-video}
158-
159-
You may be interested in watching [this short video](https://www.youtube.com/watch?v=wUpPsEcGsg8) (26 mins) which gives an introduction on how to contribute to React.
160-
161-
#### Video highlights: {#video-highlights}
162-
- [4:12](https://youtu.be/wUpPsEcGsg8?t=4m12s) - Building and testing React locally
163-
- [6:07](https://youtu.be/wUpPsEcGsg8?t=6m7s) - Creating and sending pull requests
164-
- [8:25](https://youtu.be/wUpPsEcGsg8?t=8m25s) - Organizing code
165-
- [14:43](https://youtu.be/wUpPsEcGsg8?t=14m43s) - React npm registry
166-
- [19:15](https://youtu.be/wUpPsEcGsg8?t=19m15s) - Adding new React features
167-
168-
For a realistic overview of what it _feels_ like to contribute to React for the first time, check out [this entertaining ReactNYC talk](https://www.youtube.com/watch?v=GWCcZ6fnpn4).
169-
170158
### Request for Comments (RFC) {#request-for-comments-rfc}
171159

172160
Many changes, including bug fixes and documentation improvements can be implemented and reviewed via the normal GitHub pull request workflow.

0 commit comments

Comments
 (0)