From 8e805d799501b2cc7db3a9726272f90228fc1916 Mon Sep 17 00:00:00 2001
From: Gasim Gasimzada <me@gasim.xyz>
Date: Thu, 28 Feb 2019 02:40:09 +0400
Subject: [PATCH 1/4] Add missing `avatarSize` in "Before you use context" to
 text and code (#1737)

---
 content/docs/context.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/docs/context.md b/content/docs/context.md
index 8e41a465f..e7bb925c7 100644
--- a/content/docs/context.md
+++ b/content/docs/context.md
@@ -54,7 +54,7 @@ For example, consider a `Page` component that passes a `user` and `avatarSize` p
 
 It might feel redundant to pass down the `user` and `avatarSize` props through many levels if in the end only the `Avatar` component really needs it. It's also annoying that whenever the `Avatar` component needs more props from the top, you have to add them at all the intermediate levels too.
 
-One way to solve this issue **without context** is to [pass down the `Avatar` component itself](/docs/composition-vs-inheritance.html#containment) so that the intermediate components don't need to know about the `user` prop:
+One way to solve this issue **without context** is to [pass down the `Avatar` component itself](/docs/composition-vs-inheritance.html#containment) so that the intermediate components don't need to know about the `user` or `avatarSize` props:
 
 ```js
 function Page(props) {
@@ -68,7 +68,7 @@ function Page(props) {
 }
 
 // Now, we have:
-<Page user={user} />
+<Page user={user} avatarSize={avatarSize} />
 // ... which renders ...
 <PageLayout userLink={...} />
 // ... which renders ...

From c0b32b7378d505cbabc4d33923ce89ee576fb34e Mon Sep 17 00:00:00 2001
From: Monica Powell <mmp2181@columbia.edu>
Date: Thu, 28 Feb 2019 01:23:10 -0500
Subject: [PATCH 2/4] Add ReactJS Girls Conference to Conference List (#1762)

- add upcoming ReactJS Girls Conf
- move past conferences to the right place
---
 content/community/conferences.md | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/content/community/conferences.md b/content/community/conferences.md
index a9a113650..89ed871d0 100644
--- a/content/community/conferences.md
+++ b/content/community/conferences.md
@@ -12,10 +12,6 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c
 
 ## Upcoming Conferences {#upcoming-conferences}
 
-### React Iran 2019 {#react-iran-2019}
-January 31, 2019 in Tehran, Iran
-[Website](http://reactiran.com) - [Instagram](https://www.instagram.com/reactiran/)
-
 ### Reactathon 2019 {#reactathon-2019}
 March 30-31, 2019 in San Francisco, USA
 
@@ -31,6 +27,11 @@ April 12, 2019 in Amsterdam, The Netherlands
 
 [Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam)
 
+### ReactJS Girls Conference 
+May 3, 2019 in London, UK
+
+[Website](https://reactjsgirls.com/) - [Twitter](https://twitter.com/reactjsgirls)
+
 ### ReactEurope 2019 {#reacteurope-2019}
 May 23-24, 2019 in Paris, France
 
@@ -343,3 +344,8 @@ November 4 in Tel Aviv, Israel
 November 30, Berlin, Germany
 
 [Website](https://reactday.berlin) - [Twitter](https://twitter.com/reactdayberlin) - [Facebook](https://www.facebook.com/reactdayberlin/) - [Videos](https://www.youtube.com/channel/UC1EYHmQYBUJjkmL6OtK4rlw)
+
+### React Iran 2019 {#react-iran-2019}
+January 31, 2019 in Tehran, Iran
+
+[Website](http://reactiran.com) - [Instagram](https://www.instagram.com/reactiran/)

From c6b6dc2d564190a79fd6bf17af0bb2914749112b Mon Sep 17 00:00:00 2001
From: Adam Markon <amarkon895@gmail.com>
Date: Thu, 28 Feb 2019 09:31:52 -0500
Subject: [PATCH 3/4] Stop calling function components stateless (#1760)

These docs still refer to function components as "stateless function components" despite the fact that function components aren't necessarily stateless (anymore). The docs shouldn't use this outdated terminology anymore.

I left the "stateless" in the link to avoid breaking existing links to these docs but can remove if keeping links valid isn't a priority.
---
 content/docs/legacy-context.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/docs/legacy-context.md b/content/docs/legacy-context.md
index 1c62e6650..a17137fd8 100644
--- a/content/docs/legacy-context.md
+++ b/content/docs/legacy-context.md
@@ -152,11 +152,11 @@ If `contextTypes` is defined within a component, the following [lifecycle method
 >
 > As of React 16, `componentDidUpdate` no longer receives `prevContext`.
 
-### Referencing Context in Stateless Function Components {#referencing-context-in-stateless-function-components}
+### Referencing Context in Function Components {#referencing-context-in-stateless-function-components}
 
 > This section documents a legacy API. See the [new API](/docs/context.html).
 
-Stateless function components are also able to reference `context` if `contextTypes` is defined as a property of the function. The following code shows a `Button` component written as a stateless function component.
+Function components are also able to reference `context` if `contextTypes` is defined as a property of the function. The following code shows a `Button` component written as a function component.
 
 ```javascript
 import PropTypes from 'prop-types';

From 89dc4ad2bd932a905acf206e6ceda93f08138927 Mon Sep 17 00:00:00 2001
From: Jhon Mike <developer@jhonmike.com.br>
Date: Sat, 2 Mar 2019 09:20:53 -0300
Subject: [PATCH 4/4] conflict resolution

---
 content/docs/context.md | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/content/docs/context.md b/content/docs/context.md
index 283f0b2c0..060799c97 100644
--- a/content/docs/context.md
+++ b/content/docs/context.md
@@ -54,11 +54,7 @@ Considere por exemplo o componente `Page` que passa as props `user` e `avatarSiz
 
 Pode parecer redundante passar para baixo as props `user` e `avatarSize` através de vários níveis se no final apenas o componente `Avatar` realmente precisa usa-las. Além disso, é incômodo sempre que o componente `Avatar` precisar de mais props do topo, você também precisar adicionar todas elas por todos os níveis intermediários.
 
-<<<<<<< HEAD
-A única maneira de resolver este problema **sem contexto** é [atribuir o próprio componente Avatar a uma prop do componente Page](/docs/composition-vs-inheritance.html#containment), assim os componentes intermediários não precisam saber sobre a prop `user`.
-=======
-One way to solve this issue **without context** is to [pass down the `Avatar` component itself](/docs/composition-vs-inheritance.html#containment) so that the intermediate components don't need to know about the `user` or `avatarSize` props:
->>>>>>> c6b6dc2d564190a79fd6bf17af0bb2914749112b
+Uma forma de resolver este problema **sem contexto** é [atribuir o próprio componente Avatar a uma prop do componente Page](/docs/composition-vs-inheritance.html#containment), assim os componentes intermediários não precisam saber sobre a prop `user` ou o `avatarSize`:
 
 ```js
 function Page(props) {
@@ -71,15 +67,9 @@ function Page(props) {
   return <PageLayout userLink={userLink} />;
 }
 
-<<<<<<< HEAD
 // Agora temos:
-<Page user={user} />
-// ... que renderiza ...
-=======
-// Now, we have:
 <Page user={user} avatarSize={avatarSize} />
-// ... which renders ...
->>>>>>> c6b6dc2d564190a79fd6bf17af0bb2914749112b
+// ... que renderiza ...
 <PageLayout userLink={...} />
 // ... que renderiza ...
 <NavigationBar userLink={...} />