diff --git a/.gitignore b/.gitignore
index 319bab66cafa..21728725b2f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,7 @@ docs/code
 docs/_site
 docs/.sass-cache
 docs/js/*
-docs/downloads
+docs/downloads/*.zip
 docs/vendor/bundle
 examples/shared/*.js
 examples/**/bundle.js
diff --git a/docs/_data/nav_docs_old.yml b/docs/_data/nav_docs_old.yml
index 27f910cb0ccc..6fdffce88f6a 100644
--- a/docs/_data/nav_docs_old.yml
+++ b/docs/_data/nav_docs_old.yml
@@ -22,8 +22,6 @@
     title: React (Virtual) DOM Terminology
 - title: Old Quick Start
   items:
-  - id: getting-started
-    title: Getting Started
   - id: tutorial
     title: Tutorial
   - id: thinking-in-react
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 15d60f99fd39..01f24862fd3f 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -51,7 +51,6 @@
         </a>
         <ul class="nav-site nav-site-internal">
           <li><a href="/react/docs/installation.html"{% if page.sectionid == 'docs' or page.sectionid == 'tips' or page.sectionid == 'contributing' %} class="active"{% endif %}>Docs</a></li>
-          <li><a href="/react/downloads.html"{% if page.id == 'downloads' %} class="active"{% endif %}>Download</a></li>
           <li><a href="/react/community/support.html"{% if page.sectionid == 'community' %} class="active"{% endif %}>Community</a></li>
           <li><a href="/react/blog/"{% if page.sectionid == 'blog' %} class="active"{% endif %}>Blog</a></li>
           <li>
@@ -75,8 +74,13 @@
         </div>
 
         <div class="buttons-unit">
+<<<<<<< HEAD
+          <a href="/react/docs/getting-started.html" class="button">Get Started</a>
+          <a href="/react/docs/tutorial.html" class="button">Take the Tutorial</a>
+=======
           <a href="/react/docs/installation.html" class="button">Get Started</a>
           <a href="/react/downloads.html" class="button">Download React v{{site.react_version}}</a>
+>>>>>>> 46983cf36c2e2b7e5eeae4f76273cd0daf299b7e
         </div>
       </div>
     </div>
