Merge pull request #3 from vuefe/2.0-cn

10.07更新

Author: 70data

src/about/apidoc.md

@@ -19,16 +19,16 @@ order: 2
 1 | 是 |  Global Config | 全局配置 |  dear-lizhihua |  @dear-lizhihua
 2 | x | Global API | 全局API | | @dear-lizhihua
 3 | x | Options / Data | 选项 / 数据 | | @dear-lizhihua
-4 | x | Options / DOM | 选项 / DOM | |
-5 | x | Options / Lifecycle Hooks | 选项 / 生命周期钩子 | | 
+4 | x | Options / DOM | 选项 / DOM | | @ATLgo 
+5 | x | Options / Lifecycle Hooks | 选项 / 生命周期钩子 | |  @ATLgo 
 6 | x | Options / Assets | 选项 / 资源 | |
 7 | x | Options / Misc | 选项 / 杂项 |  | 
 8 | x | Instance Properties | 实例属性 | |
 9 | x | Instance Methods / Data | 实例方法 / 数据 | | 
-10 | x | Instance Methods / Events | 实例方法 / 事件 |  |
-11 | x |  Instance Methods / Lifecycle | 实例方法 / 生命周期 | |
+10 | x | Instance Methods / Events | 实例方法 / 事件 |  | @mlyknown
+11 | x |  Instance Methods / Lifecycle | 实例方法 / 生命周期 | | @mlyknown
 12 | x | Directives | 指令|  |  @tingtien 
-13 | x | Special Attributes | 特殊元素 | |
+13 | x | Special Attributes | 特殊元素 | | @70data
 14 | x | Built-In Components | 内置的组件  | |
-15 | x | VNode Interface | VNode接口  | |
-16 | x | Server-Side Rendering | 服务端渲染| | |
+15 | 是 | VNode Interface | VNode接口  | @70data | @70data
+16 | 是 | Server-Side Rendering | 服务端渲染| @70data | @70data

src/about/guide.md

@@ -25,12 +25,12 @@ order: 1
 3 | 是 | instance.md | 实例 |  @dingyiming | @dingyiming
 4 | × | syntax.md  | 模板语法 |  | @tingtien
 5 | 是 | computed.md | 计算属性 |  @dingyiming | @dingyiming
-6 | × | class-and-style.md | Class 与 Style 绑定 |   | @595074187
+6 | 是 | class-and-style.md | Class 与 Style 绑定 | @595074187  | @595074187
 7 | 是 |  conditional.md  | 条件渲染 | @dingyiming | @dingyiming
 8 | 是 | list.md |  列表渲染 | @tingtien | @tingtien
 9 | 是 | events.md | 事件处理器 | @dingyiming | @dingyiming
 10 | 是 |  forms.md  | 表单控件绑定 | @dingyiming | @dingyiming
-11 | × | components.md |  组件 |  | @ezreally
+11 | 是 | components.md |  组件 | @ezreally  | @ezreally
 
 ### Advanced  进阶
 
@@ -43,16 +43,22 @@ order: 1
 16 | 是 | custom-directive.md |  自定义指令 | @harrytospring | @harrytospring
 17 | 是 | mixins.md |  混合 |  @harrytospring | @harrytospring
 18 | x | plugins.md |  插件 |  | @hgcoder
-19 | x | single-file-components.md |  单文件组件 |  | @ATLgo 
+19 | 是 | single-file-components.md |  单文件组件 | @ATLgo  | @ATLgo 
 20 | 是 | routing.md | 路由 | @dingyiming | @dingyiming
 21 | 是 | state-management.md |  状态管理 | @dear-lizhihua | @dear-lizhihua
-22 | 是 | unit-testing.md | 单元测试 | @70data | @70data
+22 | 是 | unit-testing.md | 单元测试 | @70data  | @70data
 23 | 是 | ssr.md |  服务端渲染 | @dingyiming | @dingyiming
+
+### Migration  迁移
+
+序号 | 是否完成  | 对应文档文件名 | 中文标题 | 贡献者 | 认领者
+----- | ------- | ------------- | --- | --- | ---
 24 | x  | migration.md | 1.x迁移 |   | @harrytospring 
