Merge branch 'master' into 2.0-cn

* master:
  Improve responsive design on mobile devices (vuejs#428)
  Fix typo in Server-Side Rendering guide (vuejs#434)
  Small refactor of count + knife > 1 knife (vuejs#433)
  Update unit-testing.md (vuejs#430)
  Fix a broken loader url (vuejs#429)
  make component examples clearer in guide index
  remove number for example in guide index
  2.0.1
  update cdn link
  fix npm main export instructions
  2.0
  fix example links
  update commits example url

# Conflicts:
#	src/guide/index.md
#	src/guide/ssr.md
#	themes/vue/_config.yml

Author: dingyiming

src/examples/commits.md

@@ -6,4 +6,4 @@ order: 1
 
 > This example fetches latest Vue.js commits data from GitHub's API and displays them as a list. You can switch between the master and dev branches.
 
-<iframe width="100%" height="500" src="https://jsfiddle.net/yyx990803/cLvadprL/embedded/result,html,js,css" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="500" src="https://jsfiddle.net/yyx990803/c5g8xnar/embedded/result,html,js,css" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

src/examples/elastic-header.md

@@ -4,4 +4,4 @@ type: examples
 order: 7
 ---
 
-<iframe width="100%" height="500" src="https://jsfiddle.net/yyx990803/5hfsajjr/embedded/result,html,js,css" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="500" src="https://jsfiddle.net/yyx990803/y91wy85p/embedded/result,html,js,css" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

src/examples/firebase.md

@@ -6,4 +6,4 @@ order: 2
 
 > This example uses [Firebase](https://www.firebase.com/) as the data persistence backend and syncs between clients in real time (you can try opening it in multiple browser tabs). In addition, it performs instant validation using computed properties and triggers CSS transitions when adding/removing items.
 
-<iframe width="100%" height="500" src="https://jsfiddle.net/yyx990803/7vLv44kh/embedded/result,html,js,css" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="500" src="https://jsfiddle.net/yyx990803/hkrxmp0h/embedded/result,html,js,css" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

src/examples/grid-component.md

@@ -6,4 +6,4 @@ order: 3
 
 > This is an example of creating a reusable grid component and using it with external data.
 
-<iframe width="100%" height="500" src="https://jsfiddle.net/yyx990803/23qze30k/embedded/result,html,js,css" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="500" src="https://jsfiddle.net/yyx990803/xkkbfL3L/embedded/result,html,js,css" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

src/examples/index.md

@@ -6,4 +6,4 @@ order: 0
 
 > Dead simple Markdown editor.
 
-<iframe width="100%" height="500" src="https://jsfiddle.net/yyx990803/v368d4g3/embedded/result,html,js,css" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="500" src="https://jsfiddle.net/yyx990803/pq22eoj5/embedded/result,html,js,css" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

src/examples/modal.md

@@ -6,4 +6,4 @@ order: 6
 
 > Features used: component, prop passing, content insertion, transitions.
 
-<iframe width="100%" height="500" src="https://jsfiddle.net/yyx990803/70yyx8z2/embedded/result,html,js,css" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="500" src="https://jsfiddle.net/yyx990803/mwLbw11k/embedded/result,html,js,css" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

src/examples/select2.md

@@ -6,4 +6,4 @@ order: 8
 
 > In this example we are integrating a 3rd party jQuery plugin (select2) by wrapping it inside a custom component.
 
-<iframe width="100%" height="500" src="https://jsfiddle.net/yyx990803/j17w6kjh/embedded/result,html,js,css" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="500" src="https://jsfiddle.net/yyx990803/fruqrvdL/embedded/result,html,js,css" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

src/examples/svg.md

@@ -6,4 +6,4 @@ order: 5
 
 > This example showcases a combination of custom component, computed property, two-way binding and SVG support.
 
-<iframe width="100%" height="500" src="https://jsfiddle.net/yyx990803/8rj70kh1/embedded/result,html,js,css" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="500" src="https://jsfiddle.net/yyx990803/mhrckqgq/embedded/result,html,js,css" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

src/examples/todomvc.md

@@ -6,4 +6,4 @@ order: 9
 
 > This is a fully spec-compliant TodoMVC implementation in under 120 effective lines of JavaScript (excluding comments and blank lines).
 
-<iframe width="100%" height="500" src="https://jsfiddle.net/yyx990803/aump8a25/embedded/result,html,js,css" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="500" src="https://jsfiddle.net/yyx990803/4dr2fLb7/embedded/result,html,js,css" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

src/examples/tree-view.md

@@ -6,4 +6,4 @@ order: 4
 
 > Example of a simple tree view implementation showcasing recursive usage of components.
 
-<iframe width="100%" height="500" src="https://jsfiddle.net/yyx990803/5oyu4c4u/embedded/result,html,js,css" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="500" src="https://jsfiddle.net/yyx990803/3p0j5sgy/embedded/result,html,js,css" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

src/guide/index.md

@@ -122,8 +122,7 @@ var app3 = new Vue({
 
 在控制台设置 `app3.seen = false`，可以看到消息消失了。
 
-
-第二个示例演示了我们不仅可以绑定数据到文本和属性，也可以绑定到DOM结构上。甚至，Vue还提供一套强力的过渡系统在元素通过Vue插入/更新/移除自动应用[过渡效果](transitions.html)。
+示例演示了我们不仅可以绑定数据到文本和属性，也可以绑定到DOM结构上。甚至，Vue还提供一套强力的过渡系统在元素通过Vue插入/更新/移除自动应用[过渡效果](transitions.html)。
 
 这里有一些其他指令，每一个都有自己独特的函数。例如，`v-for`指令可以被用来从数组数据中展示列表元素。
 
@@ -263,7 +262,8 @@ var app6 = new Vue({
 Vue中，一个组件基本上是一个预定义了设置的Vue实例。在Vue注册组件也很简单：
 
 ``` js
-Vue.component('todo', {
+// Define a new component called todo-item
+Vue.component('todo-item', {
   template: '<li>This is a todo</li>'
 })
 ```
@@ -272,14 +272,21 @@ Vue.component('todo', {
 
 ``` html
 <ul>
-  <todo v-for="todo in todos"></todo>
+  <!--
+  Create an instance of the todo-item component
+  for each todo in a todos array
+  -->
+  <todo-item v-for="todo in todos"></todo-item>
 </ul>
 ```
 
 不过每个Todo都渲染一样的文本并不有趣。我们可以从父组件传递数据到子组件中。让我们修改组件定义，使它可以结构一个 [prop](/guide/components.html#Props)：
 
 ``` js
-Vue.component('todo', {
+Vue.component('todo-item', {
+  // The todo-item component now accepts a
+  // "prop", which is like a custom attribute.
+  // This prop is called todo.
   props: ['todo'],
   template: '<li>{{ todo.text }}</li>'
 })
@@ -290,7 +297,11 @@ Vue.component('todo', {
 ``` html
 <div id="app-7">
   <ol>
-    <todo v-for="todo in todos" v-bind:todo="todo"></todo>
+    <!--
+    Now we provide each todo-item with the todo object
+    it's representing, so that its content can be dynamic
+    -->
+    <todo-item v-for="todo in todos" v-bind:todo="todo"></todo-item>
   </ol>
 </div>
 ```
@@ -305,11 +316,11 @@ var app7 = new Vue({
 {% raw %}
 <div id="app-7" class="demo">
   <ol>
-    <todo v-for="todo in todos" v-bind:todo="todo"></todo>
+    <todo-item v-for="todo in todos" v-bind:todo="todo"></todo-item>
   </ol>
 </div>
 <script>
-Vue.component('todo', {
+Vue.component('todo-item', {
   props: ['todo'],
   template: '<li>{{ todo.text }}</li>'
 })
@@ -326,7 +337,7 @@ var app7 = new Vue({
 </script>
 {% endraw %}
 
-这只是一个例子，不过我们已经成功将应用分成两个更小的单元，并且子组件可以与父组件通过props很好地解耦。我们现在可以进一步使用复杂的模板和不影响父组件的逻辑改良`<todo>`组件
+这只是一个例子，不过我们已经成功将应用分成两个更小的单元，并且子组件可以与父组件通过props很好地解耦。我们现在可以进一步使用复杂的模板和不影响父组件的逻辑改良`<todo-item>`组件
 
 在大型应用中，很有必要把整个应用拆分使开发更好管理。更多关于组件的内容在[后面的指南](/guide/components.html),这里有个类似的示例展示应用的模板可以像这样：
 

src/guide/installation.md

@@ -2,10 +2,10 @@
 title: 安装
 type: guide
 order: 1
-vue_version: 2.0.0-rc.8
-dev_size: "183.80"
-min_size: "61.54"
-gz_size: "22.53"
+vue_version: 2.0.1
+dev_size: "184.49"
+min_size: "61.72"
+gz_size: "22.58"
 ---
 
 ### 兼容性
@@ -30,7 +30,7 @@ Vue.js 不支持 IE8 及其以下版本，因为 Vue.js 使用了 IE8 不能实
 
 ### CDN
 
-Recommended: [unpkg](https://unpkg.com/vue), which will reflect the latest version as soon as it is published to npm. You can also browse the source of the npm package at [unpkg.com/vue/](https://unpkg.com/vue/).
+Recommended: [unpkg](https://unpkg.com/vue/dist/vue.js), which will reflect the latest version as soon as it is published to npm. You can also browse the source of the npm package at [unpkg.com/vue/](https://unpkg.com/vue/).
 
 Also available on [jsdelivr](//cdn.jsdelivr.net/vue/{{vue_version}}/vue.js) or [cdnjs](//cdnjs.cloudflare.com/ajax/libs/vue/{{vue_version}}/vue.js), but these two services take some time to sync so the latest release may not be available yet.
 
@@ -47,23 +47,23 @@ $ npm install vue
 
 There are two builds available, the standalone build and the runtime-only build.
 
-- The standalone build includes the compiler and supports the `template` option.
+- The standalone build includes the compiler and supports the `template` option. **It also relies on the presence of browser APIs so you cannot use it for server-side rendering.**
 
 - The runtime-only build does not include the template compiler, and does not support the `template` option. You can only use the `render` option when using the runtime-only build, but it works with single-file components, because single-file components' templates are pre-compiled into `render` functions during the build step. The runtime-only build is roughly 30% lighter-weight than the standalone build, weighing only 16kb min+gzip.
 
-By default, the NPM package exports the standalone build. To use the runtime-only build, add the following alias to your webpack config:
+By default, the NPM package exports the **runtime-only** build. To use the standalone build, add the following alias to your webpack config:
 
 ``` js
 resolve: {
   alias: {
-    vue: 'vue/dist/vue.common.js'
+    vue: 'vue/dist/vue.js'
   }
 }
 ```
 
 对于Browserify,可以用 [aliasify](https://github.com/benbria/aliasify) 
 
-<p class="tip">Do NOT do `import Vue from 'vue/dist/vue.common.js'` - since some tools or 3rd party libraries may import vue as well, this may cause the app to load both the runtime and standalone builds at the same time and lead to errors.</p>
+<p class="tip">Do NOT do `import Vue from 'vue/dist/vue.js'` - since some tools or 3rd party libraries may import vue as well, this may cause the app to load both the runtime and standalone builds at the same time and lead to errors.</p>
 
 ### CSP environments
 

src/guide/migration.md

@@ -990,7 +990,7 @@ function pluralizeKnife (count) {
   if (count === 0) {
     return 'no knives'
   } else if (count === 1) {
-    return count + 'knife'
+    return '1 knife'
   } else {
     return count + 'knives'
   }

src/guide/single-file-components.md

@@ -49,7 +49,7 @@ After you've taken a day to dive into these resources, we recommend checking out
 
 The template uses [Webpack](https://webpack.github.io/), a module bundler that takes a number of "modules" and then bundle them into your final application. To learn more about Webpack itself, [this video](https://www.youtube.com/watch?v=WQue1AN93YU) offers a good intro. Once you get past the basics, you might also want to check out [this advanced Webpack course on Egghead.io](https://egghead.io/courses/using-webpack-for-production-javascript-applications).
 
-In Webpack, each module can be transformed by a "loader" before included into the bundle, and Vue offers the [vue-loader](https://github.com/vuejs/vue-loader) plugin to take care of translating `.vue` single-file components. The [webpack-simple](https://github.com/vuejs-templates/webpack-simple) template has already set up everything for you, but if you'd like to learn more about how `.vue` components work with Webpack, you can read [the docs for vue-loader](vue-loader.vuejs.org).
+In Webpack, each module can be transformed by a "loader" before included into the bundle, and Vue offers the [vue-loader](https://github.com/vuejs/vue-loader) plugin to take care of translating `.vue` single-file components. The [webpack-simple](https://github.com/vuejs-templates/webpack-simple) template has already set up everything for you, but if you'd like to learn more about how `.vue` components work with Webpack, you can read [the docs for vue-loader](https://vue-loader.vuejs.org).
 
 ### For Advanced Users
 
@@ -99,25 +99,3 @@ NODE_ENV=production browserify -g envify -e main.js | uglifyjs -c -m > build.js
 ``` bash
 NODE_ENV=production browserify -g envify -p [ vueify/plugins/extract-css -o build.css ] -e main.js | uglifyjs -c -m > build.js
 ```
-
-### Use the Runtime-Only Build
-
-There are two builds available, the standalone build and the runtime-only build.
-
-- The standalone build includes the compiler and supports the `template` option.
-
-- The runtime-only build does not include the template compiler, and does not support the `template` option. You can only use the `render` option when using the runtime-only build, but it works with single-file components, because single-file components' templates are pre-compiled into `render` functions during the build step. The runtime-only build is roughly 30% lighter-weight than the standalone build, weighing only 16kb min+gzip.
-
-By default, the NPM package exports the standalone build. To use the runtime-only build, add the following alias to your webpack config:
-
-``` js
-resolve: {
-  alias: {
-    vue: 'vue/dist/vue.common.js'
-  }
-}
-```
-
-For Browserify, you can use [aliasify](https://github.com/benbria/aliasify) to achieve the same.
-
-<p class="tip">Do NOT do `import Vue from 'vue/dist/vue.common.js'` - since some tools or 3rd party libraries may import vue as well, this may cause the app to load both the runtime and standalone builds at the same time and lead to errors.</p>

src/guide/ssr.md

@@ -207,7 +207,7 @@ server.listen(5000, function (error) {
 })
 ```
 
-这样就完成了。[整个示例](https://github.com/chrisvfritz/vue-ssr-demo-simple)，克隆下来深度实验。一个它在本地运行时，你可以通过在页面右击选择`页面资源`（或类似操作）确认服务选渲染真的运行了。可以在body中看到：
+这样就完成了。[整个示例](https://github.com/chrisvfritz/vue-ssr-demo-simple)，克隆下来深度实验。一旦它在本地运行时，你可以通过在页面右击选择`页面资源`（或类似操作）确认服务选渲染真的运行了。可以在body中看到：
 
 ``` html
 <div id="app" server-rendered="true">You have been here for 0 seconds&period;</div>

src/guide/unit-testing.md

@@ -93,7 +93,7 @@ import MyComponent from './MyComponent.vue'
 
 // helper function that mounts and returns the rendered text
 function getRenderedText (Component, propsData) {
-  const Ctor = Vue.extend(MyComponent)
+  const Ctor = Vue.extend(Component)
   const vm = new Ctor({ propsData }).$mount()
   return vm.$el.textContent
 }

themes/vue/_config.yml

@@ -1,3 +1,3 @@
-google_analytics: UA-46852172-1
+google_analytics: 
 root_domain: vuefe.cn
-vue_version: 2.0正式版
+vue_version: 2.0.1

themes/vue/source/css/_sidebar.styl

@@ -58,7 +58,7 @@
         display none
         padding-left 0
 
-@media screen and (max-width: 720px)
+@media screen and (max-width: 900px)
     .sidebar
         position fixed
         z-index 8

themes/vue/source/css/page.styl

@@ -218,7 +218,7 @@
             bottom 12px
             left 140px
 
-@media screen and (max-width: 720px)
+@media screen and (max-width: 900px)
     #ad
         width 100%
     body
@@ -240,7 +240,7 @@
         padding 1.2em 1em
     .content
         &.with-sidebar
-            margin-left 0
+            margin auto
     .footer
         margin-left 0
         text-align center