diff --git a/docs/docs-old/getting-started.it-IT.md b/docs/docs-old/getting-started.it-IT.md
deleted file mode 100644
index b9bf0a93d317..000000000000
--- a/docs/docs-old/getting-started.it-IT.md
+++ /dev/null
@@ -1,123 +0,0 @@
----
-id: getting-started-it-IT
-title: Primi Passi
-permalink: docs-old/getting-started-it-IT.html
-next: tutorial-it-IT.html
-redirect_from: "docs/index.html"
----
-
-## JSFiddle
-
-La maniera più semplice di cominciare ad hackerare con React è usare i seguenti esempi di Hello World su JSFiddle:
-
- * **[React JSFiddle](https://jsfiddle.net/reactjs/69z2wepo/)**
- * [React JSFiddle senza JSX](https://jsfiddle.net/reactjs/5vjqabv3/)
-
-## Starter Kit
-
-Scarica lo starter kit per cominciare.
-
-<div class="buttons-unit downloads">
-  <a href="/react/downloads/react-{{site.react_version}}.zip" class="button">
-    Scarica lo Starter Kit {{site.react_version}}
-  </a>
-</div>
-
-Nella directory principale dello starter kit, crea `helloworld.html` con il seguente contenuto.
-
-```html
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8" />
-    <title>Ciao React!</title>
-    <script src="build/react.js"></script>
-    <script src="https://unpkg.com/babel-core@5.8.38/browser.min.js"></script>
-  </head>
-  <body>
-    <div id="example"></div>
-    <script type="text/babel">
-      ReactDOM.render(
-        <h1>Cial, mondo!</h1>,
-        document.getElementById('example')
-      );
-    </script>
-  </body>
-</html>
-```
-
-La sintassi XML all'interno di JavaScript è chiamata JSX; dài un'occhiata alla [sintassi JSX](/react/docs/jsx-in-depth.html) per saperne di più. Allo scopo di tradurla in puro JavaScript usiamo `<script type="text/babel">` e includiamo Babel per effettuare la trasformazione effettiva nel browser.
-
-### File Separato
-
-Il tuo codice React JSX può trovarsi in un file a parte. Crea il seguente `src/helloworld.js`.
-
-```javascript
-ReactDOM.render(
-  <h1>Ciao, mondo!</h1>,
-  document.getElementById('example')
-);
-```
-
-Quindi fai riferimento ad esso da `helloworld.html`:
-
-```html{10}
-<script type="text/babel" src="src/helloworld.js"></script>
-```
-
-Nota che in alcuni browsers (Chrome, ad esempio) falliranno nel caricamento del file a meno che non sia servito tramite HTTP.
-
-### Trasformazione Offline
-
-Anzitutto installa gli strumenti da riga di comando di [Babel](http://babeljs.io/) (è richiesto [npm](https://www.npmjs.com/)):
-
-```
-npm install --global babel
-```
-
-Quindi, traduci il tuo file `src/helloworld.js` a semplice JavaScript:
-
-```
-babel src --watch --out-dir build
-
-```
-
-Il file `build/helloworld.js` è generato automaticamente ogni qualvolta effettui un cambiamento. Leggi la [documentazione di Babel CLI](http://babeljs.io/docs/usage/cli/) per un uso più avanzato.
-
-```javascript{2}
-ReactDOM.render(
-  React.createElement('h1', null, 'Ciao, mondo!'),
-  document.getElementById('example')
-);
-```
-
-
-Aggiorna il tuo file HTML come segue:
-
-```html{7,11}
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8" />
-    <title>Ciao React!</title>
-    <script src="build/react.js"></script>
-    <!-- Non c'è bisogno di Babel! -->
-  </head>
-  <body>
-    <div id="example"></div>
-    <script src="build/helloworld.js"></script>
-  </body>
-</html>
-```
-
-## Vuoi CommonJS?
-
-Se vuoi usare React con [browserify](http://browserify.org/), [webpack](https://webpack.github.io/), o un altro sistema modulare compatibile con CommonJS, usa il [pacchetto npm `react`](https://www.npmjs.com/package/react). In aggiunta, lo strumento di build `jsx` può essere integrato in quasi tutti i sistemi di packaging (non soltanto CommonJS) assai facilmente.
-
-## Passi Successivi
-
-Dài un'occhiata [al tutorial](/react/docs/tutorial-it-IT.html) e agli altri esempi nella directory `examples` dello starter kit per saperne di più.
-
-Abbiamo anche un wiki al quale la comunità contribuisce con [flussi di lavoro, componenti UI, routing, gestione dati etc.](https://github.com/facebook/react/wiki/Complementary-Tools)
-
-In bocca al lupo, e benvenuto/a!
diff --git a/docs/docs-old/getting-started.ja-JP.md b/docs/docs-old/getting-started.ja-JP.md
deleted file mode 100644
index 88c0b1222016..000000000000
--- a/docs/docs-old/getting-started.ja-JP.md
+++ /dev/null
@@ -1,121 +0,0 @@
----
-id: getting-started-ja-JP
-title: 始めてみましょう
-permalink: docs-old/getting-started-ja-JP.html
-next: tutorial-ja-JP.html
-redirect_from: "docs/index-ja-JP.html"
----
-
-## JSFiddle
-
-React でのハッキングを始めるにあたり、一番簡単なものとして次の JSFiddle で動いている Hello World の例を取り上げます。
-
- * **[React JSFiddle](https://jsfiddle.net/reactjs/69z2wepo/)**
- * [React JSFiddle without JSX](https://jsfiddle.net/reactjs/5vjqabv3/)
-
-## スターターキット
-
-始めるためにスターターキットをダウンロードしましょう。
-
-<div class="buttons-unit downloads">
-  <a href="/react/downloads/react-{{site.react_version}}.zip" class="button">
-    Download Starter Kit {{site.react_version}}
-  </a>
-</div>
-
-スターターキットのルートディレクトリに `helloworld.html` を作り、次のように書いてみましょう。
-
-```html
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8" />
-    <title>Hello React!</title>
-    <script src="build/react.js"></script>
-    <script src="https://unpkg.com/babel-core@5.8.38/browser.min.js"></script>
-  </head>
-  <body>
-    <div id="example"></div>
-    <script type="text/babel">
-      ReactDOM.render(
-        <h1>Hello, world!</h1>,
-        document.getElementById('example')
-      );
-    </script>
-  </body>
-</html>
-```
-
-JavaScript の中に書かれた XML シンタックスは JSX と呼ばれるものです（JSX の詳しいことについては [JSX syntax](/react/docs/jsx-in-depth.html) を読んでください）。ここでは JSX から vanilla JavaScript への変換をブラウザ内で行わせるため、先程のコードには `<script type="text/jsx">` と書いており、加えて `JSXTransformer.js` を読み込ませています。
-
-### ファイルの分割
-
-React の JSX コードは別ファイルに分離することができます。 次のような `src/helloworld.js` を作ってみましょう。
-
-```javascript
-ReactDOM.render(
-  <h1>Hello, world!</h1>,
-  document.getElementById('example')
-);
-```
-
-それが終わったら、`helloworld.js` への参照を `helloworld.html` に書き込みましょう。
-
-```html{10}
-<script type="text/babel" src="src/helloworld.js"></script>
-```
-
-### オフラインでの変換
-
-まずはコマンドラインツールをインストールしましょう（[npm](https://www.npmjs.com/) が必要です）。
-
-```
-npm install -g react-tools
-```
-
-インストールが終わったら、先程書いた `src/helloworld.js` ファイルを生の JavaScript に変換してみましょう。
-
-```
-jsx --watch src/ build/
-
-```
-
-すると、`src/helloword.js` に変更を加えるごとに `build/helloworld.js` が自動で生成されるようになります。
-
-```javascript{2}
-ReactDOM.render(
-  React.createElement('h1', null, 'Hello, world!'),
-  document.getElementById('example')
-);
-```
-
-
-最後に HTML ファイルを以下のように書き換えましょう。
-
-```html{7,11}
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8" />
-    <title>Hello React!</title>
-    <script src="build/react.js"></script>
-    <!-- Babel は必要ありません！ -->
-  </head>
-  <body>
-    <div id="example"></div>
-    <script src="build/helloworld.js"></script>
-  </body>
-</html>
-```
-
-## CommonJS を使うには
-
-React を [browserify](http://browserify.org/) や [webpack](https://webpack.github.io/)、または CommonJS 準拠の他のモジュールシステムと一緒に使いたい場合、 [`react` npm package](https://www.npmjs.com/package/react) を使ってみてください。また、`jsx` ビルドツールをパッケージングシステム（CommonJS に限らず）に導入することも非常に簡単です。
-
-## 次にすること
-
-[チュートリアル](/react/docs/tutorial-ja-JP.html) や、スターターキットの `examples` ディレクトリに入っている他の例を読んでみてください。
-
-また、[ワークフロー、UIコンポーネント、ルーティング、データマネジメントなど](https://github.com/facebook/react/wiki/Complementary-Tools)の方面で貢献しているコミュニティの wiki もあります。
-
-幸運を祈ります！React へようこそ！
diff --git a/docs/docs-old/getting-started.ko-KR.md b/docs/docs-old/getting-started.ko-KR.md
deleted file mode 100644
index 983f5d730a89..000000000000
--- a/docs/docs-old/getting-started.ko-KR.md
+++ /dev/null
@@ -1,150 +0,0 @@
----
-id: getting-started-ko-KR
-title: 시작해보기
-permalink: docs-old/getting-started-ko-KR.html
-next: tutorial-ko-KR.html
-redirect_from: "docs/index-ko-KR.html"
----
-
-## JSFiddle
-
-React를 시작하는 가장 빠른 방법은 다음의 Hello World JSFiddle 예제를 따라 해 보는 것입니다.
-
- * **[React JSFiddle](https://jsfiddle.net/reactjs/69z2wepo/)**
- * [React JSFiddle without JSX](https://jsfiddle.net/reactjs/5vjqabv3/)
-
-## npm으로 React 사용하기
-
-[browserify](http://browserify.org/), [webpack](https://webpack.github.io/) 같은 CommonJS 모듈 시스템과 함께 React를 사용하시는 것을 권장합니다. [`react`](https://www.npmjs.com/package/react), [`react-dom`](https://www.npmjs.com/package/react-dom) npm 패키지를 사용하세요.
-
-```js
-// main.js
-var React = require('react');
-var ReactDOM = require('react-dom');
-
-ReactDOM.render(
-  <h1>Hello, world!</h1>,
-  document.getElementById('example')
-);
-```
-
-browserify를 설치한 후에 React DOM을 설치하고 bundle을 빌드합니다.
-
-```sh
-$ npm install --save react react-dom babelify babel-preset-react
-$ browserify -t [ babelify --presets [ react ] ] main.js -o bundle.js
-```
-
-> 주의:
->
-> ES2015를 사용하고 있다면, `babel-preset-es2015` 패키지도 설치할 필요가 있습니다.
-
-## npm 없이 Quick Start 하기
-
-만약 당신이 npm을 사용할 준비가 아직 안되었다면, 미리빌드된 React와 React DOM 파일이 포함된 초심자용 키트를 다운로드 받을 수 있습니다.
-
-<div class="buttons-unit downloads">
-  <a href="/react/downloads/react-{{site.react_version}}.zip" class="button">
-   초심자용 키트 내려받기 {{site.react_version}}
-  </a>
-</div>
-
-초심자용 키트의 최상위 디렉터리에 아래의 내용대로 `helloworld.html` 파일을 생성합니다.
-
-```html
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8" />
-    <title>Hello React!</title>
-    <script src="build/react.js"></script>
-    <script src="build/react-dom.js"></script>
-    <script src="https://unpkg.com/babel-core@5.8.38/browser.min.js"></script>
-  </head>
-  <body>
-    <div id="example"></div>
-    <script type="text/babel">
-      ReactDOM.render(
-        <h1>Hello, world!</h1>,
-        document.getElementById('example')
-      );
-    </script>
-  </body>
-</html>
-```
-
-JavaScript 안에 보이는 XML 구문은 JSX라고 합니다; 더 자세한 내용은 [JSX syntax](/react/docs/jsx-in-depth-ko-KR.html)을 확인하세요. 일반적인 JavaScript로 번역하기 위해 `<script type="text/babel">`를 사용하고 Babel을 포함하는 것으로 실제로 브라우저에서 변환작업을 수행합니다.
-
-### 파일의 분리
-
-React JSX 코드는 분리된 파일로 존재할 수 있습니다. 다음 내용으로 `src/helloworld.js`를 생성해보세요.
-
-```javascript
-ReactDOM.render(
-  <h1>Hello, world!</h1>,
-  document.getElementById('example')
-);
-```
-
-그다음 `helloworld.html`에서 참조합니다:
-
-```html{10}
-<script type="text/babel" src="src/helloworld.js"></script>
-```
-
-크롬 같은 몇몇 브라우저에서는 HTTP를 통해 제공되는 파일이 아니면 로드에 실패하므로 주의하세요.
-
-### 오프라인 변환
-
-먼저 [Babel](http://babeljs.io/) 커맨드라인 도구를 설치합니다. ([npm](https://www.npmjs.com/) 필요):
-
-```
-npm install --global babel-cli
-npm install babel-preset-react
-```
-
-그다음, `src/helloworld.js` 파일을 일반 JavaScript 파일로 변환합니다:
-
-```
-babel --presets react src --watch --out-dir build
-```
-
-> 주의:
->
-> ES2015를 사용하고 있다면, `babel-preset-es2015` 패키지도 설치할 필요가 있습니다.
-
-수정할 때마다 `build/helloworld.js` 파일이 자동생성됩니다. 더 자세한 사용법은 [Babel CLI 문서](http://babeljs.io/docs/usage/cli/)를 읽어보세요.
-
-```javascript{2}
-ReactDOM.render(
-  React.createElement('h1', null, 'Hello, world!'),
-  document.getElementById('example')
-);
-```
-
-아래의 내용대로 HTML 파일을 업데이트합니다:
-
-```html{8,12}
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8" />
-    <title>Hello React!</title>
-    <script src="build/react.js"></script>
-    <script src="build/react-dom.js"></script>
-    <!-- Babel은 이제 불필요합니다! -->
-  </head>
-  <body>
-    <div id="example"></div>
-    <script src="build/helloworld.js"></script>
-  </body>
-</html>
-```
-
-## 다음 단계로
-
-더 알아보려면 [튜토리얼](/react/docs/tutorial-ko-KR.html)과 초심자용 키트의 `examples` 디렉터리에서 다른 예제들을 확인해 보세요.
-
-커뮤니티의 기여로 운영되는 Wiki도 있습니다: [워크플로우, UI 컴포넌트, 라우팅, 데이터 관리 등](https://github.com/facebook/react/wiki/Complementary-Tools)
-
-React의 세계에 오신 것을 환영합니다. 행운을 빌어요!
diff --git a/docs/docs-old/getting-started.md b/docs/docs-old/getting-started.md
deleted file mode 100644
index be1dbba78ada..000000000000
--- a/docs/docs-old/getting-started.md
+++ /dev/null
@@ -1,84 +0,0 @@
----
-id: getting-started
-title: Getting Started
-permalink: docs/getting-started.html
-next: tutorial.html
----
-
-## JSFiddle
-
-The easiest way to start hacking on React is using the following JSFiddle Hello World examples:
-
- * **[React JSFiddle](https://jsfiddle.net/reactjs/69z2wepo/)**
- * [React JSFiddle without JSX](https://jsfiddle.net/reactjs/5vjqabv3/)
-
-## Create React App
-
-**[Create React App](http://github.com/facebookincubator/create-react-app)** is a new officially supported way to create single-page React applications. It offers a modern build setup with no configuration. It requires Node 4 or higher.
-
-Note that it has [some limitations](https://github.com/facebookincubator/create-react-app#limitations) and is only useful for single-page applications. If you need more flexibility, or if you want to integrate React into an existing project, consider other options below.
-
-## Starter Pack
-
-If you're just getting started, you can download the starter kit. The starter kit includes prebuilt copies of React and React DOM for the browser, as well as a collection of usage examples to help you get started.
-
-<div class="buttons-unit downloads">
-  <a href="/react/downloads/react-{{site.react_version}}.zip" class="button">
-    Download Starter Kit {{site.react_version}}
-  </a>
-</div>
-
-In the root directory of the starter kit, create a `helloworld.html` with the following contents.
-
-```html
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8" />
-    <title>Hello React!</title>
-    <script src="build/react.js"></script>
-    <script src="build/react-dom.js"></script>
-    <script src="https://unpkg.com/babel-core@5.8.38/browser.min.js"></script>
-  </head>
-  <body>
-    <div id="example"></div>
-    <script type="text/babel">
-      ReactDOM.render(
-        <h1>Hello, world!</h1>,
-        document.getElementById('example')
-      );
-    </script>
-  </body>
-</html>
-```
-
-The XML syntax inside of JavaScript is called JSX; check out the [JSX syntax](/react/docs/jsx-in-depth.html) to learn more about it. In order to translate it to vanilla JavaScript we use `<script type="text/babel">` and include Babel to actually perform the transformation in the browser. Open the html from a browser and you should already be able to see the greeting!
-
-### Separate File
-
-Your React JSX code can live in a separate file. Create the following `src/helloworld.js`.
-
-```javascript
-ReactDOM.render(
-  <h1>Hello, world!</h1>,
-  document.getElementById('example')
-);
-```
-
-Then reference it from `helloworld.html`:
-
-```html{10}
-<script type="text/babel" src="src/helloworld.js"></script>
-```
-
-Note that some browsers (Chrome, e.g.) will fail to load the file unless it's served via HTTP.
-
-## Using React with npm or Bower
-
-You can also use React with package managers like npm or Bower. You can learn more in our [Package Managers](/react/docs/package-management.html) section.
-
-## Next Steps
-
-Check out [the tutorial](/react/docs/tutorial.html) and the other examples in the starter kit's `examples` directory to learn more.
-
-Good luck, and welcome!
diff --git a/docs/docs-old/getting-started.zh-CN.md b/docs/docs-old/getting-started.zh-CN.md
deleted file mode 100644
index 2d3133b45fb0..000000000000
--- a/docs/docs-old/getting-started.zh-CN.md
+++ /dev/null
@@ -1,168 +0,0 @@
----
-id: getting-started-zh-CN
-title: 入门教程
-permalink: docs-old/getting-started-zh-CN.html
-next: tutorial-zh-CN.html
-redirect_from: "docs/index-zh-CN.html"
----
-
-## JSFiddle
-
-开始 Hack React 的最简单的方法是用下面 JSFiddle 的Hello Worlds：
-
- * **[React JSFiddle](https://jsfiddle.net/reactjs/69z2wepo/)**
- * [React JSFiddle without JSX](https://jsfiddle.net/reactjs/5vjqabv3/)
-
-## 通过 npm 使用 React
-
-我们建议在 React 中使用 CommonJS 模块系统，比如 [browserify](http://browserify.org/) 或 [webpack](https://webpack.github.io/)。使用 [`react`](https://www.npmjs.com/package/react) 和 [`react-dom`](https://www.npmjs.com/package/react-dom) npm 包.
-
-```js
-// main.js
-var React = require('react');
-var ReactDOM = require('react-dom');
-
-ReactDOM.render(
-  <h1>Hello, world!</h1>,
-  document.getElementById('example')
-);
-```
-
-要用 browserify 安装 React DOM 和构建你的包。
-
-```sh
-$ npm install --save react react-dom babelify babel-preset-react
-$ browserify -t [ babelify --presets [ react ] ] main.js -o bundle.js
-```
-
-要用 webpack 安装 React DOM 和构建你的包:  
-
-```sh
-$ npm install --save react react-dom babel-preset-react
-$ webpack
-```
-
-> 注意:
->
-> 如果你正在使用 ES2015, 你将要使用 `babel-preset-es2015` 包.
-
-**注意:** 默认情况下，React 将会在开发模式，很缓慢，不建议用于生产。要在生产模式下使用 React，设置环境变量 `NODE_ENV` 为 `production` （使用 envify 或者 webpack's DefinePlugin）。例如：
-
-```js
-new webpack.DefinePlugin({
-  "process.env": {
-    NODE_ENV: JSON.stringify("production")
-  }
-});
-```
-
-## 不用 npm 的快速开始
-
-如果你现在还没准备要使用npm,你可以下载这个已经包含了预构建的 React 和 React DOM 拷贝的入门套件. 
-
-<div class="buttons-unit downloads">
-  <a href="/react/downloads/react-{{site.react_version}}.zip" class="button">
-    下载入门套件 {{site.react_version}}
-  </a>
-</div>
-
-在入门教程包的根目录，创建一个含有如下代码的 `helloworld.html`。
-
-```html
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8" />
-    <title>Hello React!</title>
-    <script src="build/react.js"></script>
-    <script src="build/react-dom.js"></script>
-    <script src="https://unpkg.com/babel-core@5.8.38/browser.min.js"></script>
-  </head>
-  <body>
-    <div id="example"></div>
-    <script type="text/babel">
-      ReactDOM.render(
-        <h1>Hello, world!</h1>,
-        document.getElementById('example')
-      );
-    </script>
-  </body>
-</html>
-```
-
-在 JavaScript 代码里写着 XML 格式的代码称为 JSX；可以去 [JSX 语法](/react/docs/jsx-in-depth.html) 里学习更多 JSX 相关的知识。为了把 JSX 转成标准的 JavaScript，我们用 `<script type="text/babel">` 标签，并引入 Babel 来完成在浏览器里的代码转换。在浏览器里打开这个html，你应该可以看到成功的消息！
-
-### 分离文件
-
-你的 React JSX 代码文件可以写在另外的文件里。新建下面的 `src/helloworld.js`。
-
-```javascript
-ReactDOM.render(
-  <h1>Hello, world!</h1>,
-  document.getElementById('example')
-);
-```
-
-然后在 `helloworld.html` 引用该文件：
-
-```html{10}
-<script type="text/babel" src="src/helloworld.js"></script>
-```
-
-注意一些浏览器（比如 Chrome ）会在使用 HTTP 以外的协议加载文件时失败。
-
-### 离线转换
-
-先安装[Babel](http://babeljs.io/)命令行工具（需要 [npm](https://www.npmjs.com/)）：
-
-```
-npm install --global babel-cli
-npm install babel-preset-react
-```
-
-然后把你的 `src/helloworld.js` 文件转成标准的 JavaScript:
-
-```
-babel --presets react src --watch --out-dir build
-```
-
-> 注意:
->
-> 如果你正在使用 ES2015, 你将需要使用 `babel-preset-es2015` 包.
-
-`build/helloworld.js` 会在你对文件进行修改时自动生成。 阅读 [Babel CLI 文档](http://babeljs.io/docs/usage/cli/) 了解高级用法。
-
-```javascript{2}
-ReactDOM.render(
-  React.createElement('h1', null, 'Hello, world!'),
-  document.getElementById('example')
-);
-```
-
-
-对照下面更新你的 HTML 代码
-
-```html{8,12}
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8" />
-    <title>Hello React!</title>
-    <script src="build/react.js"></script>
-    <script src="build/react-dom.js"></script>
-    <!-- 不需要 Babel! -->
-  </head>
-  <body>
-    <div id="example"></div>
-    <script src="build/helloworld.js"></script>
-  </body>
-</html>
-```
-
-## 下一步
-
-去看看[入门教程](/react/docs/tutorial-zh-CN.html) 和入门教程包 `examples` 目录下的其它例子学习更多。
-
-我们还有一个社区开发者共建的 Wiki：[workflows, UI-components, routing, data management etc.](https://github.com/facebook/react/wiki/Complementary-Tools)
-
-恭喜你，欢迎来到 React 的世界。
diff --git a/docs/docs/01-installation.md b/docs/docs/01-installation.md
index 31ecc56e3c03..4f94e9da16db 100644
--- a/docs/docs/01-installation.md
+++ b/docs/docs/01-installation.md
@@ -3,7 +3,77 @@ id: installation
 title: Installation
 permalink: docs/installation.html
 redirect_from: "docs/index.html"
+redirect_from: "downloads.html"
 next: hello-world.html
 ---
 
-TODO
+React is flexible and can be used in a variety of projects. You can create new apps with it, but you can also gradually introduce it into an existing codebase without doing a rewrite.
+
+## Trying Out React
+
+If you're just interested in playing around with React, you can use JSFiddle. Try starting from [this Hello World example code](https://jsfiddle.net/o9gspf3e/). You don't need to install anything; you can just modify the code and click "Run" to see if it works.
+
+If you prefer to use your own text editor, you can also download [this HTML file](/react/downloads/single-file-example.html), edit it, and open it from the local filesystem in your browser. It does a slow runtime code transformation, so don't use it in production.
+
+## Creating a Single Page Application
+
+[Create React App](http://github.com/facebookincubator/create-react-app) is the best way to starting building a new React single page application. It sets up your development environment so that you can use the latest JavaScript features, provides a nice developer experience, and optimizes your app for production.
+
+```bash
+npm install -g create-react-app
+create-react-app hello-world
+cd hello-world
+npm start
+```
+
+Create React App doesn't handle backend logic or databases; it just creates a frontend build pipeline, so you can use it with any backend you want. It uses Webpack, Babel and ESLint under the hood, but configures them for you.
+
+## Adding React to an Existing Application
+
+### Using npm
+
+We recommend using React from npm with a bundler like [browserify](http://browserify.org/) or [webpack](https://webpack.github.io/). If you use npm for client package management, you can install React with:
+
+```bash
+npm install --save react react-dom
+```
+
+and import it from your code with something like:
+
+```js
+var React = require('react');
+var ReactDOM = require('react-dom');
+
+class App extends React.Component {
+  render() {
+    return <div>Hello world!</div>;
+  }
+}
+
+ReactDOM.render(<App />, document.getElementById('root'));
+```
+
+This code renders into an HTML element with the id of `root` so you need `<div id="root"></div>` somewhere in your HTML file. When you use React in this way, you should be transpiling your JavaScript using `babel` with the `es2015` and `react` presets.
+
+### Enabling ES6 and JSX
+
+We recommend using React with Babel to let you use ES6 and JSX in your JavaScript code. ES6 is a set of modern JavaScript features that make development easier, and JSX is an extension to the JavaScript language that works nicely with React. The [Babel setup instructions](https://babeljs.io/docs/setup/) explain how to configure Babel in many different build environments. Make sure you install `babel-preset-react` and `babel-preset-es2015` and enable them in your `.babelrc`, and you're good to go.
+
+### Using a CDN
+
+If you don't want to use npm to manage client packages, the `react` and `react-dom` npm packages also provide UMD distributions in `dist` folders, which are hosted on a CDN:
+
+```html
+<script src="https://unpkg.com/react@latest/dist/react.js"></script>
+<script src="https://unpkg.com/react-dom@latest/dist/react-dom.js"></script>
+```
+
+To load a specific version of `react` and `react-dom`, replace `latest` with the version number.
+
+### Using Bower
+
+If you use Bower, React is available via the `react` package:
+
+```bash
+bower install --save react
+```
diff --git a/docs/downloads.md b/docs/downloads.md
deleted file mode 100644
index 6eb80ddbd006..000000000000
--- a/docs/downloads.md
+++ /dev/null
@@ -1,78 +0,0 @@
----
-id: downloads
-title: Downloads
-layout: single
-permalink: downloads.html
----
-Download the starter kit to get everything you need to
-[get started with React](/react/docs/installation.html). The starter kit includes React and some simple example apps.
-
-<div class="buttons-unit downloads">
-  <a href="/react/downloads/react-{{site.react_version}}.zip" class="button">
-    Download Starter Kit {{site.react_version}}
-  </a>
-</div>
-
-## Development vs. Production Builds
-
-We provide two versions of React: an uncompressed version for development and a minified version for production. The development version includes extra warnings about common mistakes, whereas the production version includes extra performance optimizations and strips all error messages.
-
-If you're just starting out, make sure to use the development version.
-
-## Individual Downloads
-
-#### React {{site.react_version}} (development)
-The uncompressed, development version of [react.js](https://unpkg.com/react@{{site.react_version}}/dist/react.js) and [react-dom.js](https://unpkg.com/react-dom@{{site.react_version}}/dist/react-dom.js) with inline documentation (you need both files).
-
-```html
-<script src="https://unpkg.com/react@{{site.react_version}}/dist/react.js"></script>
-<script src="https://unpkg.com/react-dom@{{site.react_version}}/dist/react-dom.js"></script>
-```
-
-#### React {{site.react_version}} (production)
-The compressed, production version of [react.js](https://unpkg.com/react@{{site.react_version}}/dist/react.min.js) and [react-dom.js](https://unpkg.com/react-dom@{{site.react_version}}/dist/react-dom.min.js) (you need both).
-
-```html
-<script src="https://unpkg.com/react@{{site.react_version}}/dist/react.min.js"></script>
-<script src="https://unpkg.com/react-dom@{{site.react_version}}/dist/react-dom.min.js"></script>
-```
-
-#### React with Add-Ons {{site.react_version}} (development)
-The uncompressed, development version of React with [optional add-ons](/react/docs/addons.html).
-
-```html
-<script src="https://unpkg.com/react@{{site.react_version}}/dist/react-with-addons.js"></script>
-<script src="https://unpkg.com/react-dom@{{site.react_version}}/dist/react-dom.js"></script>
-```
-
-#### React with Add-Ons {{site.react_version}} (production)
-The compressed, production version of React with [optional add-ons](/react/docs/addons.html).
-
-```html
-<script src="https://unpkg.com/react@{{site.react_version}}/dist/react-with-addons.min.js"></script>
-<script src="https://unpkg.com/react-dom@{{site.react_version}}/dist/react-dom.min.js"></script>
-```
-
-> Note:
->
-> We're using [unpkg](https://unpkg.com) to serve these files. This is a free service with the goal to provide a hassle-free CDN for npm package authors. React is also available on other free CDNs including [cdnjs](https://cdnjs.com/libraries/react/) and [jsDelivr](https://www.jsdelivr.com/projects/react). If you have concerns with relying on an external host, we always recommend that you download React and serve it from your own servers.
-
-## npm
-
-We recommend using React from npm with a bundler like [browserify](http://browserify.org/) or [webpack](https://webpack.github.io/). You can use the `react` and `react-dom` packages. After installing it using `npm install --save react react-dom`, you can use:
-
-```js
-var React = require('react');
-var ReactDOM = require('react-dom');
-ReactDOM.render(<App />, ...);
-```
-
-Each of the [add-ons](/react/docs/addons.html) lives in its own package.
-
-**Note:** by default, React will be in development mode. To use React in production mode, set the environment variable `NODE_ENV` to `production` (using envify or webpack's DefinePlugin). A minifier that performs dead-code elimination such as [UglifyJS](https://github.com/mishoo/UglifyJS2) is recommended to completely remove the extra code present in development mode.
-
-## Bower
-
-```sh
-$ bower install --save react
-```
diff --git a/docs/downloads/single-file-example.html b/docs/downloads/single-file-example.html
new file mode 100644
index 000000000000..5197b6faca42
--- /dev/null
+++ b/docs/downloads/single-file-example.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8" />
+    <title>Hello React World!</title>
+    <script src="https://unpkg.com/react@latest/dist/react.js"></script>
+    <script src="https://unpkg.com/react-dom@latest/dist/react-dom.js"></script>
+    <script src="https://unpkg.com/babel-standalone@6.15.0/babel.min.js"></script>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="text/babel">
+
+      class Hello extends React.Component {
+        render() {
+          return <h1>Hello, world!</h1>;
+        }
+      }
+
+      ReactDOM.render(
+        <Hello />,
+        document.getElementById('root')
+      );
+
+    </script>
+  </body>
+</html>
diff --git a/docs/index.md b/docs/index.md
index 1043a550bd5a..dbfc0ad46217 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -82,6 +82,6 @@ id: home
 <section class="home-bottom-section">
   <div class="buttons-unit">
     <a href="docs/installation.html" class="button">Get Started</a>
-    <a href="downloads.html" class="button">Download React v{{site.react_version}}</a>
+    <a href="docs/tutorial.html" class="button">Take the Tutorial</a>
   </div>
 </section>
