v0.13.1

Ensure FullPageComponents are treated as DOM components
(cherry picked from commit dacd4db1fa)

.eslintignore

@@ -0,0 +1,19 @@
+# We can probably lint these later but not important at this point
+src/vendor
+# eslint uses JSX* node types to determine if using JSX. esprima-fb still uses
+# XJS* nodes. When we fix that (https://github.com/facebook/esprima/pull/85) we
+# can enable linting the tests and fix those errors.
+src/**/__tests__/**
+# This should be enabled but that folder has too much in it that doesn't belong
+src/test
+test/the-files-to-test.generated.js
+# This is synced with a different file internally, don't want to lint it yet
+vendor/fbtransform/syntax.js
+vendor/jasmine/
+vendor/jasmine-jsreporter/
+# But not in docs/_js/examples/*
+docs/_js/*.js
+docs/js/
+# This should be more like examples/**/thirdparty/** but
+# we should fix https://github.com/facebook/esprima/pull/85 first
+examples/

.eslintrc

@@ -0,0 +1,51 @@
+---
+parser: esprima-fb
+
+env:
+  browser: true
+  node: true
+
+globals:
+  __DEV__: true
+
+rules:
+  # ERRORS
+  space-before-blocks: 2
+  indent: [2, 2, indentSwitchCase: true]
+  brace-style: 2
+  space-after-keywords: 2
+  strict: 2
+  # We actually have a transform to support this and we fix this for bundled
+  # releases but not for the npm package, so enforce it strictly
+  no-comma-dangle: 2
+  # Make this a warning for now. We do this in a few places so we might need to
+  # disable
+  no-unused-expressions: 2
+  block-scoped-var: 2
+  eol-last: 2
+  dot-notation: 2
+  consistent-return: 2
+  no-unused-vars: [2, args: none]
+  quotes: [2, 'single']
+
+  # WARNINGS
+  # This is the only one that's hard to track since we don't lint just changes.
+  max-len: [1, 80]
+
+  # WISHLIST. One day...
+  # We'll need a custom version of this that does a subset of the whole rule.
+  # Otherwise this is just too noisy.
+  # valid-jsdoc: 1
+
+  # DISABLED. These aren't compatible with our style
+  # We use this for private/internal variables
+  no-underscore-dangle: 0
+  # We pass constructors around / access them from members
+  new-cap: 0
+  # We do this a lot.
+  no-use-before-define: 0
+  # We do this in a few places to align values
+  key-spacing: 0
+
+  # DISABLED. These currently cause errors when running.
+  no-multi-spaces: 0

.jshintrc

@@ -1,21 +0,0 @@
-{
-  "node": true,
-
-  "boss": true,
-  "curly": true,
-  "devel": true,
-  "eqnull": true,
-  "expr": true,
-  "funcscope": true,
-  "globalstrict": true,
-  "loopfunc": true,
-  "newcap": false,
-  "noempty": true,
-  "nonstandard": true,
-  "onecase": true,
-  "sub": true,
-  "regexdash": true,
-  "trailing": true,
-  "undef": true,
-  "unused": "vars"
-}

.mailmap

@@ -1,8 +1,13 @@
+Alex Mykyta <dancingwithcows@gmail.com>
+Andreas Svensson <andreas@syranide.com>
 Andres Suarez <zertosh@gmail.com>
+Ben Alpert <ben@benalpert.com> <balpert@fb.com>
 Ben Alpert <ben@benalpert.com> <spicyjalapeno@gmail.com>
 Ben Newman <bn@cs.stanford.edu> <benjamn@fb.com>
 Bill Fisher <fisherwebdev@gmail.com>
+Brandon Tilley <brandon@brandontilley.com>
 Cheng Lou <chenglou92@gmail.com> <chenglou@fb.com>
+Christian Oliff <christianoliff@yahoo.com>
 Christoph Pojer <christoph.pojer@gmail.com>
 Christoph Pojer <christoph.pojer@gmail.com> <cpojer@fb.com>
 Connor McSheffrey <c@conr.me> <connor.mcsheffrey@gmail.com>
@@ -14,10 +19,12 @@ Evan Coonrod <evan@paloalto.com>
 Fabio M. Costa <fabiomcosta@gmail.com> <fabs@fb.com>
 Felix Kling <felix.kling@gmx.net> <fkling@fb.com>
 François-Xavier Bois <fxbois@gmail.com>
+Gabe Levi <gabelevi@gmail.com> <glevi@fb.com>
 Geert Pasteels <geert.pasteels@gmail.com>
 George A Sisco III <george.sisco@gmail.com>
 Harry Hull <harry.hull1@gmail.com>
 Hendrik Swanepoel <hendrik.swanepoel@gmail.com>
+Ian Obermiller <ian@obermillers.com> <iano@fb.com>
 Ingvar Stepanyan <me@rreverser.com> <rreverser@ubuntu.rreverser.a4.internal.cloudapp.net>
 Irae Carvalho <irae@irae.pro.br>
 Ivan Vergiliev <ivan.vergiliev@gmail.com>
@@ -29,18 +36,25 @@ Jason Bonta <jbonta@gmail.com> <jasonbonta@fb.com>
 Jason Trill <jason@jasontrill.com>
 Jeff Morrison <jeff@anafx.com> <Jeff@anafx.com>
 Jeff Morrison <jeff@anafx.com> <jeffmo@fb.com>
+Jeff Morrison <jeff@anafx.com> <lbljeffmo@gmail.com>
 Jeffrey Lin <lin.jeffrey@gmail.com> <jeffreylin@fb.com>
+Jim Sproch <jsproch@fb.com>
+Jim Sproch <jsproch@fb.com> <jsfb@github>
+Jon Madison <jon@tfftech.com>
 Jonathan Hsu <jhiswin@gmail.com>
 Jordan Walke <jordojw@gmail.com>
 Jordan Walke <jordojw@gmail.com> <jordanjcw@fb.com>
 Josh Duck <josh@fb.com> <github@joshduck.com>
+Juan Serrano <germ13@users.noreply.github.com>
 Jun Wu <quark@lihdd.net>
 Keito Uchiyama <projects@keito.me> <keito@fb.com>
 Kunal Mehta <k.mehta@berkeley.edu> <kunalm@fb.com>
 Laurence Rowe <l@lrowe.co.uk> <laurence@lrowe.co.uk>
 Martin Andert <mandert@gmail.com>
 Mathieu M-Gosselin <mathieumg@gmail.com> <mathieumg@atx33.com>
+Matt Zabriskie <mzabriskie@gmail.com>
 Michal Srb <xixixao@seznam.cz> xixixao <xixixao@seznam.cz>
+Minwe LUO <minwe@yunshipei.com>
 Nick Gavalas <njg57@cornell.edu>
 Nick Thompson <ncthom91@gmail.com> <nickt@instagram.com>
 Paul O’Shannessy <paul@oshannessy.com> <poshannessy@fb.com>
@@ -52,16 +66,24 @@ Pete Hunt <floydophone@gmail.com> <phunt@instagram.com>
 Petri Lievonen <plievone@cc.hut.fi>
 Petri Lievonen <plievone@cc.hut.fi> <petri.lievonen@tkk.fi>
 Pieter Vanderwerff <me@pieter.io> <pieter@heyday.co.nz>
+Pouja Nikray <poujanik@gmail.com>
 Ray <ray@tomo.im>
 Richard Feldman <richard.t.feldman@gmail.com> <richard@noredink.com>
 Richard Livesey <Livesey7@hotmail.co.uk>
 Rob Arnold <robarnold@cs.cmu.edu>
 Sander Spies <sandermail@gmail.com>
+Scott Feeney <scott@oceanbase.org> <smf@fb.com>
 Sebastian Markbåge <sebastian@calyptus.eu> <sema@fb.com>
+Sergey Rubanov <chi187@gmail.com>
+Steven Luscher <react@steveluscher.com> <github@steveluscher.com>
+Steven Luscher <react@steveluscher.com> <steveluscher@instagram.com>
+Steven Luscher <react@steveluscher.com> <steveluscher@users.noreply.github.com>
 Stoyan Stefanov <ssttoo@ymail.com>
 Thomas Aylott <oblivious@subtlegradient.com> <aylott@fb.com>
 Timothy Yung <yungsters@gmail.com> <yungsters@fb.com>
 Vjeux <vjeuxx@gmail.com>
 Vjeux <vjeuxx@gmail.com> <vjeux@fb.com>
 Volkan Unsal <spocksplanet@gmail.com>
+YouBao Nong <noyobo@gmail.com> <nongyoubao@alibaba-inc.com>
 Zach Bruggeman <mail@bruggie.com> <zbruggeman@me.com>
+张敏 <cookfront@gmail.com>

.travis.yml

@@ -2,6 +2,7 @@
 language: node_js
 node_js:
 - '0.10'
+sudo: false
 cache:
   directories:
   - node_modules
@@ -40,6 +41,7 @@ after_script:
 env:
   matrix:
   - TEST_TYPE=test
+  - TEST_TYPE=jest
   - TEST_TYPE=lint
   - TEST_TYPE=test:webdriver:saucelabs:modern
   global:
@@ -50,7 +52,6 @@ env:
 matrix:
   fast_finish: true
   allow_failures:
-    - env: TEST_TYPE=lint
     - env: TEST_TYPE=test:coverage
     - env: TEST_TYPE=perf:full
     - env: TEST_TYPE=test:webdriver:saucelabs:modern

AUTHORS

@@ -1,39 +1,63 @@
+Aaron Franks <aaron.franks@gmail.com>
 Adam Krebs <amk528@cs.nyu.edu>
 Adam Mark <adammark75@gmail.com>
 Adam Solove <asolove@gmail.com>
 Alan deLevie <adelevie@gmail.com>
+Alex Boyd <alex@opengroove.org>
+Alex Mykyta <dancingwithcows@gmail.com>
 Alex Zelenskiy <azelenskiy@fb.com>
 Alexander Solovyov <alexander@solovyov.net>
+Alexander Tseung <alextsg@gmail.com>
+Alexandre Gaudencio <shahor@shahor.fr>
 Alexey Raspopov <avenger7x13@gmail.com>
+Alexey Shamrin <shamrin@gmail.com>
 Andre Z Sanchez <andrezacsanchez@gmail.com>
 Andreas Svensson <andreas@syranide.com>
 Andres Suarez <zertosh@gmail.com>
+Andrew Cobby <cobbweb@users.noreply.github.com>
 Andrew Davey <andrew@equin.co.uk>
 Andrew Rasmussen <andras@fb.com>
 Andrew Zich <azich@fb.com>
 Andrey Popp <8mayday@gmail.com>
 Anthony van der Hoorn <anthony.vanderhoorn@gmail.com>
+Antti Ahti <antti.ahti@gmail.com>
 Areeb Malik <areeb.malik91@gmail.com>
+Aria Buckles <aria@khanacademy.org>
+Artem Nezvigin <artem@artnez.com>
 Ayman Osman <aymano.osman@gmail.com>
+Bartosz Kaszubowski <gosimek@gmail.com>
+Beau Smith <beau@beausmith.com>
 Ben Alpert <ben@benalpert.com>
 Ben Foxall <benfoxall@gmail.com>
 Ben Newman <bn@cs.stanford.edu>
 Ben Ripkens <bripkens.dev@gmail.com>
+Benjamin Keen <ben.keen@gmail.com>
+Benjamin Leiken <benleiken@gmail.com>
 Bill Fisher <fisherwebdev@gmail.com>
+Blaine Hatab <jbhatab@gmail.com>
 Bob Eagan <bob@synapsestudios.com>
+Bob Ralian <bob.ralian@gmail.com>
 Bojan Mihelac <bmihelac@mihelac.org>
 Brandon Bloom <brandon@brandonbloom.name>
 Brandon Tilley <brandon@brandontilley.com>
 Brian Cooke <bri@bricooke.com>
+Brian Holt <btholt@gmail.com>
+Brian Hsu <brianhsu@Brians-MacBook-Pro.local>
 Brian Kim <briankimpossible@gmail.com>
+Brian Kung <brian@callmekung.com>
 Brian Reavis <brian@thirdroute.com>
 Brian Rue <brian@rollbar.com>
+Bruno Škvorc <bruno@skvorc.me>
+Cam Song <neosoyn@gmail.com>
 Cam Spiers <camspiers@gmail.com>
 Cassus Adam Banko <banko.adam@gmail.com>
 Cat Chen <catchen@fb.com>
+Cedric Sohrauer <cedric.sohrauer@infopark.de>
 Charles Marsh <charlie@khanacademy.org>
 Cheng Lou <chenglou92@gmail.com>
+Chitharanjan Das <das.chitharanjan@gmail.com>
 Chris Sciolla <csciolla1@gmail.com>
+Christian <christianoliff@yahoo.com>
 Christian Alfoni <christianalfoni@gmail.com>
 Christian Roman <chroman16@gmail.com>
 Christoph Pojer <christoph.pojer@gmail.com>
@@ -42,19 +66,26 @@ Clay Allsopp <clay.allsopp@gmail.com>
 Connor McSheffrey <c@conr.me>
 Cotton Hou <himcotton@gmail.com>
 Dan Abramov <dan.abramov@gmail.com>
+Dan Fox <iamdanfox@gmail.com>
 Dan Schafer <dschafer@fb.com>
+Daniel Carlsson <daniel.carlsson.1987@gmail.com>
 Daniel Gasienica <daniel@gasienica.ch>
 Daniel Lo Nigro <daniel@dan.cx>
+Daniel Mané <danmane@gmail.com>
 Daniel Miladinov <dmiladinov@wingspan.com>
 Daniel Schonfeld <daniel@schonfeld.org>
 Danny Ben-David <dannybd@fb.com>
 Daryl Lau <daryl@weak.io>
 David Hellsing <david@aino.se>
 David Hu <davidhu91@gmail.com>
+Denis Sokolov <denis@sokolov.cc>
+Dennis Johnson <djohnson@rallydev.com>
 Devon Blandin <dblandin@gmail.com>
 Dmitrii Abramov <dmitrii@rheia.us>
 Dmitry Mazuro <dmitry.mazuro@icloud.com>
+Dustan Kasten <dustan.kasten@gmail.com>
 Dustin Getz <dgetz@wingspan.com>
+Dylan Harrington <dylanharrington@gmail.com>
 Enguerran <engcolson@gmail.com>
 Eric Clemmons <eric@smarterspam.com>
 Eric Florenzano <floguy@gmail.com>
@@ -68,6 +99,8 @@ Fernando Correia <fernando@servicero.com>
 François-Xavier Bois <fxbois@gmail.com>
 Fred Zhao <fredz@fb.com>
 G Scott Olson <gscottolson@gmail.com>
+G. Kay Lee <balancetraveller+github@gmail.com>
+Gabe Levi <gabelevi@gmail.com>
 Garren Smith <garren.smith@gmail.com>
 Geert Pasteels <geert.pasteels@gmail.com>
 Geert-Jan Brits <gbrits@gmail.com>
@@ -79,14 +112,20 @@ Greg Roodt <groodt@gmail.com>
 Guangqiang Dong <gqdong@fb.com>
 Guido Bouman <m@guido.vc>
 Harry Hull <harry.hull1@gmail.com>
+Harry Marr <harry.marr@gmail.com>
+Harry Moreno <morenoh149@gmail.com>
 Harshad Sabne <harshadsabne@users.noreply.github.com>
 Hendrik Swanepoel <hendrik.swanepoel@gmail.com>
+Henry Zhu <hi@henryzoo.com>
+Hou Chia <kchia87@gmail.com>
 Hugo Jobling <me@thisishugo.com>
-Ian Obermiller <iano@fb.com>
+Héliton Nordt <hnordt@hnordt.com>
+Ian Obermiller <ian@obermillers.com>
 Ingvar Stepanyan <me@rreverser.com>
 Irae Carvalho <irae@irae.pro.br>
 Isaac Salier-Hellendag <isaac@fb.com>
 Ivan Kozik <ivan@ludios.org>
+Ivan Krechetov <ikr@ikr.su>
 Ivan Vergiliev <ivan.vergiliev@gmail.com>
 Jacob Gable <jacob.gable@gmail.com>
 Jacob Greenleaf <jake@imgur.com>
@@ -101,24 +140,30 @@ Jan Hancic <jan.hancic@gmail.com>
 Jan Kassens <jan@kassens.net>
 Jared Forsyth <jared@jaredforsyth.com>
 Jason Bonta <jbonta@gmail.com>
+Jason Ly <jason.ly@gmail.com>
 Jason Trill <jason@jasontrill.com>
 Jean Lauliac <lauliacj@gmail.com>
 Jed Watson <jed.watson@me.com>
 Jeff Barczewski <jeff.barczewski@gmail.com>
 Jeff Carpenter <gcarpenterv@gmail.com>
 Jeff Chan <jefftchan@gmail.com>
+Jeff Kolesky <github@kolesky.com>
 Jeff Morrison <jeff@anafx.com>
 Jeff Welch <whatthejeff@gmail.com>
 Jeffrey Lin <lin.jeffrey@gmail.com>
 Jesse Skinner <jesse@thefutureoftheweb.com>
 Jignesh Kakadiya <jigneshhk1992@gmail.com>
 Jim OBrien <jimobrien930@gmail.com>
+Jim Sproch <jsproch@fb.com>
 Jimmy Jea <jimjea@gmail.com>
 Jing Chen <jingc@fb.com>
+Joel Auterson <joel.auterson@googlemail.com>
 Johannes Baiter <johannes.baiter@gmail.com>
 Johannes Emerich <johannes@emerich.de>
+John Heroy <johnheroy@users.noreply.github.com>
 John Watson <jwatson@fb.com>
 Jon Beebe <jon.beebe@daveramsey.com>
+Jon Madison <jon@tfftech.com>
 Jonas Enlund <jonas.enlund@gmail.com>
 Jonas Gebhardt <jonas@instagram.com>
 Jonathan Hsu <jhiswin@gmail.com>
@@ -126,20 +171,29 @@ Jordan Walke <jordojw@gmail.com>
 Josh Bassett <josh.bassett@gmail.com>
 Josh Duck <josh@fb.com>
 Josh Yudaken <yud@instagram.com>
+Joshua Goldberg <jsgoldberg90@gmail.com>
 Joshua Ma <me@joshma.com>
+João Valente <filipevalente@gmail.com>
+Juan Serrano <germ13@users.noreply.github.com>
 Julen Ruiz Aizpuru <julenx@gmail.com>
 Julien Bordellier <git@julienbordellier.com>
 Jun Wu <quark@lihdd.net>
 Juraj Dudak <jdudak@fb.com>
 Justin Jaffray <justinjaffray@khanacademy.org>
+Justin Woo <moomoowoo@gmail.com>
 Karl Mikkelsen <karl@kingkarl.com>
 Karpich Dmitry <karpich@gollard.ru>
 Keito Uchiyama <projects@keito.me>
+Kevin Old <kevin@kevinold.com>
+Kirk Steven Hansen <hanski07@kirk-hansens-macbook.local>
 Kit Randel <kit@nocturne.net.nz>
 Kunal Mehta <k.mehta@berkeley.edu>
+Kurt Ruppel <me@kurtruppel.com>
 Kyle Mathews <mathews.kyle@gmail.com>
 Laurence Rowe <l@lrowe.co.uk>
 Lee Byron <lee@leebyron.com>
+Lei <tendant@gmail.com>
+Leon Fedotov <LeonFedotov@users.noreply.github.com>
 Levi McCallum <levi@levimccallum.com>
 Lily <qvang.j@gmail.com>
 Logan Allen <loganfynne@gmail.com>
@@ -148,21 +202,31 @@ Marcin Kwiatkowski <marcin.kwiatkowski@hotmail.com>
 Marcin Szczepanski <marcins@gmail.com>
 Mariano Desanze <protronm@gmail.com>
 Mark Anderson <undernewmanagement@users.noreply.github.com>
+Mark Funk <mark@boomtownroi.com>
 Mark Hintz <markohintz@gmail.com>
 Mark IJbema <markijbema@gmail.com>
 Mark Richardson <echo@fb.com>
+Marlon Landaverde <milanlandaverde@gmail.com>
 Marshall Roch <mroch@fb.com>
 Martin Andert <mandert@gmail.com>
+Martin Jul <martin@mjul.com>
 Martin Konicek <mkonicek@fb.com>
 Mathieu M-Gosselin <mathieumg@gmail.com>
+Matias Singers <mail@matiassingers.com>
 Matt Harrison <mt.harrison86@gmail.com>
+Matt Huggins <matt.huggins@gmail.com>
+Matt Zabriskie <mzabriskie@gmail.com>
 Matthew Dapena-Tretter <m@tthewwithanm.com>
+Matthew Johnston <matthewjohnston4@users.noreply.github.com>
 Matti Nelimarkka <matti.nelimarkka@hiit.fi>
 Max F. Albrecht <1@178.is>
 Michael Chan <mijoch@gmail.com>
 Michael Randers-Pehrson <michael.rp@gmail.com>
 Michal Srb <xixixao@seznam.cz>
+Michelle Todd <himichelletodd@gmail.com>
+Mihai Parparita <mihai.parparita@gmail.com>
 Mike D Pilsbury <mike.pilsbury@gmail.com>
+Minwe LUO <minwe@yunshipei.com>
 Miorel Palii <miorel@fb.com>
 Mouad Debbar <mdebbar@fb.com>
 Nadeesha Cabral <nadeesha.cabral@gmail.com>
@@ -173,45 +237,70 @@ Nicholas Bergson-Shilcock <me@nicholasbs.net>
 Nick Fitzgerald <fitzgen@gmail.com>
 Nick Gavalas <njg57@cornell.edu>
 Nick Merwin <nick@lemurheavy.com>
+Nick Raienko <enaqxx@gmail.com>
 Nick Thompson <ncthom91@gmail.com>
 Nick Williams <WickyNilliams@users.noreply.github.com>
 Niklas Boström <nbostrom@gmail.com>
+Oiva Eskola <oiva.eskola@gmail.com>
 Oleg <o.yanchinskiy@gmail.com>
 Oleksii Markhovskyi <olexiy.markhovsky@gmail.com>
 Oliver Zeigermann <oliver.zeigermann@gmail.com>
 Owen Coutts <owenc@fb.com>
 Pablo Lacerda de Miranda <pablolm@yahoo-inc.com>
 Pascal Hartig <passy@twitter.com>
+Patrick Laughlin <patrick@laughl.info>
 Paul O’Shannessy <paul@oshannessy.com>
 Paul Seiffert <paul.seiffert@gmail.com>
 Paul Shen <paul@mnml0.com>
+Pedro Nauck <pedronauck@gmail.com>
 Pete Hunt <floydophone@gmail.com>
+Peter Blazejewicz <peter.blazejewicz@gmail.com>
 Peter Cottle <pcottle@fb.com>
+Peter Jaros <peter.a.jaros@gmail.com>
+Petri Lehtinen <petri@digip.org>
 Petri Lievonen <plievone@cc.hut.fi>
 Pieter Vanderwerff <me@pieter.io>
+Pouja Nikray <poujanik@gmail.com>
+Preston Parry <ClimbsRocks@users.noreply.github.com>
+Rafael <rafael.garcia@clever.com>
+Rafal Dittwald <rafal.dittwald@gmail.com>
 Rajiv Tirumalareddy <rajivtreddy@gmail.com>
 Randall Randall <randall@randallsquared.com>
 Ray <ray@tomo.im>
+Raymond Ha <raymond@shraymonks.com>
 Richard D. Worth <rdworth@gmail.com>
 Richard Feldman <richard.t.feldman@gmail.com>
+Richard Kho <hello@richardkho.com>
+Richard Littauer <richard.littauer@gmail.com>
 Richard Livesey <Livesey7@hotmail.co.uk>
 Rick Beerendonk <rick@beerendonk.com>
+Riley Tomasek <riley.tomasek@gmail.com>
 Rob Arnold <robarnold@cs.cmu.edu>
+Robert Sedovsek <robert.sedovsek@gmail.com>
+Roman Vanesyan <roman.vanesyan@gmail.com>
 Ryan Seddon <seddon.ryan@gmail.com>
 Sahat Yalkabov <sakhat@gmail.com>
+Sam Saccone <samccone@gmail.com>
 Sam Selikoff <sam.selikoff@gmail.com>
 Sander Spies <sandermail@gmail.com>
+Scott Feeney <scott@oceanbase.org>
 Sean Kinsey <oyvind@fb.com>
 Sebastian Markbåge <sebastian@calyptus.eu>
 Sergey Generalov <sergey@genbit.ru>
+Sergey Rubanov <chi187@gmail.com>
 Shane O'Sullivan <shaneosullivan1@gmail.com>
 Shaun Trennery <shaun.trennery@gmail.com>
 Sheraz <undernewmanagement@users.noreply.github.com>
+ShihChi Huang <hhuang@netflix.com>
 Shripad K <assortmentofsorts@gmail.com>
 Simon Højberg <r.hackr@gmail.com>
 Simon Welsh <simon@simon.geek.nz>
+Sophia Westwood <sophia@quip.com>
+Spencer Handley <spencerhandley@gmail.com>
 Stefan Dombrowski <sdo451@gmail.com>
 Stephen Murphy <smurphy3@apple.com>
+Steve Baker <_steve_@outlook.com>
+Steven Luscher <react@steveluscher.com>
 Stoyan Stefanov <ssttoo@ymail.com>
 Sundeep Malladi <sundeep.malladi@gmail.com>
 Sunny Juneja <me@sunnyjuneja.com>
@@ -222,22 +311,33 @@ Thomas Boyt <thomas.boyt@venmo.com>
 Thomas Shaddox <thomas@heyzap.com>
 Thomas Shafer <thomasjshafer@gmail.com>
 ThomasCrvsr <crevoisier.thomas@gmail.com>
+Tienchai Wirojsaksaree <tienchai@fb.com>
+Tim Schaub <tschaub@users.noreply.github.com>
 Timothy Yung <yungsters@gmail.com>
 Tom Haggie <thaggie@gmail.com>
 Tom Hauburger <thauburger@gmail.com>
 Tom MacWright <tom@macwright.org>
 Tom Occhino <tomocchino@gmail.com>
+Toru Kobayashi <koba0004@gmail.com>
 Ville Immonen <ville.immonen@iki.fi>
+Vincent Riemer <vincentriemer@gmail.com>
+Vincent Siao <vincent@asana.com>
 Vjeux <vjeuxx@gmail.com>
 Volkan Unsal <spocksplanet@gmail.com>
 Wayne Larsen <wayne@larsen.st>
 WickyNilliams <WickyNilliams@MBA>
 Wincent Colaiuta <win@wincent.com>
+Wout Mertens <Wout.Mertens@gmail.com>
 XuefengWu <benewu@gmail.com>
+YouBao Nong <noyobo@gmail.com>
 Yuriy Dybskiy <yuriy@dybskiy.com>
 Yuval Dekel <thedekel@fb.com>
 Zach Bruggeman <mail@bruggie.com>
+Zacharias <zachasme@users.noreply.github.com>
+brafdlog <brafdlog@gmail.com>
+chen <kikyous@163.com>
 cutbko <kutsenko.eugene@hotmail.com>
 davidxi <davidgraycn@gmail.com>
 imagentleman <imagentlemail@gmail.com>
-jon madison <jon@tfftech.com>
+Árni Hermann Reynisson <arnihr@gmail.com>
+张敏 <cookfront@gmail.com>

CHANGELOG.md

@@ -1,3 +1,108 @@
+## 0.13.1 (March 16, 2015)
+
+### React Core
+
+#### Bug Fixes
+
+* Don't throw when rendering empty `<select>` elements
+* Ensure updating `style` works when transitioning from `null`
+
+### React with Add-Ons
+
+### Bug Fixes
+
+* TestUtils: Don't warn about `getDOMNode` for ES6 classes
+* TestUtils: Ensure wrapped full page components (`<html>`, `<head>`, `<body>`) are treated as DOM components
+* Perf: Stop double-counting DOM components
+
+### React Tools
+
+#### Bug Fixes
+
+* Fix option parsing for `--non-strict-es6module`
+
+
+## 0.13.0 (March 10, 2015)
+
+### React Core
+
+#### Breaking Changes
+
+* Deprecated patterns that warned in 0.12 no longer work: most prominently, calling component classes without using JSX or React.createElement and using non-component functions with JSX or createElement
+* Mutating `props` after an element is created is deprecated and will cause warnings in development mode; future versions of React will incorporate performance optimizations assuming that props aren't mutated
+* Static methods (defined in `statics`) are no longer autobound to the component class
+* `ref` resolution order has changed slightly such that a ref to a component is available immediately after its `componentDidMount` method is called; this change should be observable only if your component calls a parent component's callback within your `componentDidMount`, which is an anti-pattern and should be avoided regardless
+* Calls to `setState` in life-cycle methods are now always batched and therefore asynchronous. Previously the first call on the first mount was synchronous.
+* `setState` and `forceUpdate` on an unmounted component now warns instead of throwing. That avoids a possible race condition with Promises.
+* Access to most internal properties has been completely removed, including `this._pendingState` and `this._rootNodeID`.
+
+#### New Features
+
+* Support for using ES6 classes to build React components; see the [v0.13.0 beta 1 notes](http://facebook.github.io/react/blog/2015/01/27/react-v0.13.0-beta-1.html) for details.
+* Added new top-level API `React.findDOMNode(component)`, which should be used in place of `component.getDOMNode()`. The base class for ES6-based components will not have `getDOMNode`. This change will enable some more patterns moving forward.
+* Added a new top-level API `React.cloneElement(el, props)` for making copies of React elements – see the [v0.13 RC2 notes](/react/blog/2015/03/03/react-v0.13-rc2.html#react.cloneelement) for more details.
+* New `ref` style, allowing a callback to be used in place of a name: `<Photo ref={(c) => this._photo = c} />` allows you to reference the component with `this._photo` (as opposed to `ref="photo"` which gives `this.refs.photo`).
+* `this.setState()` can now take a function as the first argument for transactional state updates, such as `this.setState((state, props) => ({count: state.count + 1}));` – this means that you no longer need to use `this._pendingState`, which is now gone.
+* Support for iterators and immutable-js sequences as children.
+
+#### Deprecations
+
+* `ComponentClass.type` is deprecated. Just use `ComponentClass` (usually as `element.type === ComponentClass`).
+* Some methods that are available on `createClass`-based components are removed or deprecated from ES6 classes (`getDOMNode`, `replaceState`, `isMounted`, `setProps`, `replaceProps`).
+
+### React with Add-Ons
+
+#### New Features
+
+* [`React.addons.createFragment` was added](/react/docs/create-fragment.html) for adding keys to entire sets of children.
+
+#### Deprecations
+
+* `React.addons.classSet` is now deprecated. This functionality can be replaced with several freely available modules. [classnames](https://www.npmjs.com/package/classnames) is one such module.
+* Calls to `React.addons.cloneWithProps` can be migrated to use `React.cloneElement` instead – make sure to merge `style` and `className` manually if desired.
+
+### React Tools
+
+#### Breaking Changes
+
+* When transforming ES6 syntax, `class` methods are no longer enumerable by default, which requires `Object.defineProperty`; if you support browsers such as IE8, you can pass `--target es3` to mirror the old behavior
+
+#### New Features
+
+* `--target` option is available on the jsx command, allowing users to specify and ECMAScript version to target.
+  * `es5` is the default.
+  * `es3` restores the previous default behavior. An additional transform is added here to ensure the use of reserved words as properties is safe (eg `this.static` will become `this['static']` for IE8 compatibility).
+* The transform for the call spread operator has also been enabled.
+
+### JSX
+
+#### Breaking Changes
+* A change was made to how some JSX was parsed, specifically around the use of `>` or `}` when inside an element. Previously it would be treated as a string but now it will be treated as a parse error. The [`jsx_orphaned_brackets_transformer`](https://www.npmjs.com/package/jsx_orphaned_brackets_transformer) package on npm can be used to find and fix potential issues in your JSX code.
+
+
+## 0.12.2 (December 18, 2014)
+
+### React Core
+
+* Added support for more HTML attributes: `formAction`, `formEncType`, `formMethod`, `formTarget`, `marginHeight`, `marginWidth`
+* Added `strokeOpacity` to the list of unitless CSS properties
+* Removed trailing commas (allows npm module to be bundled and used in IE8)
+* Fixed bug resulting in error when passing `undefined` to `React.createElement` - now there is a useful warning
+
+### React Tools
+
+* JSX-related transforms now always use double quotes for props and `displayName`
+
+
+## 0.12.1 (November 18, 2014)
+
+### React Tools
+
+* Types transform updated with latest support
+* jstransform version updated with improved ES6 transforms
+* Explicit Esprima dependency removed in favor of using Esprima information exported by jstransform
+
+
 ## 0.12.0 (October 28, 2014)
 
 ### React Core

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing to React
 
-React is one of Facebook's first open source projects that is both under very active development and is also being used to ship code to everybody on facebook.com. We're still working out the kinks to make contributing to this project as easy and transparent as possible, but we're not quite there yet. Hopefully this document makes the process for contributing clear and preempts some questions you may have.
+React is one of Facebook's first open source projects that is both under very active development and is also being used to ship code to everybody on [facebook.com](https://facebook.com). We're still working out the kinks to make contributing to this project as easy and transparent as possible, but we're not quite there yet. Hopefully this document makes the process for contributing clear and preempts some questions you may have.
 
 ## Our Development Process
 
@@ -27,7 +27,7 @@ The core team will be monitoring for pull requests. When we get one, we'll run s
 
 In order to accept your pull request, we need you to submit a CLA. You only need to do this once, so if you've done this for another Facebook open source project, you're good to go. If you are submitting a pull request for the first time, just let us know that you have completed the CLA and we can cross-check with your GitHub username.
 
-Complete your CLA here: <https://code.facebook.com/cla>
+[Complete your CLA here](https://code.facebook.com/cla)
 
 ## Bugs
 
@@ -41,7 +41,7 @@ The best way to get your bug fixed is to provide a reduced test case. jsFiddle,
 
 ### Security Bugs
 
-Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe disclosure of security bugs. With that in mind, please do not file public issues and go through the process outlined on that page.
+Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe disclosure of security bugs. With that in mind, please do not file public issues; go through the process outlined on that page.
 
 ## How to Get in Touch
 
@@ -56,7 +56,7 @@ Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe
 * Commas last,
 * 2 spaces for indentation (no tabs)
 * Prefer `'` over `"`
-* `"use strict";`
+* `'use strict';`
 * 80 character line length
 * "Attractive"
 * Do not use the optional parameters of `setTimeout` and `setInterval`
@@ -67,4 +67,4 @@ Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe
 
 ## License
 
-By contributing to React, you agree that your contributions will be licensed under its BSD license..
+By contributing to React, you agree that your contributions will be licensed under its BSD license.

Gruntfile.js

@@ -1,6 +1,5 @@
 'use strict';
 
-var exec = require('child_process').exec;
 var jsxTask = require('./grunt/tasks/jsx');
 var browserifyTask = require('./grunt/tasks/browserify');
 var populistTask = require('./grunt/tasks/populist');
@@ -13,6 +12,7 @@ var npmReactTasks = require('./grunt/tasks/npm-react');
 var npmReactToolsTasks = require('./grunt/tasks/npm-react-tools');
 var versionCheckTask = require('./grunt/tasks/version-check');
 var gemReactSourceTasks = require('./grunt/tasks/gem-react-source');
+var eslintTask = require('./grunt/tasks/eslint');
 
 module.exports = function(grunt) {
 
@@ -23,25 +23,43 @@ module.exports = function(grunt) {
     browserify: require('./grunt/config/browserify'),
     populist: require('./grunt/config/populist')(grunt),
     connect: require('./grunt/config/server')(grunt),
-    "webdriver-jasmine": require('./grunt/config/webdriver-jasmine'),
-    "webdriver-perf": require('./grunt/config/webdriver-perf'),
+    'webdriver-jasmine': require('./grunt/config/webdriver-jasmine'),
+    'webdriver-perf': require('./grunt/config/webdriver-perf'),
     npm: require('./grunt/config/npm'),
-    clean: ['./build', './*.gem', './docs/_site', './examples/shared/*.js', '.module-cache'],
+    clean: [
+      './build',
+      './*.gem',
+      './docs/_site',
+      './examples/shared/*.js',
+      '.module-cache'
+    ],
     jshint: require('./grunt/config/jshint'),
+    /*eslint-disable camelcase */
     compare_size: require('./grunt/config/compare_size')
