Merge pull request reactjs#11 from reactjs/sync-61b96a2f

Sync with reactjs.org @ 61b96a2

Author: JeremiePat

README.md

@@ -57,6 +57,16 @@ This repo is meant to provide French translation for the [reactjs.org](https://r
 1. Follow GitHub's instructions.
 1. If possible, include screenshots of visual changes. A Netlify build will also be automatically created once you make your PR so other people can see your change.
 
+<<<<<<< HEAD
+=======
+## Translation
+
+If you are interesting in translating `reactjs.org`, please see the current translation efforts at [isreactreadyyet.com](https://www.isreactreadyyet.com).
+
+
+If your language does not have a translation and you would like to create one, please follow the instructions at [reactjs.org Translations](https://github.com/reactjs/reactjs.org-translation#translating-reactjsorg).
+
+>>>>>>> 61b96a2f24d6c64851ee747e99d5ea7629059ec6
 ## Troubleshooting
 
 - `yarn reset` to clear the local cache

content/home/examples/a-component-using-external-plugins.md

@@ -4,4 +4,4 @@ order: 3
 domid: markdown-example
 ---
 
-React is flexible and provides hooks that allow you to interface with other libraries and frameworks. This example uses **remarkable**, an external Markdown library, to convert the `<textarea>`'s value in real time.
+React allows you to interface with other libraries and frameworks. This example uses **remarkable**, an external Markdown library, to convert the `<textarea>`'s value in real time.

content/tutorial/tutorial.md

@@ -82,7 +82,9 @@ npx create-react-app my-app
 
 3. Delete all files in the `src/` folder of the new project 
 
-> Note: **don't delete the entire `src` folder, just the original source files inside it.**.  We'll replace the default source files with examples for this project in the next step.
+> Note:
+>
+>**Don't delete the entire `src` folder, just the original source files inside it.** We'll replace the default source files with examples for this project in the next step.
 
 ```bash
 cd my-app