facebook · flarnie · Jun 7, 2017 · Apr 13, 2017 · Apr 13, 2017 · Apr 13, 2017
diff --git a/circle.yml b/circle.yml
@@ -1,9 +1,4 @@
 ---
-general:
- branches:
- ignore:
- - gh-pages
-
 machine:
  timezone: America/Los_Angeles
  node:

diff --git a/docs/_data/nav_docs.yml b/docs/_data/nav_docs.yml
@@ -30,6 +30,8 @@
  items:
  - id: jsx-in-depth
  title: JSX In Depth
+ - id: typechecking-with-proptypes
+ title: Typechecking With PropTypes
  - id: refs-and-the-dom
  title: Refs and the DOM
  - id: uncontrolled-components
@@ -48,6 +50,8 @@
  title: Web Components
  - id: higher-order-components
  title: Higher-Order Components
+ - id: integrating-with-other-libraries
+ title: Integrating with Other Libraries
 - title: Reference
  items:
  - id: react-api

diff --git a/docs/_data/nav_tutorial.yml b/docs/_data/nav_tutorial.yml
@@ -1,12 +1,29 @@
 - title: Tutorial
  items:
  - id: tutorial
- title: Overview
+ title: Before We Start
  subitems:
  - id: what-were-building 
  title: What We're Building
  href: /react/tutorial/tutorial.html#what-were-building
  forceInternal: true
+ - id: prerequisites
+ title: Prerequisites
+ href: /react/tutorial/tutorial.html#prerequisites
+ forceInternal: true
+ - id: how-to-follow-along
+ title: How to Follow Along
+ href: /react/tutorial/tutorial.html#how-to-follow-along
+ forceInternal: true
+ - id: help-im-stuck
+ title: Help, I'm Stuck!
+ href: /react/tutorial/tutorial.html#help-im-stuck
+ forceInternal: true
+ - id: overview
+ title: Overview
+ href: /react/tutorial/tutorial.html#overview
+ forceInternal: true
+ subitems:
  - id: what-is-react
  title: What is React?
  href: /react/tutorial/tutorial.html#what-is-react