+    /*eslint-enable camelcase */
   });
 
   grunt.config.set('compress', require('./grunt/config/compress'));
 
   Object.keys(grunt.file.readJSON('package.json').devDependencies)
-    .filter(function(npmTaskName) { return npmTaskName.indexOf('grunt-') === 0; })
-    .filter(function(npmTaskName) { return npmTaskName != 'grunt-cli'; })
-    .forEach(function(npmTaskName) { grunt.loadNpmTasks(npmTaskName); });
+    .filter(function(npmTaskName) {
+      return npmTaskName.indexOf('grunt-') === 0;
+    })
+    .filter(function(npmTaskName) {
+      return npmTaskName !== 'grunt-cli';
+    })
+    .forEach(function(npmTaskName) {
+      grunt.loadNpmTasks(npmTaskName);
+    });
 
-  // Alias 'jshint' to 'lint' to better match the workflow we know
-  grunt.registerTask('lint', ['jshint']);
+  grunt.registerTask('eslint', eslintTask);
 
-  grunt.registerTask('download-previous-version', require('./grunt/tasks/download-previous-version.js'));
+  grunt.registerTask('lint', ['eslint']);
+
+  grunt.registerTask(
+    'download-previous-version',
+    require('./grunt/tasks/download-previous-version.js')
+  );
 
   grunt.registerTask('delete-build-modules', function() {
     if (grunt.file.exists('build/modules')) {
@@ -74,11 +92,28 @@ module.exports = function(grunt) {
 
   grunt.registerTask('version-check', versionCheckTask);
 
-  grunt.registerTask('build:basic', ['jsx:normal', 'version-check', 'browserify:basic']);
-  grunt.registerTask('build:addons', ['jsx:normal', 'browserify:addons']);
-  grunt.registerTask('build:transformer', ['jsx:normal', 'browserify:transformer']);
-  grunt.registerTask('build:min', ['jsx:normal', 'version-check', 'browserify:min']);
-  grunt.registerTask('build:addons-min', ['jsx:normal', 'browserify:addonsMin']);
+  grunt.registerTask('build:basic', [
+    'jsx:normal',
+    'version-check',
+    'browserify:basic'
+  ]);
+  grunt.registerTask('build:addons', [
+    'jsx:normal',
+    'browserify:addons'
+  ]);
+  grunt.registerTask('build:transformer', [
+    'jsx:normal',
+    'browserify:transformer'
+  ]);
+  grunt.registerTask('build:min', [
+    'jsx:normal',
+    'version-check',
+    'browserify:min'
+  ]);
+  grunt.registerTask('build:addons-min', [
+    'jsx:normal',
+    'browserify:addonsMin'
+  ]);
   grunt.registerTask('build:withCodeCoverageLogging', [
     'jsx:normal',
     'version-check',
@@ -98,8 +133,15 @@ module.exports = function(grunt) {
     'version-check',
     'populist:test'
   ]);
-  grunt.registerTask('build:npm-react', ['version-check', 'jsx:normal', 'npm-react:release']);
-  grunt.registerTask('build:gem-react-source', ['build', 'gem-react-source:release'])
+  grunt.registerTask('build:npm-react', [
+    'version-check',
+    'jsx:normal',
+    'npm-react:release'
+  ]);
+  grunt.registerTask('build:gem-react-source', [
+    'build',
+    'gem-react-source:release'
+  ]);
 
   grunt.registerTask('webdriver-phantomjs', webdriverPhantomJSTask);
 
@@ -142,7 +184,7 @@ module.exports = function(grunt) {
     'webdriver-perf:saucelabs_firefox',
     'webdriver-perf:saucelabs_chrome',
     'webdriver-perf:saucelabs_ie11',
-    'webdriver-perf:saucelabs_ie8',
+    'webdriver-perf:saucelabs_ie8'
   ]);
 
   grunt.registerTask('test:webdriver:saucelabs', [

LICENSE

@@ -2,7 +2,7 @@ BSD License
 
 For React software
 
-Copyright (c) 2013-2014, Facebook, Inc.
+Copyright (c) 2013-2015, Facebook, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

README.md

@@ -1,4 +1,4 @@
-# [React](http://facebook.github.io/react) [![Build Status](https://travis-ci.org/facebook/react.svg?branch=0.12-stable)](https://travis-ci.org/facebook/react)
+# [React](http://facebook.github.io/react) [![Build Status](https://travis-ci.org/facebook/react.svg?branch=0.13-stable)](https://travis-ci.org/facebook/react)
 
 React is a JavaScript library for building user interfaces.
 
@@ -35,12 +35,12 @@ The fastest way to get started is to serve JavaScript from the CDN (also availab
 
 ```html
 <!-- The core React library -->
-<script src="http://fb.me/react-0.12.0.js"></script>
+<script src="http://fb.me/react-0.13.1.js"></script>
 <!-- In-browser JSX transformer, remove when pre-compiling JSX. -->
-<script src="http://fb.me/JSXTransformer-0.12.0.js"></script>
+<script src="http://fb.me/JSXTransformer-0.13.1.js"></script>
 ```
 
-We've also built a [starter kit](http://facebook.github.io/react/downloads/react-0.12.0.zip) which might be useful if this is your first time using React. It includes a webpage with an example of using React with live code.
+We've also built a [starter kit](http://facebook.github.io/react/downloads/react-0.13.1.zip) which might be useful if this is your first time using React. It includes a webpage with an example of using React with live code.
 
 If you'd like to use [bower](http://bower.io), it's as easy as:
 
@@ -86,7 +86,7 @@ grunt test
 grunt test --debug
 # For speed, you can use fasttest and add --filter to only run one test
 grunt fasttest --filter=ReactIdentity
-# Lint the code with JSHint
+# Lint the code with ESLint
 grunt lint
 # Wipe out build directory
 grunt clean

bin/jsx

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 // -*- mode: js -*-
-"use strict";
+'use strict';
 
 var transform = require('../main').transform;
 
@@ -11,18 +11,41 @@ require('commoner').version(
 }).option(
   '--harmony',
   'Turns on JS transformations such as ES6 Classes etc.'
+).option(
+  '--target [version]',
+  'Specify your target version of ECMAScript. Valid values are "es3" and ' +
+  '"es5". The default is "es5". "es3" will avoid uses of defineProperty and ' +
+  'will quote reserved words. WARNING: "es5" is not properly supported, even ' +
+  'with the use of es5shim, es5sham. If you need to support IE8, use "es3".',
+  'es5'
 ).option(
   '--strip-types',
   'Strips out type annotations.'
+).option(
+  '--es6module',
+  'Parses the file as a valid ES6 module. ' +
+  '(Note that this means implicit strict mode)'
+).option(
+  '--non-strict-es6module',
+  'Parses the file as an ES6 module, except disables implicit strict-mode. ' +
+  '(This is useful if you\'re porting non-ES6 modules to ES6, but haven\'t ' +
+  'yet verified that they are strict-mode safe yet)'
 ).option(
   '--source-map-inline',
   'Embed inline sourcemap in transformed source'
 ).process(function(id, source) {
   // This is where JSX, ES6, etc. desugaring happens.
+  // We don't do any pre-processing of options so that the command line and the
+  // JS API both expose the same set of options. We do extract the options that
+  // we care about from commoner though so we aren't passing too many things
+  // along.
   var options = {
     harmony: this.options.harmony,
     sourceMap: this.options.sourceMapInline,
-    stripTypes: this.options.stripTypes
+    stripTypes: this.options.stripTypes,
+    es6module: this.options.es6module,
+    nonStrictEs6module: this.options.nonStrictEs6module,
+    target: this.options.target
   };
   return transform(source, options);
 });

bin/jsx-internal

@@ -2,8 +2,7 @@
 // -*- mode: js -*-
 "use strict";
 
-var getAllVisitors = require('../vendor/fbtransform/visitors').getAllVisitors;
-var transform = require('jstransform').transform;
+var transform = require('../main').transform;
 var propagate = require("../vendor/constants").propagate;
 
 require("commoner").version(
@@ -31,7 +30,7 @@ require("commoner").version(
   var constants = context.config.constants || {};
 
   // This is where JSX, ES6, etc. desugaring happens.
-  source = transform(getAllVisitors(), source).code;
+  source = transform(source, {harmony: true, stripTypes: true});
 
   // Constant propagation means removing any obviously dead code after
   // replacing constant expressions with literal (boolean) values.

docs/Gemfile.lock

@@ -61,7 +61,7 @@ GEM
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     redcarpet (3.1.2)
-    safe_yaml (1.0.3)
+    safe_yaml (1.0.4)
     sanitize (2.0.6)
       nokogiri (>= 1.4.4)
     sass (3.3.14)

docs/README.md

@@ -52,7 +52,7 @@ $ bundle exec rake watch # Automatically compiles as needed.
 
 ### Updating `facebook.github.io/react`
 
-The easiest way to do this is to have a separate clone of this repository, checked out to the `gh-pages` branch. We have a build step that expects this to be in a directory named `react-gh-pages` at the same depth as `react`. Then it's just a matter of running `grunt docs`, which will compile the site and copy it out to this repository. From there you can check it in.
+The easiest way to do this is to have a separate clone of this repository, checked out to the `gh-pages` branch. We have a build step that expects this to be in a directory named `react-gh-pages` at the same depth as `react`. Then it's just a matter of running `grunt docs`, which will compile the site and copy it out to this repository. From there, you can check it in.
 
 **Note:** This should only be done for new releases. You should create a tag corresponding to the release tag in the main repository.
 

docs/_config.yml

@@ -34,4 +34,4 @@ sass:
   sass_dir: _css
 gems:
 - jekyll-redirect-from
-react_version: 0.11.2
+react_version: 0.13.1

docs/_data/acknowledgements.yml

@@ -1,40 +1,64 @@
 ---
-- - Adam Krebs
+- - Aaron Franks
+  - Adam Krebs
   - Adam Mark
   - Adam Solove
   - Alan deLevie
+  - Alex Boyd
+  - Alex Mykyta
   - Alex Zelenskiy
   - Alexander Solovyov
+  - Alexander Tseung
+  - Alexandre Gaudencio
   - Alexey Raspopov
+  - Alexey Shamrin
   - Andre Z Sanchez
   - Andreas Svensson
   - Andres Suarez
+  - Andrew Cobby
   - Andrew Davey
   - Andrew Rasmussen
   - Andrew Zich
   - Andrey Popp
   - Anthony van der Hoorn
+  - Antti Ahti
   - Areeb Malik
+  - Aria Buckles
+  - Artem Nezvigin
   - Ayman Osman
+  - Bartosz Kaszubowski
+  - Beau Smith
   - Ben Alpert
   - Ben Foxall
   - Ben Newman
   - Ben Ripkens
+  - Benjamin Keen
+  - Benjamin Leiken
   - Bill Fisher
+  - Blaine Hatab
   - Bob Eagan
+  - Bob Ralian
   - Bojan Mihelac
   - Brandon Bloom
   - Brandon Tilley
   - Brian Cooke
+  - Brian Holt
+  - Brian Hsu
   - Brian Kim
+  - Brian Kung
   - Brian Reavis
   - Brian Rue
+  - Bruno Škvorc
+  - Cam Song
   - Cam Spiers
   - Cassus Adam Banko
   - Cat Chen
+  - Cedric Sohrauer
   - Charles Marsh
   - Cheng Lou
+  - Chitharanjan Das
   - Chris Sciolla
+  - Christian
   - Christian Alfoni
   - Christian Roman
   - Christoph Pojer
@@ -43,19 +67,26 @@
   - Connor McSheffrey
   - Cotton Hou
   - Dan Abramov
+  - Dan Fox
   - Dan Schafer
+  - Daniel Carlsson
   - Daniel Gasienica
   - Daniel Lo Nigro
+  - Daniel Mané
   - Daniel Miladinov
   - Daniel Schonfeld
   - Danny Ben-David
   - Daryl Lau
   - David Hellsing
   - David Hu
+  - Denis Sokolov
+  - Dennis Johnson
   - Devon Blandin
   - Dmitrii Abramov
   - Dmitry Mazuro
+  - Dustan Kasten
   - Dustin Getz
+  - Dylan Harrington
   - Enguerran
   - Eric Clemmons
   - Eric Florenzano
@@ -69,6 +100,8 @@
   - François-Xavier Bois
   - Fred Zhao
   - G Scott Olson
+  - G. Kay Lee
+  - Gabe Levi
   - Garren Smith
   - Geert Pasteels
   - Geert-Jan Brits
@@ -80,14 +113,20 @@
   - Guangqiang Dong
   - Guido Bouman
   - Harry Hull
-- - Harshad Sabne
+  - Harry Marr
+- - Harry Moreno
+  - Harshad Sabne
   - Hendrik Swanepoel
+  - Henry Zhu
+  - Hou Chia
   - Hugo Jobling
+  - Héliton Nordt
   - Ian Obermiller
   - Ingvar Stepanyan
   - Irae Carvalho
   - Isaac Salier-Hellendag
   - Ivan Kozik
+  - Ivan Krechetov
   - Ivan Vergiliev
   - Jacob Gable
   - Jacob Greenleaf
@@ -102,24 +141,30 @@
   - Jan Kassens
   - Jared Forsyth
   - Jason Bonta
+  - Jason Ly
   - Jason Trill
   - Jean Lauliac
   - Jed Watson
   - Jeff Barczewski
   - Jeff Carpenter
   - Jeff Chan
+  - Jeff Kolesky
   - Jeff Morrison
   - Jeff Welch
   - Jeffrey Lin
   - Jesse Skinner
   - Jignesh Kakadiya
   - Jim OBrien
+  - Jim Sproch
   - Jimmy Jea
   - Jing Chen
+  - Joel Auterson
   - Johannes Baiter
   - Johannes Emerich
+  - John Heroy
   - John Watson
   - Jon Beebe
+  - Jon Madison
   - Jonas Enlund
   - Jonas Gebhardt
   - Jonathan Hsu
@@ -127,20 +172,29 @@
   - Josh Bassett
   - Josh Duck
   - Josh Yudaken
+  - Joshua Goldberg
   - Joshua Ma
+  - João Valente
+  - Juan Serrano
   - Julen Ruiz Aizpuru
   - Julien Bordellier
   - Jun Wu
   - Juraj Dudak
   - Justin Jaffray
+  - Justin Woo
   - Karl Mikkelsen
   - Karpich Dmitry
   - Keito Uchiyama
+  - Kevin Old
+  - Kirk Steven Hansen
   - Kit Randel
   - Kunal Mehta
+  - Kurt Ruppel
   - Kyle Mathews
   - Laurence Rowe
   - Lee Byron
+  - Lei
+  - Leon Fedotov
   - Levi McCallum
   - Lily
   - Logan Allen
@@ -149,23 +203,33 @@
   - Marcin Szczepanski
   - Mariano Desanze
   - Mark Anderson
+  - Mark Funk
   - Mark Hintz
   - Mark IJbema
   - Mark Richardson
+  - Marlon Landaverde
   - Marshall Roch
   - Martin Andert
+  - Martin Jul
   - Martin Konicek
   - Mathieu M-Gosselin
+  - Matias Singers
   - Matt Harrison
+  - Matt Huggins
+  - Matt Zabriskie
   - Matthew Dapena-Tretter
+  - Matthew Johnston
   - Matti Nelimarkka
   - Max F. Albrecht
   - Michael Chan
-- - Michael Randers-Pehrson
+  - Michael Randers-Pehrson
   - Michal Srb
+  - Michelle Todd
+  - Mihai Parparita
   - Mike D Pilsbury
+  - Minwe LUO
   - Miorel Palii
-  - Mouad Debbar
+- - Mouad Debbar
   - Nadeesha Cabral
   - Naman Goel
   - Nate Hunzaker
@@ -174,45 +238,70 @@
   - Nick Fitzgerald
   - Nick Gavalas
   - Nick Merwin
+  - Nick Raienko
   - Nick Thompson
   - Nick Williams
   - Niklas Boström
+  - Oiva Eskola
   - Oleg
   - Oleksii Markhovskyi
   - Oliver Zeigermann
   - Owen Coutts
   - Pablo Lacerda de Miranda
   - Pascal Hartig
+  - Patrick Laughlin
   - Paul O’Shannessy
   - Paul Seiffert
   - Paul Shen
+  - Pedro Nauck
   - Pete Hunt
+  - Peter Blazejewicz
   - Peter Cottle
+  - Peter Jaros
+  - Petri Lehtinen
   - Petri Lievonen
   - Pieter Vanderwerff
+  - Pouja Nikray
+  - Preston Parry
+  - Rafael
+  - Rafal Dittwald
   - Rajiv Tirumalareddy
   - Randall Randall
   - Ray
+  - Raymond Ha
   - Richard D. Worth
   - Richard Feldman
+  - Richard Kho
+  - Richard Littauer
   - Richard Livesey
   - Rick Beerendonk
+  - Riley Tomasek
   - Rob Arnold
+  - Robert Sedovsek
+  - Roman Vanesyan
   - Ryan Seddon
   - Sahat Yalkabov
+  - Sam Saccone
   - Sam Selikoff
   - Sander Spies
+  - Scott Feeney
   - Sean Kinsey
   - Sebastian Markbåge
   - Sergey Generalov
+  - Sergey Rubanov
   - Shane O'Sullivan
   - Shaun Trennery
   - Sheraz
+  - ShihChi Huang
   - Shripad K
   - Simon Højberg
   - Simon Welsh
+  - Sophia Westwood
+  - Spencer Handley
   - Stefan Dombrowski
   - Stephen Murphy
+  - Steve Baker
+  - Steven Luscher
   - Stoyan Stefanov
   - Sundeep Malladi
   - Sunny Juneja
@@ -223,22 +312,33 @@
   - Thomas Shaddox
   - Thomas Shafer
   - ThomasCrvsr
+  - Tienchai Wirojsaksaree
+  - Tim Schaub
   - Timothy Yung
   - Tom Haggie
   - Tom Hauburger
   - Tom MacWright
   - Tom Occhino
+  - Toru Kobayashi
   - Ville Immonen
+  - Vincent Riemer
+  - Vincent Siao
   - Vjeux
   - Volkan Unsal
   - Wayne Larsen
   - WickyNilliams
   - Wincent Colaiuta
+  - Wout Mertens
   - XuefengWu
+  - YouBao Nong
   - Yuriy Dybskiy
   - Yuval Dekel
   - Zach Bruggeman
+  - Zacharias
+  - brafdlog
+  - chen
   - cutbko
   - davidxi
   - imagentleman
-  - jon madison
+  - "Árni Hermann Reynisson"
+  - "张敏"

docs/_data/nav_docs.yml

@@ -8,6 +8,8 @@
     title: Thinking in React
 - title: Community Resources
   items:
+  - id: conferences
+    title: Conferences
   - id: videos
     title: Videos
   - id: complementary-tools
@@ -57,12 +59,16 @@
       title: Test Utilities
     - id: clone-with-props
       title: Cloning Components
+    - id: create-fragment
+      title: Keyed Fragments
     - id: update
       title: Immutability Helpers
     - id: pure-render-mixin
       title: PureRenderMixin
     - id: perf
       title: Performance Tools
+  - id: advanced-performance
+    title: Advanced Performance
 - title: Reference
   items:
   - id: top-level-api

docs/_data/nav_tips.yml

@@ -34,3 +34,7 @@
     title: References to Components
   - id: children-undefined
     title: this.props.children undefined
+  - id: use-react-with-other-libraries
+    title: Use React with Other Libraries
+  - id: dangerously-set-inner-html
+    title: Dangerously Set innerHTML

docs/_js/examples/.eslintrc

@@ -0,0 +1,3 @@
+rules:
+  block-scoped-var: false
+  no-undef: false

docs/_js/html-jsx.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2014, Facebook, Inc.
+ * Copyright 2013-2015, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the

docs/_js/jsfiddle-integration.js

@@ -0,0 +1,11 @@
+(function() {
+  var tag = document.querySelector(
+    'script[type="application/javascript;version=1.7"]'
+  );
+  if (!tag || tag.textContent.indexOf('window.onload=function(){') !== -1) {
+    alert('Bad JSFiddle configuration, please fork the original React JSFiddle');
+  }
+  tag.setAttribute('type', 'text/jsx;harmony=true');
+  tag.textContent = tag.textContent.replace(/^\/\/<!\[CDATA\[/, '');
+})();
+

docs/_js/jsx-compiler.js

@@ -27,6 +27,7 @@ var CompilerPlayground = React.createClass({
           renderCode={true}
           transformer={transformer.bind(null, this.state.harmony)}
           showCompiledJSTab={false}
+          showLineNumbers={true}
         />
         <label className="compiler-option">
           <input
@@ -37,7 +38,7 @@ var CompilerPlayground = React.createClass({
         </label>
       </div>
     );
-  },
+  }
 });
 React.render(
   <CompilerPlayground />,

docs/_js/live_editor.js

@@ -9,12 +9,21 @@ var IS_MOBILE = (
 );
 
 var CodeMirrorEditor = React.createClass({
+  propTypes: {
+    lineNumbers: React.PropTypes.bool,
+    onChange: React.PropTypes.func
+  },
+  getDefaultProps: function() {
+    return {
+      lineNumbers: false
+    };
+  },
   componentDidMount: function() {
     if (IS_MOBILE) return;
 
     this.editor = CodeMirror.fromTextArea(this.refs.editor.getDOMNode(), {
       mode: 'javascript',
-      lineNumbers: false,
+      lineNumbers: this.props.lineNumbers,
       lineWrapping: true,
       smartIndent: false,  // javascript mode does bad things with jsx indents
       matchBrackets: true,
@@ -75,6 +84,7 @@ var ReactPlayground = React.createClass({
     transformer: React.PropTypes.func,
     renderCode: React.PropTypes.bool,
     showCompiledJSTab: React.PropTypes.bool,
+    showLineNumbers: React.PropTypes.bool,
     editorTabTitle: React.PropTypes.string
   },
 
@@ -84,7 +94,8 @@ var ReactPlayground = React.createClass({
         return JSXTransformer.transform(code).code;
       },
       editorTabTitle: 'Live JSX Editor',
-      showCompiledJSTab: true
+      showCompiledJSTab: true,
+      showLineNumbers: false
     };
   },
 
@@ -122,6 +133,7 @@ var ReactPlayground = React.createClass({
         onChange={this.handleCodeChange}
         codeText={compiledCode}
         readOnly={true}
+        lineNumbers={this.props.showLineNumbers}
       />;
 
     var JSXContent =
@@ -130,6 +142,7 @@ var ReactPlayground = React.createClass({
         onChange={this.handleCodeChange}
         className="playgroundStage"
         codeText={this.state.code}
+        lineNumbers={this.props.showLineNumbers}
       />;
 
     var JSXTabClassName =

docs/_layouts/default.html

@@ -50,7 +50,7 @@
           <li><a href="/react/support.html"{% if page.id == 'support' %} class="active"{% endif %}>support</a></li>
           <li><a href="/react/downloads.html"{% if page.id == 'downloads' %} class="active"{% endif %}>download</a></li>
           <li><a href="/react/blog/"{% if page.sectionid == 'blog' %} class="active"{% endif %}>blog</a></li>
-          <li><a href="http://github.com/facebook/react">github</a>
+          <li><a href="https://github.com/facebook/react">github</a>
         </ul>
       </div>
     </div>
@@ -79,8 +79,8 @@
         <a href="/react/acknowledgements.html">Acknowledgements</a>
       </div>
       <div class="right">
-        &copy; 2013&ndash;2014 Facebook Inc.<br>
-        Documentation licensed under <a href="http://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
+        &copy; 2013&ndash;{{ site.time | date: '%Y' }} Facebook Inc.<br>
+        Documentation licensed under <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
       </div>
     </footer>
   </div>

docs/_layouts/single.html

@@ -8,13 +8,15 @@ layout: default
     <div class="subHeader">{{ page.description }}</div>
     {{ content }}
 
-    <div class="docs-prevnext">
-      {% if page.prev %}
-        <a class="docs-prev" href="/react/docs/{{ page.prev }}">&larr; Prev</a>
-      {% endif %}
-      {% if page.next %}
-        <a class="docs-next" href="/react/docs/{{ page.next }}">Next &rarr;</a>
-      {% endif %}
-    </div>
+    {% if page.prev or page.next %}
+      <div class="docs-prevnext">
+        {% if page.prev %}
+          <a class="docs-prev" href="/react/docs/{{ page.prev }}">&larr; Prev</a>
+        {% endif %}
+        {% if page.next %}
+          <a class="docs-next" href="/react/docs/{{ page.next }}">Next &rarr;</a>
+        {% endif %}
+      </div>      
+    {% endif %}
   </div>
 </section>

docs/_posts/2013-07-03-community-roundup-4.md

@@ -47,7 +47,7 @@ Over the past several weeks, members of our team, [Pete Hunt](http://www.petehun
 
 [Pete Hunt](http://www.petehunt.net/) recorded himself implementing a simple `<Blink>` tag in React.
 
-<figure><iframe src="http://player.vimeo.com/video/67248575" width="500" height="340" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe></figure>
+<figure><iframe src="https://player.vimeo.com/video/67248575" width="500" height="340" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe></figure>
 
 ## Snake in React
 

docs/_posts/2013-07-23-community-roundup-5.md

@@ -68,7 +68,7 @@ React.renderComponent(
 
 [Domenic Denicola](http://domenicdenicola.com/) wrote a slide deck about the great applications of ES6 features and one slide shows how we could use Template Strings to compile JSX at run-time without the need for a pre-processing phase.
 
-<figure><iframe src="http://www.slideshare.net/slideshow/embed_code/24187146?rel=0&startSlide=36" width="600" height="356" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC;border-width:1px 1px 0;margin-bottom:5px" allowfullscreen webkitallowfullscreen mozallowfullscreen> </iframe></figure>
+<figure><iframe src="https://www.slideshare.net/slideshow/embed_code/24187146?rel=0&startSlide=36" width="600" height="356" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC;border-width:1px 1px 0;margin-bottom:5px" allowfullscreen webkitallowfullscreen mozallowfullscreen> </iframe></figure>
 
 
 ## React Presentation

docs/_posts/2013-09-24-community-roundup-8.md

@@ -66,4 +66,4 @@ While this is not going to work for all the attributes since they are camelCased
 
 [Vjeux](http://blog.vjeux.com/) re-implemented the display part of the IRC logger in React. Just 130 lines are needed for a performant infinite scroll with timestamps and color-coded author names.
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/vjeux/QL9tz/embedded/" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" src="https://jsfiddle.net/vjeux/QL9tz/embedded/" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_posts/2013-10-3-community-roundup-9.md

@@ -29,7 +29,7 @@ We organized a React hackathon last week-end in the Facebook Seattle office. 50
 
 The video will be available soon on the [JSConf EU website](http://2013.jsconf.eu/speakers/pete-hunt-react-rethinking-best-practices.html), but in the meantime, here are Pete's slides:
 
-<figure><iframe src="http://www.slideshare.net/slideshow/embed_code/26589373" width="550" height="450" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" allowfullscreen></iframe></figure>
+<figure><iframe src="https://www.slideshare.net/slideshow/embed_code/26589373" width="550" height="450" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" allowfullscreen></iframe></figure>
 
 
 ## Pump - Clojure bindings for React

docs/_posts/2013-11-05-thinking-in-react.md

@@ -56,7 +56,7 @@ Now that we've identified the components in our mock, let's arrange them into a
 
 ## Step 2: Build a static version in React
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/6wQMG/embedded/" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" src="https://jsfiddle.net/6wQMG/embedded/" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 Now that you have your component hierarchy it's time to start implementing your app. The easiest way is to build a version that takes your data model and renders the UI but has no interactivity. It's easiest to decouple these processes because building a static version requires a lot of typing and no thinking, and adding interactivity requires a lot of thinking and not a lot of typing. We'll see why.
 
@@ -100,7 +100,7 @@ So finally, our state is:
 
 ## Step 4: Identify where your state should live
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/QvHnx/embedded/" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" src="https://jsfiddle.net/QvHnx/embedded/" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 OK, so we've identified what the minimal set of app state is. Next we need to identify which component mutates, or *owns*, this state.
 
@@ -125,7 +125,7 @@ You can start seeing how your application will behave: set `filterText` to `"bal
 
 ## Step 5: Add inverse data flow
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/3Vs3Q/embedded/" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" src="https://jsfiddle.net/3Vs3Q/embedded/" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 So far we've built an app that renders correctly as a function of props and state flowing down the hierarchy. Now it's time to support data flowing the other way: the form components deep in the hierarchy need to update the state in `FilterableProductTable`.
 

docs/_posts/2013-12-23-community-roundup-12.md

@@ -63,7 +63,7 @@ React declarative approach is well suited to write games. [Cheng Lou](https://gi
 
 [Ross Allen](https://twitter.com/ssorallen) implemented [MontageJS](http://montagejs.org/)'s [Reddit tutorial](http://montagejs.org/docs/tutorial-reddit-client-with-montagejs.html) in React. This is a good opportunity to compare the philosophies of the two libraries.
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/ssorallen/fEsYt/embedded/result,html,js" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" src="https://jsfiddle.net/ssorallen/fEsYt/embedded/result,html,js" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 [View the source on JSFiddle...](http://jsfiddle.net/ssorallen/fEsYt/)
 

docs/_posts/2014-01-06-community-roundup-14.md

@@ -45,7 +45,7 @@ rails s
 
 [Eldar Djafarov](http://eldar.djafarov.com/) implemented a mixin to link Backbone models to React state and a small abstraction to write two-way binding on-top.
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/djkojb/qZf48/13/embedded/" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" src="https://jsfiddle.net/djkojb/qZf48/13/embedded/" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 [Check out the blog post...](http://eldar.djafarov.com/2013/11/reactjs-mixing-with-backbone/)
 
@@ -71,7 +71,7 @@ rails s
 
 [Thomas Aylott](http://subtlegradient.com/) implemented an API that looks like Web Components but using React underneath.
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/SubtleGradient/ue2Aa/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" src="https://jsfiddle.net/SubtleGradient/ue2Aa/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 
 ## React vs Angular

docs/_posts/2014-09-24-testing-flux-applications.md

@@ -3,6 +3,8 @@ title: "Testing Flux Applications"
 author: Bill Fisher
 ---
 
+**A more up-to-date version of this post is available as part of the [Flux documentation](http://facebook.github.io/flux/docs/testing-flux-applications.html).**
+
 [Flux](http://facebook.github.io/flux/) is the application architecture that Facebook uses to build web applications with [React](http://facebook.github.io/react/). It's based on a unidirectional data flow. In previous blog posts and documentation articles, we've shown the [basic structure and data flow](http://facebook.github.io/flux/docs/overview.html), more closely examined the [dispatcher and action creators](http://facebook.github.io/react/blog/2014/07/30/flux-actions-and-the-dispatcher.html), and shown how to put it all together with a [tutorial](http://facebook.github.io/flux/docs/todo-list.html). Now let's look at how to do formal unit testing of Flux applications with [Jest](http://facebook.github.io/jest/), Facebook's auto-mocking testing framework.
 
 

docs/_posts/2014-10-17-community-roundup-23.md

@@ -61,7 +61,7 @@ Yahoo is converting Yahoo Mail to React and Flux and in the process, they open s
 >
 > - There should be only one channel for all state changes: The Dispatcher. This makes debugging easy because it just requires a single console.log in the dispatcher to observe every single state change trigger.
 >
-> - Asynchronously executed callbacks should not leak into Stores. The consequences of it are just to hard to fully foresee. This leads to elusive bugs. Stores should only execute synchronous code. Otherwise they are too hard to understand.
+> - Asynchronously executed callbacks should not leak into Stores. The consequences of it are just too hard to fully foresee. This leads to elusive bugs. Stores should only execute synchronous code. Otherwise they are too hard to understand.
 >
 > - Avoiding actions firing other actions makes your app simple. We use the newest Dispatcher implementation from Facebook that does not allow a new dispatch while dispatching. It forces you to do things right.
 >

docs/_posts/2014-11-24-react-js-conf-updates.md

@@ -0,0 +1,39 @@
+---
+title: React.js Conf Updates
+author: Vjeux
+---
+
+Yesterday was the [React.js Conf](http://conf.reactjs.com/index.html) call for presenters submission deadline. We were
+surprised to have received a total of **one hundred talk proposals** and were
+amazed that 600 people requested to be notified when ticket go on sale. This is incredible!
+
+When we organized the conference, we decided to start small since this is the
+first React.js conference. Also, we weren't sure what level of demand to expect,
+so we planned for a single-track, two-day conference on Facebook's campus. The
+largest room available would accomodate 18 speaking slots and 200 attendees.
+The spacial configuration makes it difficult to add a second track and changing
+venues only two months in advance would be too difficult, so we are deciding to
+stick with the originally planned format and venue on Facebook's campus.
+
+Unfortunately, this means that we can only accept a small number of the awesome
+conference talk proposals. In order to make sure attendees get a fair shot at
+registering, we're going to to sell tickets in three separate first-come,
+first-serve phases. **Tickets will cost $200 regardless of which phase they are
+purchased from and all proceeds will go to charity**.
+
+- Friday November 28th 2014 — Noon PST: First wave of tickets
+- Friday December 5th 2014 — Noon PST: Second wave of tickets
+- Friday December 12th 2014 — Noon PST: Third and last wave of tickets
+
+We really do wish that everyone could attend React.js Conf, but in order to
+ensure a quality experience for those who attend, we feel it will be best to
+limit the size of the conference to what was originally planned for. This means
+that not everyone who wants to attend will be able to, and many talks that
+would be excellent contributions to the conference will have to be postponed
+until the next conference. All the talks will be recorded and put online shortly after.
+
+We hope to see many of you at React.js Conf this January.
+
+Sincerely,
+
+React Core Team

docs/_posts/2014-11-25-community-roundup-24.md

@@ -0,0 +1,99 @@
+---
+title: "Community Round-up #24"
+layout: post
+author: Steven Luscher
+---
+
+## Keep it Simple
+
+Pedro Nauck ([pedronauck](https://github.com/pedronauck)) delivered an impeccably illustrated deck at Brazil's _Front in Floripa_ conference. Watch him talk about how to keep delivering value as your app scales, by keeping your development process simple.
+
+<script async class="speakerdeck-embed" data-id="44129b9054c901328b89221e99b278fe" data-ratio="1.33333333333333" src="//speakerdeck.com/assets/embed.js"></script>
+
+Murilo Pereira ([mpereira](https://github.com/mpereira)) tussles with the topic of complexity in this blog post about [coping with scaling up](http://www.techsonian.net/2014/09/from-backbone-to-react-our-experience-scaling-a-web-application/), where he describes how his team used React to make possible the “nearly impossible.”
+
+I ([steveluscher](https://github.com/steveluscher)) spoke at Manning Publications' “Powered By JavaScript” Strangeloop pre-conf in St. Louis. There, I proposed a new notation to talk about development complexity – Big-Coffee Notation ☕(n) – and spoke about the features of React that help keep our Big-Coffee from going quadratic, as our user interfaces get more complex.
+
+<iframe width="560" height="315" src="//www.youtube.com/embed/rI0GQc__0SM" frameborder="0" allowfullscreen></iframe>
+
+James Pearce ([jamesgpearce](https://github.com/jamesgpearce)) carried Big-Coffee all the way to Raleigh, NC. At the _All Things Open_ conference, he spoke about some of the design decisions that went into React, particularly those that lend themselves to simpler, more reliable code.
+
+<iframe width="560" height="315" src="//www.youtube.com/embed/m2fuO2wl_3c" frameborder="0" allowfullscreen></iframe>
+
+## All About Isomorphism
+
+Michael Ridgway ([mridgway](https://github.com/mridgway)) shows us how Yahoo! (who recently [moved Yahoo! Mail to React](http://www.slideshare.net/rmsguhan/react-meetup-mailonreact)) renders their React+Flux application, server-side.
+
+<script async class="speakerdeck-embed" data-id="87ecaa3048750132f42542ffc18c6fcf" data-ratio="1.77777777777778" src="//speakerdeck.com/assets/embed.js"></script>
+
+Péter Márton ([hekike](https://github.com/hekike)) helps us brew a cold one (literally) using an application that's server-client [isomorphic and indexable](http://blog.risingstack.com/from-angularjs-to-react-the-isomorphic-way/). Demo and sample code included – cold ones sold separately.
+
+And, lest you think that client-server isomorphism exists in pursuit of crawalable, indexable HTML alone, watch as Nate Hunzaker ([nhunzaker](https://github.com/nhunzaker)) [server renders data visualizations as SVG](http://viget.com/extend/visualization-is-for-sharing-using-react-for-portable-data-visualization) with React.
+
+## React Router Mows the Lawn
+
+Ryan Florence ([rpflorence](https://github.com/rpflorence])) and Michael Jackson ([mjackson](https://github.com/mjackson)) unveiled a new API for [React Router](https://github.com/rackt/react-router) that solves some of its user's problems by eliminating the problems themselves. Read all about what React Router learned from its community of users, and how they've [rolled your ideas into their latest release](https://github.com/rackt/react-router/wiki/Announcements).
+
+## React in Practice
+
+Jonathan Beebe ([somethingkindawierd](https://github.com/somethingkindawierd)) spoke about how he uses React to build tools that deliver hope to those trying to make the best of a bad situation. Watch his talk from this year's _Nodevember_ conference in Nashville
+
+<iframe width="420" height="315" src="//www.youtube.com/embed/uZgAq1CZ1N8" frameborder="0" allowfullscreen></iframe>
+
+If you take a peek under the covers, you'll find that React powers [Carousel](https://blog.carousel.com/2014/11/introducing-carousel-for-web-ipad-and-android-tablet/), Dropbox's new photo and video gallery app.
+
+We enjoyed a cinematic/narrative experience with this React-powered, interactive story by British author William Boyd. Dive into “[The Vanishing Game](https://thevanishinggame.wellstoried.com)” and see for yourself.
+
+## Be Kind, Rewind
+
+Spend the next 60 seconds watching Daniel Woelfel ([dwwoelfel](https://github.com/dwwoelfel)) serialize a React app's state as a string, then deserialize it to produce a working UI. Read about how he uses this technique to [reproduce bugs](http://blog.circleci.com/local-state-global-concerns/) reported to him by his users.
+
+<iframe width="420" height="315" src="//www.youtube.com/embed/5yHFTN-_mOo" frameborder="0" allowfullscreen></iframe>
+
+## Community Components
+
+Tom Chen ([tomchentw](https://github.com/tomchentw)) brings us a [react-google-maps](http://tomchentw.github.io/react-google-maps/) component, and a way to syntax highlight source code using Prism and the [react-prism](http://tomchentw.github.io/react-prism/) component, for good measure.
+
+Jed Watson ([jedwatson](https://github.com/JedWatson)) helps you manage touch, tap, and press events using the [react-tappable](https://github.com/JedWatson/react-tappable) component.
+
+To find these, and more community-built components, consult the [React Components](http://react-components.com/) and [React Rocks](http://react.rocks) component directories. React Rocks recently exceeded one-hundred listed components and counting. See one missing? Add the keyword `react-component` to your `package.json` to get listed on React Components, and [submit a link to React Rocks](https://docs.google.com/forms/d/1TpnwJmLcmmGj-_TI68upu_bKBViYeiKx7Aj9uKmV6wY/viewform).
+
+## Waiter, There's a CSS In My JavaScript
+
+The internet is abuzz with talk of styling React components using JavaScript instead of CSS. Christopher Chedeau ([vjeux](https://github.com/vjeux)) talks about some of the [fundamental style management challenges](https://speakerdeck.com/vjeux/react-css-in-js) we grapple with, at Facebook scale. A number of implementations of JavaScript centric style management solutions have appeared in the wild, including the React-focused [react-style](https://github.com/js-next/react-style).
+
+## Test Isolation
+
+Yahoo! shows us how they make use of `iframe` elements to [unit test React components in isolation](http://yahooeng.tumblr.com/post/102274727496/to-testutil-or-not-to-testutil).
+
+## You've Got The Hang of Flux, Now Let's Flow
+
+Facebook Open Source released [Flow](https://code.facebook.com/posts/1505962329687926/flow-a-new-static-type-checker-for-javascript/) this month – a static type checker for JavaScript. Naturally, Flow supports JSX, and you can use it to [type check React applications](https://code.facebook.com/posts/1505962329687926/flow-a-new-static-type-checker-for-javascript/#compatibility). There's never been a better reason to start making use of `propTypes` in your component specifications!
+
+## Countdown to React.js Conf 2014
+
+We're counting down the days until [React.js Conf](http://conf.reactjs.com) at Facebook's headquarters in Menlo Park, California, on January 28th & 29th, 2015. Thank you, to everyone who responded to the Call for Presenters. Mark the dates; tickets go on sale in three waves: at noon PST on November 28th, December 5th, and December 12th, 2014.
+
+## React Meetups Around the World
+
+<blockquote class="twitter-tweet" lang="en"><p>React JS meetup having pretty good turn up rate today <a href="https://twitter.com/hashtag/londonreact?src=hash">#londonreact</a> <a href="http://t.co/c360dlVVAe">pic.twitter.com/c360dlVVAe</a></p>&mdash; Alexander Savin (@karismafilms) <a href="https://twitter.com/karismafilms/status/535152580377468928">November 19, 2014</a></blockquote>
+
+<div class="skinny-row">
+  <div class="skinny-col">
+    <blockquote class="twitter-tweet" lang="en"><p>60+ attendees at the second React.js Utah meetup. <a href="https://twitter.com/ryanflorence">@ryanflorence</a> doing a great job, even without the internet. <a href="http://t.co/fV59AQTOyu">pic.twitter.com/fV59AQTOyu</a></p>&mdash; ReactJS Utah (@reactjsutah) <a href="https://twitter.com/reactjsutah/status/527259410020573184">October 29, 2014</a></blockquote>
+  </div>
+  <div class="skinny-col">
+    <blockquote class="twitter-tweet" lang="en"><p><a href="https://twitter.com/hashtag/ReactJS?src=hash">#ReactJS</a> meetup at <a href="https://twitter.com/Yahoo">@Yahoo</a> ! History of <a href="https://twitter.com/yahoomail">@yahoomail</a> and why we chose react and NodeJS <a href="http://t.co/Nm4EdTv45G">pic.twitter.com/Nm4EdTv45G</a></p>&mdash; rmsguhan (@rmsguhan) <a href="https://twitter.com/rmsguhan/status/515370950427029504">September 26, 2014</a></blockquote>
+  </div>
+</div>
+
+<div class="skinny-row">
+  <div class="skinny-col">
+    <blockquote class="twitter-tweet" data-cards="hidden" lang="en"><p>The very first ReactJS meetup in NYC tonight, I&#39;ll be speaking about the big ideas behind Om <a href="http://t.co/dvPrFqE9eP">http://t.co/dvPrFqE9eP</a></p>&mdash; David Nolen (@swannodette) <a href="https://twitter.com/swannodette/status/532190993463128064">November 11, 2014</a></blockquote>
+  </div>
+  <div class="skinny-col">
+    <blockquote class="twitter-tweet" lang="en"><p>If anyone in Sydney is curious about <a href="https://twitter.com/reactjs">@reactjs</a>, I&#39;m presenting at <a href="https://twitter.com/sydjs">@sydjs</a> tonight on how to use it and why it is the future. <a href="https://twitter.com/hashtag/javascript?src=hash">#javascript</a></p>&mdash; Jed Watson (@JedWatson) <a href="https://twitter.com/JedWatson/status/534943557568565248">November 19, 2014</a></blockquote>
+  </div>
+</div>
+
+<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>

docs/_posts/2014-12-18-react-v0.12.2.md

@@ -0,0 +1,37 @@
+---
+title: React v0.12.2
+author: Paul O’Shannessy
+---
+
+We just shipped React v0.12.2, bringing the 0.12 branch up to date with a few small fixes that landed in master over the past 2 months.
+
+You may have noticed that we did not do an announcement for v0.12.1. That release was snuck out in anticipation of [Flow](http://flowtype.org/), with only transform-related changes. Namely we added a flag to the `jsx` executable which allowed you to safely transform Flow-based code to vanilla JS. If you didn't update for that release, you can safely skip it and move directly to v0.12.2.
+
+The release is available for download from the CDN:
+
+* **React**  
+  Dev build with warnings: <http://fb.me/react-0.12.2.js>  
+  Minified build for production: <http://fb.me/react-0.12.2.min.js>  
+* **React with Add-Ons**  
+  Dev build with warnings: <http://fb.me/react-with-addons-0.12.2.js>  
+  Minified build for production: <http://fb.me/react-with-addons-0.12.2.min.js>  
+* **In-Browser JSX transformer**  
+  <http://fb.me/JSXTransformer-0.12.2.js>
+
+We've also published version `0.12.2` of the `react` and `react-tools` packages on npm and the `react` package on bower. `0.12.1` is also available in the same locations if need those.
+
+Please try these builds out and [file an issue on GitHub](https://github.com/facebook/react/issues/new) if you see anything awry.
+
+## Changelog
+
+### React Core
+
+* Added support for more HTML attributes: `formAction`, `formEncType`, `formMethod`, `formTarget`, `marginHeight`, `marginWidth`
+* Added `strokeOpacity` to the list of unitless CSS properties
+* Removed trailing commas (allows npm module to be bundled and used in IE8)
+* Fixed bug resulting in error when passing `undefined` to `React.createElement` - now there is a useful warning
+
+### React Tools
+
+* JSX-related transforms now always use double quotes for props and `displayName`
+

docs/_posts/2014-12-19-react-js-conf-diversity-scholarship.md

@@ -0,0 +1,37 @@
+---
+title: React.js Conf Diversity Scholarship
+author: Paul O’Shannessy
+---
+
+Today I'm really happy to announce the React.js Conf Diversity Scholarship! We believe that a diverse set of viewpoints and opinions is really important to build a thriving community. In an ideal world, every part of the tech community would be made up of people from all walks of life. However the reality is that we must be proactive and make an effort to make sure everybody has a voice. As conference organizers we worked closely with the Diversity Team here at Facebook to set aside 10 tickets and provide a scholarship. 10 tickets may not be many in the grand scheme but we really believe that this will have a positive impact on the discussions we have at the conference.
+
+I'm really excited about this and I hope you are too! The full announcement is below:
+
+- - -
+
+The Diversity Team at Facebook is excited to announce that we are now accepting applications for the React.js Conf scholarship!
+
+Beginning today, those studying or working in computer science or a related field can apply for an all-expense paid scholarship to attend the React.js Conf at Facebook’s Headquarters in Menlo Park, CA on January 28 & 29, 2015. React opens a world of new possibilities such as server-side rendering, real-time updates, different rendering targets like SVG and canvas. Join us at React.js Conf to shape the future of client-side applications! For more information about the React.js conference, please see the [website](http://conf.reactjs.com/) and [previous](http://facebook.github.io/react/blog/2014/10/27/react-js-conf.html) [updates](http://facebook.github.io/react/blog/2014/11/24/react-js-conf-updates.html) on our blog.
+
+At Facebook, we believe that anyone anywhere can make a positive impact by developing products to make the world more open and connected to the people and things they care about. Given the current realities of the tech industry and the lack of representation of communities we seek to serve, applicants currently under-represented in Computer Science and related fields are strongly encouraged to apply.
+Facebook will make determinations on scholarship recipients in its sole discretion. Facebook complies with all equal opportunity laws.
+
+To apply for the scholarship, please visit the Application Page: <https://www.surveymonkey.com/s/XVJGK6R>
+
+## Award Includes
+
+* Paid registration fee for the React.js Conf January 28 & 29th at Facebook’s Headquarters in Menlo Park, CA
+* Paid travel and lodging expenses
+* Additional $200 meal stipend
+
+## Important Dates
+
+* Monday, January 5, 2015: Applications for the React.js Conf Scholarship must be submitted in full
+* Friday, January 9, 2015: Award recipients will be notified by email of their acceptance
+* Wednesday & Thursday, January 28 & 29, 2015: React.js Conf
+
+## Eligibility
+
+* Must currently be studying or working in Computer Science or a related field
+* International applicants are welcome, but you will be responsible for securing your own visa to attend the conference
+* You must be available to attend the full duration of React.js conf on January 28 and 29 at Facebook Headquarters in Menlo Park

docs/_posts/2015-01-27-react-v0.13.0-beta-1.md

@@ -0,0 +1,165 @@
+---
+title: React v0.13.0 Beta 1
+author: Sebastian Markbåge
+---
+
+React 0.13 has a lot of nice features but there is one particular feature that I'm really excited about. I couldn't wait for React.js Conf to start tomorrow morning.
+
+Maybe you're like me and staying up late excited about the conference, or maybe you weren't one of the lucky ones to get a ticket. Either way I figured I'd give you all something to play with until then.
+
+We just published a beta version of React v0.13.0 to [npm](https://www.npmjs.com/package/react)! You can install it with `npm install react@0.13.0-beta.1`. Since this is a pre-release, we don't have proper release notes ready.
+
+So what is that one feature I'm so excited about that I just couldn't wait to share?
+
+
+## Plain JavaScript Classes!!
+
+JavaScript originally didn't have a built-in class system. Every popular framework built their own, and so did we. This means that you have a learn slightly different semantics for each framework.
+
+We figured that we're not in the business of designing a class system. We just want to use whatever is the idiomatic JavaScript way of creating classes.
+
+In React 0.13.0 you no longer need to use `React.createClass` to create React components. If you have a transpiler you can use ES6 classes today. You can use the transpiler we ship with `react-tools` by making use of the harmony option: `jsx --harmony`.
+
+
+### ES6 Classes
+
+```javascript
+class HelloMessage extends React.Component {
+  render() {
+    return <div>Hello {this.props.name}</div>;
+  }
+}
+
+React.render(<HelloMessage name="Sebastian" />, mountNode);
+```
+
+The API is mostly what you would expect, with the exception of `getInitialState`. We figured that the idiomatic way to specify class state is to just use a simple instance property. Likewise `getDefaultProps` and `propTypes` are really just properties on the constructor.
+
+```javascript
+export class Counter extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {count: props.initialCount};
+  }
+  tick() {
+    this.setState({count: this.state.count + 1});
+  }
+  render() {
+    return (
+      <div onClick={this.tick.bind(this)}>
+        Clicks: {this.state.count}
+      </div>
+    );
+  }
+}
+Counter.propTypes = { initialCount: React.PropTypes.number };
+Counter.defaultProps = { initialCount: 0 };
+```
+
+### ES7+ Property Initializers
+
+Wait, assigning to properties seems like a very imperative way of defining classes! You're right, however, we designed it this way because it's idiomatic. We fully expect a more declarative syntax for property initialization to arrive in future version of JavaScript. It might look something like this:
+
+```javascript
+// Future Version
+export class Counter extends React.Component {
+  static propTypes = { initialCount: React.PropTypes.number };
+  static defaultProps = { initialCount: 0 };
+  state = { count: this.props.initialCount };
+  tick() {
+    this.setState({ count: this.state.count + 1 });
+  }
+  render() {
+    return (
+      <div onClick={this.tick.bind(this)}>
+        Clicks: {this.state.count}
+      </div>
+    );
+  }
+}
+```
+
+This was inspired by TypeScript's property initializers.
+
+### Autobinding
+
+`React.createClass` has a built-in magic feature that bound all methods to `this` automatically for you. This can be a little confusing for JavaScript developers that are not used to this feature in other classes, or it can be confusing when they move from React to other classes.
+
+Therefore we decided not to have this built-in into React's class model. You can still explicitly prebind methods in your constructor if you want.
+
+```javascript
+class Counter extends React.Component {
+  constructor() {
+    super();
+    this.tick = this.tick.bind(this);
+  }
+  tick() {
+    ...
+  }
+  ...
+}
+```
+
+However, when we have the future property initializers, there is a neat trick that you can use to accomplish this syntactically:
+
+```javascript
+class Counter extends React.Component {
+  tick = () => {
+    ...
+  }
+  ...
+}
+```
+
+### Mixins
+
+Unfortunately, we will not launch any mixin support for ES6 classes in React. That would defeat the purpose of only using idiomatic JavaScript concepts.
+
+There is no standard and universal way to define mixins in JavaScript. In fact, several features to support mixins were dropped from ES6 today. There are a lot of libraries with different semantics. We think that there should be one way of defining mixins that you can use for any JavaScript class. React just making another doesn't help that effort.
+
+Therefore, we will keep working with the larger JS community to create a standard for mixins. We will also start designing a new compositional API that will help make common tasks easier to do without mixins. E.g. first-class subscriptions to any kind of Flux store.
+
+Luckily, if you want to keep using mixins, you can just keep using `React.createClass`.
+
+> **Note:**
+>
+> The classic `React.createClass` style of creating classes will continue to work just fine.
+
+## Other Languages!
+
+Since these classes are just plain old JavaScript classes, you can use other languages that compile to JavaScript classes, such as TypeScript.
+
+You can also use CoffeeScript classes:
+
+```coffeescript
+div = React.createFactory 'div'
+
+class Counter extends React.Component
+  @propTypes = initialCount: React.PropTypes.number
+  @defaultProps = initialCount: 0
+
+  constructor: (props) ->
+    super props
+    @state = count: props.initialCount
+
+  tick: =>
+    @setState count: @state.count + 1
+
+  render: ->
+    div onClick: @tick,
+      'Clicks: '
+      @state.count
+```
+
+You can even use the old ES3 module pattern if you want:
+
+```javascript
+function MyComponent(initialProps) {
+  return {
+    state: { value: initialProps.initialValue },
+    render: function() {
+      return <span className={this.state.value} />
+    }
+  };
+}
+```

docs/_posts/2015-02-18-react-conf-roundup-2015.md

@@ -0,0 +1,269 @@
+---
+title: React.js Conf Round-up 2015
+layout: post
+author: Steven Luscher
+---
+
+It was a privilege to welcome the React community to Facebook HQ on January 28–29 for the first-ever React.js Conf, and a pleasure to be be able to unveil three new technologies that we've been using internally at Facebook for some time: GraphQL, Relay, and React Native.
+
+## The talks
+
+<div class="skinny-row">
+  <div class="skinny-col">
+    <h3 style="margin-top:0"><a class="anchor" name="talk-keynote"></a>Keynote <a class="hash-link" href="#talk-keynote">#</a></h3>
+    <p>
+      <strong>Tom Occhino</strong> opened with a history of how React came to be, before announcing Facebook’s answer to a long-looming what-if question: what if we could use React to target something other than the DOM?
+    </p>
+  </div>
+  <div class="skinny-col">
+    <iframe width="305" height="171" src="https://www.youtube.com/embed/KVZ-P-ZI6W4" frameborder="0" allowfullscreen></iframe>
+  </div>
+</div>
+
+<div class="skinny-row">
+  <div class="skinny-col">
+    <h3 style="margin-top:0"><a class="anchor" name="talk-tweak"></a>Tweaking in real time <a class="hash-link" href="#talk-tweak">#</a></h3>
+    <p>
+      <strong>Brenton Simpson</strong> showed us how eBay brings Bret Victor’s feedback loop to your favorite editor using Webpack, react-hot-loader, and <a href="https://github.com/appsforartists/ambidex">Ambidex</a>.
+    </p>
+  </div>
+  <div class="skinny-col">
+    <iframe width="305" height="171" src="https://www.youtube.com/embed/yaymfLj5tjA" frameborder="0" allowfullscreen></iframe>
+  </div>
+</div>
+
+<div class="skinny-row">
+  <div class="skinny-col">
+    <h3 style="margin-top:0"><a class="anchor" name="talk-ast"></a>Abstract Syntax Trees <a class="hash-link" href="#talk-ast">#</a></h3>
+    <p>
+      <strong>Gurdas Nijor</strong> showed us how we can leverage some conventions of React to perform source code transformations that unlock an inspirational set of use cases.
+    </p>
+  </div>
+  <div class="skinny-col">
+    <iframe width="305" height="171" src="https://www.youtube.com/embed/OZGgVxFxSIs" frameborder="0" allowfullscreen></iframe>
+  </div>
+</div>
+
+<div class="skinny-row">
+  <div class="skinny-col">
+    <h3 style="margin-top:0"><a class="anchor" name="talk-relay-graphql"></a>Relay and GraphQL <a class="hash-link" href="#talk-relay-graphql">#</a></h3>
+    <p>
+      <strong>Daniel Schafer</strong> and <strong>Jing Chen</strong> showed us how Facebook approaches data fetching with React, giving us an early peek at the forthcoming duo of Relay and GraphQL.
+    </p>
+  </div>
+  <div class="skinny-col">
+    <iframe width="305" height="171" src="https://www.youtube.com/embed/9sc8Pyc51uU" frameborder="0" allowfullscreen></iframe>
+  </div>
+</div>
+
+<div class="skinny-row">
+  <div class="skinny-col">
+    <h3 style="margin-top:0"><a class="anchor" name="talk-channels"></a>Channels <a class="hash-link" href="#talk-channels">#</a></h3>
+    <p>
+      <strong>James Long</strong> explores what might happen if we introduce channels, a new style of coordinating actions, to React.
+    </p>
+  </div>
+  <div class="skinny-col">
+    <iframe width="305" height="171" src="https://www.youtube.com/embed/W2DgDNQZOwo" frameborder="0" allowfullscreen></iframe>
+  </div>
+</div>
+
+<div class="skinny-row">
+  <div class="skinny-col">
+    <h3 style="margin-top:0"><a class="anchor" name="talk-router"></a>React Router <a class="hash-link" href="#talk-router">#</a></h3>
+    <p>
+      <strong>Michael Jackson</strong> reminded us that URLs should be part of our design process, and showed us how <a href="https://github.com/rackt/react-router">react-router</a> can help to manage the transitions between them.
+    </p>
+  </div>
+  <div class="skinny-col">
+    <iframe width="305" height="171" src="https://www.youtube.com/embed/XZfvW1a8Xac" frameborder="0" allowfullscreen></iframe>
+  </div>
+</div>
+
+<div class="skinny-row">
+  <div class="skinny-col">
+    <h3 style="margin-top:0"><a class="anchor" name="talk-full-stack-flux"></a>Full-stack Flux <a class="hash-link" href="#talk-full-stack-flux">#</a></h3>
+    <p>
+      <strong>Pete Hunt</strong> showed us how a Flux approach can help us scale actions and questions on the backend in addition to the frontend.
+    </p>
+  </div>
+  <div class="skinny-col">
+    <iframe width="305" height="171" src="https://www.youtube.com/embed/KtmjkCuV-EU" frameborder="0" allowfullscreen></iframe>
+  </div>
+</div>
+
+<div class="skinny-row">
+  <div class="skinny-col">
+    <h3 style="margin-top:0"><a class="anchor" name="talk-performance"></a>High-performance <a class="hash-link" href="#talk-performance">#</a></h3>
+    <p>
+      <strong>Jason Bonta</strong> showed us how complex user interfaces can get, and how his team keeps them performant as they scale. He also had the pleasure of open-sourcing his team’s work on <a href="http://facebook.github.io/fixed-data-table/">FixedDataTable</a>.
+    </p>
+  </div>
+  <div class="skinny-col">
+    <iframe width="305" height="171" src="https://www.youtube.com/embed/KYzlpRvWZ6c" frameborder="0" allowfullscreen></iframe>
+  </div>
+</div>
+
+<div class="skinny-row">
+  <div class="skinny-col">
+    <h3 style="margin-top:0"><a class="anchor" name="talk-intl"></a>FormatJS and react-intl <a class="hash-link" href="#talk-intl">#</a></h3>
+    <p>
+      <strong>Eric Ferraiuolo</strong> showed how you can bring your app to a worldwide audience using a series of polyfills and emerging ECMAScript APIs.
+    </p>
+  </div>
+  <div class="skinny-col">
+    <iframe width="305" height="171" src="https://www.youtube.com/embed/Sla-DkvmIHY" frameborder="0" allowfullscreen></iframe>
+  </div>
+</div>
+
+<div class="skinny-row">
+  <div class="skinny-col">
+    <h3 style="margin-top:0"><a class="anchor" name="talk-hype"></a>Hype! <a class="hash-link" href="#talk-hype">#</a></h3>
+    <p>
+      <strong>Ryan Florence</strong> showed us how easy it is to transition from a career selling life insurance, to a burgeoning one as a software developer. All you have to do is to learn how to say “yes.”
+    </p>
+  </div>
+  <div class="skinny-col">
+    <iframe width="305" height="171" src="https://www.youtube.com/embed/z5e7kWSHWTg" frameborder="0" allowfullscreen></iframe>
+  </div>
+</div>
+
+<div class="skinny-row">
+  <div class="skinny-col">
+    <h3 style="margin-top:0"><a class="anchor" name="talk-native"></a>React Native <a class="hash-link" href="#talk-native">#</a></h3>
+    <p>
+      <strong>Christopher Chedeau</strong> showed us how to bring the developer experience of working with React on the web to native app development, using React Native.
+    </p>
+  </div>
+  <div class="skinny-col">
+    <iframe width="305" height="171" src="https://www.youtube.com/embed/7rDsRXj9-cU" frameborder="0" allowfullscreen></iframe>
+  </div>
+</div>
+
+<div class="skinny-row">
+  <div class="skinny-col">
+    <h3 style="margin-top:0"><a class="anchor" name="talk-components"></a>Components <a class="hash-link" href="#talk-components">#</a></h3>
+    <p>
+      <strong>Andrew Rota</strong> explained how React and Web Components can work together, and how to avoid some common pitfalls.
+    </p>
+  </div>
+  <div class="skinny-col">
+    <iframe width="305" height="171" src="https://www.youtube.com/embed/g0TD0efcwVg" frameborder="0" allowfullscreen></iframe>
+  </div>
+</div>
+
+<div class="skinny-row">
+  <div class="skinny-col">
+    <h3 style="margin-top:0"><a class="anchor" name="talk-immutable"></a>Immutability <a class="hash-link" href="#talk-immutable">#</a></h3>
+    <p>
+      <strong>Lee Byron</strong> led a master-class on persistent immutable data structures, showing us the world of possibility that they can unlock for your software, and perhaps Javascript in general.
+    </p>
+  </div>
+  <div class="skinny-col">
+    <iframe width="305" height="171" src="https://www.youtube.com/embed/I7IdS-PbEgI" frameborder="0" allowfullscreen></iframe>
+  </div>
+</div>
+
+<div class="skinny-row">
+  <div class="skinny-col">
+    <h3 style="margin-top:0"><a class="anchor" name="talk-gibbon"></a>Beyond the DOM <a class="hash-link" href="#talk-gibbon">#</a></h3>
+    <p>
+      <strong>Jafar Husain</strong> told us a story about how Netflix was able to push React into places where the DOM could not go.
+  </div>
+  <div class="skinny-col">
+    <iframe width="305" height="171" src="https://www.youtube.com/embed/eNC0mRYGWgc" frameborder="0" allowfullscreen></iframe>
+  </div>
+</div>
+
+<div class="skinny-row">
+  <div class="skinny-col">
+    <h3 style="margin-top:0"><a class="anchor" name="talk-visualization"></a>Data Visualization <a class="hash-link" href="#talk-visualization">#</a></h3>
+    <p>
+      <strong>Zach Nation</strong> showed us how we can produce visualizations from over 45 million data points without breaking a sweat.
+  </div>
+  <div class="skinny-col">
+    <iframe width="305" height="171" src="https://www.youtube.com/embed/2ii1lEkIv1s" frameborder="0" allowfullscreen></iframe>
+  </div>
+</div>
+
+<div class="skinny-row">
+  <div class="skinny-col">
+    <h3 style="margin-top:0"><a class="anchor" name="talk-refracted"></a>React Refracted <a class="hash-link" href="#talk-refracted">#</a></h3>
+    <p>
+      <strong>David Nolen</strong> gave us a view of React from a non-JavaScript perspective, challenging some common intuition along the way.
+  </div>
+  <div class="skinny-col">
+    <iframe width="305" height="171" src="https://www.youtube.com/embed/5hGHdETNteE" frameborder="0" allowfullscreen></iframe>
+  </div>
+</div>
+
+<div class="skinny-row">
+  <div class="skinny-col">
+    <h3 style="margin-top:0"><a class="anchor" name="talk-flux-panel"></a>Flux Panel <a class="hash-link" href="#talk-flux-panel">#</a></h3>
+    <p>
+      <strong>Bill Fisher</strong> coordinated a Flux panel together with <strong>Michael Ridgway</strong>, <strong>Spike Brehm</strong>, <strong>Andres Suarez</strong>, <strong>Jing Chen</strong>, <strong>Ian Obermiller</strong>, and <strong>Kyle Davis</strong>.
+  </div>
+  <div class="skinny-col">
+    <iframe width="305" height="171" src="https://www.youtube.com/embed/LTj4O7WJJ98" frameborder="0" allowfullscreen></iframe>
+  </div>
+</div>
+
+<div class="skinny-row">
+  <div class="skinny-col">
+    <h3 style="margin-top:0"><a class="anchor" name="talk-communication"></a>Component communication <a class="hash-link" href="#talk-communication">#</a></h3>
+    <p>
+      <strong>Bonnie Eisenman</strong> led us through the ‘adapter’ approach to inter-component communication taken by her team at Codecademy.
+  </div>
+  <div class="skinny-col">
+    <iframe width="305" height="171" src="https://www.youtube.com/embed/ZM6wXoFTY3o" frameborder="0" allowfullscreen></iframe>
+  </div>
+</div>
+
+<div class="skinny-row">
+  <div class="skinny-col">
+    <h3 style="margin-top:0"><a class="anchor" name="talk-typescript"></a>Flow and TypeScript <a class="hash-link" href="#talk-typescript">#</a></h3>
+    <p>
+      <strong>James Brantly</strong> demonstrated how we can reap the benefits of static typing using both Flow and TypeScript.
+  </div>
+  <div class="skinny-col">
+    <iframe width="305" height="171" src="https://www.youtube.com/embed/9PTa9-PPVAc" frameborder="0" allowfullscreen></iframe>
+  </div>
+</div>
+
+<div class="skinny-row">
+  <div class="skinny-col">
+    <h3 style="margin-top:0"><a class="anchor" name="talk-qa"></a>Core Team Q&amp;A <a class="hash-link" href="#talk-qa">#</a></h3>
+    <p>
+      <strong>Tom Occhino</strong>, <strong>Ben Alpert</strong>, <strong>Lee Byron</strong>, <strong>Christopher Chedeau</strong>, <strong>Sebastian Markbåge</strong>, <strong>Jing Chen</strong>, and <strong>Dan Schafer</strong> closed the conference with a Q&amp;A session.
+  </div>
+  <div class="skinny-col">
+    <iframe width="305" height="171" src="https://www.youtube.com/embed/EPpkboSKvPI" frameborder="0" allowfullscreen></iframe>
+  </div>
+</div>
+
+## Reactions
+
+The conference is over, but the conversation has just begun.
+
+**Mihai Parparita** detailed his efforts to [hack his way to a React.js Conf ticket](http://blog.persistent.info/2014/12/html-munging-my-way-to-reactjs-conf.html); **James Long** blogged about [his first encounter with React Native](http://jlongster.com/First-Impressions-using-React-Native); **Eric Florenzano** talked about how he perceives the [impact of Relay, GraphQL, and React Native](https://medium.com/@ericflo/facebook-just-taught-us-all-how-to-build-websites-51f1e7e996f2) on software development; **Margaret Staples** blogged about her experience of [being on-campus at Facebook HQ](http://deadlugosi.blogspot.com/2015/02/facebook-gave-me-ice-cream.html); **Jeff Barczewski** tied his experience of attending the conference up with a bow in this [blog post filled with photos, videos, and links](http://codewinds.com/blog/2015-02-04-reactjs-conf.html); **Kevin Old** left us with [his takeaways](http://kevinold.com/2015/01/31/takeaways-from-reactjs-conf-2015.html); **Paul Wittmann** found React Native [freshly on his radar](http://www.railslove.com/stories/fresh-on-our-radar-react-native); and finally, undeterred by not being able to attend the conference in person, **Justin Ball** [summarized it from afar](http://www.justinball.com/2015/02/03/i-didn't-attend-react.js-conf/).
+
+And, in case you missed a session, you can borrow **Michael Chan’s** [drawings](http://chantastic.io/2015-reactjs-conf/), **Mihai Parparita’s** [summary](https://quip.com/uJQeABv7nkFN), or **Shaohua Zhou’s** [day 1](http://getshao.com/2015/01/29/react-js-conf-notes-day1/) / [day 2](http://getshao.com/2015/01/29/react-js-conf-notes-day-2/) notes.
+
+<div class="skinny-row">
+  <div class="skinny-col">
+    <blockquote class="twitter-tweet" lang="en"><p>Notes from <a href="https://twitter.com/dlschafer">@dlschafer</a> and <a href="https://twitter.com/jingc">@jingc</a>&#39;s <a href="https://twitter.com/hashtag/reactjsconf?src=hash">#reactjsconf</a> talk &quot;Data fetching for React applications at Facebook&quot; <a href="http://t.co/IUZUbDCDMQ">pic.twitter.com/IUZUbDCDMQ</a></p>&mdash; Michael Chan (@chantastic) <a href="https://twitter.com/chantastic/status/560538533161472000">January 28, 2015</a></blockquote>
+    <blockquote class="twitter-tweet" lang="en"><p>This is just magical (in the good way)… GraphQL + Relay is amazing. <a href="https://twitter.com/hashtag/reactjsconf?src=hash">#reactjsconf</a></p>&mdash; Chris Williams (@voodootikigod) <a href="https://twitter.com/voodootikigod/status/560533225395589120">January 28, 2015</a></blockquote>
+    <blockquote class="twitter-tweet" lang="en"><p>These… these are my people. :) <a href="https://twitter.com/hashtag/reactjsconf?src=hash">#reactjsconf</a></p>&mdash; Thomas Beirne (@Beirnet) <a href="https://twitter.com/Beirnet/status/560317879501848576">January 28, 2015</a></blockquote>
+  </div>
+  <div class="skinny-col">
+    <blockquote class="twitter-tweet" lang="en"><p>Humbled by the React team and community. Found <a href="https://twitter.com/hashtag/reactjsconf?src=hash">#reactjsconf</a> very mindful, practical and just real.</p>&mdash; xnoɹǝʃ uɐıɹq (@brianleroux) <a href="https://twitter.com/brianleroux/status/560972130112655360">January 30, 2015</a></blockquote>
+    <blockquote class="twitter-tweet" lang="en"><p>I say with confidence as a former UIKit author: React&#39;s model for the UI layer is vastly better than UIKit&#39;s. React Native is a *huge* deal.</p>&mdash; Andy Matuschak (@andy_matuschak) <a href="https://twitter.com/andy_matuschak/status/560511204867575808">January 28, 2015</a></blockquote>
+    <blockquote class="twitter-tweet" lang="en"><p><a href="https://twitter.com/hashtag/reactjsconf?src=hash">#reactjsconf</a> was incredible. Amazing project stewardship and community. Boring prediction, React Native sends adoption vertical in 2015.</p>&mdash; David Nolen (@swannodette) <a href="https://twitter.com/swannodette/status/561232290273980416">January 30, 2015</a></blockquote>
+    <blockquote class="twitter-tweet" lang="en"><p>I really love the community shout outs by <a href="https://twitter.com/Vjeux">@vjeux</a> between talks at <a href="https://twitter.com/hashtag/reactjsconf?src=hash">#reactjsconf</a>!</p>&mdash; Andrew Rota (@AndrewRota) <a href="https://twitter.com/AndrewRota/status/560927339522297856">January 29, 2015</a></blockquote>
+  </div>
+</div>
+<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
+
+**All proceeds from React.js Conf 2015 were donated to the wonderful programs at [code.org](http://code.org)**. These programs aim to increase access to the field of computer science by underrepresented members of our community. Watch this video to learn more.
+
+<iframe width="305" height="171" src="https://www.youtube.com/embed/FC5FbmsH4fw" frameborder="0" allowfullscreen></iframe>

docs/_posts/2015-02-20-introducing-relay-and-graphql.md

@@ -0,0 +1,63 @@
+---
+title: "Introducing Relay and GraphQL"
+layout: post
+author: Greg Hurrell
+---
+
+## Data fetching for React applications
+
+There's more to building an application than creating a user interface. Data fetching is still a tricky problem, especially as applications become more complicated. At [React.js Conf](http://conf.reactjs.com/) we announced two projects we've created at Facebook to make data fetching simple for developers, even as a product grows to include dozens of contributors and the application becomes as complex as Facebook itself.
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/9sc8Pyc51uU" frameborder="0" allowfullscreen></iframe>
+
+The two projects &mdash; Relay and GraphQL &mdash; have been in use in production at Facebook for some time, and we're excited to be bringing them to the world as open source in the future. In the meantime, we wanted to share some additional information about the projects here.
+
+<script async class="speakerdeck-embed" data-id="7af7c2f33bf9451a892dcd91de55b7c2" data-ratio="1.29456384323641" src="//speakerdeck.com/assets/embed.js"></script>
+
+## What is Relay?
+
+Relay is a new framework from Facebook that provides data-fetching functionality for React applications. It was announced at React.js Conf (January 2015).
+
+Each component specifies its own data dependencies declaratively using a query language called GraphQL. The data is made available to the component via properties on `this.props`.
+
+Developers compose these React components naturally, and Relay takes care of composing the data queries into efficient batches, providing each component with exactly the data that it requested (and no more), updating those components when the data changes, and maintaining a client-side store (cache) of all data.
+
+## What is GraphQL?
+
+GraphQL is a data querying language designed to describe the complex, nested data dependencies of modern applications. It's been in production use in Facebook's native apps for several years.
+
+On the server, we configure the GraphQL system to map queries to underlying data-fetching code. This configuration layer allows GraphQL to work with arbitrary underlying storage mechanisms. Relay uses GraphQL as its query language, but it is not tied to a specific implementation of GraphQL.
+
+## The value proposition
+
+Relay was born out of our experiences building large applications at Facebook. Our overarching goal is to enable developers to create correct, high-performance applications in a straightforward and obvious way. The design enables even large teams to make changes with a high degree of isolation and confidence. Fetching data is hard, dealing with ever-changing data is hard, and performance is hard. Relay aims to reduce these problems to simple ones, moving the tricky bits into the framework and freeing you to concentrate on building your application.
+
+By co-locating the queries with the view code, the developer can reason about what a component is doing by looking at it in isolation; it's not necessary to consider the context where the component was rendered in order to understand it. Components can be moved anywhere in a render hierarchy without having to apply a cascade of modifications to parent components or to the server code which prepares the data payload.
+
+Co-location leads developers to fall into the "pit of success", because they get exactly the data they asked for and the data they asked for is explicitly defined right next to where it is used. This means that performance becomes the default (it becomes much harder to accidentally over-fetch), and components are more robust (under-fetching is also less likely for the same reason, so components won't try to render missing data and blow up at runtime).
+
+Relay provides a predictable environment for developers by maintaining an invariant: a component won't be rendered until all the data it requested is available. Additionally, queries are defined statically (ie. we can extract queries from a component tree before rendering) and the GraphQL schema provides an authoritative description of what queries are valid, so we can validate queries early and fail fast when the developer makes a mistake.
+
+Only the fields of an object that a component explicitly asks for will be accessible to that component, even if other fields are known and cached in the store (because another component requested them). This makes it impossible for implicit data dependency bugs to exist latently in the system.
+
+By handling all data-fetching via a single abstraction, we're able to handle a bunch of things that would otherwise have to be dealt with repeatedly and pervasively across the application:
+
+- **Performance:** All queries flow through the framework code, where things that would otherwise be inefficient, repeated query patterns get automatically collapsed and batched into efficient, minimal queries. Likewise, the framework knows which data have been previously requested, or for which requests are currently "in flight", so queries can be automatically de-duplicated and the minimal queries can be produced.
+- **Subscriptions:** All data flows into a single store, and all reads from the store are via the framework. This means the framework knows which components care about which data and which should be re-rendered when data changes; components never have to set up individual subscriptions.
+- **Common patterns:** We can make common patterns easy. Pagination is the example that [Jing](https://twitter.com/jingc) gave at the conference: if you have 10 records initially, getting the next page just means declaring you want 15 records in total, and the framework automatically constructs the minimal query to grab the delta between what you have and what you need, requests it, and re-renders your view when the data become available.
+- **Simplified server implementation:** Rather than having a proliferation of end-points (per action, per route), a single GraphQL endpoint can serve as a facade for any number of underlying resources.
+- **Uniform mutations:** There is one consistent pattern for performing mutations (writes), and it is conceptually baked into the data querying model itself. You can think of a mutation as a query with side-effects: you provide some parameters that describe the change to be made (eg. attaching a comment to a record) and a query that specifies the data you'll need to update your view of the world after the mutation completes (eg. the comment count on the record), and the data flows through the system using the normal flow. We can do an immediate "optimistic" update on the client (ie. update the view under the assumption that the write will succeed), and finally commit it, retry it or roll it back in the event of an error when the server payload comes back.
+
+## How does it relate to Flux?
+
+In some ways Relay is inspired by Flux, but the mental model is much simpler. Instead of multiple stores, there is one central store that caches all GraphQL data. Instead of explicit subscriptions, the framework itself can track which data each component requests, and which components should be updated whenever the data change. Instead of actions, modifications take the form of mutations.
+
+At Facebook, we have apps built entirely using Flux, entirely using Relay, or with both. One pattern we see emerging is letting Relay manage the bulk of the data flow for an application, but using Flux stores on the side to handle a subset of application state.
+
+## Open source plans
+
+We're working very hard right now on getting both GraphQL (a spec, and a reference implementation) and Relay ready for public release (no specific dates yet, but we are super excited about getting these out there).
+
+In the meantime, we'll be providing more and more information in the form of blog posts (and in [other channels](https://gist.github.com/wincent/598fa75e22bdfa44cf47)). As we get closer to the open source release, you can expect more concrete details, syntax and API descriptions and more.
+
+Watch this space!

docs/_posts/2015-02-24-react-v0.13-rc1.md

@@ -0,0 +1,78 @@
+---
+title: "React v0.13 RC"
+author: Paul O'Shannessy
+date: 2015-02-24 14:00
+---
+
+Over the weekend we pushed out our first (and hopefully only) release candidate for React v0.13!
+
+We've talked a little bit about the changes that are coming. The splashiest of these changes is support for ES6 Classes. You can read more about this in [our beta announcement](/react/blog/2015/01/27/react-v0.13.0-beta-1.html). We're really excited about this! Sebastian also posted earlier this morning about [some of the other changes coming focused around ReactElement](/react/blog/2015/02/24/streamlining-react-elements.html). The changes we've been working on there will hopefully enable lots of improvements to performance and developer experience.
+
+
+The release candidate is available for download:
+
+* **React**  
+  Dev build with warnings: <http://fb.me/react-0.13.0-rc1.js>  
+  Minified build for production: <http://fb.me/react-0.13.0-rc1.min.js>  
+* **React with Add-Ons**  
+  Dev build with warnings: <http://fb.me/react-with-addons-0.13.0-rc1.js>  
+  Minified build for production: <http://fb.me/react-with-addons-0.13.0-rc1.min.js>  
+* **In-Browser JSX transformer**  
+  <http://fb.me/JSXTransformer-0.13.0-rc1.js>
+
+We've also published version `0.13.0-rc1` of the `react` and `react-tools` packages on npm and the `react` package on bower.
+
+- - -
+
+## Changelog
+
+### React Core
+
+#### Breaking Changes
+
+* Mutating `props` after an element is created is deprecated and will cause warnings in development mode; future versions of React will incorporate performance optimizations assuming that props aren't mutated
+* Static methods (defined in `statics`) are no longer autobound to the component class
+* `ref` resolution order has changed slightly such that a ref to a component is available immediately after its `componentDidMount` method is called; this change should be observable only if your component calls a parent component's callback within your `componentDidMount`, which is an anti-pattern and should be avoided regardless
+* Calls to `setState` in life-cycle methods are now always batched and therefore asynchronous. Previously the first call on the first mount was synchronous.
+* `setState` and `forceUpdate` on an unmounted component now warns instead of throwing. That avoids a possible race condition with Promises.
+* Access to most internal properties has been completely removed, including `this._pendingState` and `this._rootNodeID`.
+
+#### New Features
+
+* Support for using ES6 classes to build React components; see the [v0.13.0 beta 1 notes](http://facebook.github.io/react/blog/2015/01/27/react-v0.13.0-beta-1.html) for details
+* Added new top-level API `React.findDOMNode(component)`, which should be used in place of `component.getDOMNode()`. The base class for ES6-based components will not have `getDOMNode`. This change will enable some more patterns moving forward.
+* New `ref` style, allowing a callback to be used in place of a name: `<Photo ref={(c) => this._photo = c} />` allows you to reference the component with `this._photo` (as opposed to `ref="photo"` which gives `this.refs.photo`)
+* `this.setState()` can now take a function as the first argument for transactional state updates, such as `this.setState((state, props) => ({count: state.count + 1}));` -- this means that you no longer need to use `this._pendingState`, which is now gone.
+* Support for iterators and immutable-js sequences as children
+
+#### Deprecations
+
+* `ComponentClass.type` is deprecated. Just use `ComponentClass` (usually as `element.type === ComponentClass`)
+* Some methods that are available on `createClass`-based components are removed or deprecated from ES6 classes (for example, `getDOMNode`, `setProps`, `replaceState`).
+
+
+### React with Add-Ons
+
+#### Deprecations
+
+* `React.addons.classSet` is now deprecated. This functionality can be replaced with several freely available modules. [classnames](https://www.npmjs.com/package/classnames) is one such module.
+
+
+### React Tools
+
+#### Breaking Changes
+
+* When transforming ES6 syntax, `class` methods are no longer enumerable by default, which requires `Object.defineProperty`; if you support browsers such as IE8, you can pass `--target es3` to mirror the old behavior
+
+#### New Features
+
+* `--target` option is available on the jsx command, allowing users to specify and ECMAScript version to target.
+  * `es5` is the default.
+  * `es3` restored the previous default behavior. An additional transform is added here to ensure the use of reserved words as properties is safe (eg `this.static` will become `this['static']` for IE8 compatibility).
+* The transform for the call spread operator has also been enabled.
+
+
+### JSX
+
+#### Breaking Changes
+* A change was made to how some JSX was parsed, specifically around the use of `>` or `}` when inside an element. Previously it would be treated as a string but now it will be treated as a parse error. We will be releasing a standalone executable to find and fix potential issues in your JSX code.

docs/_posts/2015-02-24-streamlining-react-elements.md

@@ -0,0 +1,230 @@
+---
+title: "Streamlining React Elements"
+author: Sebastian Markbåge
+date: 2015-02-24 11:00
+---
+
+React v0.13 is right around the corner and so we wanted to discuss some upcoming changes to ReactElement. In particular, we added several warnings to some esoteric use cases of ReactElement. There are no runtime behavior changes for ReactElement - we're adding these warnings in the hope that we can change some behavior in v0.14 if the changes are valuable to the community.
+
+If you use React in an idiomatic way, chances are, you’ll never see any of these warnings. In that case, you can skip this blog post. You can just enjoy the benefits! These changes will unlock simplified semantics, better error messages, stack traces and compiler optimizations!
+
+## Immutable Props
+
+In React 0.12, the props object was mutable. It allows you to do patterns like this:
+
+```js
+var element = <Foo bar={false} />;
+if (shouldUseFoo) {
+  element.props.foo = 10;
+  element.props.bar = true;
+}
+```
+
+The problem is that we don’t have a convenient way to tell when you’re done mutating.
+
+### Problem: Mutating Props You Don’t Own
+
+If you mutate something, you destroy the original value. Therefore, there is nothing to diff against. Imagine something like this:
+
+```js
+var element = this.props.child;
+element.props.count = this.state.count;
+return element;
+```
+
+You take a ReactElement through `props.child` and mutate its property before rendering it. If this component's state updates, this render function won't actually get a new ReactElement in `props.child`. It will be the same one. You're mutating the same props.
+
+You could imagine that this would work. However, this disables the ability for any component to use `shouldComponentUpdate`. It looks like the component never changed because the previous value is always the same as the next one. Since the DOM layer does diffing, this pattern doesn't even work in this case. The change will never propagate down to the DOM except the first time.
+
+Additionally, if this element is reused in other places or used to switch back and forth between two modes, then you have all kinds of weird race conditions.
+
+It has always been broken to mutate the props of something passed into you. The problem is that we can’t warn you about this special case if you accidentally do this.
+
+### Problem: Too Late Validation
+
+In React 0.12, we do PropType validation very deep inside React during mounting. This means that by the time you get an error, the debugger stack is long gone. This makes it difficult to find complex issues during debugging. We have to do this since it is fairly common for extra props to be added between the call to React.createElement and the mount time. So the type is incomplete until then.
+
+The static analysis in Flow is also impaired by this. There is no convenient place in the code where Flow can determine that the props are finalized.
+
+### Solution: Immutable Props
+
+Therefore, we would like to be able to freeze the element.props object so that it is immediately immutable at the JSX callsite (or createElement). In React 0.13 we will start warning you if you mutate `element.props` after this point.
+
+You can generally refactor these pattern to simply use two different JSX calls:
+
+```js
+if (shouldUseFoo) {
+  return <Foo foo={10} bar={true} />;
+} else {
+  return <Foo bar={false} />;
+}
+```
+
+However, if you really need to dynamically build up your props you can just use a temporary object and spread it into JSX:
+
+```js
+var props = { bar: false };
+if (shouldUseFoo) {
+  props.foo = 10;
+  props.bar = true;
+}
+return <Foo {...props} />;
+```
+
+It is still OK to do deep mutations of objects. E.g:
+
+```js
+return <Foo nestedObject={this.state.myModel} />;
+```
+
+In this case it's still ok to mutate the myModel object in state. We recommend that you use fully immutable models. E.g. by using immutable-js. However, we realize that mutable models are still convenient in many cases. Therefore we're only considering shallow freezing the props object that belongs to the ReactElement itself. Not nested objects.
+
+### Solution: Early PropType Warnings
+
+We will also start warning you for PropTypes at the JSX or createElement callsite. This will help debugging as you’ll have the stack trace right there. Similarly, Flow also validates PropTypes at this callsite.
+
+Note: There are valid patterns that clones a ReactElement and adds additional props to it. In that case these additional props needs to be optional.
+
+```js
+var element1 = <Foo />; // extra prop is optional
+var element2 = React.addons.cloneWithProps(element1, { extra: 'prop' });
+```
+
+## Owner
+
+In React each child has both a "parent" and an “owner”. The owner is the component that created a ReactElement. I.e. the render method which contains the JSX or createElement callsite.
+
+```js
+class Foo {
+  render() {
+    return <div><span /></div>;
+  }
+}
+```
+
+In this example, the owner of the `span` is `Foo` but the parent is the `div`.
+
+There is also an undocumented feature called "context" that also relies on the concept of an “owner” to pass hidden props down the tree.
+
+### Problem: The Semantics are Opaque and Confusing
+
+The problem is that these are hidden artifacts attached to the ReactElement. In fact, you probably didn’t even know about it. It silently changes semantics. Take this for example:
+
+```js
+var foo = <input className="foo" />;
+class Component {
+  render() {
+    return bar ? <input className="bar" /> : foo;
+  }
+}
+```
+
+These two inputs have different owners, therefore React will not keep its state when the conditional switches. There is nothing in the code to indicate that. Similarly, if you use `React.addons.cloneWithProps`, the owner changes.
+
+### Problem: Timing Matters
+
+The owner is tracked by the currently executing stack. This means that the semantics of a ReactElement varies depending on when it is executed. Take this example:
+
+```js
+class A {
+  render() {
+    return <B renderer={text => <span>{text}</span>} />;
+  }
+}
+class B {
+  render() {
+    return this.props.renderer('foo');
+  }
+}
+```
+
+The owner of the `span` is actually `B`, not `A` because of the timing of the callback. This all adds complexity and suffers from similar problems as mutation.
+
+### Problem: It Couples JSX to React
+
+Have you wondered why JSX depends on React? Couldn’t the transpiler have that built-in to its runtime? The reason you need to have `React.createElement` in scope is because we depend on internal state of React to capture the current "owner". Without this, you wouldn’t need to have React in scope.
+
+### Solution: Make Context Parent-Based Instead of Owner-Based
+
+The first thing we’re doing is warning you if you’re using the "owner" feature in a way that relies on it propagating through owners. Instead, we’re planning on propagating it through parents to its children. In almost all cases, this shouldn’t matter. In fact, parent-based contexts is simply a superset.
+
+### Solution: Remove the Semantic Implications of Owner
+
+It turns out that there are very few cases where owners are actually important part of state-semantics. As a precaution, we’ll warn you if it turns out that the owner is important to determine state. In almost every case this shouldn’t matter. Unless you’re doing some weird optimizations, you shouldn’t see this warning.
+
+### Pending: Change the refs Semantics
+
+Refs are still based on "owner". We haven’t fully solved this special case just yet.
+
+In 0.13 we introduced a new callback-refs API that doesn’t suffer from these problems but we’ll keep on a nice declarative alternative to the current semantics for refs. As always, we won’t deprecate something until we’re sure that you’ll have a nice upgrade path.
+
+## Keyed Objects as Maps
+
+In React 0.12, and earlier, you could use keyed objects to provide an external key to an element or a set. This pattern isn’t actually widely used. It shouldn’t be an issue for most of you.
+
+```js
+<div>{ {a: <span />, b: <span />} }</div>
+```
+
+### Problem: Relies on Enumeration Order
+
+The problem with this pattern is that it relies on enumeration order of objects. This is technically unspecified, even though implementations now agree to use insertion order. Except for the special case when numeric keys are used.
+
+### Problem: Using Objects as Maps is Bad
+
+It is generally accepted that using objects as maps screw up type systems, VM optimizations, compilers etc. It is much better to use a dedicated data structure like ES6 Maps.
+
+More importantly, this can have important security implications. For example this has a potential security problem:
+
+```js
+var children = {};
+items.forEach(item => children[item.title] = <span />);
+return <div>{children}</div>;
+```
+
+Imagine if `item.title === '__proto__'` for example.
+
+### Problem: Can’t be Differentiated from Arbitrary Objects
+
+Since these objects can have any keys with almost any value, we can’t differentiate them from a mistake. If you put some random object, we will try our best to traverse it and render it, instead of failing with a helpful warning. In fact, this is one of the few places where you can accidentally get an infinite loop in React.
+
+To differentiate ReactElements from one of these objects, we have to tag them with `_isReactElement`. This is another issue preventing us from inlining ReactElements as simple object literals.
+
+### Solution: Just use an Array and key={…}
+
+Most of the time you can just use an array with keyed ReactElements.
+
+```js
+var children = items.map(item => <span key={item.title} />);
+<div>{children}</div>
+```
+
+### Solution: React.addons.createFragment
+
+However, this is not always possible if you’re trying to add a prefix key to an unknown set (e.g. this.props.children). It is also not always the easiest upgrade path. Therefore, we are adding a helper to `React.addons` called `createFragment()`. This accepts a keyed object and returns an opaque type.
+
+```js
+<div>{React.addons.createFragment({ a: <div />, b: this.props.children })}</div>
+```
+
+The exact signature of this kind of fragment will be determined later. It will likely be some kind of immutable sequence.
+
+Note: This will still not be valid as the direct return value of `render()`. Unfortunately, they still need to be wrapped in a `<div />` or some other element.
+
+## Compiler Optimizations: Unlocked!
+
+These changes also unlock several possible compiler optimizations for static content in React 0.14. These optimizations were previously only available to template-based frameworks. They will now also be possible for React code! Both for JSX and `React.createElement/Factory`*!
+
+See these GitHub Issues for a deep dive into compiler optimizations:
+
+- [Reuse Constant Value Types](https://github.com/facebook/react/issues/3226)
+- [Tagging ReactElements](https://github.com/facebook/react/issues/3227)
+- [Inline ReactElements](https://github.com/facebook/react/issues/3228)
+
+\* If you use the recommended pattern of explicit React.createFactory calls on the consumer side - since they are easily statically analyzed.
+
+## Rationale
+
+I thought that these changes were particularly important because the mere existence of these patterns means that even components that DON’T use these patterns have to pay the price. There are other problematic patterns such as mutating state, but they’re at least localized to a component subtree so they don’t harm the ecosystem.
+
+As always, we’d love to hear your feedback and if you have any trouble upgrading, please let us know.

docs/_posts/2015-03-03-react-v0.13-rc2.md

@@ -0,0 +1,58 @@
+---
+title: "React v0.13 RC2"
+author: Sebastian Markbåge
+---
+
+Thanks to everybody who has already been testing the release candidate. We've received some good feedback and as a result we're going to do a second release candidate. The changes are minimal. We haven't changed the behavior of any APIs we exposed in the previous release candidate. Here's a summary of the changes:
+
+* Introduced a new API (`React.cloneElement`, see below for details).
+* Fixed a bug related to validating `propTypes` when using the new `React.addons.createFragment` API.
+* Improved a couple warning messages.
+* Upgraded jstransform and esprima.
+
+The release candidate is available for download:
+
+* **React**  
+  Dev build with warnings: <http://fb.me/react-0.13.0-rc2.js>  
+  Minified build for production: <http://fb.me/react-0.13.0-rc2.min.js>  
+* **React with Add-Ons**  
+  Dev build with warnings: <http://fb.me/react-with-addons-0.13.0-rc2.js>  
+  Minified build for production: <http://fb.me/react-with-addons-0.13.0-rc2.min.js>  
+* **In-Browser JSX transformer**  
+  <http://fb.me/JSXTransformer-0.13.0-rc2.js>
+
+We've also published version `0.13.0-rc2` of the `react` and `react-tools` packages on npm and the `react` package on bower.
+
+- - -
+
+## React.cloneElement
+
+In React v0.13 RC2 we will introduce a new API, similar to `React.addons.cloneWithProps`, with this signature:
+
+```js
+React.cloneElement(element, props, ...children);
+```
+
+Unlike `cloneWithProps`, this new function does not have any magic built-in behavior for merging `style` and `className` for the same reason we don't have that feature from `transferPropsTo`. Nobody is sure what exactly the complete list of magic things are, which makes it difficult to reason about the code and difficult to reuse when `style` has a different signature (e.g. in the upcoming React Native).
+
+`React.cloneElement` is *almost* equivalent to:
+
+```js
+<element.type {...element.props} {...props}>{children}</element.type>
+```
+
+However, unlike JSX and `cloneWithProps`, it also preserves `ref`s. This means that if you get a child with a `ref` on it, you won't accidentally steal it from your ancestor. You will get the same `ref` attached to your new element.
+
+One common pattern is to map over your children and add a new prop. There were many issues reported about `cloneWithProps` losing the ref, making it harder to reason about your code. Now following the same pattern with `cloneElement` will work as expected. For example:
+
+```js
+var newChildren = React.Children.map(this.props.children, function(child) {
+  return React.cloneElement(child, { foo: true })
+});
+```
+
+> Note: `React.cloneElement(child, { ref: 'newRef' })` *DOES* override the `ref` so it is still not possible for two parents to have a ref to the same child, unless you use callback-refs.
+
+This was a critical feature to get into React 0.13 since props are now immutable. The upgrade path is often to clone the element, but by doing so you might lose the `ref`. Therefore, we needed a nicer upgrade path here. As we were upgrading callsites at Facebook we realized that we needed this method. We got the same feedback from the community. Therefore we decided to make another RC before the final release to make sure we get this in.
+
+We plan to eventually deprecate `React.addons.cloneWithProps`. We're not doing it yet, but this is a good opportunity to start thinking about your own uses and consider using `React.cloneElement` instead. We'll be sure to ship a release with deprecation notices before we actually remove it so no immediate action is necessary.

docs/_posts/2015-03-04-community-roundup-25.md

@@ -0,0 +1,63 @@
+---
+title: "Community Round-up #25"
+layout: post
+author: Matthew Johnston
+---
+
+## React 101
+
+Interest in React has been exploding recently, so it's a good time to explore some great recent tutorials and videos that cover getting started.
+
+[Ryan Clark](https://github.com/rynclark) provides a [great overview of the basics of React](http://ryanclark.me/getting-started-with-react/) with the goal of building a really simple dropdown nav.
+
+[Formidable Labs](https://github.com/FormidableLabs) and [Seattle JS](http://www.meetup.com/seattlejs/) recently hosted a series of React, Flux, and Flow workshops, and the first part is available to watch online:
+
+<iframe width="650" height="300" src="//www.youtube.com/embed/Pd6Ub7Ju2RM" frameborder="0" allowfullscreen></iframe>
+
+[AEFlash](https://github.com/aearly) writes up [some best practices and tips](http://aeflash.com/2015-02/react-tips-and-best-practices.html) to help you avoid potential pitfalls when developing with React.
+
+Black Mutt Media [takes us through their usage of React](http://blackmuttmedia.com/blog/react-tmdb-api/) and Ruby to build an autocomplete field, and some of the pitfalls they encountered along the way.
+
+Our own [Sebastian Markbåge](https://github.com/sebmarkbage) was on the [Web Platform Podcast](http://thewebplatform.libsyn.com/31-building-with-reactjs) to have a chat about all aspects of React.
+
+<iframe style="border: none" src="//html5-player.libsyn.com/embed/episode/id/3370114/height/75/width/200/theme/standard-mini/direction/no/autoplay/no/autonext/no/thumbnail/yes/preload/no/no_addthis/no/" height="26" width="650" scrolling="no" allowfullscreen="" webkitallowfullscreen="" mozallowfullscreen="" oallowfullscreen="" msallowfullscreen=""></iframe>
+
+## Community Additions
+
+[Formidable Labs](https://github.com/FormidableLabs) have been busy, as they've also[ just launched Radium](http://projects.formidablelabs.com/radium/), a React component that provides you with the ability to use inline styles instead of CSS. They're also [looking for some help](http://projects.formidablelabs.com/radium-bootstrap/) contributing to a Radium Bootstrap implementation.
+
+[Reactiflux.com](http://reactiflux.com/) is a new Slack community based around (you guessed it!) React, and Flux.
+
+[React Week](http://reactweek.com/) is a week-long learning workshop, happening next week, for React, Flux, and other related technologies, run by [Ryan Florence](https://github.com/ryanflorence).
+
+[Babel-sublime](https://github.com/babel/babel-sublime) is a new package which provides Sublime with language definitions for ES6 JavaScript with React JSX syntax extensions.
+
+[react-meteor](https://github.com/reactjs/react-meteor), a package that replaces the default templating system of the Meteor platform with React, recently received a big update.
+
+## Rebuilding with React
+
+[Rich Manalang](https://github.com/rmanalan) from Atlassian [explains why](https://developer.atlassian.com/blog/2015/02/rebuilding-hipchat-with-react/) they rebuilt their HipChat web client from scratch using React, and how they're already using it to rebuild their native desktop clients.
+
+[Andrew Hillel](https://twitter.com/andyhillel) of the BBC gives [an excellent and thorough breakdown](http://www.bbc.co.uk/blogs/internet/entries/47a96d23-ae04-444e-808f-678e6809765d) of the stack they used to rebuild their homepage, with React as an integral part of the front-end.
+
+A team from New Zealand called [Atomic](https://atomic.io/) is [building web and mobile prototyping and design tools](http://thenextweb.com/creativity/2015/02/19/meet-atomic-missing-tool-interface-design-thats-entirely-browser/) entirely in-browser, and as co-founder [Darryl Gray](http://twitter.com/darrylgray) says, “React.js “totally changed” the fact that browser performance often wasn’t good enough for complex tools like this.”.
+
+[Polarr](https://github.com/Polarrco) have rebuilt [their browser-based photo editor](http://polarrist.tumblr.com/post/111290422225/polarr-photo-editor-2-0-alpha-is-here) with React.
+
+<center><a href="http://polarrist.tumblr.com/post/111290422225/polarr-photo-editor-2-0-alpha-is-here"><img src="/react/img/blog/polarr.jpg"></a></center>
+
+## It's F8!
+
+F8 2015 is just around the corner, and you can [sign up for the video streams](https://www.fbf8.com/stream.html) in advance because we're sure to be covering all things React.
+
+## Meetups
+
+<table><tr><td width="50%" valign="top">
+<blockquote class="twitter-tweet" lang="en"><p>Our <a href="https://twitter.com/reactjs">@reactjs</a> meetup is in full effect <a href="https://twitter.com/hashtag/ReactJS?src=hash">#ReactJS</a> &#10;&#10;btw bathroom code is 6012 lol <a href="http://t.co/7iUpvmm3zz">pic.twitter.com/7iUpvmm3zz</a></p>&mdash; littleBits (@littleBits) <a href="https://twitter.com/littleBits/status/570373833028472832">February 25, 2015</a></blockquote>
+</td><td width="50%" valign="top">
+<blockquote class="twitter-tweet" lang="en"><p><a href="https://twitter.com/yrezgui">@yrezgui</a> captivating us with <a href="https://twitter.com/reactjs">@reactjs</a> at <a href="https://twitter.com/DevRocketUK">@DevRocketUK</a>. Thanks to the amazing sponsors <a href="https://twitter.com/makersacademy">@makersacademy</a> and <a href="https://twitter.com/couchbase">@couchbase</a>. <a href="http://t.co/xwA773omky">pic.twitter.com/xwA773omky</a></p>&mdash; James Nocentini (@jamiltz) <a href="https://twitter.com/jamiltz/status/570306188577001473">February 24, 2015</a></blockquote>
+</td></tr><tr><td width="50%" valign="top">
+<blockquote class="twitter-tweet" lang="en"><p>Listening to a bunch of very clever geekoids at the <a href="https://twitter.com/reactjs">@reactjs</a> seminar. Nice! <a href="http://t.co/0TeTOJOerO">pic.twitter.com/0TeTOJOerO</a></p>&mdash; Nick Middleweek (@nmiddleweek) <a href="https://twitter.com/nmiddleweek/status/568183658395394049">February 18, 2015</a></blockquote>
+</td><td width="50%" valign="top">
+<blockquote class="twitter-tweet" lang="en"><p>Watching the <a href="https://twitter.com/FrontendMasters">@FrontendMasters</a> ReactJS workshop! <a href="http://t.co/YraYIK97Lu">pic.twitter.com/YraYIK97Lu</a></p>&mdash; ReactJS News (@ReactJSNews) <a href="https://twitter.com/ReactJSNews/status/566269552112041985">February 13, 2015</a></blockquote>
+</td></tr></table>

docs/_posts/2015-03-10-react-v0.13.md

@@ -0,0 +1,90 @@
+---
+title: "React v0.13"
+author: Ben Alpert
+---
+
+Today, we're happy to release React v0.13!
+
+The most notable new feature is [support for ES6 classes](/react/blog/2015/01/27/react-v0.13.0-beta-1.html), which allows developers to have more flexibility when writing components. Our eventual goal is for ES6 classes to replace `React.createClass` completely, but until we have a replacement for current mixin use cases and support for class property initializers in the language, we don't plan to deprecate `React.createClass`.
+
+At EmberConf and ng-conf last week, we were excited to see that Ember and Angular have been working on speed improvements and now both have performance comparable to React. We've always thought that performance isn't the most important reason to choose React, but we're still planning more optimizations to **make React even faster**.
+
+Our planned optimizations require that ReactElement objects are immutable, which has always been a best practice when writing idiomatic React code. In this release, we've added runtime warnings that fire when props are changed or added between the time an element is created and when it's rendered. When migrating your code, you may want to use new `React.cloneElement` API (which is similar to `React.addons.cloneWithProps` but preserves `key` and `ref` and does not merge `style` or `className` automatically). For more information about our planned optimizations, see GitHub issues
+[#3226](https://github.com/facebook/react/issues/3226),
+[#3227](https://github.com/facebook/react/issues/3227),
+[#3228](https://github.com/facebook/react/issues/3228).
+
+The release is now available for download:
+
+* **React**  
+  Dev build with warnings: <http://fb.me/react-0.13.0.js>  
+  Minified build for production: <http://fb.me/react-0.13.0.min.js>  
+* **React with Add-Ons**  
+  Dev build with warnings: <http://fb.me/react-with-addons-0.13.0.js>  
+  Minified build for production: <http://fb.me/react-with-addons-0.13.0.min.js>  
+* **In-Browser JSX transformer**  
+  <http://fb.me/JSXTransformer-0.13.0.js>
+
+We've also published version `0.13.0` of the `react` and `react-tools` packages on npm and the `react` package on bower.
+
+- - -
+
+## Changelog
+
+### React Core
+
+#### Breaking Changes
+
+* Deprecated patterns that warned in 0.12 no longer work: most prominently, calling component classes without using JSX or React.createElement and using non-component functions with JSX or createElement
+* Mutating `props` after an element is created is deprecated and will cause warnings in development mode; future versions of React will incorporate performance optimizations assuming that props aren't mutated
+* Static methods (defined in `statics`) are no longer autobound to the component class
+* `ref` resolution order has changed slightly such that a ref to a component is available immediately after its `componentDidMount` method is called; this change should be observable only if your component calls a parent component's callback within your `componentDidMount`, which is an anti-pattern and should be avoided regardless
+* Calls to `setState` in life-cycle methods are now always batched and therefore asynchronous. Previously the first call on the first mount was synchronous.
+* `setState` and `forceUpdate` on an unmounted component now warns instead of throwing. That avoids a possible race condition with Promises.
+* Access to most internal properties has been completely removed, including `this._pendingState` and `this._rootNodeID`.
+
+#### New Features
+
+* Support for using ES6 classes to build React components; see the [v0.13.0 beta 1 notes](http://facebook.github.io/react/blog/2015/01/27/react-v0.13.0-beta-1.html) for details.
+* Added new top-level API `React.findDOMNode(component)`, which should be used in place of `component.getDOMNode()`. The base class for ES6-based components will not have `getDOMNode`. This change will enable some more patterns moving forward.
+* Added a new top-level API `React.cloneElement(el, props)` for making copies of React elements – see the [v0.13 RC2 notes](/react/blog/2015/03/03/react-v0.13-rc2.html#react.cloneelement) for more details.
+* New `ref` style, allowing a callback to be used in place of a name: `<Photo ref={(c) => this._photo = c} />` allows you to reference the component with `this._photo` (as opposed to `ref="photo"` which gives `this.refs.photo`).
+* `this.setState()` can now take a function as the first argument for transactional state updates, such as `this.setState((state, props) => ({count: state.count + 1}));` – this means that you no longer need to use `this._pendingState`, which is now gone.
+* Support for iterators and immutable-js sequences as children.
+
+#### Deprecations
+
+* `ComponentClass.type` is deprecated. Just use `ComponentClass` (usually as `element.type === ComponentClass`).
+* Some methods that are available on `createClass`-based components are removed or deprecated from ES6 classes (`getDOMNode`, `replaceState`, `isMounted`, `setProps`, `replaceProps`).
+
+
+### React with Add-Ons
+
+#### New Features
+
+* [`React.addons.createFragment` was added](/react/docs/create-fragment.html) for adding keys to entire sets of children.
+
+#### Deprecations
+
+* `React.addons.classSet` is now deprecated. This functionality can be replaced with several freely available modules. [classnames](https://www.npmjs.com/package/classnames) is one such module.
+* Calls to `React.addons.cloneWithProps` can be migrated to use `React.cloneElement` instead – make sure to merge `style` and `className` manually if desired.
+
+
+### React Tools
+
+#### Breaking Changes
+
+* When transforming ES6 syntax, `class` methods are no longer enumerable by default, which requires `Object.defineProperty`; if you support browsers such as IE8, you can pass `--target es3` to mirror the old behavior
+
+#### New Features
+
+* `--target` option is available on the jsx command, allowing users to specify and ECMAScript version to target.
+  * `es5` is the default.
+  * `es3` restores the previous default behavior. An additional transform is added here to ensure the use of reserved words as properties is safe (eg `this.static` will become `this['static']` for IE8 compatibility).
+* The transform for the call spread operator has also been enabled.
+
+
+### JSX
+
+#### Breaking Changes
+* A change was made to how some JSX was parsed, specifically around the use of `>` or `}` when inside an element. Previously it would be treated as a string but now it will be treated as a parse error. The [`jsx_orphaned_brackets_transformer`](https://www.npmjs.com/package/jsx_orphaned_brackets_transformer) package on npm can be used to find and fix potential issues in your JSX code.

docs/css/react.scss

@@ -7,7 +7,7 @@
 
 @mixin code-typography {
   font-family: 'source-code-pro', Menlo, Consolas, 'Courier New', monospace;
-  font-size: 0.8em;
+  font-size: 13px;
   line-height: 1.5;
 }
 
@@ -288,6 +288,19 @@ h1, h2, h3, h4, h5, h6 {
   width: 400px;
 }
 
+.skinny-row {
+  @include clearfix;
+}
+
+.skinny-col {
+  float: left;
+  margin-left: $columnGutter;
+  width: ($skinnyContentWidth - $columnGutter) / 2;
+  &:first-child {
+    margin-left: 0;
+  }
+}
+
 .marketing-row {
   @include clearfix;
   margin: 50px 0;
@@ -595,8 +608,8 @@ div.CodeMirror pre, div.CodeMirror-linenumber, code {
   @include code-typography;
 }
 
-div.CodeMirror-linenumber:after {
-  content: '.';
+div.CodeMirror-linenumber {
+  text-align: right;
 }
 
 .CodeMirror, div.CodeMirror-gutters, div.highlight {
@@ -671,6 +684,10 @@ p code {
   height: 100px
 }
 
+.MarkdownEditor .content {
+  white-space: pre-wrap;
+}
+
 .hll {
   background-color: #f7ebc6;
   border-left: 5px solid #f7d87c;
@@ -776,6 +793,7 @@ p code {
 // Twitter embeds. Need to !important because they inline margin on the iframe.
 div[data-twttr-id] iframe {
   margin: 10px auto !important;
+  width: 100% !important;
 }
 
 /* Acknowledgements */

docs/docs/01-why-react.zh-CN.md

@@ -13,9 +13,9 @@ React 是一个 Facebook 和 Instagram 用来创建用户界面的 JavaScript
 
 仅仅只要表达出你的应用程序在任一个时间点应该长的样子，然后当底层的数据变了，React 会自动处理所有用户界面的更新。
 
-### 表达能力 (Declarative)
+### 声明式 (Declarative)
 
-当数据变化了，React 概念上是类似点击了更新的按钮，但仅会更新变化的部分。
+数据变化后，React 概念上与点击“刷新”按钮类似，但仅会更新变化的部分。
 
 ## 构建可组合的组件
 

docs/docs/02-displaying-data.md

@@ -66,7 +66,7 @@ The inputs to this component are called `props` — short for "properties". They
 
 ## Components are Just Like Functions
 
-React components are very simple. You can think of them as simple function that take in `props` and `state` (discussed later) and render HTML. Because they're so simple, it makes them very easy to reason about.
+React components are very simple. You can think of them as simple functions that take in `props` and `state` (discussed later) and render HTML. Because they're so simple, it makes them very easy to reason about.
 
 > Note:
 >
@@ -100,15 +100,16 @@ The easiest way to get started with JSX is to use the in-browser `JSXTransformer
 
 ## React without JSX
 
-JSX is completely optional. You don't have to use JSX with React. You can create these trees through `React.createElement`. The first argument is the tag, pass a properties object as the second argument and children to the third argument.
+JSX is completely optional; you don't have to use JSX with React. You can create React elements in plain JavaScript using `React.createElement`, which takes a tag name or component, a properties object, and variable number of optional child arguments.
 
 ```javascript
-var child = React.createElement('li', null, 'Text Content');
-var root = React.createElement('ul', { className: 'my-list' }, child);
+var child1 = React.createElement('li', null, 'First Text Content');
+var child2 = React.createElement('li', null, 'Second Text Content');
+var root = React.createElement('ul', { className: 'my-list' }, child1, child2);
 React.render(root, document.body);
 ```
 
-As a convenience you can create short-hand factory function to create elements from custom components.
+As a convenience you can create short-hand factory functions to create elements from custom components.
 
 ```javascript
 var Factory = React.createFactory(ComponentClass);
@@ -117,7 +118,7 @@ var root = Factory({ custom: 'prop' });
 React.render(root, document.body);
 ```
 
-React already have built-in factories for common HTML tags:
+React already has built-in factories for common HTML tags:
 
 ```javascript
 var root = React.DOM.ul({ className: 'my-list' },

docs/docs/02-displaying-data.zh-CN.md

@@ -4,10 +4,11 @@ title: 显示数据
 layout: docs
 permalink: displaying-data-zh-CN.html
 prev: why-react-zh-CN.html
-next: jsx-in-depth.html
+next: jsx-in-depth-zh-CN.html
 ---
 
-通过用户界面，最基础可以做的事就是显示一些数据。React 让显示数据变得简单，当数据变化的时候，用户界面会自动同步更新。
+用户界面能做的最基础的事就是显示一些数据。React 让显示数据变得简单，当数据变化的时候，用户界面会自动同步更新。
+
 
 ## 开始
 
@@ -54,6 +55,7 @@ setInterval(function() {
 }, 500);
 ```
 
+
 ## 被动更新 (Reactive Updates)
 
 在浏览器中打开 `hello-react.html` ，在输入框输入你的名字。你会发现 React 在用户界面中只改变了时间， 任何你在输入框输入的内容一直保留着，即使你没有写任何代码来完成这个功能。React 为你解决了这个问题，做了正确的事。
@@ -62,6 +64,7 @@ setInterval(function() {
 
 对这个组件的输入称为 `props` - "properties"的缩写。得益于 JSX 语法，它们通过参数传递。你必须知道在组件里，这些属性是不可改变的，也就是说 **`this.props` 是只读的**。
 
+
 ## 组件就像是函数
 
 React 组件非常简单。你可以认为它们就是简单的函数，接受 `props` 和 `state` (后面会讨论) 作为参数，然后渲染出 HTML。正是应为它们是这么的简单，这使得它们非常容易理解。
@@ -70,16 +73,53 @@ React 组件非常简单。你可以认为它们就是简单的函数，接受 `
 >
 > **只有一个限制**: React 组件只能渲染单个根节点。如果你想要返回多个节点，它们*必须*被包含在同一个节点里。
 
+
 ## JSX 语法
 
 我们坚信组件是正确方法去做关注分离，而不是通过“模板”和“展示逻辑”。我们认为标签和生成它的代码是紧密相连的。此外，展示逻辑通常是很复杂的，通过模板语言实现这些逻辑会产生大量代码。
 
 我们得出解决这个问题最好的方案是通过 JavaScript 直接生成模板，这样你就可以用一个真正语言的所有表达能力去构建用户界面。为了使这变得更简单，我们做了一个非常简单、**可选**类似 HTML 语法 ，通过函数调用即可生成模板的编译器，称为 JSX。
 
-**JSX 让你可以用 HTML 语法去写 JavaScript 函数调用** 为了在 React 生成一个链接，通过纯 JavaScript 你可以这么写： `React.createElement('a', {href: 'http://facebook.github.io/react/'}, 'Hello React!')`。通过 JSX 这就变成了 `<a href="http://facebook.github.io/react/">Hello React!</a>`。我们发现这会使搭建 React 应用更加简单，设计师也偏向用这用语法，但是每个人可以有它们自己的工作流，所以**JSX 不是必须用的。**
+**JSX 让你可以用 HTML 语法去写 JavaScript 函数调用** 为了在 React 生成一个链接，通过纯 JavaScript 你可以这么写： 
 
-JSX 非常小；上面“hello, world”的例子使用了 JSX 所有的特性。想要了解更多，请看 [深入理解 JSX](/react/docs/jsx-in-depth.html)。或者直接使用[在线 JSX 编译器](/react/jsx-compiler.html)观察变化过程。
+`React.createElement('a', {href: 'http://facebook.github.io/react/'}, 'Hello React!')`。
 
-JSX 类似于 HTML，但不是完全一样。参考[JSX gotchas](/react/docs/jsx-gotchas.html) 学习关键区别。
+通过 JSX 这就变成了
+
+`<a href="http://facebook.github.io/react/">Hello React!</a>`。
+
+我们发现这会使搭建 React 应用更加简单，设计师也偏向用这用语法，但是每个人可以有它们自己的工作流，所以**JSX 不是必须用的。**
+
+JSX 非常小；上面“hello, world”的例子使用了 JSX 所有的特性。想要了解更多，请看 [深入理解 JSX](/react/docs/jsx-in-depth-zh-CN.html)。或者直接使用[在线 JSX 编译器](/react/jsx-compiler.html)观察变化过程。
+
+JSX 类似于 HTML，但不是完全一样。参考 [JSX 陷阱](/react/docs/jsx-gotchas-zh-CN.html) 学习关键区别。
 
 最简单开始学习 JSX 的方法就是使用浏览器端的 `JSXTransformer`。我们强烈建议你不要在生产环境中使用它。你可以通过我们的命令行工具 [react-tools](http://npmjs.org/package/react-tools) 包来预编译你的代码。
+
+
+## 没有 JSX 的 React
+
+你完全可以选择是否使用 JSX，并不是 React 必须的。你可以通过 `React.createElement` 来创建一个树。第一个参数是标签，第二个参数是一个属性对象，每三个是子节点。
+
+```javascript
+var child = React.createElement('li', null, 'Text Content');
+var root = React.createElement('ul', { className: 'my-list' }, child);
+React.render(root, document.body);
+```
+
+方便起见，你可以创建基于自定义组件的速记工厂方法。
+
+```javascript
+var Factory = React.createFactory(ComponentClass);
+...
+var root = Factory({ custom: 'prop' });
+React.render(root, document.body);
+```
+
+React 已经为 HTML 标签提供内置工厂方法。
+
+```javascript
+var root = React.DOM.ul({ className: 'my-list' },
+  React.DOM.li(null, 'Text Content')
+);
+```

docs/docs/02.1-jsx-in-depth.md

@@ -14,7 +14,7 @@ You don't have to use JSX with React. You can just use plain JS. However, we rec
 
 It's more familiar for casual developers such as designers.
 
-XML has the benefit of balanced open and closing tags. This helps make large trees easier to read than function calls or object literals.
+XML has the benefit of balanced opening and closing tags. This helps make large trees easier to read than function calls or object literals.
 
 It doesn't alter the semantics of JavaScript.
 
@@ -29,7 +29,7 @@ var myDivElement = <div className="foo" />;
 React.render(myDivElement, document.body);
 ```
 
-To render a React Component, just a local variable that starts with an upper-case letter:
+To render a React Component, just create a local variable that starts with an upper-case letter:
 
 ```javascript
 var MyComponent = React.createClass({/*...*/});
@@ -47,7 +47,7 @@ React's JSX uses the upper vs. lower case convention to distinguish between loca
 
 ## The Transform
 
-React JSX transforms from an XML-like syntax into native JavaScript. XML elements, attributes and children are transformed into arguments to `React.createElement`.
+React JSX transforms from an XML-like syntax into native JavaScript. XML elements, attributes and children are transformed into arguments that are passed to `React.createElement`.
 
 ```javascript
 var Nav;
@@ -73,6 +73,15 @@ var app = React.createElement(
 );
 ```
 
+JSX will infer the class's [displayName](/react/docs/component-specs.html#displayName) from the variable assignment when the displayName is undefined:
+
+```javascript
+// Input (JSX):
+var Nav = React.createClass({ });
+// Output (JS):
+var Nav = React.createClass({displayName: "Nav", });
+```
+
 Use the [JSX Compiler](/react/jsx-compiler.html) to try out JSX and see how it
 desugars into native JavaScript, and the
 [HTML to JSX converter](/react/html-jsx.html) to convert your existing HTML to
@@ -87,6 +96,69 @@ If you want to use JSX, the [Getting Started](/react/docs/getting-started.html)
 > ReactElement as an object literal to bypass the validation code in
 > `React.createElement`.
 
+## Namespaced Components
+
+If you are building a component that has many children, like a form, you might end up with something with a lot of variable declarations:
+
+```javascript
+// Awkward block of variable declarations
+var Form = MyFormComponent;
+var FormRow = Form.Row;
+var FormLabel = Form.Label;
+var FormInput = Form.Input;
+
+var App = (
+  <Form>
+    <FormRow>
+      <FormLabel />
+      <FormInput />
+    </FormRow>
+  </Form>
+);
+```
+
+To make it simpler and easier, *namespaced components* let you use one component that has other components as attributes:
+
+```javascript
+var Form = MyFormComponent;
+
+var App = (
+  <Form>
+    <Form.Row>
+      <Form.Label />
+      <Form.Input />
+    </Form.Row>
+  </Form>
+);
+```
+
+To do this, you just need to create your *"sub-components"* as attributes of the main component:
+
+```javascript
+var MyFormComponent = React.createClass({ ... });
+
+MyFormComponent.Row = React.createClass({ ... });
+MyFormComponent.Label = React.createClass({ ... });
+MyFormComponent.Input = React.createClass({ ... });
+```
+
+JSX will handle this properly when compiling your code.
+
+```javascript
+var App = (
+  React.createElement(Form, null, 
+    React.createElement(Form.Row, null, 
+      React.createElement(Form.Label, null), 
+      React.createElement(Form.Input, null)
+    )
+  )
+);
+```
+
+> Note:
+>
+> This feature is available in [v0.11](http://facebook.github.io/react/blog/2014/07/17/react-v0.11.html#jsx) and above.
+
 ## JavaScript Expressions
 
 ### Attribute Expressions

docs/docs/02.1-jsx-in-depth.zh-CN.md

@@ -0,0 +1,140 @@
+---
+id: jsx-in-depth-zh-CN
+title: 深入 JSX
+permalink: jsx-in-depth-zh-CN.html
+prev: displaying-data-zh-CN.html
+next: jsx-spread-zh-CN.html
+---
+
+[JSX](http://facebook.github.io/jsx/) 是一个看起来很像 XML 的 JavaScript 语法扩展。React 可以用来做简单的 JSX 句法转换。
+
+
+## 为什么要用 JSX？
+
+你不需要为了 React 使用 JSX，可以直接使用原生 JS。但是，我们建议使用 JSX 是因为它能精确，也是常用的定义包含属性的树状结构的语法。
+
+它对于非专职开发者比如设计师也比较熟悉。
+
+XML 有固定的标签开启和闭合的优点。这能让复杂的树更易于阅读，优于方法调用和对象字面量的形式。
+
+它没有修改 JavaScript 语义。
+
+
+## HTML 标签对比 React 组件
+
+React 可以渲染 HTML 标签 (strings) 或 React 组件 (classes)。
+
+要渲染 HTML 标签，只需在 JSX 里使用小写字母开头的标签名。
+
+```javascript
+var myDivElement = <div className="foo" />;
+React.render(myDivElement, document.body);
+```
+
+要渲染 React 组件，只需创建一个大写字母开头的本地变量。
+
+```javascript
+var MyComponent = React.createClass({/*...*/});
+var myElement = <MyComponent someProperty={true} />;
+React.render(myElement, document.body);
+```
+
+React 的 JSX 里约定分别使用首字母大、小写来区分本地组件的类和 HTML 标签。
+
+> 注意:
+>
+> 由于 JSX 就是 JavaScript，一些标识符像 `class` 和 `for` 不建议作为 XML
+> 属性名。作为替代，React DOM 使用 `className` 和 `htmlFor` 来做对应的属性。
+
+
+## 转换（Transform）
+
+JSX 把类 XML 的语法转成原生 JavaScript，XML 元素、属性和子节点被转换成 `React.createElement` 的参数。
+
+```javascript
+var Nav;
+// 输入 (JSX):
+var app = <Nav color="blue" />;
+// 输出 (JS):
+var app = React.createElement(Nav, {color:"blue"});
+```
+
+注意，要想使用 `<Nav />`，`Nav` 变量一定要在作用区间内。
+
+JSX 也支持使用 XML 语法定义子结点：
+
+```javascript
+var Nav, Profile;
+// 输入 (JSX):
+var app = <Nav color="blue"><Profile>click</Profile></Nav>;
+// 输出 (JS):
+var app = React.createElement(
+  Nav,
+  {color:"blue"},
+  React.createElement(Profile, null, "click")
+);
+```
+
+使用 [JSX 编译器](/react/jsx-compiler.html) 来试用 JSX 并理解它是如何转换到原生 JavaScript，还有 [HTML 到 JSX 转换器](/react/html-jsx.html) 来把现有 HTML 转成 JSX。
+
+如果你要使用 JSX，这篇 [新手入门](/react/docs/getting-started.html) 教程来教你如何搭建环境。
+
+> 注意:
+>
+> JSX 表达式总是会当作 ReactElement 执行。具体的实际细节可能不同。一种优化
+> 的模式是把 ReactElement 当作一个行内的对象字面量形式来绕过
+> `React.createElement` 里的校验代码。
+
+
+## JavaScript 表达式
+
+### 属性表达式
+
+要使用 JavaScript 表达式作为属性值，只需把这个表达式用一对大括号 (`{}`) 包起来，不要用引号 (`""`)。
+
+```javascript
+// 输入 (JSX):
+var person = <Person name={window.isLoggedIn ? window.name : ''} />;
+// 输出 (JS):
+var person = React.createElement(
+  Person,
+  {name: window.isLoggedIn ? window.name : ''}
+);
+```
+
+### 子节点表达式
+
+同样地，JavaScript 表达式可用于描述子结点：
+
+```javascript
+// 输入 (JSX):
+var content = <Container>{window.isLoggedIn ? <Nav /> : <Login />}</Container>;
+// 输出 (JS):
+var content = React.createElement(
+  Container,
+  null,
+  window.isLoggedIn ? React.createElement(Nav) : React.createElement(Login)
+);
+```
+
+### 注释
+
+JSX 里添加注释很容易；它们只是 JS 表达式而已。你只需要在一个标签的子节点内(非最外层)小心地用 `{}` 包围要注释的部分。
+
+```javascript
+var content = (
+  <Nav>
+    {/* 一般注释, 用 {} 包围 */}
+    <Person
+      /* 多
+         行
+         注释 */
+      name={window.isLoggedIn ? window.name : ''} // 行尾注释
+    />
+  </Nav>
+);
+```
+
+> 注意:
+> 
+> JSX 类似于 HTML，但不完全一样。参考 [JSX 陷阱](/react/docs/jsx-gotchas-zh-CN.html) 了解主要不同。

docs/docs/02.2-jsx-spread.md

@@ -6,7 +6,7 @@ prev: jsx-in-depth.html
 next: jsx-gotchas.html
 ---
 
-If you know all the properties that you want to place on a component a head of time, it is easy to use JSX:
+If you know all the properties that you want to place on a component ahead of time, it is easy to use JSX:
 
 ```javascript
   var component = <Component foo={x} bar={y} />;
@@ -49,23 +49,4 @@ You can use this multiple times or combine it with other attributes. The specifi
 
 ## What's with the weird `...` notation?
 
-The `...` operator (or spread operator) is already supported for [arrays in ES6](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Spread_operator). There is also an ES7 proposal for [Object Rest and Spread Properties](https://github.com/sebmarkbage/ecmascript-rest-spread).
-
-In fact, you can already use this in our code base as an experimental syntax:
-
-```javascript
-  var oldObj = { foo: 'hello', bar: 'world' };
-  var newObj = { ...oldObj, foo: 'hi' };
-  console.log(newObj.foo); // 'hi';
-  console.log(newObj.bar); // 'world';
-```
-
-Merging two objects can be expressed as:
-
-```javascript
-  var ab = { ...a, ...b };
-```
-
-> Note:
->
-> Use the [JSX command-line tool](http://npmjs.org/package/react-tools) with the `--harmony` flag to activate the experimental ES7 syntax.
+The `...` operator (or spread operator) is already supported for [arrays in ES6](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Spread_operator). There is also an ES7 proposal for [Object Rest and Spread Properties](https://github.com/sebmarkbage/ecmascript-rest-spread). We're taking advantage of these supported and developing standards in order to provide a cleaner syntax in JSX.

docs/docs/02.2-jsx-spread.zh-CN.md

@@ -0,0 +1,55 @@
+---
+id: jsx-spread-zh-CN
+title: JSX 展开属性
+permalink: jsx-spread-zh-CN.html
+prev: jsx-in-depth-zh-CN.html
+next: jsx-gotchas-zh-CN.html
+---
+
+如果你事先知道组件需要的全部 Props（属性），JSX 很容易地这样写：
+
+```javascript
+  var component = <Component foo={x} bar={y} />;
+```
+
+
+## 修改 Props 是不好的，明白吗
+
+如果你不知道要设置哪些 Props，那么现在最好不要设置它：
+
+```javascript
+  var component = <Component />;
+  component.props.foo = x; // 不好
+  component.props.bar = y; // 同样不好
+```
+
+这样是反模式，因为 React 不能帮你检查属性类型（propTypes）。这样即使你的 属性类型有错误也不能得到清晰的错误提示。
+
+Props 应该被当作禁止修改的。修改 props 对象可能会导致预料之外的结果，所以最好不要去修改 props 对象。
+
+
+## 展开属性（Spread Attributes）
+
+现在你可以使用 JSX 的新特性 - 展开属性：
+
+```javascript
+  var props = {};
+  props.foo = x;
+  props.bar = y;
+  var component = <Component {...props} />;
+```
+
+传入对象的属性会被复制到组件内。
+
+它能被多次使用，也可以和其它属性一起用。注意顺序很重要，后面的会覆盖掉前面的。
+
+```javascript
+  var props = { foo: 'default' };
+  var component = <Component {...props} foo={'override'} />;
+  console.log(component.props.foo); // 'override'
+```
+
+
+## 这个奇怪的 `...` 标记是什么？
+
+这个 `...` 操作符（增强的操作符）已经被 [ES6 数组](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Spread_operator) 支持。相关的还有 ES7 规范草案中的 [Object 剩余和展开属性（Rest and Spread Properties）](https://github.com/sebmarkbage/ecmascript-rest-spread)。我们利用了这些还在制定中标准中已经被支持的特性来使 JSX 拥有更优雅的语法。

docs/docs/02.3-jsx-gotchas.md

@@ -46,7 +46,7 @@ You can use mixed arrays with strings and JSX elements.
 <div>{['First ', <span>&middot;</span>, ' Second']}</div>
 ```
 
-As a last resort, you always have the ability to insert raw HTML.
+As a last resort, you always have the ability to [insert raw HTML](/react/tips/dangerously-set-inner-html.html).
 
 ```javascript
 <div dangerouslySetInnerHTML={{'{{'}}__html: 'First &middot; Second'}} />

docs/docs/02.3-jsx-gotchas.zh-CN.md

@@ -0,0 +1,67 @@
+---
+id: jsx-gotchas-zh-CN
+title: JSX 陷阱
+permalink: jsx-gotchas-zh-CN.html
+prev: jsx-spread-zh-CN.html
+next: interactivity-and-dynamic-uis-zh-CN.html
+---
+
+JSX 与 HTML 非常相似，但是有些关键区别要注意。
+
+> 注意:
+>
+> 关于 DOM 的区别，如行内样式属性 `style`，参考 [DOM 区别](/react/docs/dom-differences.html)
+
+## HTML 实体
+
+HTML 实体可以插入到 JSX 的文本中。
+
+```javascript
+<div>First &middot; Second</div>
+```
+
+如果想在 JSX 表达式中显示 HTML 实体，可以会遇到二次转义的问题，因为 React 默认会转义所有字符串，为了防止各种 XSS 攻击。
+
+```javascript
+// 错误: 会显示 “First &middot; Second”
+<div>{'First &middot; Second'}</div>
+```
+
+有多种绕过的方法。最简单的是直接用 Unicode 字符。这时要确保文件是 UTF-8 编码且网页也指定为 UTF-8 编码。
+
+```javascript
+<div>{'First · Second'}</div>
+```
+
+安全的做法是先找到 [实体的 Unicode 编号](http://www.fileformat.info/info/unicode/char/b7/index.htm) ，然后在 JavaScript 字符串里使用。
+
+```javascript
+<div>{'First \u00b7 Second'}</div>
+<div>{'First ' + String.fromCharCode(183) + ' Second'}</div>
+```
+
+可以在数组里混合使用字符串和 JSX 元素。
+
+```javascript
+<div>{['First ', <span>&middot;</span>, ' Second']}</div>
+```
+
+万不得已，可以直接使用原始 HTML。
+
+```javascript
+<div dangerouslySetInnerHTML={{'{{'}}__html: 'First &middot; Second'}} />
+```
+
+## 自定义 HTML 属性
+
+如果往原生 HTML 元素里传入 HTML 规范里不存在的属性，React 不会显示它们。如果需要使用自定义属性，要加 `data-` 前缀。
+
+```javascript
+<div data-custom-attribute="foo" />
+```
+
+以 `aria-` 开头的 [网络无障碍] 属性可以正常使用。
+
+```javascript
+<div aria-hidden={true} />
+```

docs/docs/03-interactivity-and-dynamic-uis.md

@@ -45,9 +45,9 @@ If you'd like to use React on a touch device such as a phone or tablet, simply c
 
 ## Under the Hood: Autobinding and Event Delegation
 
-Under the hood React does a few things to keep your code performant and easy to understand.
+Under the hood, React does a few things to keep your code performant and easy to understand.
 
-**Autobinding:** When creating callbacks in JavaScript you usually need to explicitly bind a method to its instance such that the value of `this` is correct. With React, every method is automatically bound to its component instance. React caches the bound method such that it's extremely CPU and memory efficient. It's also less typing!
+**Autobinding:** When creating callbacks in JavaScript, you usually need to explicitly bind a method to its instance such that the value of `this` is correct. With React, every method is automatically bound to its component instance. React caches the bound method such that it's extremely CPU and memory efficient. It's also less typing!
 
 **Event delegation:** React doesn't actually attach event handlers to the nodes themselves. When React starts up, it starts listening for all events at the top level using a single event listener. When a component is mounted or unmounted, the event handlers are simply added or removed from an internal mapping. When an event occurs, React knows how to dispatch it using this mapping. When there are no event handlers left in the mapping, React's event handlers are simple no-ops. To learn more about why this is fast, see [David Walsh's excellent blog post](http://davidwalsh.name/event-delegate).
 
@@ -83,4 +83,4 @@ A common pattern is to create several stateless components that just render data
 
 * **Computed data:** Don't worry about precomputing values based on state — it's easier to ensure that your UI is consistent if you do all computation within `render()`. For example, if you have an array of list items in state and you want to render the count as a string, simply render `this.state.listItems.length + ' list items'` in your `render()` method rather than storing it on state.
 * **React components:** Build them in `render()` based on underlying props and state.
-* **Duplicated data from props:** Try to use props as the source of truth where possible. Because props can change over time, it's appropriate to store props in state to be able to know its previous values.
+* **Duplicated data from props:** Try to use props as the source of truth where possible. One valid use to store props in state is to be able to know its previous values, because props can change over time.

docs/docs/03-interactivity-and-dynamic-uis.zh-CN.md

@@ -0,0 +1,86 @@
+---
+id: interactivity-and-dynamic-uis-zh-CN
+title: 动态交互式用户界面
+permalink: interactivity-and-dynamic-uis-zh-CN.html
+prev: jsx-gotchas-zh-CN.html
+next: multiple-components-zh-CN.html
+---
+
+我们已经学习如何使用 React [显示数据](/react/docs/displaying-data-zh-CN.html)。现在让我们来学习如何创建交互式界面。
+
+
+## 简单例子
+
+```javascript
+var LikeButton = React.createClass({
+  getInitialState: function() {
+    return {liked: false};
+  },
+  handleClick: function(event) {
+    this.setState({liked: !this.state.liked});
+  },
+  render: function() {
+    var text = this.state.liked ? 'like' : 'haven\'t liked';
+    return (
+      <p onClick={this.handleClick}>
+        You {text} this. Click to toggle.
+      </p>
+    );
+  }
+});
+
+React.render(
+  <LikeButton />,
+  document.getElementById('example')
+);
+```
+
+
+## 事件处理与合成事件（Synthetic Events）
+
+React 里只需把事件处理器（event handler）以骆峰命名（camelCased）形式当作组件的 props 传入即可，就像使用普通 HTML 那样。React 内部创建一套合成事件系统来使所有事件在 IE8 和以上浏览器表现一致。也就是说，React 知道如何冒泡和捕获事件，而且你的事件处理器接收到的 events 参数与 [W3C 规范](http://www.w3.org/TR/DOM-Level-3-Events/) 一致，无论你使用哪种浏览器。
+
+如果需要在手机或平板等触摸设备上使用 React，需要调用 `React.initializeTouchEvents(true);` 启用触摸事件处理。
+
+## 幕后原理：自动绑定（Autobinding）和事件代理（Event Delegation）
+
+在幕后，React 做了一些操作来让代码高效运行且易于理解。
+
+**Autobinding:** 在 JavaScript 里创建回调的时候，为了保证 `this` 的正确性，一般都需要显式地绑定方法到它的实例上。有了 React，所有方法被自动绑定到了它的组件实例上。React 还缓存这些绑定方法，所以 CPU 和内存都是非常高效。而且还能减少打字！
+
+**事件代理 ：** React 实际并没有把事件处理器绑定到节点本身。当 React 启动的时候，它在最外层使用唯一一个事件监听器处理所有事件。当组件被加载和卸载时，只是在内部映射里添加或删除事件处理器。当事件触发，React 根据映射来决定如何分发。当映射里处理器时，会当作空操作处理。参考 [David Walsh 很棒的文章](http://davidwalsh.name/event-delegate) 了解这样做高效的原因。
+
+
+## 组件其实是状态机（State Machines）
+
+React 把用户界面当作简单状态机。把用户界面想像成拥有不同状态然后渲染这些状态，可以轻松让用户界面和数据保持一致。
+
+React 里，只需更新组件的 state，然后根据新的 state 重新渲染用户界面（不要操作 DOM）。React 来决定如何最高效地更新 DOM。
+
+
+## State 工作原理
+
+常用的通知 React 数据变化的方法是调用 `setState(data, callback)`。这个方法会合并（merge） `data` 到 `this.state`，并重新渲染组件。渲染完成后，调用可选的 `callback` 回调。大部分情况下不需要提供 `callback`，因为 React 会负责把界面更新到最新状态。
+
+
+## 哪些组件应该有 State？
+
+大部分组件的工作应该是从 `props` 里取数据并渲染出来。但是，有时需要对用户输入、服务器请求或者时间变化等作出响应，这时才需要使用 State。
+
+** 尝试把尽可能多的组件无状态化。** 这样做能隔离 state，把它放到最合理的地方，也能减少冗余并，同时易于解释程序运作过程。
+
+常用的模式是创建多个只负责渲染数据的无状态（stateless）组件，在它们的上层创建一个有状态（stateful）组件并把它的状态通过 `props` 传给子级。这个有状态的组件封装了所有用户的交互逻辑，而这些无状态组件则负责声明式地渲染数据。
+
+
+## 哪些 *应该* 作为 State？
+
+**State 应该包括那些可能被组件的事件处理器改变并触发用户界面更新的数据。** 真实的应用中这种数据一般都很小且能被 JSON 序列化。当创建一个状态化的组件时，想象一下表示它的状态最少需要哪些数据，并只把这些数据存入 `this.state`。在 `render()` 里再根据 state 来计算你需要的其它数据。你会发现以这种方式思考和开发程序最终往往是正确的，因为如果在 state 里添加冗余数据或计算所得数据，需要你经常手动保持数据同步，不能让 React 来帮你处理。
+
+
+## 哪些 *不应该* 作为 State？
+
+`this.state` 应该仅包括能表示用户界面状态所需的最少数据。因些，它不应该包括：
+
+* **计算所得数据：** 不要担心根据 state 来预先计算数据 —— 把所有的计算都放到 `render()` 里更容易保证用户界面和数据的一致性。例如，在 state 里有一个数组（listItems），我们要把数组长度渲染成字符串， 直接在 `render()` 里使用 `this.state.listItems.length + ' list items'` 比把它放到 state 里好的多。
+* **React 组件：** 在 `render()` 里使用当前 props 和 state 来创建它。
+* **基于 props 的重复数据：** 尽可能使用 props 来作为惟一数据来源。把 props 保存到 state 的一个有效的场景是需要知道它以前值的时候，因为未来的 props 可能会变化。

docs/docs/04-multiple-components.md

@@ -171,26 +171,7 @@ var MyComponent = React.createClass({
 });
 ```
 
-You can also key children by passing an object. The object keys will be used as `key` for each value. However it is important to remember that JavaScript does not guarantee the ordering of properties will be preserved. In practice browsers will preserve property order **except** for properties that can be parsed as a 32-bit unsigned integers. Numeric properties will be ordered sequentially and before other properties. If this happens React will render components out of order. This can be avoided by adding a string prefix to the key:
-
-```javascript
-  render: function() {
-    var items = {};
-
-    this.props.results.forEach(function(result) {
-      // If result.id can look like a number (consider short hashes), then
-      // object iteration order is not guaranteed. In this case, we add a prefix
-      // to ensure the keys are strings.
-      items['result-' + result.id] = <li>{result.text}</li>;
-    });
-
-    return (
-      <ol>
-        {items}
-      </ol>
-    );
-  }
-```
+You can also key children by passing a ReactFragment object. See [Keyed Fragments](create-fragment.html) for more details.
 
 ## Data Flow
 

docs/docs/04-multiple-components.zh-CN.md

@@ -0,0 +1,204 @@
+---
+id: multiple-components-zh-CN
+title: 复合组件
+permalink: multiple-components-zh-CN.html
+prev: interactivity-and-dynamic-uis-zh-CN.html
+next: reusable-components-zh-CN.html
+---
+
+目前为止，我们已经学了如何用单个组件来展示数据和处理用户输入。下一步让我们来体验 React 最激动人心的特性之一：可组合性（composability）。
+
+
+## 动机：关注分离
+
+通过复用那些接口定义良好的组件来开发新的模块化组件，我们得到了与使用函数和类相似的好处。具体来说就是能够通过开发简单的组件把程序的*不同关注面分离*。如果为程序开发一套自定义的组件库，那么就能以最适合业务场景的方式来展示你的用户界面。
+
+## 组合实例
+
+一起来使用 Facebook Graph API 开发显示个人图片和用户名的简单 Avatar 组件吧。
+
+```javascript
+var Avatar = React.createClass({
+  render: function() {
+    return (
+      <div>
+        <ProfilePic username={this.props.username} />
+        <ProfileLink username={this.props.username} />
+      </div>
+    );
+  }
+});
+
+var ProfilePic = React.createClass({
+  render: function() {
+    return (
+      <img src={'http://graph.facebook.com/' + this.props.username + '/picture'} />
+    );
+  }
+});
+
+var ProfileLink = React.createClass({
+  render: function() {
+    return (
+      <a href={'http://www.facebook.com/' + this.props.username}>
+        {this.props.username}
+      </a>
+    );
+  }
+});
+
+React.render(
+  <Avatar username="pwh" />,
+  document.getElementById('example')
+);
+```
+
+
+## 从属关系
+
+上面例子中，`Avatar` 拥有 `ProfilePic` 和 `ProfileLink` 的实例。`拥有者` 就是给其它组件设置 `props` 的那个组件。更正式地说，
+如果组件 `Y` 在 `render()` 方法是创建了组件 `X`，那么 `Y` 就拥有 `X`。上面讲过，组件不能修改自身的 `props` - 它们总是与它们拥有者设置的保持一致。这是保持用户界面一致性的关键性原则。
+
+把从属关系与父子关系加以区别至关重要。从属关系是 React 特有的，而父子关系简单来讲就是DOM 里的标签的关系。在上一个例子中，`Avatar` 拥有 `div`、`ProfilePic` 和 `ProfileLink` 实例，`div` 是 `ProfilePic` 和 `ProfileLink` 实例的**父级**（但不是拥有者）。
+
+
+## 子级
+
+实例化 React 组件时，你可以在开始标签和结束标签之间引用在React 组件或者Javascript 表达式：
+
+```javascript
+<Parent><Child /></Parent>
+```
+
+`Parent` 能通过专门的 `this.props.children`  props 读取子级。**`this.props.children` 是一个不透明的数据结构：** 通过 [React.Children 工具类](/react/docs/top-level-api.html#react.children) 来操作。
+
+### 子级校正（Reconciliation）
+
+**校正就是每次 render 方法调用后 React 更新 DOM 的过程。** 一般情况下，子级会根据它们被渲染的顺序来做校正。例如，下面代码描述了两次渲染的过程：
+
+```html
+// 第一次渲染
+<Card>
+  <p>Paragraph 1</p>
+  <p>Paragraph 2</p>
+</Card>
+// 第二次渲染
+<Card>
+  <p>Paragraph 2</p>
+</Card>
+```
+
+直观来看，只是删除了`<p>Paragraph 1</p>`。事实上，React 先更新第一个子级的内容，然后删除最后一个组件。React 是根据子级的*顺序*来校正的。
+
+### 子组件状态管理
+
+对于大多数组件，这没什么大碍。但是，对于使用 `this.state` 来在多次渲染过程中里维持数据的状态化组件，这样做潜在很多问题。
+
+多数情况下，可以通过隐藏组件而不是删除它们来绕过这些问题。
+
+```html
+// 第一次渲染
+<Card>
+  <p>Paragraph 1</p>
+  <p>Paragraph 2</p>
+</Card>
+// 第二次渲染
+<Card>
+  <p style={{'{{'}}display: 'none'}}>Paragraph 1</p>
+  <p>Paragraph 2</p>
+</Card>
+```
+
+### 动态子级
+
+如果子组件位置会改变（如在搜索结果中）或者有新组件添加到列表开头（如在流中）情况会变得更加复杂。如果子级要在多个渲染阶段保持自己的特征和状态，在这种情况下，你可以通过给子级设置惟一标识的 `key` 来区分。
+
+```javascript
+  render: function() {
+    var results = this.props.results;
+    return (
+      <ol>
+        {results.map(function(result) {
+          return <li key={result.id}>{result.text}</li>;
+        })}
+      </ol>
+    );
+  }
+```
+
+当 React 校正带有 key 的子级时，它会确保它们被重新排序（而不是破坏）或者删除（而不是重用）。
+`务必` 把 `key` 添加到子级数组里组件本身上，而不是每个子级内部最外层 HTML 上：
+
+```javascript
+// 错误！
+var ListItemWrapper = React.createClass({
+  render: function() {
+    return <li key={this.props.data.id}>{this.props.data.text}</li>;
+  }
+});
+var MyComponent = React.createClass({
+  render: function() {
+    return (
+      <ul>
+        {this.props.results.map(function(result) {
+          return <ListItemWrapper data={result}/>;
+        })}
+      </ul>
+    );
+  }
+});
+
+// 正确 :)
+var ListItemWrapper = React.createClass({
+  render: function() {
+    return <li>{this.props.data.text}</li>;
+  }
+});
+var MyComponent = React.createClass({
+  render: function() {
+    return (
+      <ul>
+        {this.props.results.map(function(result) {
+           return <ListItemWrapper key={result.id} data={result}/>;
+        })}
+      </ul>
+    );
+  }
+});
+```
+
+也可以传递 object 来做有 key 的子级。object 的 key 会被当作每个组件的 `key`。但是一定要牢记 JavaScript 并不总是保证属性的顺序会被保留。实际情况下浏览器一般会保留属性的顺序，**除了** 使用 32位无符号数字做为 key 的属性。数字型属性会按大小排序并且排在其它属性前面。一旦发生这种情况，React 渲染组件的顺序就是混乱。可能在 key 前面加一个字符串前缀来避免：
+
+```javascript
+  render: function() {
+    var items = {};
+
+    this.props.results.forEach(function(result) {
+      // 如果 result.id 看起来是一个数字（比如短哈希），那么
+      // 对象字面量的顺序就得不到保证。这种情况下，需要添加前缀
+      // 来确保 key 是字符串。
+      items['result-' + result.id] = <li>{result.text}</li>;
+    });
+
+    return (
+      <ol>
+        {items}
+      </ol>
+    );
+  }
+```
+
+## 数据流
+
+React 里，数据通过上面介绍过的 `props` 从拥有者流向归属者。这就是高效的单向数据绑定(one-way data binding)：拥有者通过它的 `props` 或 `state` 计算出一些值，并把这些值绑定到它们拥有的组件的 props 上。因为这个过程会递归地调用，所以数据变化会自动在所有被使用的地方自动反映出来。
+
+
+## 性能提醒
+
+你或许会担心如果一个拥有者有大量子级时，对于数据变化做出响应非常耗费性能。值得庆幸的是执行 JavaScript  非常的快，而且 `render()` 方法一般比较简单，所以在大部分应用里这样做速度极快。此外，性能的瓶颈大多是因为 DOM 更新，而非 JS 执行，而且 React 会通过批量更新和变化检测来优化性能。
+
+但是，有时候需要做细粒度的性能控制。这种情况下，可以重写 `shouldComponentUpdate()` 方法返回 false 来让 React 跳过对子树的处理。参考 [React reference docs](/react/docs/component-specs.html) 了解更多。
+
+> 注意：
+> 
+> 如果在数据变化时让 `shouldComponentUpdate()` 返回 false，React 就不能保证用户界面同步。当使用它的时候一定确保你清楚到底做了什么，并且只在遇到明显性能问题的时候才使用它。不要低估 JavaScript 的速度，DOM 操作通常才是慢的原因。

docs/docs/05-reusable-components.md

@@ -25,12 +25,12 @@ React.createClass({
     optionalObject: React.PropTypes.object,
     optionalString: React.PropTypes.string,
 
-    // Anything that can be rendered: numbers, strings, components or an array
+    // Anything that can be rendered: numbers, strings, elements or an array
     // containing these types.
-    optionalRenderable: React.PropTypes.renderable,
+    optionalNode: React.PropTypes.node,
 
-    // A React component.
-    optionalComponent: React.PropTypes.component,
+    // A React element.
+    optionalElement: React.PropTypes.element,
 
     // You can also declare that a prop is an instance of a class. This uses
     // JS's instanceof operator.
@@ -120,13 +120,13 @@ React.render(
 
 ## Single Child
 
-With `React.PropTypes.component` you can specify that only a single child can be passed to
+With `React.PropTypes.element` you can specify that only a single child can be passed to
 a component as children.
 
 ```javascript
 var MyComponent = React.createClass({
   propTypes: {
-    children: React.PropTypes.component.isRequired
+    children: React.PropTypes.element.isRequired
   },
 
   render: function() {
@@ -187,3 +187,48 @@ React.render(
 
 A nice feature of mixins is that if a component is using multiple mixins and several mixins define the same lifecycle method (i.e. several mixins want to do some cleanup when the component is destroyed), all of the lifecycle methods are guaranteed to be called. Methods defined on mixins run in the order mixins were listed, followed by a method call on the component.
 
+## ES6 Classes
+
+You may also define your React classes as a plain JavaScript class. For example using ES6 class syntax:
+
+```javascript
+class HelloMessage extends React.Component {
+  render() {
+    return <div>Hello {this.props.name}</div>;
+  }
+}
+React.render(<HelloMessage name="Sebastian" />, mountNode);
+```
+
+The API is similar to `React.createClass` with the exception of `getInitialState`. Instead of providing a separate `getInitialState` method, you set up your own `state` property in the constructor.
+
+Another difference is that `propTypes` and `defaultProps` are defined as properties on the constructor instead of in the class body.
+
+```javascript
+export class Counter extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {count: props.initialCount};
+  }
+  tick() {
+    this.setState({count: this.state.count + 1});
+  }
+  render() {
+    return (
+      <div onClick={this.tick.bind(this)}>
+        Clicks: {this.state.count}
+      </div>
+    );
+  }
+}
+Counter.propTypes = { initialCount: React.PropTypes.number };
+Counter.defaultProps = { initialCount: 0 };
+```
+
+### No Autobinding
+
+Methods follow the same semantics as regular ES6 classes, meaning that they don't automatically bind `this` to the instance. You'll have to explicitly use `.bind(this)` or arrow functions.
+
+### No Mixins
+
+Unfortunately ES6 launched without any mixin support. Therefore, there is no support for mixins when you use React with ES6 classes. Instead, we're working on making it easier to support such use cases without resorting to mixins.

docs/docs/05-reusable-components.zh-CN.md

@@ -0,0 +1,183 @@
+---
+id: reusable-components-zh-CN
+title: 可复用组件
+permalink: reusable-components-zh-CN.html
+prev: multiple-components-zh-CN.html
+next: transferring-props-zh-CN.html
+---
+
+设计接口的时候，把通用的设计元素（按钮，表单框，布局组件等）拆成接口良好定义的可复用的组件。这样，下次开发相同界面程序时就可以写更少的代码，也意义着更高的开发效率，更少的 Bug 和更少的程序体积。
+
+
+## Prop 验证
+
+随着应用不断变大，保证组件被正确使用变得非常有用。为此我们引入 `propTypes`。`React.PropTypes` 提供很多验证器 (validator) 来验证传入数据的有效性。当向 props 传入无效数据时，JavaScript 控制台会抛出警告。注意为了性能考虑，只在开发环境验证 `propTypes`。下面用例子来说明不同验证器的区别：
+
+```javascript
+React.createClass({
+  propTypes: {
+    // 可以声明 prop 为指定的 JS 基本类型。默认
+    // 情况下，这些 prop 都是可传可不传的。
+    optionalArray: React.PropTypes.array,
+    optionalBool: React.PropTypes.bool,
+    optionalFunc: React.PropTypes.func,
+    optionalNumber: React.PropTypes.number,
+    optionalObject: React.PropTypes.object,
+    optionalString: React.PropTypes.string,
+
+    // 所有可以被渲染的对象：数字，
+    // 字符串，DOM 元素或包含这些类型的数组。
+    optionalNode: React.PropTypes.node,
+
+    // React 元素
+    optionalElement: React.PropTypes.element,
+
+    // 用 JS 的 instanceof 操作符声明 prop 为类的实例。
+    optionalMessage: React.PropTypes.instanceOf(Message),
+
+    // 用 enum 来限制 prop 只接受指定的值。
+    optionalEnum: React.PropTypes.oneOf(['News', 'Photos']),
+
+    // 指定的多个对象类型中的一个
+    optionalUnion: React.PropTypes.oneOfType([
+      React.PropTypes.string,
+      React.PropTypes.number,
+      React.PropTypes.instanceOf(Message)
+    ]),
+
+    // 指定类型组成的数组
+    optionalArrayOf: React.PropTypes.arrayOf(React.PropTypes.number),
+
+    // 指定类型的属性构成的对象
+    optionalObjectOf: React.PropTypes.objectOf(React.PropTypes.number),
+
+    // 特定形状参数的对象
+    optionalObjectWithShape: React.PropTypes.shape({
+      color: React.PropTypes.string,
+      fontSize: React.PropTypes.number
+    }),
+
+    // 以后任意类型加上 `isRequired` 来使 prop 不可空。
+    requiredFunc: React.PropTypes.func.isRequired,
+
+    // 不可空的任意类型
+    requiredAny: React.PropTypes.any.isRequired,
+
+    // 自定义验证器。如果验证失败需要返回一个 Error 对象。不要直接
+    // 使用 `console.warn` 或抛异常，因为这样 `oneOfType` 会失效。
+    customProp: function(props, propName, componentName) {
+      if (!/matchme/.test(props[propName])) {
+        return new Error('Validation failed!');
+      }
+    }
+  },
+  /* ... */
+});
+```
+
+
+## 默认 Prop 值
+
+React 支持以声明式的方式来定义 `props` 的默认值。
+
+```javascript
+var ComponentWithDefaultProps = React.createClass({
+  getDefaultProps: function() {
+    return {
+      value: 'default value'
+    };
+  }
+  /* ... */
+});
+```
+
+当父级没有传入 props 时，`getDefaultProps()` 可以保证  `this.props.value` 有默认值，注意 `getDefaultProps` 的结果会被 *缓存*。得益于此，你可以直接使用 props，而不必写手动编写一些重复或无意义的代码。
+
+## 传递 Props：小技巧
+
+有一些常用的 React 组件只是对 HTML 做简单扩展。通常，你想少写点代码来把传入组件的 props 复制到对应的 HTML 元素上。这时 JSX 的 _spread_ 语法会帮到你：
+
+```javascript
+var CheckLink = React.createClass({
+  render: function() {
+    // 这样会把 CheckList 所有的 props 复制到 <a>
+    return <a {...this.props}>{'√ '}{this.props.children}</a>;
+  }
+});
+
+React.render(
+  <CheckLink href="/checked.html">
+    Click here!
+  </CheckLink>,
+  document.getElementById('example')
+);
+```
+
+## 单个子级
+
+`React.PropTypes.element` 可以限定只能有一个子级传入。
+
+```javascript
+var MyComponent = React.createClass({
+  propTypes: {
+    children: React.PropTypes.element.isRequired
+  },
+
+  render: function() {
+    return (
+      <div>
+        {this.props.children} // 有且仅有一个元素，否则会抛异常。
+      </div>
+    );
+  }
+
+});
+```
+
+
+## Mixins
+
+组件是 React 里复用代码最佳方式，但是有时一些复杂的组件间也需要共用一些功能。有时会被称为 [跨切面关注点](http://en.wikipedia.org/wiki/Cross-cutting_concern)。React 使用 `mixins` 来解决这类问题。
+
+一个通用的场景是：一个组件需要定期更新。用 `setInterval()` 做很容易，但当不需要它的时候取消定时器来节省内存是非常重要的。React 提供 [生命周期方法](/react/docs/working-with-the-browser.html#component-lifecycle) 来告知组件创建或销毁的时间。下面来做一个简单的 mixin，使用 `setInterval()` 并保证在组件销毁时清理定时器。
+
+```javascript
+var SetIntervalMixin = {
+  componentWillMount: function() {
+    this.intervals = [];
+  },
+  setInterval: function() {
+    this.intervals.push(setInterval.apply(null, arguments));
+  },
+  componentWillUnmount: function() {
+    this.intervals.map(clearInterval);
+  }
+};
+
+var TickTock = React.createClass({
+  mixins: [SetIntervalMixin], // 引用 mixin
+  getInitialState: function() {
+    return {seconds: 0};
+  },
+  componentDidMount: function() {
+    this.setInterval(this.tick, 1000); // 调用 mixin 的方法
+  },
+  tick: function() {
+    this.setState({seconds: this.state.seconds + 1});
+  },
+  render: function() {
+    return (
+      <p>
+        React has been running for {this.state.seconds} seconds.
+      </p>
+    );
+  }
+});
+
+React.render(
+  <TickTock />,
+  document.getElementById('example')
+);
+```
+
+关于 mixin 值得一提的优点是，如果一个组件使用了多个 mixin，并用有多个 mixin 定义了同样的生命周期方法（如：多个 mixin 都需要在组件销毁时做资源清理操作），所有这些生命周期方法都保证会被执行到。方法执行顺序是：首先按 mixin 引入顺序执行 mixin 里方法，最后执行组件内定义的方法。

docs/docs/06-transferring-props.md

@@ -24,7 +24,7 @@ The rest of this tutorial explains best practices. It uses JSX and experimental
 
 ## Manual Transfer
 
-Most of the time you should explicitly pass the properties down. That ensures that you only exposes a subset of the inner API, one that you know will work.
+Most of the time you should explicitly pass the properties down. That ensures that you only expose a subset of the inner API, one that you know will work.
 
 ```javascript
 var FancyCheckbox = React.createClass({
@@ -37,8 +37,8 @@ var FancyCheckbox = React.createClass({
     );
   }
 });
-React.renderComponent(
-  <FancyCheckbox checked={true} onClick={console.log}>
+React.render(
+  <FancyCheckbox checked={true} onClick={console.log.bind(console)}>
     Hello world!
   </FancyCheckbox>,
   document.body
@@ -49,6 +49,10 @@ But what about the `name` prop? Or the `title` prop? Or `onMouseOver`?
 
 ## Transferring with `...` in JSX
 
+> NOTE:
+> 
+> In the example below, the `--harmony ` flag is required as this syntax is an experimental ES7 syntax. If using the in-browser JSX transformer, simply open your script with `<script type="text/jsx;harmony=true">`. See the [Rest and Spread Properties ...](http://facebook.github.io/react/docs/transferring-props.html#rest-and-spread-properties-...) section below for more details.
+
 Sometimes it's fragile and tedious to pass every property along. In that case you can use [destructuring assignment](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Destructuring_assignment) with rest properties to extract a set of unknown properties.
 
 List out all the properties that you would like to consume, followed by `...other`.
@@ -70,8 +74,8 @@ var FancyCheckbox = React.createClass({
     );
   }
 });
-React.renderComponent(
-  <FancyCheckbox checked={true} onClick={console.log}>
+React.render(
+  <FancyCheckbox checked={true} onClick={console.log.bind(console)}>
     Hello world!
   </FancyCheckbox>,
   document.body

docs/docs/06-transferring-props.zh-CN.md

@@ -0,0 +1,164 @@
+---
+id: transferring-props-zh-CN
+title: 传递 Props
+permalink: transferring-props-zh-CN.html
+prev: reusable-components-zh-CN.html
+next: forms-zh-CN.html
+---
+
+React 里有一个非常常用的模式就是对组件做一层抽象。组件对外公开一个简单的属性（Props）来实现功能，但内部细节可能有非常复杂的实现。
+
+可以使用 [JSX 展开属性](/react/docs/jsx-spread-zh-CN.html) 来合并现有的 props 和其它值：
+
+```javascript
+return <Component {...this.props} more="values" />;
+```
+
+如果不使用 JSX，可以使用一些对象辅助方法如 ES6 的 `Object.assign` 或 Underscore `_.extend`。
+
+```javascript
+return Component(Object.assign({}, this.props, { more: 'values' }));
+```
+
+下面的教程介绍一些最佳实践。使用了 JSX 和 ES7 的还在试验阶段的特性。
+
+
+## 手动传递
+
+大部分情况下你应该显式地向下传递 props。这样可以确保只公开你认为是安全的内部 API 的子集。
+
+```javascript
+var FancyCheckbox = React.createClass({
+  render: function() {
+    var fancyClass = this.props.checked ? 'FancyChecked' : 'FancyUnchecked';
+    return (
+      <div className={fancyClass} onClick={this.props.onClick}>
+        {this.props.children}
+      </div>
+    );
+  }
+});
+React.render(
+  <FancyCheckbox checked={true} onClick={console.log.bind(console)}>
+    Hello world!
+  </FancyCheckbox>,
+  document.body
+);
+```
+
+但 `name` 这个属性怎么办？还有 `title`、`onMouseOver` 这些 props？
+
+
+## 在 JSX 里使用 `...` 传递
+
+有时把所有属性都传下去是不安全或啰嗦的。这时可以使用 [解构赋值](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Destructuring_assignment) 中的剩余属性特性来把未知属性批量提取出来。
+
+列出所有要当前使用的属性，后面跟着 `...other`。
+
+```javascript
+var { checked, ...other } = this.props;
+```
+
+这样能确保把所有 props 传下去，*除了* 那些已经被使用了的。
+
+```javascript
+var FancyCheckbox = React.createClass({
+  render: function() {
+    var { checked, ...other } = this.props;
+    var fancyClass = checked ? 'FancyChecked' : 'FancyUnchecked';
+    // `other` 包含 { onClick: console.log } 但 checked 属性除外
+    return (
+      <div {...other} className={fancyClass} />
+    );
+  }
+});
+React.render(
+  <FancyCheckbox checked={true} onClick={console.log.bind(console)}>
+    Hello world!
+  </FancyCheckbox>,
+  document.body
+);
+```
+
+> 注意:
+> 
+> 上面例子中，`checked` 属性也是一个有效的 DOM 属性。如果你没有使用解构赋值，那么可能无意中把它传下去。
+
+在传递这些未知的 `other` 属性时，要经常使用解构赋值模式。
+
+```javascript
+var FancyCheckbox = React.createClass({
+  render: function() {
+    var fancyClass = this.props.checked ? 'FancyChecked' : 'FancyUnchecked';
+    // 反模式：`checked` 会被传到里面的组件里
+    return (
+      <div {...this.props} className={fancyClass} />
+    );
+  }
+});
+```
+
+
+## 使用和传递同一个 Prop
+
+如果组件需要使用一个属性又要往下传递，可以直接使用 `checked={checked}` 再传一次。这样做比传整个 `this.props` 对象要好，因为更利于重构和语法检查。
+
+```javascript
+var FancyCheckbox = React.createClass({
+  render: function() {
+    var { checked, title, ...other } = this.props;
+    var fancyClass = checked ? 'FancyChecked' : 'FancyUnchecked';
+    var fancyTitle = checked ? 'X ' + title : 'O ' + title;
+    return (
+      <label>
+        <input {...other}
+          checked={checked}
+          className={fancyClass}
+          type="checkbox"
+        />
+        {fancyTitle}
+      </label>
+    );
+  }
+});
+```
+
+> 注意:
+> 
+> 顺序很重要，把 `{...other}` 放到 JSX props 前面会使它不被覆盖。上面例子中我们可以保证 input 的 type 是 `"checkbox"`。
+
+
+## 剩余属性和展开属性 `...`
+
+剩余属性可以把对象剩下的属性提取到一个新的对象。会把所有在解构赋值中列出的属性剔除。
+
+这是 [ES7 草案](https://github.com/sebmarkbage/ecmascript-rest-spread) 中的试验特性。
+
+```javascript
+var { x, y, ...z } = { x: 1, y: 2, a: 3, b: 4 };
+x; // 1
+y; // 2
+z; // { a: 3, b: 4 }
+```
+
+> 注意:
+>
+> 使用 [JSX 命令行工具](http://npmjs.org/package/react-tools) 配合 `--harmony` 标记来启用 ES7 语法。
+
+
+## 使用 Underscore 来传递
+
+如果不使用 JSX，可以使用一些库来实现相同效果。Underscore 提供 `_.omit` 来过滤属性，`_.extend` 复制属性到新的对象。
+
+```javascript
+var FancyCheckbox = React.createClass({
+  render: function() {
+    var checked = this.props.checked;
+    var other = _.omit(this.props, 'checked');
+    var fancyClass = checked ? 'FancyChecked' : 'FancyUnchecked';
+    return (
+      React.DOM.div(_.extend({}, other, { className: fancyClass }))
+    );
+  }
+});
+```

docs/docs/07-forms.md

@@ -87,7 +87,7 @@ If you want to initialize the component with a non-empty value, you can supply a
 
 This example will function much like the **Controlled Components** example above.
 
-Likewise, `<input>` supports `defaultChecked` and `<select>` supports `defaultValue`.
+Likewise, `<input>` supports `defaultValue` and `<select>` supports `defaultChecked`.
 
 
 ## Advanced Topics

docs/docs/07-forms.zh-CN.md

@@ -0,0 +1,168 @@
+---
+id: forms-zh-CN
+title: 表单组件
+permalink: forms-zh-CN.html
+prev: transferring-props-zh-CN.html
+next: working-with-the-browser-zh-CN.html
+---
+
+诸如 `<input>`、`<textarea>`、`<option>` 这样的表单组件不同于其他组件，因为他们可以通过用户交互发生变化。这些组件提供的界面使响应用户交互的表单数据处理更加容易。
+  
+关于 `<form>` 事件详情请查看 [表单事件](/react/docs/events-zh-CN.html#form-events)。
+
+## 交互属性    
+    
+表单组件支持几个受用户交互影响的属性：
+    
+* `value`，用于 `<input>`、`<textarea>` 组件。
+* `checked`，用于类型为 `checkbox` 或者 `radio` 的 `<input>` 组件。
+* `selected`，用于 `<option>` 组件。
+
+在 HTML 中，`<textarea>` 的值通过子节点设置；在 React 中则应该使用 `value` 代替。        
+
+表单组件可以通过 `onChange` 回调函数来监听组件变化。当用户做出以下交互时，`onChange` 执行并通过浏览器做出响应：
+          
+* `<input>` 或 `<textarea>` 的 `value` 发生变化时。
+* `<input>` 的 `checked` 状态改变时。
+* `<option>` 的 `selected` 状态改变时。
+              
+和所有 DOM 事件一样，所有的 HTML 原生组件都支持 `onChange` 属性，而且可以用来监听冒泡的 `change` 事件。               
+              
+              
+## 受限组件              
+
+设置了 `value` 的 `<input>` 是一个*受限*组件。 对于受限的 `<input>`，渲染出来的 HTML 元素始终保持 `value` 属性的值。例如：
+
+```javascript
+  render: function() {
+    return <input type="text" value="Hello!" />;
+  }
+```
+              
+上面的代码将渲染出一个值为 `Hello!` 的 input 元素。用户在渲染出来的元素里输入任何值都不起作用，因为 React 已经赋值为     `Hello!`。如果想响应更新用户输入的值，就得使用 `onChange` 事件：
+
+```javascript
+  getInitialState: function() {
+    return {value: 'Hello!'};
+  },
+  handleChange: function(event) {
+    this.setState({value: event.target.value});
+  },
+  render: function() {
+    var value = this.state.value;
+    return <input type="text" value={value} onChange={this.handleChange} />;
+  }
+```
+
+上面的代码中，React 将用户输入的值更新到 `<input>` 组件的 `value` 属性。这样实现响应或者验证用户输入的界面就很容易了。例如：
+
+```javascript
+  handleChange: function(event) {
+    this.setState({value: event.target.value.substr(0, 140)});
+  }
+```
+
+上面的代码接受用户输入，并截取前 140 个字符。
+
+              
+## 不受限组件
+
+没有设置 `value`(或者设为 `null`) 的 `<input>` 组件是一个*不受限*组件。对于不受限的 `<input>` 组件，渲染出来的元素直接反应用户输入。例如：
+
+```javascript
+  render: function() {
+    return <input type="text" />;
+  }
+```
+
+上面的代码将渲染出一个空值的输入框，用户输入将立即反应到元素上。和受限元素一样，使用 `onChange` 事件可以监听值的变化。
+
+如果想给组件设置一个非空的初始值，可以使用 `defaultValue` 属性。例如：
+
+```javascript
+  render: function() {
+    return <input type="text" defaultValue="Hello!" />;
+  }
+```
+
+上面的代码渲染出来的元素和**受限组件**一样有一个初始值，但这个值用户可以改变并会反应到界面上。
+
+同样地， 类型为 `radio`、`checkbox` 的`<input>` 支持 `defaultChecked` 属性， `<select>` 支持 `defaultValue` 属性。
+
+```javascript
+  render: function() {
+      return (
+          <div>
+            <input type="radio" name="opt" defaultChecked /> Option 1
+            <input type="radio" name="opt" /> Option 2
+            <select defaultValue="C">
+              <option value="A">Apple</option>
+              <option value="B">Banana</option>
+              <option value="C">Cranberry</option>
+            </select>
+          </div>
+      );
+    }
+```                
+
+
+## 高级主题
+                
+### 为什么使用受限组件？
+
+在 React 中使用诸如 `<input>` 的表单组件时，遇到了一个在传统 HTML 中没有的挑战。
+                
+比如下面的代码：                
+
+```html
+  <input type="text" name="title" value="Untitled" />
+```
+
+在 HTML 中将渲染初始值为 `Untitled` 的输入框。用户改变输入框的值时，节点的 `value` 属性（*property*）将随之变化，但是 `node.getAttribute('value')` 还是会返回初始设置的值 `Untitled`.
+
+与 HTML 不同，React 组件必须在任何时间点描绘视图的状态，而不仅仅是在初始化时。比如在 React 中：
+
+```javascript
+  render: function() {
+    return <input type="text" name="title" value="Untitled" />;
+  }
+```
+
+该方法在任何时间点渲染组件以后，输入框的值就应该*始终*为 `Untitled`。
+
+
+### 为什么 `<textarea>` 使用 `value` 属性？
+
+在 HTML 中， `<textarea>` 的值通常使用子节点设置：
+
+```html
+  <!-- 反例：在 React 中不要这样使用！ -->
+  <textarea name="description">This is the description.</textarea>
+```
+                  
+对 HTML 而言，让开发者设置多行的值很容易。但是，React 是 JavaScript，没有字符限制，可以使用 `\n` 实现换行。简言之，React 已经有 `value`、`defaultValue` 属性，`</textarea>` 组件的子节点扮演什么角色就有点模棱两可了。基于此， 设置 `<textarea>` 值时不应该使用子节点：
+
+```javascript
+  <textarea name="description" value="This is a description." />
+```
+
+如果*非要**使用子节点，效果和使用 `defaultValue` 一样。
+
+
+### 为什么 `<select>` 使用 `value` 属性                  
+
+HTML 中 `<select>` 通常使用 `<option>` 的 `selected` 属性设置选中状态；React 为了更方面的控制组件，采用以下方式代替：
+
+```javascript
+  <select value="B">
+    <option value="A">Apple</option>
+    <option value="B">Banana</option>
+    <option value="C">Cranberry</option>
+  </select>
+```
+
+如果是不受限组件，则使用 `defaultValue`。
+
+> 注意：
+>
+> 给 `value` 属性传递一个数组，可以选中多个选项：`<select multiple={true} value={['B', 'C']}>`。

docs/docs/08-working-with-the-browser.md

@@ -18,13 +18,13 @@ Additionally, React implements a full synthetic event system such that all event
 Most of the time you should stay within React's "faked browser" world since it's more performant and easier to reason about. However, sometimes you simply need to access the underlying API, perhaps to work with a third-party library like a jQuery plugin. React provides escape hatches for you to use the underlying DOM API directly.
 
 
-## Refs and getDOMNode()
+## Refs and findDOMNode()
 
-To interact with the browser, you'll need a reference to a DOM node. Every mounted React component has a `getDOMNode()` function which you can call to get a reference to it.
+To interact with the browser, you'll need a reference to a DOM node. React has a `React.findDOMNode(component)` function which you can call to get a reference to the component's DOM node.
 
 > Note:
 >
-> `getDOMNode()` only works on mounted components (that is, components that have been placed in the DOM). If you try to call this on a component that has not been mounted yet (like calling `getDOMNode()` in `render()` on a component that has yet to be created) an exception will be thrown.
+> `findDOMNode()` only works on mounted components (that is, components that have been placed in the DOM). If you try to call this on a component that has not been mounted yet (like calling `findDOMNode()` in `render()` on a component that has yet to be created) an exception will be thrown.
 
 In order to get a reference to a React component, you can either use `this` to get the current React component, or you can use refs to refer to a component you own. They work like this:
 
@@ -32,7 +32,7 @@ In order to get a reference to a React component, you can either use `this` to g
 var MyComponent = React.createClass({
   handleClick: function() {
     // Explicitly focus the text input using the raw DOM API.
-    this.refs.myTextInput.getDOMNode().focus();
+    React.findDOMNode(this.refs.myTextInput).focus();
   },
   render: function() {
     // The ref attribute adds a reference to the component to
@@ -97,7 +97,7 @@ React provides lifecycle methods that you can specify to hook into this process.
 
 _Mounted_ composite components also support the following methods:
 
-* `getDOMNode(): DOMElement` can be invoked on any mounted component in order to obtain a reference to its rendered DOM node.
+* `findDOMNode(): DOMElement` can be invoked on any mounted component in order to obtain a reference to its rendered DOM node.
 * `forceUpdate()` can be invoked on any mounted component when you know that some deeper aspect of the component's state has changed without using `this.setState()`.
 
 

docs/docs/08.1-more-about-refs.md

@@ -65,7 +65,7 @@ In this counterexample, the `<input />` is merely a *description* of an `<input
 
 So how do we talk to the *real* backing instance of the input?
 
-## The ref Attribute
+## The ref String Attribute
 
 React supports a very special property that you can attach to any component that is output from `render()`. This special property allows you to refer to the corresponding **backing instance** of anything returned from `render()`. It is always guaranteed to be the proper instance, at any point in time.
 
@@ -83,7 +83,19 @@ It's as simple as:
   this.refs.myInput
   ```
 
-  You can access the component's DOM node directly by calling `this.refs.myInput.getDOMNode()`.
+  You can access the component's DOM node directly by calling `React.findDOMNode(this.refs.myInput)`.
+
+
+## The ref Callback Attribute
+
+The `ref` attribute can be a callback function instead of a name.  This callback will be executed immediately after the component is mounted.  The referenced component will be passed in as a parameter, and the callback function may use the component immediately, or save the reference for future use (or both).
+
+It's as simple as assigning a `ref` attribute to anything returned from `render` such as:
+
+  ```html
+  <input ref={ function(component){ React.findDOMNode(component).focus();} } />
+  ```
+
 
 ## Completing the Example
 
@@ -99,7 +111,7 @@ It's as simple as:
       // Clear the input
       this.setState({userInput: ''}, function() {
         // This code executes after the component is re-rendered
-        this.refs.theInput.getDOMNode().focus();   // Boom! Focused!
+        React.findDOMNode(this.refs.theInput).focus();   // Boom! Focused!
       });
     },
     render: function() {
@@ -129,7 +141,7 @@ Refs are a great way to send a message to a particular child instance in a way t
 ### Benefits:
 
 - You can define any public method on your component classes (such as a reset method on a Typeahead) and call those public methods through refs (such as `this.refs.myTypeahead.reset()`).
-- Performing DOM measurements almost always requires reaching out to a "native" component such as `<input />` and accessing its underlying DOM node via `this.refs.myInput.getDOMNode()`. Refs are one of the only practical ways of doing this reliably.
+- Performing DOM measurements almost always requires reaching out to a "native" component such as `<input />` and accessing its underlying DOM node via `React.findDOMNode(this.refs.myInput)`. Refs are one of the only practical ways of doing this reliably.
 - Refs are automatically book-kept for you! If that child is destroyed, its ref is also destroyed for you. No worrying about memory here (unless you do something crazy to retain a reference yourself).
 
 ### Cautions:

docs/docs/09-tooling-integration.md

@@ -32,7 +32,11 @@ If you like using JSX, we provide an in-browser JSX transformer for development
 
 ### Productionizing: Precompiled JSX
 
-If you have [npm](http://npmjs.org/), you can simply run `npm install -g react-tools` to install our command-line `jsx` tool. This tool will translate files that use JSX syntax to plain JavaScript files that can run directly in the browser. It will also watch directories for you and automatically transform files when they are changed; for example: `jsx --watch src/ build/`. Run `jsx --help` for more information on how to use this tool.
+If you have [npm](http://npmjs.org/), you can simply run `npm install -g react-tools` to install our command-line `jsx` tool. This tool will translate files that use JSX syntax to plain JavaScript files that can run directly in the browser. It will also watch directories for you and automatically transform files when they are changed; for example: `jsx --watch src/ build/`.
+
+By default JSX files with a `.js` extension are transformed. Use `jsx --extension jsx src/ build/` to transform files with a `.jsx` extension.
+
+Run `jsx --help` for more information on how to use this tool.
 
 
 ### Helpful Open-Source Projects

docs/docs/10-addons.md

@@ -10,14 +10,15 @@ next: animation.html
 
 - [`TransitionGroup` and `CSSTransitionGroup`](animation.html), for dealing with animations and transitions that are usually not simple to implement, such as before a component's removal.
 - [`LinkedStateMixin`](two-way-binding-helpers.html), to simplify the coordination between user's form input data and the component's state.
-- [`classSet`](class-name-manipulation.html), for manipulating the DOM `class` string a bit more cleanly.
-- [`TestUtils`](test-utils.html), simple helpers for writing test cases (unminified build only).
 - [`cloneWithProps`](clone-with-props.html), to make shallow copies of React components and change their props.
+- [`createFragment`](create-fragment.html), to create a set of externally-keyed children.
 - [`update`](update.html), a helper function that makes dealing with immutable data in JavaScript easier.
+- [`PureRenderMixin`](pure-render-mixin.html), a performance booster under certain situations.
+- (DEPRECATED) [`classSet`](class-name-manipulation.html), for manipulating the DOM `class` string a bit more cleanly.
 
 The add-ons below are in the development (unminified) version of React only:
 
-- [`PureRenderMixin`](pure-render-mixin.html), a performance booster under certain situations.
+- [`TestUtils`](test-utils.html), simple helpers for writing test cases (unminified build only).
 - [`Perf`](perf.html), for measuring performance and giving you hint where to optimize.
 
 To get the add-ons, use `react-with-addons.js` (and its minified counterpart) rather than the common `react.js`.

docs/docs/10.1-animation.md

@@ -141,7 +141,7 @@ You can disable animating `enter` or `leave` animations if you want. For example
 
 ## Low-level API: `ReactTransitionGroup`
 
-`ReactTransitionGroup` is the basis for animations. When children are declaratively added or removed from it (as in the example above) special lifecycle hooks are called on them.
+`ReactTransitionGroup` is the basis for animations. It is accessible as `React.addons.TransitionGroup`. When children are declaratively added or removed from it (as in the example above) special lifecycle hooks are called on them.
 
 ### `componentWillEnter(callback)`
 
@@ -175,7 +175,7 @@ Every DOM component that React can render is available for use. However, `compon
 >
 > Prior to v0.12, when using DOM components, the `component` prop needed to be a reference to `React.DOM.*`. Since the component is simply passed to `React.createElement`, it must now be a string. Composite components must pass the factory.
 
-Any additional, user-defined, properties will be become properties of the rendered component. For example, here's how you would you render a `<ul>` with css class:
+Any additional, user-defined, properties will become properties of the rendered component. For example, here's how you would render a `<ul>` with css class:
 
 ```javascript{1}
 <ReactTransitionGroup component="ul" className="animated-list">

docs/docs/10.3-class-name-manipulation.md

@@ -6,6 +6,10 @@ prev: two-way-binding-helpers.html
 next: test-utils.html
 ---
 
+> NOTE:
+>
+> This module now exists independently at [JedWatson/classnames](https://github.com/JedWatson/classnames) and is React-agnostic. The add-on here will thus be removed in the future.
+
 `classSet()` is a neat utility for easily manipulating the DOM `class` string.
 
 Here's a common scenario and its solution without `classSet()`:
@@ -42,4 +46,17 @@ render: function() {
 
 When using `classSet()`, pass an object with keys of the CSS class names you might or might not need. Truthy values will result in the key being a part of the resulting string.
 
+`classSet()` also lets pass class names in as arguments that are then concatenated for you:
+
+```javascript
+render: function() {
+  var cx = React.addons.classSet;
+  var importantModifier = 'message-important';
+  var readModifier = 'message-read';
+  var classes = cx('message', importantModifier, readModifier);
+  // Final string is 'message message-important message-read'
+  return <div className={classes}>Great, I'll be there.</div>;
+}
+```
+
 No more hacky string concatenations!

docs/docs/10.4-test-utils.md

@@ -19,9 +19,9 @@ Simulate an event dispatch on a DOM node with optional `eventData` event data. *
 Example usage:
 
 ```javascript
-var node = this.refs.input.getDOMNode();
+var node = React.findDOMNode(this.refs.input);
 React.addons.TestUtils.Simulate.click(node);
-React.addons.TestUtils.Simulate.change(node);
+React.addons.TestUtils.Simulate.change(node, {target: {value: 'Hello, world'}});
 React.addons.TestUtils.Simulate.keyDown(node, {key: "Enter"});
 ```
 
@@ -43,6 +43,14 @@ object mockComponent(function componentClass, string? mockTagName)
 
 Pass a mocked component module to this method to augment it with useful methods that allow it to be used as a dummy React component. Instead of rendering as usual, the component will become a simple `<div>` (or other tag if `mockTagName` is provided) containing any provided children.
 
+### isElement
+
+```javascript
+boolean isElement(ReactElement element)
+```
+
+Returns true if `element` is any ReactElement.
+
 ### isElementOfType
 
 ```javascript
@@ -73,15 +81,7 @@ Returns true if `instance` is a composite component (created with `React.createC
 boolean isCompositeComponentWithType(ReactComponent instance, function componentClass)
 ```
 
-The combination of `isComponentOfType()` and `isCompositeComponent()`.
-
-### isTextComponent
-
-```javascript
-boolean isTextComponent(ReactComponent instance)
-```
-
-Returns true if `instance` is a plain text component.
+Returns true if `instance` is a composite component (created with `React.createClass()`) whose type is of a React `componentClass`.
 
 ### findAllInRenderedTree
 
@@ -138,3 +138,46 @@ ReactComponent findRenderedComponentWithType(ReactComponent tree, function compo
 ```
 
 Same as `scryRenderedComponentsWithType()` but expects there to be one result and returns that one result, or throws exception if there is any other number of matches besides one.
+
+
+## Shallow rendering
+
+Shallow rendering is an experimental feature that lets you render a component "one level deep" and assert facts about what its render method returns, without worrying about the behavior of child components, which are not instantiated or rendered. This does not require a DOM.
+
+```javascript
+ReactShallowRenderer createRenderer()
+```
+
+Call this in your tests to create a shallow renderer. You can think of this as a "place" to render the component you're testing, where it can respond to events and update itself.
+
+```javascript
+shallowRenderer.render(ReactElement element)
+```
+
+Similar to `React.render`.
+
+```javascript
+ReactComponent shallowRenderer.getRenderOutput()
+```
+
+After render has been called, returns shallowly rendered output. You can then begin to assert facts about the output. For example, if your component's render method returns:
+
+```javascript
+<div>
+  <span className="heading">Title</span>
+  <Subcomponent foo="bar" />
+</div>
+```
+
+Then you can assert:
+
+```javascript
+result = renderer.getRenderOutput();
+expect(result.type).toBe('div');
+expect(result.props.children).toEqual([
+  <span className="heading">Title</span>
+  <Subcomponent foo="bar" />
+]);
+```
+
+Shallow testing currently has some limitations, namely not supporting refs. We're releasing this feature early and would appreciate the React community's feedback on how it should evolve.

docs/docs/10.5-clone-with-props.md

@@ -1,21 +1,23 @@
 ---
 id: clone-with-props
-title: Cloning Components
+title: Cloning ReactElement
 permalink: clone-with-props.html
 prev: test-utils.html
-next: update.html
+next: create-fragment.html
 ---
 
-In rare situations a component may want to change the props of a component that it doesn't own (like changing the `className` of a component passed as `this.props.children`). Other times it may want to make multiple copies of a component passed to it. `cloneWithProps()` makes this possible.
+In rare situations a element may want to change the props of a element that it doesn't own (like changing the `className` of a element passed as `this.props.children`). Other times it may want to make multiple copies of a element passed to it. `cloneWithProps()` makes this possible.
 
-#### `ReactComponent React.addons.cloneWithProps(ReactComponent component, object? extraProps)`
+#### `ReactElement React.addons.cloneWithProps(ReactElement element, object? extraProps)`
 
-Do a shallow copy of `component` and merge any props provided by `extraProps`. The `className` and `style` props will be merged intelligently.
+Do a shallow copy of `element` and merge any props provided by `extraProps`. The `className` and `style` props will be merged intelligently.
 
 > Note:
 >
-> `cloneWithProps` does not transfer `key` to the cloned component. If you wish to preserve the key, add it to the `extraProps` object:
+> `cloneWithProps` does not transfer `key` to the cloned element. If you wish to preserve the key, add it to the `extraProps` object:
+>
 > ```js
-> var clonedComponent = cloneWithProps(originalComponent, { key : originalComponent.key });
+> var clonedElement = cloneWithProps(originalElement, { key : originalElement.key });
 > ```
+>
 > `ref` is similarly not preserved.

docs/docs/10.6-create-fragment.md

@@ -0,0 +1,73 @@
+---
+id: create-fragment
+title: Keyed Fragments
+permalink: create-fragment.html
+prev: clone-with-props.html
+next: update.html
+---
+
+In most cases, you can use the `key` prop to specify keys on the elements you're returning from `render`. However, this breaks down in one situation: if you have two sets of children that you need to reorder, there's no way to put a key on each set without adding a wrapper element.
+
+That is, if you have a component such as:
+
+```js
+var Swapper = React.createClass({
+  propTypes: {
+    // `leftChildren` and `rightChildren` can be a string, element, array, etc.
+    leftChildren: React.PropTypes.node,
+    rightChildren: React.PropTypes.node,
+
+    swapped: React.PropTypes.bool
+  }
+  render: function() {
+    var children;
+    if (this.props.swapped) {
+      children = [this.props.rightChildren, this.props.leftChildren];
+    } else {
+      children = [this.props.leftChildren, this.props.rightChildren];
+    }
+    return <div>{children}</div>;
+  }
+});
+```
+
+The children will unmount and remount as you change the `swapped` prop because there aren't any keys marked on the two sets of children.
+
+To solve this problem, you can use `React.addons.createFragment` to give keys to the sets of children.
+
+#### `ReactFragment React.addons.createFragment(object children)`
+
+Instead of creating arrays, we write:
+
+```js
+if (this.props.swapped) {
+  children = React.addons.createFragment({
+    right: this.props.rightChildren,
+    left: this.props.leftChildren
+  });
+} else {
+  children = React.addons.createFragment({
+    left: this.props.leftChildren,
+    right: this.props.rightChildren
+  });
+}
+```
+
+The keys of the passed object (that is, `left` and `right`) are used as keys for the entire set of children, and the order of the object's keys is used to determine the order of the rendered children. With this change, the two sets of children will be properly reordered in the DOM without unmounting.
+
+The return value of `createFragment` should be treated as an opaque object; you can use the `React.Children` helpers to loop through a fragment but should not access it directly. Note also that we're relying on the JavaScript engine preserving object enumeration order here, which is not guaranteed by the spec but is implemented by all major browsers and VMs for objects with non-numeric keys.
+
+> **Note:**
+>
+> In the future, `createFragment` may be replaced by an API such as
+>
+> ```js
+> return (
+>   <div>
+>     <x:frag key="right">{this.props.rightChildren}</x:frag>,
+>     <x:frag key="left">{this.props.leftChildren}</x:frag>
+>   </div>
+> );
+> ```
+>
+> allowing you to assign keys directly in JSX without adding wrapper elements.

docs/docs/10.7-update.md

@@ -2,7 +2,7 @@
 id: update
 title: Immutability Helpers
 permalink: update.html
-prev: clone-with-props.html
+prev: create-fragment.html
 next: pure-render-mixin.html
 ---
 
@@ -20,7 +20,7 @@ myData.x.y.z = 7;
 myData.a.b.push(9);
 ```
 
-you have no way of determining which data has changed since the previous copy is overriden. Instead, you need to create a new copy of `myData` and change only the parts of it that need to be changed. Then you can compare the old copy of `myData` with the new one in `shouldComponentUpdate()` using triple-equals:
+you have no way of determining which data has changed since the previous copy is overridden. Instead, you need to create a new copy of `myData` and change only the parts of it that need to be changed. Then you can compare the old copy of `myData` with the new one in `shouldComponentUpdate()` using triple-equals:
 
 ```js
 var newData = deepCopy(myData);
@@ -58,7 +58,7 @@ The `$`-prefixed keys are called *commands*. The data structure they are "mutati
 
   * `{$push: array}` `push()` all the items in `array` on the target.
   * `{$unshift: array}` `unshift()` all the items in `array` on the target.
-  * `{$splice: array of arrays}` for each item in `array()` call `splice()` on the target with the parameters provided by the item.
+  * `{$splice: array of arrays}` for each item in `arrays` call `splice()` on the target with the parameters provided by the item.
   * `{$set: any}` replace the target entirely.
   * `{$merge: object}` merge the keys of `object` with the target.
   * `{$apply: function}` passes in the current value to the function and updates it with the new returned value.

docs/docs/10.8-pure-render-mixin.md

@@ -11,7 +11,7 @@ If your React component's render function is "pure" (in other words, it renders
 Example:
 
 ```js
-var PureRenderMixin = require('react').addons.PureRenderMixin;
+var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
 React.createClass({
   mixins: [PureRenderMixin],
 
@@ -25,6 +25,6 @@ Under the hood, the mixin implements [shouldComponentUpdate](/react/docs/compone
 
 > Note:
 >
-> This only shallowly compares the objects. If these contain complex data structures, it may produce false-negatives for deeper differences. Only mix into components which have simple props and state, or use `forceUpdate()` when you know deep data structures have changed.
+> This only shallowly compares the objects. If these contain complex data structures, it may produce false-negatives for deeper differences. Only mix into components which have simple props and state, or use `forceUpdate()` when you know deep data structures have changed. Or, consider using [immutable objects](http://facebook.github.io/immutable-js/) to facilitate fast comparisons of nested data.
 >
 > Furthermore, `shouldComponentUpdate` skips updates for the whole component subtree. Make sure all the children components are also "pure".

docs/docs/10.9-perf.md

@@ -3,6 +3,7 @@ id: perf
 title: Performance Tools
 permalink: perf.html
 prev: pure-render-mixin.html
+next: advanced-performance.html
 ---
 
 React is usually quite fast out of the box. However, in situations where you need to squeeze every ounce of performance out of your app, it provides a [shouldComponentUpdate](/react/docs/component-specs.html#updating-shouldcomponentupdate) hook where you can add optimization hints to React's diff algorithm.

docs/docs/11-advanced-performance.md

@@ -0,0 +1,207 @@
+---
+id: advanced-performance
+title: Advanced Performance
+permalink: advanced-performance.html
+prev: perf.html
+---
+
+One of the first questions people ask when considering React for a project is whether their application will be as fast and responsive as an equivalent non-React version. The idea of re-rendering an entire subtree of components in response to every state change makes people wonder whether this process negatively impacts performance. React uses several clever techniques to minimize the number of costly DOM operations required to update the UI.
+
+## Avoiding reconciling the DOM
+
+React makes use of a *virtual DOM*, which is a descriptor of a DOM subtree rendered in the browser. This parallel representation allows React to avoid creating DOM nodes and accessing existing ones, which is slower than operations on JavaScript objects. When a component's props or state change, React decides whether an actual DOM update is necessary by constructing a new virtual DOM and comparing it to the old one. Only in the case they are not equal, will React [reconcile](http://facebook.github.io/react/docs/reconciliation.html) the DOM, applying as few mutations as possible.
+
+On top of this, React provides a component lifecycle function, `shouldComponentUpdate`, which is triggered before the re-rendering process starts, giving the developer the ability to short circuit this process. The default implementation of this function returns `true`, leaving React to perform the update:
+
+```javascript
+shouldComponentUpdate: function(nextProps, nextState) {
+  return true;
+}
+```
+
+Keep in mind that React will invoke this function pretty often, so the implementation has to be fast.
+
+Say you have a messaging application with several chat threads. Suppose only one of the threads has changed. If we implement `shouldComponentUpdate` on the `ChatThread` component, React can skip the rendering step for the other threads:
+
+```javascript
+shouldComponentUpdate: function(nextProps, nextState) {
+  // TODO: return whether or not current chat thread is
+  // different to former one.
+}
+```
+
+So, in summary, React avoids carrying out expensive DOM operations required to reconcile subtrees of the DOM by allowing the user to short circuit the process using `shouldComponentUpdate`, and, for those which should update, by comparing virtual DOMs.
+
+## shouldComponentUpdate in action
+
+Here's a subtree of components. For each one is indicated what `shouldComponentUpdate` returned and whether or not the virtual DOMs were equivalent. Finally, the circle's color indicates whether the component had to be reconciled or not.
+
+<figure><img src="/react/img/docs/should-component-update.png" /></figure>
+
+In the example above, since `shouldComponentUpdate` returned `false` for the subtree rooted at C2, React had no need to generate the new virtual DOM, and therefore, it neither needed to reconcile the DOM. Note that React didn't even had to invoke `shouldComponentUpdate` on C4 and C5.
+
+For C1 and C3 `shouldComponentUpdate` returned `true`, so React had to go down to the leaves and check them. For C6 it returned `true`; since the virtual DOMs weren't equivalent it had to reconcile the DOM.
+The last interesting case is C8. For this node React had to compute the virtual DOM, but since it was equal to the old one, it didn't have to reconcile it's DOM.
+
+Note that React only had to do DOM mutations for C6, which was inevitable. For C8 it bailed out by comparing the virtual DOMs, and for C2's subtree and C7, it didn't even have to compute the virtual DOM as we bailed out on `shouldComponentUpdate`.
+
+So, how should we implement `shouldComponentUpdate`? Say that you have a component that just renders a string value:
+
+```javascript
+React.createClass({
+  propsTypes: {
+    value: React.PropTypes.string.isRequired
+  },
+
+  render: function() {
+    return <div>this.props.value</div>;
+  }
+});
+```
+
+We could easily implement `shouldComponentUpdate` as follow:
+
+```javascript
+shouldComponentUpdate: function(nextProps, nextState) {
+  return this.props.value !== nextProps.value;
+}
+```
+
+So far so good, dealing with such simple props/state structures is easy. We could even generalize an implementation based on shallow equality and mix it into components. In fact, React already provides such implementation: [PureRenderMixin](http://facebook.github.io/react/docs/pure-render-mixin.html).
+
+But what if your components' props or state are mutable data structures?. Say the prop the component receives, instead of being a string like `'bar'`, is a Javascript object that contains a string such as, `{ foo: 'bar' }`:
+
+```javascript
+React.createClass({
+  propsTypes: {
+    value: React.PropTypes.object.isRequired
+  },
+
+  render: function() {
+    return <div>this.props.value.foo</div>;
+  }
+});
+```
+
+The implementation of `shouldComponentUpdate` we had before wouldn't always work as expected:
+
+```javascript
+// assume this.props.value is { foo: 'bar' }
+// assume nextProps.value is { foo: 'bar' },
+// but this reference is different to this.props.value
+this.props.value !== nextProps.value; // true
+```
+
+The problem is `shouldComponentUpdate` will return `true` when the prop actually didn't change. To fix this we could come up with this alternative implementation:
+
+```javascript
+shouldComponentUpdate: function(nextProps, nextState) {
+  return this.props.value.foo !== nextProps.value.foo;
+}
+```
+
+Basically, we ended up doing a deep comparison to make sure we properly track changes. This approach is pretty expensive in terms of performance and it doesn't scale as we would have to write different deep equality code for each model. On top of that, it might not even work if we don't carefully manage object references. Say this component is used by a parent:
+
+```javascript
+React.createClass({
+  getInitialState: function() {
+    return { value: { foo: 'bar' } };
+  },
+
+  onClick: function() {
+    var value = this.state.value;
+    value.foo += 'bar'; // ANTI-PATTERN!
+    this.setState({ value: value });
+  },
+
+  render: function() {
+    return (
+      <div>
+        <InnerComponent value={this.state.value} />
+        <a onClick={this.onClick}>Click me</a>
+      </div>
+    );
+  }
+});
+```
+
+The first time the inner component gets rendered it will have `{ foo: 'bar' }` as the value prop. If the user clicks on the anchor, the parent component's state will get updated to `{ value: { foo: 'barbar' } }`, triggering the re-rendering process of the inner component, which will receive `{ foo: 'barbar' }` as the new value for the prop.
+
+The problem is that since the parent and inner components share a reference to the same object, when the object gets mutated on line 2 of the `onClick` function, the prop the inner component had will change. So, when the re-rendering process starts, and `shouldComponentUpdate` gets invoked, `this.props.value.foo` will be equal to `nextProps.value.foo`, because in fact, `this.props.value` references the same object as `nextProps.value`.
+
+Consequently, since we'll miss the change on the prop and short circuit the re-rendering process, the UI won't get updated from `'bar'` to `'barbar'`.
+
+## Immutable-js to the rescue
+
+[Immutable-js](https://github.com/facebook/immutable-js) is a Javascript collections library  written by Lee Byron, which Facebook recently open-sourced. It provides *immutable persistent* collections via *structural sharing*. Lets see what these properties mean:
+
+* *Immutable*: once created, a collection cannot be altered at another point in time.
+* *Persistent*: new collections can be created from a previous collection and a mutation such as set. The original collection is still valid after the new collection is created.
+* *Structural Sharing*: new collections are created using as much of the same structure as the original collection as possible, reducing copying to a minimum to achieve space efficiency and acceptable performance. If the new collection is equal to the original, the original is often returned.
+
+Immutability makes tracking changes cheap; a change will always result in a new object so we only need to check if the reference to the object has changed. For example, in this regular Javascript code:
+
+```javascript
+var x = { foo: "bar" };
+var y = x;
+y.foo = "baz";
+x === y; // true
+```
+
+Although `y` was edited, since it's a reference to the same object as `x`, this comparison returns `true`. However, this code could be written using immutable-js as follows:
+
+```javascript
+var SomeRecord = Immutable.Record({ foo: null });
+var x = new SomeRecord({ foo: 'bar'  });
+var y = x.set('foo', 'baz');
+x === y; // false
+```
+
+In this case, since a new reference is returned when mutating `x`, we can safely assume that `x` has changed.
+
+Another possible way to track changes could be doing dirty checking by having a flag set by setters. A problem with this approach is that it forces you to use setters and, either write a lot of additional code, or somehow instrument your classes. Alternatively, you could deep copy the object just before the mutations and deep compare to determine whether there was a change or not. A problem with this approach is both deepCopy and deepCompare are expensive operations.
+
+So, Immutable data structures provides you a cheap and less verbose way to track changes on objects, which is all we need to implement `shouldComponentUpdate`. Therefore, if we model props and state attributes using the abstractions provided by immutable-js we'll be able to use `PureRenderMixin` and get a nice boost in perf.
+
+## Immutable-js and Flux
+
+If you're using [Flux](http://facebook.github.io/flux/), you should start writing your stores using immutable-js. Take a look at the [full API](http://facebook.github.io/immutable-js/docs/#/).
+
+Let's see one possible way to model the thread example using Immutable data structures. First, we need to define a `Record` for each of the entities we're trying to model. Records are just immutable containers that hold values for a specific set of fields:
+
+```javascript
+var User = Immutable.Record({
+  id: undefined,
+  name: undefined,
+  email: undefined
+});
+
+var Message = Immutable.Record({
+  timestamp: new Date(),
+  sender: undefined,
+  text: ''
+});
+```
+
+The object the `Record` function receives defines the fields the object has and their default values.
+
+The messages *store* could keep track of the users and messages using two lists:
+
+```javascript
+this.users = Immutable.List();
+this.messages = Immutable.List();
+```
+
+It should be pretty straightforward to implement functions to process each *payload* type. For instance, when the store sees a payload representing a new message,  we can just create a new record and append it to the messages list:
+
+```javascript
+this.messages = this.messages.push(new Message({
+  timestamp: payload.timestamp,
+  sender: payload.sender,
+  text: payload.text
+});
+```
+
+Note that since the data structures are immutable, we need to assign the result of the push function to this.messages.
+
+On the React side, if we also use immutable-js data structures to hold the components' state, we could mix `PureRenderMixin` into all our components and short circuit the re-rendering process.

docs/docs/complementary-tools.zh-CN.md

@@ -0,0 +1,9 @@
+---
+id: complementary-tools-zh-CN
+title: 补充工具
+permalink: complementary-tools-zh-CN.html
+prev: videos-zh-CN.html
+next: examples-zh-CN.html
+---
+
+本页被移到了 [GitHub wiki](https://github.com/facebook/react/wiki/Complementary-Tools)。

docs/docs/conferences.md

@@ -0,0 +1,19 @@
+---
+id: conferences
+title: Conferences
+permalink: conferences.html
+prev: thinking-in-react.html
+next: videos.html
+---
+
+### React.js Conf 2015
+January 28 & 29
+
+[Website](http://conf.reactjs.com/) - [Schedule](http://conf.reactjs.com/schedule.html) - [Videos](https://www.youtube.com/playlist?list=PLb0IAmt7-GS1cbw4qonlQztYV1TAW0sCr)
+
+<iframe width="650" height="315" src="//www.youtube.com/embed/KVZ-P-ZI6W4?list=PLb0IAmt7-GS1cbw4qonlQztYV1TAW0sCr" frameborder="0" allowfullscreen></iframe>
+
+### ReactEurope 2015
+July 2 & 3
+
+[Website](http://www.react-europe.org/) - [Schedule](http://www.react-europe.org/#schedule)

docs/docs/examples.zh-CN.md

@@ -0,0 +1,8 @@
+---
+id: examples-zh-CN
+title: 示例
+permalink: examples-zh-CN.html
+prev: complementary-tools-zh-CN.html
+---
+
+本页被移到了 [GitHub wiki](https://github.com/facebook/react/wiki/Examples)。

docs/docs/flux-overview.zh-CN.md

@@ -0,0 +1,7 @@
+---
+id: flux-overview-zh-CN
+title: Flux 应用架构
+permalink: flux-overview-zh-CN.html
+---
+
+本页被移到了 Flux 网站。[点击访问](http://facebook.github.io/flux/docs/overview.html)。

docs/docs/flux-todo-list.zh-CN.md

@@ -0,0 +1,7 @@
+---
+id: flux-todo-list-zh-CN
+title: Flux TodoMVC 教程
+permalink: flux-todo-list-zh-CN.html
+---
+
+本页被移到了 Flux 网站。[点击访问](http://facebook.github.io/flux/docs/todo-list.html)。

docs/docs/getting-started.md

@@ -9,8 +9,8 @@ redirect_from: "docs/index.html"
 
 The easiest way to start hacking on React is using the following JSFiddle Hello World examples:
 
- * **[React JSFiddle](http://jsfiddle.net/vjeux/kb3gN/)**
- * [React JSFiddle without JSX](http://jsfiddle.net/vjeux/VkebS/)
+ * **[React JSFiddle](http://jsfiddle.net/reactjs/69z2wepo/)**
+ * [React JSFiddle without JSX](http://jsfiddle.net/reactjs/5vjqabv3/)
 
 ## Starter Kit
 
@@ -110,4 +110,8 @@ If you want to use React with [browserify](http://browserify.org/), [webpack](ht
 
 ## 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!
+Check out [the tutorial](/react/docs/tutorial.html) and the other examples in the starter kit's `examples` directory to learn more. 
+
+We also have a wiki where the community contributes with [workflows, UI-components, routing, data management etc.](https://github.com/facebook/react/wiki/Complementary-Tools)
+
+Good luck, and welcome!

docs/docs/getting-started.zh-CN.md

@@ -1,19 +1,21 @@
 ---
 id: getting-started-zh-CN
 title: 入门教程
-next: tutorial.html
+permalink: getting-started-zh-CN.html
+next: tutorial-zh-CN.html
+redirect_from: "docs/index-zh-CN.html"
 ---
 
 ## JSFiddle
 
-开始 Hack React 的最简单的方法是用下面 JSFiddle 的Hello Worlds
+开始 Hack React 的最简单的方法是用下面 JSFiddle 的Hello Worlds：
 
- * **[React JSFiddle](http://jsfiddle.net/vjeux/kb3gN/)**
- * [React JSFiddle without JSX](http://jsfiddle.net/vjeux/VkebS/)
+ * **[React JSFiddle](http://jsfiddle.net/reactjs/69z2wepo/)**
+ * [React JSFiddle without JSX](http://jsfiddle.net/reactjs/5vjqabv3/)
 
 ## 入门教程包 (Starter Kit)
 
-开始先下载入门教程包
+开始先下载入门教程包。
 
 <div class="buttons-unit downloads">
   <a href="/react/downloads/react-{{site.react_version}}.zip" class="button">
@@ -21,7 +23,7 @@ next: tutorial.html
   </a>
 </div>
 
-在入门教程包的根目录，创建一个含有下面代码的 `helloworld.html`
+在入门教程包的根目录，创建一个含有下面代码的 `helloworld.html`。
 
 ```html
 <!DOCTYPE html>
@@ -93,7 +95,7 @@ React.render(
   <head>
     <title>Hello React!</title>
     <script src="build/react.js"></script>
-    <!-- No need for JSXTransformer! -->
+    <!-- 不需要 JSXTransformer！ -->
   </head>
   <body>
     <div id="example"></div>
@@ -102,11 +104,16 @@ React.render(
 </html>
 ```
 
+
 ## 想用 CommonJS？
 
-如果你想在一个模块系统里使用 React，[fork 我们的代码](http://github.com/facebook/react)， `npm install` 然后运行 `grunt`。一个漂亮的 CommonJS 模块集将会被生成。我们的 `jsx` 转换工具可以很轻松的集成到大部分打包系统里（不仅仅是 CommonJS）。
+如果你想在 [browserify](http://browserify.org/)，[webpack](http://webpack.github.io/) 或者或其它兼容CommonJS的模块系统里使用 React，只要使用 [`react` npm 包](https://www.npmjs.org/package/react) 即可。而且，`jsx` 转换工具可以很轻松的地集成到大部分打包系统里（不仅仅是 CommonJS）。
+
 
 ## 下一步
 
-去看看[入门教程](/react/docs/tutorial.html)，然后学习其他在 `/examples` 目录里的示例代码。祝你好运，欢迎来到 React 的世界。
+去看看[入门教程](/react/docs/tutorial.html) 和入门教程包 `examples` 目录下的其它例子学习更多。
 
+我们还有一个社区开发者共建的 Wiki：[workflows, UI-components, routing, data management etc.](https://github.com/facebook/react/wiki/Complementary-Tools)
+
+恭喜你，欢迎来到 React 的世界。

docs/docs/ref-01-top-level-api.md

@@ -8,20 +8,69 @@ redirect_from: "/docs/reference.html"
 
 ## React
 
-`React` is the entry point to the React framework. If you're using one of the prebuilt packages it's available as a global; if you're using CommonJS modules you can `require()` it.
+`React` is the entry point to the React library. If you're using one of the prebuilt packages it's available as a global; if you're using CommonJS modules you can `require()` it.
+
+
+### React.Component
+
+```javascript
+class Component
+```
+
+This is the base class for React Components when they're defined using ES6 classes. See [Reusable Components](/react/docs/reusable-components.html#es6-classes) for how to use ES6 classes with React. For what methods are actually provided by the base class, see the [Component API](/react/docs/component-api.html).
 
 
 ### React.createClass
 
 ```javascript
-function createClass(object specification)
+ReactClass createClass(object specification)
 ```
 
-Create a component given a specification. A component implements a `render` method which returns **one single** child. That child may have an arbitrarily deep child structure. One thing that makes components different than standard prototypal classes is that you don't need to call new on them. They are convenience wrappers that construct backing instances (via new) for you.
+Create a component class, given a specification. A component implements a `render` method which returns **one single** child. That child may have an arbitrarily deep child structure. One thing that makes components different than standard prototypal classes is that you don't need to call new on them. They are convenience wrappers that construct backing instances (via new) for you.
 
 For more information about the specification object, see [Component Specs and Lifecycle](/react/docs/component-specs.html).
 
 
+### React.createElement
+
+```javascript
+ReactElement createElement(
+  string/ReactClass type,
+  [object props],
+  [children ...]
+)
+```
+
+Create and return a new `ReactElement` of the given type. The type argument can be either an
+html tag name string (eg. 'div', 'span', etc), or a `ReactClass` (created via `React.createClass`).
+
+
+### React.cloneElement
+
+```
+ReactElement cloneElement(
+  ReactElement element,
+  [object props],
+  [children ...]
+)
+```
+
+Clone and return a new `ReactElement` using `element` as the starting point. The resulting element will have the original element's props with the new props merged in shallowly. New children will replace existing children. Unlike `React.addons.cloneWithProps`, `key` and `ref` from the original element will be preserved. There is no special behavior for merging any props (unlike `cloneWithProps`). See the [v0.13 RC2 blog post](/react/blog/2015/03/03/react-v0.13-rc2.html) for additional details.
+
+
+### React.createFactory
+
+```javascript
+factoryFunction createFactory(
+  string/ReactClass type
+)
+```
+
+Return a function that produces ReactElements of a given type. Like `React.createElement`,
+the type argument can be either an html tag name string (eg. 'div', 'span', etc), or a
+`ReactClass`.
+
+
 ### React.render
 
 ```javascript
@@ -57,10 +106,10 @@ Remove a mounted React component from the DOM and clean up its event handlers an
 ### React.renderToString
 
 ```javascript
-string renderToString(ReactComponent component)
+string renderToString(ReactElement element)
 ```
 
-Render a component to its initial HTML. This should only be used on the server. React will return an HTML string. You can use this method to generate HTML on the server and send the markup down on the initial request for faster page loads and to allow search engines to crawl your pages for SEO purposes.
+Render a ReactElement to its initial HTML. This should only be used on the server. React will return an HTML string. You can use this method to generate HTML on the server and send the markup down on the initial request for faster page loads and to allow search engines to crawl your pages for SEO purposes.
 
 If you call `React.render()` on a node that already has this server-rendered markup, React will preserve it and only attach event handlers, allowing you to have a very performant first-load experience.
 
@@ -68,7 +117,7 @@ If you call `React.render()` on a node that already has this server-rendered mar
 ### React.renderToStaticMarkup
 
 ```javascript
-string renderToStaticMarkup(ReactComponent component)
+string renderToStaticMarkup(ReactElement element)
 ```
 
 Similar to `renderToString`, except this doesn't create extra DOM attributes such as `data-react-id`, that React uses internally. This is useful if you want to use React as a simple static page generator, as stripping away the extra attributes can save lots of bytes.
@@ -83,6 +132,14 @@ boolean isValidElement(* object)
 Verifies the object is a ReactElement.
 
 
+### React.findDOMNode
+
+```javascript
+DOMElement findDOMNode(ReactComponent component)
+```
+If this component has been mounted into the DOM, this returns the corresponding native browser DOM element. This method is useful for reading values out of the DOM, such as form field values and performing DOM measurements. When `render` returns `null` or `false`, `findDOMNode` returns `null`.
+
+
 ### React.DOM
 
 `React.DOM` provides convenience wrappers around `React.createElement` for DOM components. These should only be used when not using JSX. For example, `React.DOM.div(null, 'Hello World!')`

docs/docs/ref-02-component-api.md

@@ -6,7 +6,7 @@ prev: top-level-api.html
 next: component-specs.html
 ---
 
-## ReactComponent
+## React.Component
 
 Instances of a React Component are created internally in React when rendering. These instances are reused in subsequent renders, and can be accessed in your component methods as `this`. The only way to get a handle to a React Component instance outside of React is by storing the return value of `React.render`. Inside other Components, you may use [refs](/react/docs/more-about-refs.html) to achieve the same result.
 
@@ -14,10 +14,27 @@ Instances of a React Component are created internally in React when rendering. T
 ### setState
 
 ```javascript
-setState(object nextState[, function callback])
+setState(function|object nextState[, function callback])
+```
+Merges nextState with the current state. This is the primary method you use to trigger UI updates from event handlers and server request callbacks.
+
+The first argument can be an object (containing zero or more keys to update) or a function (of state and props) that returns an object containing keys to update.
+
+Here is the simple object usage...
+
+```javascript
+setState({mykey: 'my new value'});
 ```
 
-Merges nextState with the current state. This is the primary method you use to trigger UI updates from event handlers and server request callbacks.  In addition, you can supply an optional callback function that is executed once `setState` is completed and the component is re-rendered.
+It's also possible to pass a function with the signature `function(state, props)`. This can be useful in some cases when you want to enqueue an atomic update that consults the previous value of state+props before setting any values.  For instance, suppose we wanted to increment a value in state: 
+
+```javascript
+setState(function(previousState, currentProps) {
+  return {myInteger: previousState.myInteger + 1};
+});`
+```
+
+The second (optional) parameter is a callback function that will be executed once `setState` is completed and the component is re-rendered.
 
 > Notes:
 >
@@ -38,8 +55,12 @@ replaceState(object nextState[, function callback])
 
 Like `setState()` but deletes any pre-existing state keys that are not in nextState.
 
+> Note:
+>
+> This method is not available on ES6 `class` components that extend `React.Component`. It may be removed entirely in a future version of React.
 
-### forceUpdate()
+
+### forceUpdate
 
 ```javascript
 forceUpdate([function callback])
@@ -47,7 +68,7 @@ forceUpdate([function callback])
 
 If your `render()` method reads from something other than `this.props` or `this.state`, you'll need to tell React when it needs to re-run `render()` by calling `forceUpdate()`. You'll also need to call `forceUpdate()` if you mutate `this.state` directly.
 
-Calling `forceUpdate()` will cause `render()` to be called on the component and its children, but React will still only update the DOM if the markup changes.
+Calling `forceUpdate()` will cause `render()` to be called on the component, skipping `shouldComponentUpdate()`. This will trigger the normal lifecycle methods for child components, including the `shouldComponentUpdate()` method of each child. React will still only update the DOM if the markup changes.
 
 Normally you should try to avoid all uses of `forceUpdate()` and only read from `this.props` and `this.state` in `render()`. This makes your application much simpler and more efficient.
 
@@ -60,8 +81,14 @@ DOMElement getDOMNode()
 
 If this component has been mounted into the DOM, this returns the corresponding native browser DOM element. This method is useful for reading values out of the DOM, such as form field values and performing DOM measurements. When `render` returns `null` or `false`, `this.getDOMNode()` returns `null`.
 
+> Note:
+>
+> getDOMNode is deprecated and has been replaced with [React.findDOMNode()](/react/docs/top-level-api.html#react.finddomnode).
+>
+> This method is not available on ES6 `class` components that extend `React.Component`. It may be removed entirely in a future version of React.
 
-### isMounted()
+
+### isMounted
 
 ```javascript
 bool isMounted()
@@ -69,6 +96,10 @@ bool isMounted()
 
 `isMounted()` returns true if the component is rendered into the DOM, false otherwise. You can use this method to guard asynchronous calls to `setState()` or `forceUpdate()`.
 
+> Note:
+>
+> This method is not available on ES6 `class` components that extend `React.Component`. It may be removed entirely in a future version of React.
+
 
 ### setProps
 
@@ -85,7 +116,8 @@ Though calling `React.render()` again on the same node is the preferred way to u
 > When possible, the declarative approach of calling `React.render()` again is preferred; it tends to make updates easier to reason about. (There's no significant performance difference between the two approaches.)
 >
 > This method can only be called on a root-level component. That is, it's only available on the component passed directly to `React.render()` and none of its children. If you're inclined to use `setProps()` on a child component, instead take advantage of reactive updates and pass the new prop to the child component when it's created in `render()`.
-
+>
+> This method is not available on ES6 `class` components that extend `React.Component`. It may be removed entirely in a future version of React.
 
 ### replaceProps
 
@@ -94,3 +126,7 @@ replaceProps(object nextProps[, function callback])
 ```
 
 Like `setProps()` but deletes any pre-existing props instead of merging the two objects.
+
+> Note:
+>
+> This method is not available on ES6 `class` components that extend `React.Component`. It may be removed entirely in a future version of React.

docs/docs/ref-03-component-specs.md

@@ -21,7 +21,7 @@ The `render()` method is required.
 
 When called, it should examine `this.props` and `this.state` and return a single child component. This child component can be either a virtual representation of a native DOM component (such as `<div />` or `React.DOM.div()`) or another composite component that you've defined yourself.
 
-You can also return `null` or `false` to indicate that you don't want anything rendered. Behind the scenes, React renders a `<noscript>` tag to work with our current diffing algorithm. When returning `null` or `false`, `this.getDOMNode()` will return `null`.
+You can also return `null` or `false` to indicate that you don't want anything rendered. Behind the scenes, React renders a `<noscript>` tag to work with our current diffing algorithm. When returning `null` or `false`, `React.findDOMNode(this)` will return `null`.
 
 The `render()` function should be *pure*, meaning that it does not modify component state, it returns the same result each time it's invoked, and it does not read from or write to the DOM or otherwise interact with the browser (e.g., by using `setTimeout`). If you need to interact with the browser, perform your work in `componentDidMount()` or the other lifecycle methods instead. Keeping `render()` pure makes server rendering more practical and makes components easier to think about.
 
@@ -95,7 +95,7 @@ Methods defined within this block are _static_, meaning that you can run them be
 string displayName
 ```
 
-The `displayName` string is used in debugging messages. JSX sets this value automatically; see [JSX in Depth](/react/docs/jsx-in-depth.html#react-composite-components).
+The `displayName` string is used in debugging messages. JSX sets this value automatically; see [JSX in Depth](/react/docs/jsx-in-depth.html#the-transform).
 
 
 ## Lifecycle Methods
@@ -118,14 +118,10 @@ Invoked once, both on the client and server, immediately before the initial rend
 componentDidMount()
 ```
 
-Invoked once, only on the client (not on the server), immediately after the initial rendering occurs. At this point in the lifecycle, the component has a DOM representation which you can access via `this.getDOMNode()`.
+Invoked once, only on the client (not on the server), immediately after the initial rendering occurs. At this point in the lifecycle, the component has a DOM representation which you can access via `React.findDOMNode(this)`.
 
 If you want to integrate with other JavaScript frameworks, set timers using `setTimeout` or `setInterval`, or send AJAX requests, perform those operations in this method.
 
-> Note:
->
-> Prior to v0.9, the DOM node was passed in as the last argument. If you were using this, you can still access the DOM node by calling `this.getDOMNode()`.
-
 
 ### Updating: componentWillReceiveProps
 
@@ -195,14 +191,10 @@ Use this as an opportunity to perform preparation before an update occurs.
 componentDidUpdate(object prevProps, object prevState)
 ```
 
-Invoked immediately after updating occurs. This method is not called for the initial render.
+Invoked immediately after the component's updates are flushed to the DOM. This method is not called for the initial render.
 
 Use this as an opportunity to operate on the DOM when the component has been updated.
 
-> Note:
->
-> Prior to v0.9, the DOM node was passed in as the last argument. If you were using this, you can still access the DOM node by calling `this.getDOMNode()`.
-
 
 ### Unmounting: componentWillUnmount
 

docs/docs/ref-04-tags-and-attributes.md

@@ -53,22 +53,23 @@ These standard attributes are supported:
 
 ```
 accept acceptCharset accessKey action allowFullScreen allowTransparency alt
-async autoComplete autoPlay cellPadding cellSpacing charSet checked classID
+async autoComplete autoFocus autoPlay cellPadding cellSpacing charSet checked classID
 className cols colSpan content contentEditable contextMenu controls coords
 crossOrigin data dateTime defer dir disabled download draggable encType form
-formNoValidate frameBorder height hidden href hrefLang htmlFor httpEquiv icon
-id label lang list loop manifest max maxLength media mediaGroup method min
-multiple muted name noValidate open pattern placeholder poster preload
-radioGroup readOnly rel required role rows rowSpan sandbox scope scrolling
-seamless selected shape size sizes span spellCheck src srcDoc srcSet start step
-style tabIndex target title type useMap value width wmode
+formAction formEncType formMethod formNoValidate formTarget frameBorder height
+hidden href hrefLang htmlFor httpEquiv icon id label lang list loop manifest
+marginHeight marginWidth max maxLength media mediaGroup method min multiple
+muted name noValidate open pattern placeholder poster preload radioGroup
+readOnly rel required role rows rowSpan sandbox scope scrolling seamless
+selected shape size sizes span spellCheck src srcDoc srcSet start step style
+tabIndex target title type useMap value width wmode
 ```
 
 In addition, the following non-standard attributes are supported:
 
 - `autoCapitalize autoCorrect` for Mobile Safari.
 - `property` for [Open Graph](http://ogp.me/) meta tags.
-- `itemProp itemScope itemType` for [HTML5 microdata](http://schema.org/docs/gs.html).
+- `itemProp itemScope itemType itemRef itemId` for [HTML5 microdata](http://schema.org/docs/gs.html).
 
 There is also the React-specific attribute `dangerouslySetInnerHTML` ([more here](/react/docs/special-non-dom-attributes.html)), used for directly inserting HTML strings into a component.
 

docs/docs/ref-05-events.md

@@ -17,14 +17,14 @@ boolean bubbles
 boolean cancelable
 DOMEventTarget currentTarget
 boolean defaultPrevented
-Number eventPhase
+number eventPhase
 boolean isTrusted
 DOMEvent nativeEvent
 void preventDefault()
 void stopPropagation()
 DOMEventTarget target
-Date timeStamp
-String type
+number timeStamp
+string type
 ```
 
 > Note:
@@ -35,7 +35,9 @@ String type
 ## Supported Events
 
 React normalizes events so that they have consistent properties across
-different browsers.
+different browsers. 
+
+The event handlers below are triggered by an event in the bubbling phase. To register an event handler for the capture phase, append `Capture` to the event name; for example, instead of using `onClick`, you would use `onClickCapture` to handle the click event in the capture phase.
 
 
 ### Clipboard Events
@@ -110,11 +112,13 @@ For more information about the onChange event, see [Forms](/react/docs/forms.htm
 Event names:
 
 ```
-onClick onDoubleClick onDrag onDragEnd onDragEnter onDragExit onDragLeave
-onDragOver onDragStart onDrop onMouseDown onMouseEnter onMouseLeave
+onClick onContextMenu onDoubleClick onDrag onDragEnd onDragEnter onDragExit
+onDragLeave onDragOver onDragStart onDrop onMouseDown onMouseEnter onMouseLeave
 onMouseMove onMouseOut onMouseOver onMouseUp
 ```
 
+The `onMouseEnter` and `onMouseLeave` events propagate from the component being left to the one being entered instead of ordinary bubbling and do not have a capture phase.
+
 Properties:
 
 ```javascript

docs/docs/ref-05-events.zh-CN.md

@@ -0,0 +1,194 @@
+---
+id: events-zh-CN
+title: 事件系统
+permalink: events-zh-CN.html
+prev: tags-and-attributes-zh-CN.html
+next: dom-differences-zh-CN.html
+---
+
+## 合成事件
+
+事件处理程序通过 `合成事件`（`SyntheticEvent`）的实例传递，`SyntheticEvent` 是浏览器原生事件跨浏览器的封装。`SyntheticEvent` 和浏览器原生事件一样有 `stopPropagation()`、`preventDefault()` 接口，而且这些接口夸浏览器兼容。
+
+如果出于某些原因想使用浏览器原生事件，可以使用 `nativeEvent` 属性获取。每个和成事件（`SyntheticEvent`）对象都有以下属性：
+
+```javascript
+boolean bubbles
+boolean cancelable
+DOMEventTarget currentTarget
+boolean defaultPrevented
+Number eventPhase
+boolean isTrusted
+DOMEvent nativeEvent
+void preventDefault()
+void stopPropagation()
+DOMEventTarget target
+Date timeStamp
+String type
+```
+
+> 注意：
+>
+> React v0.12 中，事件处理程序返回 `false` 不再停止事件传播，取而代之，应该根据需要手动触发 `e.stopPropagation()` 或 `e.preventDefault()`。
+
+
+## 支持的事件
+
+React 将事件统一化，使事件在不同浏览器上有一致的属性。
+
+下面的事件处理程序在事件冒泡阶段被触发。如果要注册事件捕获处理程序，应该使用 `Capture` 事件，例如使用 `onClickCapture` 处理点击事件的捕获阶段，而不是 `onClick`。
+
+
+### 剪贴板事件
+
+事件名称：
+
+```
+onCopy onCut onPaste
+```
+
+属性：
+
+```javascript
+DOMDataTransfer clipboardData
+```
+
+
+### 键盘事件 
+
+事件名称：
+
+```
+onKeyDown onKeyPress onKeyUp
+```
+
+属性：
+
+```javascript
+boolean altKey
+Number charCode
+boolean ctrlKey
+function getModifierState(key)
+String key
+Number keyCode
+String locale
+Number location
+boolean metaKey
+boolean repeat
+boolean shiftKey
+Number which
+```
+
+
+### 焦点事件
+
+事件名称
+
+```
+onFocus onBlur
+```
+
+属性：
+
+```javascript
+DOMEventTarget relatedTarget
+```
+
+
+### 表单事件
+
+事件名称：
+
+```
+onChange onInput onSubmit
+```
+
+关于 `onChange` 事件的更多信息，参见 [表单组件](/react/docs/forms-zh-CN.html)。
+
+
+### 鼠标事件
+
+事件名称：
+
+```
+onClick onContextMenu onDoubleClick onDrag onDragEnd onDragEnter onDragExit
+onDragLeave onDragOver onDragStart onDrop onMouseDown onMouseEnter onMouseLeave
+onMouseMove onMouseOut onMouseOver onMouseUp
+```
+
+属性：
+
+```javascript
+boolean altKey
+Number button
+Number buttons
+Number clientX
+Number clientY
+boolean ctrlKey
+function getModifierState(key)
+boolean metaKey
+Number pageX
+Number pageY
+DOMEventTarget relatedTarget
+Number screenX
+Number screenY
+boolean shiftKey
+```
+
+
+### 触控事件
+
+在渲染任意组件之前调用 `React.initializeTouchEvents(true)`，以启用触控事件。
+
+事件名称：
+
+```
+onTouchCancel onTouchEnd onTouchMove onTouchStart
+```
+
+属性：
+
+```javascript
+boolean altKey
+DOMTouchList changedTouches
+boolean ctrlKey
+function getModifierState(key)
+boolean metaKey
+boolean shiftKey
+DOMTouchList targetTouches
+DOMTouchList touches
+```
+
+
+### 用户界面事件
+
+事件名称：
+
+```
+onScroll
+```
+
+属性：
+
+```javascript
+Number detail
+DOMAbstractView view
+```
+
+
+### 滚轮事件
+
+事件名称：
+
+```
+onWheel
+```
+
+属性：
+
+```javascript
+Number deltaMode
+Number deltaX
+Number deltaY
+Number deltaZ
+```

docs/docs/ref-07-special-non-dom-attributes.md

@@ -10,4 +10,4 @@ Beside [DOM differences](/react/docs/dom-differences.html), React offers some at
 
 - `key`: an optional, unique identifier. When your component shuffles around during `render` passes, it might be destroyed and recreated due to the diff algorithm. Assigning it a key that persists makes sure the component stays. See more [here](/react/docs/multiple-components.html#dynamic-children).
 - `ref`: see [here](/react/docs/more-about-refs.html).
-- `dangerouslySetInnerHTML`: takes an object with the key `__html` and a DOM string as value. This is mainly for cooperating with DOM string manipulation libraries. Refer to the last example on the front page.
+- `dangerouslySetInnerHTML`: Provides the ability to insert raw HTML, mainly for cooperating with DOM string manipulation libraries. See more [here](/react/tips/dangerously-set-inner-html.html).

docs/docs/ref-08-reconciliation.md

@@ -46,9 +46,9 @@ renderB: <Content />
 => [removeNode <Header />], [insertNode <Content />]
 ```
 
-Having this high level knowledge is a very important aspect of why React diff algorithm is both fast and precise. It provides a good heuristic to quickly prune big parts of the tree and focus on parts likely to be similar.
+Having this high level knowledge is a very important aspect of why React's diff algorithm is both fast and precise. It provides a good heuristic to quickly prune big parts of the tree and focus on parts likely to be similar.
 
-It is very unlikely that a `<Header>` element is going generate a DOM that is going to look like what a `<Content>` would generate. Instead of spending time trying to match those two structures, React just re-builds the tree from scratch.
+It is very unlikely that a `<Header>` element is going to generate a DOM that is going to look like what a `<Content>` would generate. Instead of spending time trying to match those two structures, React just re-builds the tree from scratch.
 
 As a corollary, if there is a `<Header>` element at the same position in two consecutive renders, you would expect to see a very similar structure and it is worth exploring it.
 
@@ -121,7 +121,7 @@ In practice, finding a key is not really hard. Most of the time, the element you
 
 ## Trade-offs
 
-It is important to remember that the reconciliation algorithm is an implementation detail. React could re-render the whole app on every action, the end-result would be the same. We are regularly refining the heuristics in order to make common use cases faster.
+It is important to remember that the reconciliation algorithm is an implementation detail. React could re-render the whole app on every action; the end result would be the same. We are regularly refining the heuristics in order to make common use cases faster.
 
 In the current implementation, you can express the fact that a sub-tree has been moved amongst its siblings, but you cannot tell that it has moved somewhere else. The algorithm will re-render that full sub-tree.
 

docs/docs/ref-09-glossary.md

@@ -21,7 +21,7 @@ You can create one of these object through `React.createElement`.
 var root = React.createElement('div');
 ```
 
-To render a new tree into the DOM, you create `ReactElement`s and pass them to `React.render` a long with a regular DOM `Element` (`HTMLElement` or `SVGElement`). `ReactElement`s are not to be confused with DOM `Element`s. A `ReactElement` is a light, stateless, immutable, virtual representation of a DOM `Element`. It is a virtual DOM.
+To render a new tree into the DOM, you create `ReactElement`s and pass them to `React.render` along with a regular DOM `Element` (`HTMLElement` or `SVGElement`). `ReactElement`s are not to be confused with DOM `Element`s. A `ReactElement` is a light, stateless, immutable, virtual representation of a DOM `Element`. It is a virtual DOM.
 
 ```javascript
 React.render(root, document.body);
@@ -62,7 +62,7 @@ var root = div({ className: 'my-div' });
 React.render(root, document.body);
 ```
 
-React already have built-in factories for common HTML tags:
+React already has built-in factories for common HTML tags:
 
 ```javascript
 var root = React.DOM.ul({ className: 'my-list' },
@@ -76,6 +76,7 @@ If you are using JSX you have no need for factories. JSX already provides a conv
 ## React Nodes
 
 A `ReactNode` can be either:
+
 - `ReactElement`
 - `string` (aka `ReactText`)
 - `number` (aka `ReactText`)

docs/docs/thinking-in-react.md

@@ -2,7 +2,7 @@
 id: thinking-in-react
 title: Thinking in React
 prev: tutorial.html
-next: videos.html
+next: conferences.html
 ---
 
 This was originally a [blog post](/react/blog/2013/11/05/thinking-in-react.html) from the [official React blog](/react/blog).
@@ -60,7 +60,7 @@ Now that we've identified the components in our mock, let's arrange them into a
 
 ## Step 2: Build a static version in React
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/n25pd/embedded/" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" src="https://jsfiddle.net/reactjs/yun1vgqb/embedded/" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 Now that you have your component hierarchy it's time to start implementing your app. The easiest way is to build a version that takes your data model and renders the UI but has no interactivity. It's easiest to decouple these processes because building a static version requires a lot of typing and no thinking, and adding interactivity requires a lot of thinking and not a lot of typing. We'll see why.
 
@@ -104,7 +104,7 @@ So finally, our state is:
 
 ## Step 4: Identify where your state should live
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/t53sx/embedded/" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" src="https://jsfiddle.net/reactjs/zafjbw1e/embedded/" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 OK, so we've identified what the minimal set of app state is. Next we need to identify which component mutates, or *owns*, this state.
 
@@ -129,7 +129,7 @@ You can start seeing how your application will behave: set `filterText` to `"bal
 
 ## Step 5: Add inverse data flow
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/F8H7p/embedded/" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" src="https://jsfiddle.net/reactjs/n47gckhr/embedded/" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 So far we've built an app that renders correctly as a function of props and state flowing down the hierarchy. Now it's time to support data flowing the other way: the form components deep in the hierarchy need to update the state in `FilterableProductTable`.
 

docs/docs/tutorial.md

@@ -5,7 +5,7 @@ prev: getting-started.html
 next: thinking-in-react.html
 ---
 
-We'll be building a simple, but realistic comments box that you can drop into a blog, a basic version of the realtime comments offered by Disqus, LiveFyre or Facebook comments.
+We'll be building a simple but realistic comments box that you can drop into a blog, a basic version of the realtime comments offered by Disqus, LiveFyre or Facebook comments.
 
 We'll provide:
 
@@ -16,25 +16,31 @@ We'll provide:
 It'll also have a few neat features:
 
 * **Optimistic commenting:** comments appear in the list before they're saved on the server so it feels fast.
-* **Live updates:** as other users comment we'll pop them into the comment view in real time
-* **Markdown formatting:** users can use Markdown to format their text
+* **Live updates:** other users' comments are popped into the comment view in real time.
+* **Markdown formatting:** users can use Markdown to format their text.
 
 ### Want to skip all this and just see the source?
 
 [It's all on GitHub.](https://github.com/reactjs/react-tutorial)
 
+### Running a server
+
+While it's not necessary to get started with this tutorial, later on we'll be adding functionality that requires `POST`ing to a running server. If this is something you are intimately familiar with and want to create your own server, please do. For the rest of you who might want to focus on learning about React without having to worry about the server-side aspects, we have written simple servers in a number of languages - JavaScript (using Node.js), Python, Ruby, Go, and PHP. These are all available on GitHub. You can [view the source](https://github.com/reactjs/react-tutorial/) or [download a zip file](https://github.com/reactjs/react-tutorial/archive/master.zip) to get started.
+
+To get started using the tutorial, just start editing `public/index.html`.
+
 ### Getting started
 
-For this tutorial we'll use prebuilt JavaScript files on a CDN. Open up your favorite editor and create a new HTML document:
+For this tutorial, we'll use prebuilt JavaScript files on a CDN. Open up your favorite editor and create a new HTML document:
 
 ```html
-<!-- template.html -->
+<!-- index.html -->
 <html>
   <head>
     <title>Hello React</title>
-    <script src="http://fb.me/react-{{site.react_version}}.js"></script>
-    <script src="http://fb.me/JSXTransformer-{{site.react_version}}.js"></script>
-    <script src="http://code.jquery.com/jquery-1.10.0.min.js"></script>
+    <script src="https://fb.me/react-{{site.react_version}}.js"></script>
+    <script src="https://fb.me/JSXTransformer-{{site.react_version}}.js"></script>
+    <script src="https://code.jquery.com/jquery-1.10.0.min.js"></script>
   </head>
   <body>
     <div id="content"></div>
@@ -141,7 +147,7 @@ var CommentForm = React.createClass({
 });
 ```
 
-Next, update the `CommentBox` component to use its new friends:
+Next, update the `CommentBox` component to use these new components:
 
 ```javascript{6-8}
 // tutorial3.js
@@ -160,32 +166,12 @@ var CommentBox = React.createClass({
 
 Notice how we're mixing HTML tags and components we've built. HTML components are regular React components, just like the ones you define, with one difference. The JSX compiler will automatically rewrite HTML tags to `React.createElement(tagName)` expressions and leave everything else alone. This is to prevent the pollution of the global namespace.
 
-### Component Properties
-
-Let's create our third component, `Comment`. We will want to pass it the author name and comment text so we can reuse the same code for each unique comment. First let's add some comments to the `CommentList`:
-
-```javascript{6-7}
-// tutorial4.js
-var CommentList = React.createClass({
-  render: function() {
-    return (
-      <div className="commentList">
-        <Comment author="Pete Hunt">This is one comment</Comment>
-        <Comment author="Jordan Walke">This is *another* comment</Comment>
-      </div>
-    );
-  }
-});
-```
-
-Note that we have passed some data from the parent `CommentList` component to the child `Comment` components. For example, we passed *Pete Hunt* (via an attribute) and *This is one comment* (via an XML-like child node) to the first `Comment`. Data passed from parent to children components is called **props**, short for properties.
-
 ### Using props
 
-Let's create the Comment component. Using **props** we will be able to read the data passed to it from the `CommentList`, and render some markup:
+Let's create the `Comment` component, which will depend on data passed in from it's parent. Data passed in from a parent component is available as a 'property' on the child component. These 'properties' are accessed through `this.props`. Using props we will be able to read the data passed to the `Comment` from the `CommentList`, and render some markup:
 
 ```javascript
-// tutorial5.js
+// tutorial4.js
 var Comment = React.createClass({
   render: function() {
     return (
@@ -202,6 +188,26 @@ var Comment = React.createClass({
 
 By surrounding a JavaScript expression in braces inside JSX (as either an attribute or child), you can drop text or React components into the tree. We access named attributes passed to the component as keys on `this.props` and any nested elements as `this.props.children`.
 
+### Component Properties
+
+Now that we have defined the `Comment` component, we will want to pass it the author name and comment text. This allows us to reuse the same code for each unique comment. Now let's add some comments within our `CommentList`:
+
+```javascript{6-7}
+// tutorial5.js
+var CommentList = React.createClass({
+  render: function() {
+    return (
+      <div className="commentList">
+        <Comment author="Pete Hunt">This is one comment</Comment>
+        <Comment author="Jordan Walke">This is *another* comment</Comment>
+      </div>
+    );
+  }
+});
+```
+
+Note that we have passed some data from the parent `CommentList` component to the child `Comment` components. For example, we passed *Pete Hunt* (via an attribute) and *This is one comment* (via an XML-like child node) to the first `Comment`. As noted above, the `Comment` component will access these 'properties' through `this.props.author`, and `this.props.children`.
+
 ### Adding Markdown
 
 Markdown is a simple way to format your text inline. For example, surrounding text with asterisks will make it emphasized.
@@ -209,13 +215,13 @@ Markdown is a simple way to format your text inline. For example, surrounding te
 First, add the third-party **Showdown** library to your application. This is a JavaScript library which takes Markdown text and converts it to raw HTML. This requires a script tag in your head (which we have already included in the React playground):
 
 ```html{7}
-<!-- template.html -->
+<!-- index.html -->
 <head>
   <title>Hello React</title>
-  <script src="http://fb.me/react-{{site.react_version}}.js"></script>
-  <script src="http://fb.me/JSXTransformer-{{site.react_version}}.js"></script>
-  <script src="http://code.jquery.com/jquery-1.10.0.min.js"></script>
-  <script src="http://cdnjs.cloudflare.com/ajax/libs/showdown/0.3.1/showdown.min.js"></script>
+  <script src="https://fb.me/react-{{site.react_version}}.js"></script>
+  <script src="https://fb.me/JSXTransformer-{{site.react_version}}.js"></script>
+  <script src="https://code.jquery.com/jquery-1.10.0.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/showdown/0.3.1/showdown.min.js"></script>
 </head>
 ```
 
@@ -379,7 +385,7 @@ When the component is first created, we want to GET some JSON from the server an
 
 We'll use jQuery to help make an asynchronous request to the server.
 
-Note: because this is becoming an AJAX application you'll need to develop your app using a web server rather than as a file sitting on your file system. The easiest way to do this is to run `python -m SimpleHTTPServer` in your application's directory.
+Note: because this is becoming an AJAX application you'll need to develop your app using a web server rather than as a file sitting on your file system. [As mentioned above](#running-a-server), we have provided several servers you can use [on GitHub](https://github.com/reactjs/react-tutorial/). They provide the functionality you need for the rest of this tutorial.
 
 ```javascript{6-17}
 // tutorial13.js
@@ -413,7 +419,7 @@ var CommentBox = React.createClass({
 
 Here, `componentDidMount` is a method called automatically by React when a component is rendered. The key to dynamic updates is the call to `this.setState()`. We replace the old array of comments with the new one from the server and the UI automatically updates itself. Because of this reactivity, it is only a minor change to add live updates. We will use simple polling here but you could easily use WebSockets or other technologies.
 
-```javascript{3,19-20,34}
+```javascript{3,14,19-20,34}
 // tutorial14.js
 var CommentBox = React.createClass({
   loadCommentsFromServer: function() {
@@ -476,19 +482,19 @@ var CommentForm = React.createClass({
 
 Let's make the form interactive. When the user submits the form, we should clear it, submit a request to the server, and refresh the list of comments. To start, let's listen for the form's submit event and clear it.
 
-```javascript{3-14,17-19}
+```javascript{3-13,16-19}
 // tutorial16.js
 var CommentForm = React.createClass({
   handleSubmit: function(e) {
     e.preventDefault();
-    var author = this.refs.author.getDOMNode().value.trim();
-    var text = this.refs.text.getDOMNode().value.trim();
+    var author = React.findDOMNode(this.refs.author).value.trim();
+    var text = React.findDOMNode(this.refs.text).value.trim();
     if (!text || !author) {
       return;
     }
     // TODO: send request to the server
-    this.refs.author.getDOMNode().value = '';
-    this.refs.text.getDOMNode().value = '';
+    React.findDOMNode(this.refs.author).value = '';
+    React.findDOMNode(this.refs.text).value = '';
     return;
   },
   render: function() {
@@ -511,7 +517,7 @@ Call `preventDefault()` on the event to prevent the browser's default action of
 
 ##### Refs
 
-We use the `ref` attribute to assign a name to a child component and `this.refs` to reference the component. We can call `getDOMNode()` on a component to get the native browser DOM element.
+We use the `ref` attribute to assign a name to a child component and `this.refs` to reference the component. We can call `React.findDOMNode(component)` on a component to get the native browser DOM element.
 
 ##### Callbacks as props
 
@@ -563,14 +569,14 @@ Let's call the callback from the `CommentForm` when the user submits the form:
 var CommentForm = React.createClass({
   handleSubmit: function(e) {
     e.preventDefault();
-    var author = this.refs.author.getDOMNode().value.trim();
-    var text = this.refs.text.getDOMNode().value.trim();
+    var author = React.findDOMNode(this.refs.author).value.trim();
+    var text = React.findDOMNode(this.refs.text).value.trim();
     if (!text || !author) {
       return;
     }
     this.props.onCommentSubmit({author: author, text: text});
-    this.refs.author.getDOMNode().value = '';
-    this.refs.text.getDOMNode().value = '';
+    React.findDOMNode(this.refs.author).value = '';
+    React.findDOMNode(this.refs.text).value = '';
     return;
   },
   render: function() {

docs/docs/videos.md

@@ -2,7 +2,7 @@
 id: videos
 title: Videos
 permalink: videos.html
-prev: thinking-in-react.html
+prev: conferences.html
 next: complementary-tools.html
 ---
 
@@ -96,6 +96,11 @@ A [tagtree.tv](http://tagtree.tv/) video conveying the principles of [Thinking i
 
 By [Tom Occhino](http://tomocchino.com/) and [Jordan Walke](https://github.com/jordwalke)
 
+### Backbone + React + Middleman Screencast
+<iframe width="650" height="315" src="//www.youtube.com/embed/iul1fWHVU6A" frameborder="0" allowfullscreen></iframe>
+
+Backbone is a great way in interface a REST API with React. This screencast shows how to integate the two using [Backbone-React-Component](https://github.com/magalhas/backbone-react-component). Middleman is the framework used in this example but could easily be replaced with other frameworks. A supported template of this can be found [here](https://github.com/jbhatab/middleman-backbone-react-template). -- [Open Minded Innovations](http://www.openmindedinnovations.com/)
+
 ### Developing User Interfaces With React - Super VanJS
 
 <iframe width="650" height="315" src="//www.youtube.com/embed/1OeXsL5mr4g" frameborder="0" allowfullscreen></iframe>
@@ -127,3 +132,17 @@ by [Stoyan Stefanov](http://www.phpied.com/)
 <iframe width="650" height="315" src="//www.youtube.com/embed/i__969noyAM" frameborder="0" allowfullscreen></iframe>
 
 Facebook engineers [Bill Fisher](http://twitter.com/fisherwebdev) and [Jing Chen](http://twitter.com/jingc) talk about Flux and React, and how using an application architecture with a unidirectional data flow cleans up a lot of their code.
+
+### Server-Side Rendering of Isomorphic Apps at SoundCloud
+
+<iframe src="//player.vimeo.com/video/108488724" width="500" height="281" frameborder="0" allowfullscreen></iframe>
+
+Walk-through by [Andres Suarez](https://github.com/zertosh) on how [SoundCloud](https://developers.soundcloud.com/blog/) is using React and Flux for server-side rendering.
+
+[Slides and sample code](https://github.com/zertosh/ssr-demo-kit)
+
+### Introducing React Native (+Playlist) - React.js Conf 2015
+
+<iframe width="650" height="315" src="//www.youtube.com/watch?v=KVZ-P-ZI6W4&index=1&list=PLb0IAmt7-GS1cbw4qonlQztYV1TAW0sCr" frameborder="0" allowfullscreen></iframe>
+
+[Tom Occhino](https://twitter.com/tomocchino) reviews the past and present of React in 2015, and teases where it's going next.