merging all conflicts

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,14 @@
+Note to Hacktoberfest 🎃 participants:
 
+While we appreciate the enthusiasm, we are experiencing a high volume of drive-by pull requests (one-line changes, README tweaks, etc.). Please remember that hundreds of people are subscribed to this repo and will receive notifications for these PRs. Spam submissions will be closed and won't count towards your Hacktoberfest goals.
 
+Please search for issues tagged [`good first issue`][gfi] or [`hacktoberfest`][hacktoberfest] to find things to work on.
+
+You can also search [all of GitHub][all].
+
+[gfi]: https://github.com/reactjs/reactjs.org/issues?q=is%3Aissue+is%3Aopen+label%3A"good+first+issue"
+[hacktoberfest]: https://github.com/reactjs/reactjs.org/issues?q=is%3Aissue+is%3Aopen+label%3A"good+first+issue"
+[all]: https://github.com/search?q=is%3Aissue+hacktoberfest
 <!--
 
 Thank you for the PR! Contributors like you keep React awesome!

.nvmrc

@@ -1 +1 @@
-lts/erbium
+12.16.1

content/authors.yml

@@ -52,6 +52,9 @@ kmeht:
 LoukaN:
   name: Lou Husson
   url: https://twitter.com/loukan42
+lunaruan:
+  name: Luna Ruan
+  url: https://twitter.com/lunaruan
 matthewjohnston4:
   name: Matthew Johnston
   url: https://github.com/matthewathome
@@ -61,6 +64,9 @@ nhunzaker:
 petehunt:
   name: Pete Hunt
   url: https://twitter.com/floydophone
+rachelnabors:
+  name: Rachel Nabors
+  url: https://twitter.com/rachelnabors
 schrockn:
   name: Nick Schrock
   url: https://twitter.com/schrockn
@@ -93,4 +99,4 @@ zpao:
   url: https://twitter.com/zpao
 tomocchino:
   name: Tom Occhino
-  url: https://twitter.com/tomocchino
+  url: https://twitter.com/tomocchino

content/blog/2013-10-16-react-v0.5.0.md

@@ -34,7 +34,7 @@ It's been awesome to see the things that people are building with React, and we
 * Added `React.version`.
 * Added `React.isValidClass` - Used to determine if a value is a valid component constructor.
 * Removed `React.autoBind` - This was deprecated in v0.4 and now properly removed.
-* Renamed  `React.unmountAndReleaseReactRootNode` to `React.unmountComponentAtNode`.
+* Renamed `React.unmountAndReleaseReactRootNode` to `React.unmountComponentAtNode`.
 * Began laying down work for refined performance analysis.
 * Better support for server-side rendering - [react-page](https://github.com/facebook/react-page) has helped improve the stability for server-side rendering.
 * Made it possible to use React in environments enforcing a strict [Content Security Policy](https://developer.mozilla.org/en-US/docs/Security/CSP/Introducing_Content_Security_Policy). This also makes it possible to use React to build Chrome extensions.

content/blog/2016-07-13-mixins-considered-harmful.md

@@ -607,7 +607,7 @@ var Button = React.createClass({
 
 Sometimes people use mixins to selectively add logging to lifecycle methods in some components. In the future, we intend to provide an [official DevTools API](https://github.com/facebook/react/issues/5306) that would let you implement something similar without touching the components. However it’s still very much a work in progress. If you heavily depend on logging mixins for debugging, you might want to keep using those mixins for a little longer.
 
-If you can’t accomplish something with a component, a higher-order component, or a utility module, it could be mean that React should provide this out of the box. [File an issue](https://github.com/facebook/react/issues/new) to tell us about your use case for mixins, and we’ll help you consider alternatives or perhaps implement your feature request.
+If you can’t accomplish something with a component, a higher-order component, or a utility module, it could mean that React should provide this out of the box. [File an issue](https://github.com/facebook/react/issues/new) to tell us about your use case for mixins, and we’ll help you consider alternatives or perhaps implement your feature request.
 
 Mixins are not deprecated in the traditional sense. You can keep using them with `React.createClass()`, as we won’t be changing it further. Eventually, as ES6 classes gain more adoption and their usability problems in React are solved, we might split `React.createClass()` into a separate package because most people wouldn’t need it. Even in that case, your old mixins would keep working.
 

content/blog/2019-08-15-new-react-devtools.md

@@ -23,8 +23,8 @@ It also offers full support for React Hooks, including inspecting nested objects
 * `16.x`: Supported
 
 **`react-native`**
-* `0`-`0.61`: Not supported
-* `0.62`: Will be supported (when 0.62 is released)
+* `0`-`0.61.x`: Not supported
+* `0.62`: Supported
 
 ## How do I get the new DevTools? {#how-do-i-get-the-new-devtools}
 

content/blog/2020-02-26-react-v16.13.0.md

@@ -204,6 +204,6 @@ Refer to the documentation for [detailed installation instructions](/docs/instal
 - Adjust `SuspenseList` CPU bound heuristic ([@sebmarkbage](https://github.com/sebmarkbage) in [#17455](https://github.com/facebook/react/pull/17455))
 - Add missing event plugin priorities ([@trueadm](https://github.com/trueadm) in [#17914](https://github.com/facebook/react/pull/17914))
 - Fix `isPending` only being true when transitioning from inside an input event ([@acdlite](https://github.com/acdlite) in [#17382](https://github.com/facebook/react/pull/17382))
-- Fix `React.memo` components dropping updates when interrupted by a higher priority update ([@acdlite](<(https://github.com/acdlite)>) in [#18091](https://github.com/facebook/react/pull/18091))
+- Fix `React.memo` components dropping updates when interrupted by a higher priority update ([@acdlite](https://github.com/acdlite) in [#18091](https://github.com/facebook/react/pull/18091))
 - Don't warn when suspending at the wrong priority ([@gaearon](https://github.com/gaearon) in [#17971](https://github.com/facebook/react/pull/17971))
 - Fix a bug with rebasing updates ([@acdlite](https://github.com/acdlite) and [@sebmarkbage](https://github.com/sebmarkbage) in [#17560](https://github.com/facebook/react/pull/17560), [#17510](https://github.com/facebook/react/pull/17510), [#17483](https://github.com/facebook/react/pull/17483), [#17480](https://github.com/facebook/react/pull/17480))