+27 | x | migration-vue-router.md | vue-router 0.7.x 迁移 | | @forzajuve10 
 
 ### Meta  更多
 
 序号 | 是否完成  | 对应文档文件名 | 中文标题 | 贡献者 | 认领者
 ----- | ------- | ------------- | --- | --- | ---
 25 | x |  comparison.md |   对比其他框架 |   | @yongbolv @daix6
-26 | 是 |  join.md |  加入Vue.js社区 | @daix6  | @daix6 
+26 | 是 |  join.md |  加入Vue.js社区 | @daix6   | @daix6 

src/about/index.md

@@ -40,6 +40,8 @@ order: 0
 - 翻译完后，使用git 提交更新到自己的仓库，后，在`https://github.com/vuefe/vuejs.org/pulls`  提交合并请求
 ![image](https://cloud.githubusercontent.com/assets/12537013/19106938/68c786fa-8b1c-11e6-8ea0-30f97cf1a83b.png)
 
+ - 希望大家看清楚需要合并的分支，为`vuefe vuejs.org/2.0-cn` 分支，不要向`vuejs` 官方分支发起合并请求，也不要向 `vuefe vuejs.org/master` 分支发起合并请求，谢谢。
+
 - 在QQ群里呼叫群主，合并请求
 - 群主合并内容，并记录贡献， 更新在线静态站内容
 

src/api/index.md

@@ -779,7 +779,7 @@ All lifecycle hooks automatically have their `this` context bound to the instanc
 
   Allow the component to recursively invoke itself in its template. Note that when a component is registered globally with `Vue.component()`, the global ID is automatically set as its name.
 
-  Another benefit of specifying a `name` option is debugging. Named components result in more helpful warning messages. Also, when inspecting an app in the Vue devtool, unnamed components will show up as `<AnonymousComponent>`, which isn't very informative. By providing the `name` option, you will get a much more informative component tree.
+  Another benefit of specifying a `name` option is debugging. Named components result in more helpful warning messages. Also, when inspecting an app in the [vue-devtools](https://github.com/vuejs/vue-devtools), unnamed components will show up as `<AnonymousComponent>`, which isn't very informative. By providing the `name` option, you will get a much more informative component tree.
 
 ### extends
 

src/guide/class-and-style.md

@@ -156,3 +156,9 @@ data: {
 
 当`v-bind:style`使用需要厂商前缀的 CSS 属性时，如 `transform`，Vue.js 会自动侦测并添加相应的前缀。
 
+***
+
+> 原文：http://vuejs.org/guide/class-and-style.html
+
+***
+

src/guide/comparison.md

@@ -224,7 +224,7 @@ Since you don't need to know about JSX, ES2015, or build systems to get started
 
 ReactNative enables you to write native-rendered apps for iOS and Android using the same React component model. This is great in that as a developer, you can apply your knowledge of a framework across multiple platforms. On this front, Vue has an official collaboration with [Weex](https://alibaba.github.io/weex/), a cross-platform UI framework developed by Alibaba Group, which uses Vue as its JavaScript framework runtime. This means with Weex, you can use the same Vue component syntax to author components that can not only be rendered in the Browser, but also natively on iOS and Android!
 
-At this moment, Weex is still in active development and is not as mature and battle-tested as ReactNative, but its development is driven by the production needs by the largest e-commmerce business in the world, and the Vue team will also actively collaborate with the Weex team to ensure a smooth experience for Vue developers.
+At this moment, Weex is still in active development and is not as mature and battle-tested as ReactNative, but its development is driven by the production needs of the largest e-commmerce business in the world, and the Vue team will also actively collaborate with the Weex team to ensure a smooth experience for Vue developers.
 
 ### With MobX
 
@@ -327,3 +327,9 @@ Riot 2.0 provides a similar component-based development model (which is called a
 - More mature tooling support. Vue provides official support for [Webpack](https://github.com/vuejs/vue-loader), [Browserify](https://github.com/vuejs/vueify), and [SystemJS](https://github.com/vuejs/systemjs-plugin-vue), while Riot relies on community support for build system integration.
 - [Transition effect system](transitions.html). Riot has none.
 - Better performance. [Despite advertising](https://github.com/vuejs/vuejs.org/issues/346) use of a virtual DOM, Riot in fact uses dirty checking and thus suffers from the same performance issues as Angular 1.
+
+***
+
+> 原文：http://vuejs.org/guide/comparison.html
+
+***