diff --git a/docs/_js/live_editor.js b/docs/_js/live_editor.js
@@ -221,7 +221,7 @@ var ReactPlayground = React.createClass({
  } catch (err) {
  this.setTimeout(function() {
  ReactDOM.render(
- <div className="playgroundError">{err.toString()}</div>,
+ <pre style={{overflowX: 'auto'}} className="playgroundError">{err.toString()}</pre>,
  mountNode
  );
  }, 500);

diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
@@ -35,18 +35,18 @@
  <script>try{Typekit.load();}catch(e){}</script>
 
  <!--[if lte IE 8]>
- <script src="/react/js/html5shiv.min.js"></script>
- <script src="/react/js/es5-shim.min.js"></script>
- <script src="/react/js/es5-sham.min.js"></script>
+ <script src="https://unpkg.com/[email protected]/dist/html5shiv.min.js"></script>
+ <script src="https://unpkg.com/[email protected]/es5-shim.min.js"></script>
+ <script src="https://unpkg.com/[email protected]/es5-sham.min.js"></script>
  <![endif]-->
- <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/1/docsearch.min.js"></script>
- <script src="/react/js/codemirror.js"></script>
- <script src="/react/js/javascript.js"></script>
- <script src="/react/js/xml.js"></script>
- <script src="/react/js/jsx.js"></script>
- <script src="/react/js/react.js"></script>
- <script src="/react/js/react-dom.js"></script>
- <script src="/react/js/babel.min.js"></script>
+ <script src="https://unpkg.com/docsearch.js@1.5.0/dist/cdn/docsearch.min.js"></script>
+ <script src="https://unpkg.com/codemirror@5.15.2"></script>
+ <script src="https://unpkg.com/[email protected]/mode/javascript/javascript.js"></script>
+ <script src="https://unpkg.com/[email protected]/mode/xml/xml.js"></script>
+ <script src="https://unpkg.com/[email protected]/mode/jsx/jsx.js"></script>
+ <script src="https://unpkg.com/react/dist/react.min.js"></script>
+ <script src="https://unpkg.com/react-dom/dist/react-dom.min.js"></script>
+ <script src="https://unpkg.com/[email protected]/babel.min.js"></script>
  <script src="/react/js/live_editor.js"></script>
 </head>
 <body>

diff --git a/docs/circle.yml b/docs/circle.yml
@@ -0,0 +1,5 @@
+---
+general:
+ branches:
+ ignore:
+ - gh-pages
diff --git a/docs/community/conferences.md b/docs/community/conferences.md
@@ -14,16 +14,16 @@ March 28th at the [QEII Centre, London](http://qeiicentre.london/)
 
 [Website](http://react.london/)
 
-### ReactEurope 2017
-May 18th & 19th in Paris, France
-
-[Website](http://www.react-europe.org/) - [Schedule](http://www.react-europe.org/#schedule)
-
 ### React Amsterdam 2017
 April 21st in Amsterdam, The Netherlands
 
 [Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam)
 
+### ReactEurope 2017
+May 18th & 19th in Paris, France
+
+[Website](http://www.react-europe.org/) - [Schedule](http://www.react-europe.org/#schedule)
+
 ### Chain React 2017
 July 10-11 in Portland, Oregon USA
 
@@ -34,6 +34,11 @@ August 24-25 in Salt Lake City, Utah USA
 
 [Website](http://www.reactrally.com) - [Twitter](https://twitter.com/reactrally)
 
+### React Native EU 2017
+September 6-7 in Wroclaw, Poland
+
+[Website](http://react-native.eu/)
+
 ### ReactJS Day 2017
 October 6th in Verona, Italy
 
@@ -44,11 +49,6 @@ October 13 in Stockholm, Sweden
 
 [Website](https://statejs.com/)
 
-### React Native EU 2017
-September 6-7 in Wroclaw, Poland
-
-[Website](http://react-native.eu/)
-
 
 ## Past Conferences
 

diff --git a/docs/contributing/codebase-overview.md b/docs/contributing/codebase-overview.md
@@ -38,7 +38,7 @@ var setInnerHTML = require('setInnerHTML');
 
 Haste was originally developed for giant apps like Facebook. It's easy to move files to different folders and import them without worrying about relative paths. The fuzzy file search in any editor always takes you to the correct place thanks to globally unique names.
 
-React itself was extracted from the Facebook codebase and uses Haste for historical reasons. In the future, we will probably [migrate React to use CommonJS or ES Modules](https:/facebook/react/issues/6336) to be more aligned with the community. However, this requires changes in Facebook internal infrastructure so it is unlikely to happen very soon.
+React itself was extracted from Facebook's codebase and uses Haste for historical reasons. In the future, we will probably [migrate React to use CommonJS or ES Modules](https:/facebook/react/issues/6336) to be more aligned with the community. However, this requires changes in Facebook's internal infrastructure so it is unlikely to happen very soon.
 
 **Haste will make more sense to you if you remember a few rules:**
 
@@ -66,6 +66,7 @@ After cloning the [React repository](https:/facebook/react), you wil
 
 * [`src`](https:/facebook/react/tree/master/src) is the source code of React. **If your change is related to the code, `src` is where you'll spend most of your time.**
 * [`docs`](https:/facebook/react/tree/master/docs) is the React documentation website. When you change APIs, make sure to update the relevant Markdown files.
+* [`fixtures`](https:/facebook/react/tree/master/fixtures) contains a few small React test applications for contributors.
 * [`packages`](https:/facebook/react/tree/master/packages) contains metadata (such as `package.json`) for all packages in the React repository. Nevertheless, their source code is still located inside [`src`](https:/facebook/react/tree/master/src).
 * `build` is the build output of React. It is not in the repository but it will appear in your React clone after you [build it](/react/contributing/how-to-contribute.html#development-workflow) for the first time.
 
@@ -223,7 +224,7 @@ module.exports = ReactDOMComponent;
 
 The `Mixin` in this code has no relation to React `mixins` feature. It is just a way of grouping a few methods under an object. Those methods may later get attached to some other class. We use this pattern in a few places although we try to avoid it in the new code.
 
-Equivalent code in ES6 would look like this:
+The equivalent code in ES6 would look like this:
 
 ```js
 class ReactDOMComponent {
@@ -301,10 +302,8 @@ While the code is separated in the source tree, the exact package boundaries are
 The "core" of React includes all the [top-level `React` APIs](/react/docs/top-level-api.html#react), for example:
 
 * `React.createElement()`
-* `React.createClass()`
 * `React.Component`
 * `React.Children`
-* `React.PropTypes`
 
 **React core only includes the APIs necessary to define components.** It does not include the [reconciliation](/react/docs/reconciliation.html) algorithm or any platform-specific code. It is used both by React DOM and React Native components.
 

diff --git a/docs/contributing/how-to-contribute.md b/docs/contributing/how-to-contribute.md
@@ -39,7 +39,7 @@ We are using [GitHub Issues](https:/facebook/react/issues) for our p
 
 #### Reporting New Issues
 
-The best way to get your bug fixed is to provide a reduced test case. This [JSFiddle template](https://jsfiddle.net/reactjs/69z2wepo/) is a great starting point.
+The best way to get your bug fixed is to provide a reduced test case. This [JSFiddle template](https://jsfiddle.net/84v837e9/) is a great starting point.
 
 #### Security Bugs
 
@@ -64,7 +64,7 @@ Working on your first Pull Request? You can learn how from this free video serie
 
 **[How to Contribute to an Open Source Project on GitHub](https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github)**
 
-To help you get your feet wet and get you familiar with our contribution process, we have a list of **[good first bugs](https:/facebook/react/labels/good%20first%20bug)** that contain bugs which are fairly easy to fix. This is a great place to get started.
+To help you get your feet wet and get you familiar with our contribution process, we have a list of **[beginner friendly issues](https:/facebook/react/issues?q=is%3Aopen+is%3Aissue+label%3A%22Difficulty%3A+beginner%22)** that contain bugs which are fairly easy to fix. This is a great place to get started.
 
 If you decide to fix an issue, please be sure to check the comment thread in case somebody is already working on a fix. If nobody is working on it at the moment, please leave a comment stating that you intend to work on it so other people don't accidentally duplicate your effort.
 
@@ -101,7 +101,7 @@ In order to accept your pull request, we need you to submit a CLA. You only need
 
 ### Development Workflow
 
-After cloning React, run `npm install` to fetch its dependencies. 
+After cloning React, run `npm install` to fetch its dependencies.
 Then, you can run several commands:
 
 * `npm run lint` checks the code style.