{"sha":"60c2f56e6e30e677ba8a7a4cadf463c62589d787","node_id":"MDY6Q29tbWl0MTAyNzAyNTA6NjBjMmY1NmU2ZTMwZTY3N2JhOGE3YTRjYWRmNDYzYzYyNTg5ZDc4Nw==","commit":{"author":{"name":"Paul O’Shannessy","email":"paul@oshannessy.com","date":"2015-02-07T01:17:46Z"},"committer":{"name":"Paul O’Shannessy","email":"paul@oshannessy.com","date":"2015-02-07T01:17:46Z"},"message":"Merge pull request #3074 from noyobo/master\n\nfix Chinese docs typos","tree":{"sha":"309595753d85677b74384c7f01d53dbd6704b498","url":"https://api.github.com/repos/react/react/git/trees/309595753d85677b74384c7f01d53dbd6704b498"},"url":"https://api.github.com/repos/react/react/git/commits/60c2f56e6e30e677ba8a7a4cadf463c62589d787","comment_count":0,"verification":{"verified":false,"reason":"unsigned","signature":null,"payload":null,"verified_at":null}},"url":"https://api.github.com/repos/react/react/commits/60c2f56e6e30e677ba8a7a4cadf463c62589d787","html_url":"https://github.com/react/react/commit/60c2f56e6e30e677ba8a7a4cadf463c62589d787","comments_url":"https://api.github.com/repos/react/react/commits/60c2f56e6e30e677ba8a7a4cadf463c62589d787/comments","author":{"login":"zpao","id":8445,"node_id":"MDQ6VXNlcjg0NDU=","avatar_url":"https://avatars.githubusercontent.com/u/8445?v=4","gravatar_id":"","url":"https://api.github.com/users/zpao","html_url":"https://github.com/zpao","followers_url":"https://api.github.com/users/zpao/followers","following_url":"https://api.github.com/users/zpao/following{/other_user}","gists_url":"https://api.github.com/users/zpao/gists{/gist_id}","starred_url":"https://api.github.com/users/zpao/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zpao/subscriptions","organizations_url":"https://api.github.com/users/zpao/orgs","repos_url":"https://api.github.com/users/zpao/repos","events_url":"https://api.github.com/users/zpao/events{/privacy}","received_events_url":"https://api.github.com/users/zpao/received_events","type":"User","user_view_type":"public","site_admin":false},"committer":{"login":"zpao","id":8445,"node_id":"MDQ6VXNlcjg0NDU=","avatar_url":"https://avatars.githubusercontent.com/u/8445?v=4","gravatar_id":"","url":"https://api.github.com/users/zpao","html_url":"https://github.com/zpao","followers_url":"https://api.github.com/users/zpao/followers","following_url":"https://api.github.com/users/zpao/following{/other_user}","gists_url":"https://api.github.com/users/zpao/gists{/gist_id}","starred_url":"https://api.github.com/users/zpao/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zpao/subscriptions","organizations_url":"https://api.github.com/users/zpao/orgs","repos_url":"https://api.github.com/users/zpao/repos","events_url":"https://api.github.com/users/zpao/events{/privacy}","received_events_url":"https://api.github.com/users/zpao/received_events","type":"User","user_view_type":"public","site_admin":false},"parents":[{"sha":"785326078872581a5b5acc876862ae7a5a5e086b","url":"https://api.github.com/repos/react/react/commits/785326078872581a5b5acc876862ae7a5a5e086b","html_url":"https://github.com/react/react/commit/785326078872581a5b5acc876862ae7a5a5e086b"},{"sha":"7f6c575d9d72318507645ff7f446048fe96b48f2","url":"https://api.github.com/repos/react/react/commits/7f6c575d9d72318507645ff7f446048fe96b48f2","html_url":"https://github.com/react/react/commit/7f6c575d9d72318507645ff7f446048fe96b48f2"}],"stats":{"total":32,"additions":22,"deletions":10},"files":[{"sha":"160cc1b7a083f92ef038060187093d446d577b8a","filename":"docs/docs/02-displaying-data.zh-CN.md","status":"modified","additions":14,"deletions":6,"changes":20,"blob_url":"https://github.com/react/react/blob/60c2f56e6e30e677ba8a7a4cadf463c62589d787/docs%2Fdocs%2F02-displaying-data.zh-CN.md","raw_url":"https://github.com/react/react/raw/60c2f56e6e30e677ba8a7a4cadf463c62589d787/docs%2Fdocs%2F02-displaying-data.zh-CN.md","contents_url":"https://api.github.com/repos/react/react/contents/docs%2Fdocs%2F02-displaying-data.zh-CN.md?ref=60c2f56e6e30e677ba8a7a4cadf463c62589d787","patch":"@@ -4,7 +4,7 @@ title: 显示数据\n layout: docs\n permalink: displaying-data-zh-CN.html\n prev: why-react-zh-CN.html\n-next: jsx-in-depth.html\n+next: jsx-in-depth-zh-CN.html\n ---\n \n 用户界面能做的最基础的事就是显示一些数据。React 让显示数据变得简单，当数据变化的时候，用户界面会自动同步更新。\n@@ -80,11 +80,19 @@ React 组件非常简单。你可以认为它们就是简单的函数，接受 `\n \n 我们得出解决这个问题最好的方案是通过 JavaScript 直接生成模板，这样你就可以用一个真正语言的所有表达能力去构建用户界面。为了使这变得更简单，我们做了一个非常简单、**可选**类似 HTML 语法 ，通过函数调用即可生成模板的编译器，称为 JSX。\n \n-**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 不是必须用的。**\n+**JSX 让你可以用 HTML 语法去写 JavaScript 函数调用** 为了在 React 生成一个链接，通过纯 JavaScript 你可以这么写： \n \n-JSX 非常小；上面“hello, world”的例子使用了 JSX 所有的特性。想要了解更多，请看 [深入理解 JSX](/react/docs/jsx-in-depth.html)。或者直接使用[在线 JSX 编译器](/react/jsx-compiler.html)观察变化过程。\n+`React.createElement('a', {href: 'http://facebook.github.io/react/'}, 'Hello React!')`。\n \n-JSX 类似于 HTML，但不是完全一样。参考 [JSX 陷阱](/react/docs/jsx-gotchas.html) 学习关键区别。\n+通过 JSX 这就变成了\n+\n+`<a href=\"http://facebook.github.io/react/\">Hello React!</a>`。\n+\n+我们发现这会使搭建 React 应用更加简单，设计师也偏向用这用语法，但是每个人可以有它们自己的工作流，所以**JSX 不是必须用的。**\n+\n+JSX 非常小；上面“hello, world”的例子使用了 JSX 所有的特性。想要了解更多，请看 [深入理解 JSX](/react/docs/jsx-in-depth-zh-CN.html)。或者直接使用[在线 JSX 编译器](/react/jsx-compiler.html)观察变化过程。\n+\n+JSX 类似于 HTML，但不是完全一样。参考 [JSX 陷阱](/react/docs/jsx-gotchas-zh-CN.html) 学习关键区别。\n \n 最简单开始学习 JSX 的方法就是使用浏览器端的 `JSXTransformer`。我们强烈建议你不要在生产环境中使用它。你可以通过我们的命令行工具 [react-tools](http://npmjs.org/package/react-tools) 包来预编译你的代码。\n \n@@ -112,6 +120,6 @@ React 已经为 HTML 标签提供内置工厂方法。\n \n ```javascript\n var root = React.DOM.ul({ className: 'my-list' },\n-             React.DOM.li(null, 'Text Content')\n-           );\n+  React.DOM.li(null, 'Text Content')\n+);\n ```"},{"sha":"33a4181f8cdb917e19a25b6aa7abec62c5503d43","filename":"docs/docs/02.1-jsx-in-depth.zh-CN.md","status":"modified","additions":1,"deletions":1,"changes":2,"blob_url":"https://github.com/react/react/blob/60c2f56e6e30e677ba8a7a4cadf463c62589d787/docs%2Fdocs%2F02.1-jsx-in-depth.zh-CN.md","raw_url":"https://github.com/react/react/raw/60c2f56e6e30e677ba8a7a4cadf463c62589d787/docs%2Fdocs%2F02.1-jsx-in-depth.zh-CN.md","contents_url":"https://api.github.com/repos/react/react/contents/docs%2Fdocs%2F02.1-jsx-in-depth.zh-CN.md?ref=60c2f56e6e30e677ba8a7a4cadf463c62589d787","patch":"@@ -137,4 +137,4 @@ var content = (\n \n > 注意:\n > \n-> JSX 类似于 HTML，但不完全一样。参考 [JSX 陷阱](/react/docs/jsx-gotchas.html) 了解主要不同。\n+> JSX 类似于 HTML，但不完全一样。参考 [JSX 陷阱](/react/docs/jsx-gotchas-zh-CN.html) 了解主要不同。"},{"sha":"13d2eb971a81309fbbf6af70d3176dad1efb869f","filename":"docs/docs/02.2-jsx-spread.zh-CN.md","status":"modified","additions":1,"deletions":1,"changes":2,"blob_url":"https://github.com/react/react/blob/60c2f56e6e30e677ba8a7a4cadf463c62589d787/docs%2Fdocs%2F02.2-jsx-spread.zh-CN.md","raw_url":"https://github.com/react/react/raw/60c2f56e6e30e677ba8a7a4cadf463c62589d787/docs%2Fdocs%2F02.2-jsx-spread.zh-CN.md","contents_url":"https://api.github.com/repos/react/react/contents/docs%2Fdocs%2F02.2-jsx-spread.zh-CN.md?ref=60c2f56e6e30e677ba8a7a4cadf463c62589d787","patch":"@@ -52,4 +52,4 @@ Props 应该被当作禁止修改的。修改 props 对象可能会导致预料\n \n ## 这个奇怪的 `...` 标记是什么？\n \n-这个 `...` 操作符（也被叫做）已经被 [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 拥有更优雅的语法。\n+这个 `...` 操作符（增强的操作符）已经被 [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 拥有更优雅的语法。"},{"sha":"15722ba8552fec780e0e57ab330e7dc7abc3ccd4","filename":"docs/docs/03-interactivity-and-dynamic-uis.zh-CN.md","status":"modified","additions":1,"deletions":1,"changes":2,"blob_url":"https://github.com/react/react/blob/60c2f56e6e30e677ba8a7a4cadf463c62589d787/docs%2Fdocs%2F03-interactivity-and-dynamic-uis.zh-CN.md","raw_url":"https://github.com/react/react/raw/60c2f56e6e30e677ba8a7a4cadf463c62589d787/docs%2Fdocs%2F03-interactivity-and-dynamic-uis.zh-CN.md","contents_url":"https://api.github.com/repos/react/react/contents/docs%2Fdocs%2F03-interactivity-and-dynamic-uis.zh-CN.md?ref=60c2f56e6e30e677ba8a7a4cadf463c62589d787","patch":"@@ -6,7 +6,7 @@ prev: jsx-gotchas-zh-CN.html\n next: multiple-components-zh-CN.html\n ---\n \n-我们已经学习如何使用 React [显示数据](/react/docs/displaying-data.html)。现在让我们来学习如何创建交互式界面。\n+我们已经学习如何使用 React [显示数据](/react/docs/displaying-data-zh-CN.html)。现在让我们来学习如何创建交互式界面。\n \n \n ## 简单例子"},{"sha":"30930f2fcac594946cf10ce36f28dfa06e6a3e54","filename":"docs/docs/06-transferring-props.zh-CN.md","status":"modified","additions":1,"deletions":0,"changes":1,"blob_url":"https://github.com/react/react/blob/60c2f56e6e30e677ba8a7a4cadf463c62589d787/docs%2Fdocs%2F06-transferring-props.zh-CN.md","raw_url":"https://github.com/react/react/raw/60c2f56e6e30e677ba8a7a4cadf463c62589d787/docs%2Fdocs%2F06-transferring-props.zh-CN.md","contents_url":"https://api.github.com/repos/react/react/contents/docs%2Fdocs%2F06-transferring-props.zh-CN.md?ref=60c2f56e6e30e677ba8a7a4cadf463c62589d787","patch":"@@ -149,6 +149,7 @@ z; // { a: 3, b: 4 }\n ## 使用 Underscore 来传递\n \n 如果不使用 JSX，可以使用一些库来实现相同效果。Underscore 提供 `_.omit` 来过滤属性，`_.extend` 复制属性到新的对象。\n+\n ```javascript\n var FancyCheckbox = React.createClass({\n   render: function() {"},{"sha":"669d4647d989834349d14696762666f17988e8e7","filename":"docs/docs/07-forms.zh-CN.md","status":"modified","additions":1,"deletions":1,"changes":2,"blob_url":"https://github.com/react/react/blob/60c2f56e6e30e677ba8a7a4cadf463c62589d787/docs%2Fdocs%2F07-forms.zh-CN.md","raw_url":"https://github.com/react/react/raw/60c2f56e6e30e677ba8a7a4cadf463c62589d787/docs%2Fdocs%2F07-forms.zh-CN.md","contents_url":"https://api.github.com/repos/react/react/contents/docs%2Fdocs%2F07-forms.zh-CN.md?ref=60c2f56e6e30e677ba8a7a4cadf463c62589d787","patch":"@@ -8,7 +8,7 @@ next: working-with-the-browser-zh-CN.html\n \n 诸如 `<input>`、`<textarea>`、`<option>` 这样的表单组件不同于其他组件，因为他们可以通过用户交互发生变化。这些组件提供的界面使响应用户交互的表单数据处理更加容易。\n   \n-关于 `<form>` 事件详情请查看 [表单事件](/react/docs/events.html#form-events)。\n+关于 `<form>` 事件详情请查看 [表单事件](/react/docs/events-zh-CN.html#form-events)。\n \n ## 交互属性    \n     "},{"sha":"cbbab6384bd88d1f6d4e761539db3ed2e621eaa9","filename":"docs/docs/flux-overview.zh-CN.md","status":"modified","additions":1,"deletions":0,"changes":1,"blob_url":"https://github.com/react/react/blob/60c2f56e6e30e677ba8a7a4cadf463c62589d787/docs%2Fdocs%2Fflux-overview.zh-CN.md","raw_url":"https://github.com/react/react/raw/60c2f56e6e30e677ba8a7a4cadf463c62589d787/docs%2Fdocs%2Fflux-overview.zh-CN.md","contents_url":"https://api.github.com/repos/react/react/contents/docs%2Fdocs%2Fflux-overview.zh-CN.md?ref=60c2f56e6e30e677ba8a7a4cadf463c62589d787","patch":"@@ -1,6 +1,7 @@\n ---\n id: flux-overview-zh-CN\n title: Flux 应用架构\n+permalink: flux-overview-zh-CN.html\n ---\n \n 本页被移到了 Flux 网站。[点击访问](http://facebook.github.io/flux/docs/overview.html)。"},{"sha":"136fa09951749af7bdc9b7c1ce06160011e3f1fe","filename":"docs/docs/flux-todo-list.zh-CN.md","status":"modified","additions":1,"deletions":0,"changes":1,"blob_url":"https://github.com/react/react/blob/60c2f56e6e30e677ba8a7a4cadf463c62589d787/docs%2Fdocs%2Fflux-todo-list.zh-CN.md","raw_url":"https://github.com/react/react/raw/60c2f56e6e30e677ba8a7a4cadf463c62589d787/docs%2Fdocs%2Fflux-todo-list.zh-CN.md","contents_url":"https://api.github.com/repos/react/react/contents/docs%2Fdocs%2Fflux-todo-list.zh-CN.md?ref=60c2f56e6e30e677ba8a7a4cadf463c62589d787","patch":"@@ -1,6 +1,7 @@\n ---\n id: flux-todo-list-zh-CN\n title: Flux TodoMVC 教程\n+permalink: flux-todo-list-zh-CN.html\n ---\n \n 本页被移到了 Flux 网站。[点击访问](http://facebook.github.io/flux/docs/todo-list.html)。"},{"sha":"0347af3a876899cb1b08f022fd38a38eedd5a2b7","filename":"docs/docs/getting-started.zh-CN.md","status":"modified","additions":1,"deletions":0,"changes":1,"blob_url":"https://github.com/react/react/blob/60c2f56e6e30e677ba8a7a4cadf463c62589d787/docs%2Fdocs%2Fgetting-started.zh-CN.md","raw_url":"https://github.com/react/react/raw/60c2f56e6e30e677ba8a7a4cadf463c62589d787/docs%2Fdocs%2Fgetting-started.zh-CN.md","contents_url":"https://api.github.com/repos/react/react/contents/docs%2Fdocs%2Fgetting-started.zh-CN.md?ref=60c2f56e6e30e677ba8a7a4cadf463c62589d787","patch":"@@ -1,6 +1,7 @@\n ---\n id: getting-started-zh-CN\n title: 入门教程\n+permalink: getting-started-zh-CN.html\n next: tutorial-zh-CN.html\n redirect_from: \"docs/index-zh-CN.html\"\n ---"}]}