获取官方最新英文文档更新Merge branch 'master' into 2.0-cn

* master: (38 commits)
  Fix a typing error. (#507)
  add source links to api entries
  remove warning about the migration helper not catching vue-router deprecations yet
  fix content overlapping sidebar on blog pages, fixes #431
  remove wrong statement about el: option. (#504)
  fix scoping error loadingRouteData example
  add arbitrary route properties to vue-router migration guide
  fix subRoutes case typo
  fix description for router.go deprecation
  added header background header transition and made it appear on slightly smaller screens to accomodate macbook air 11-inch
  make mobile bar box shadow more subtle
  make header mostly transparent on large screens to increase vertical content space
  make header box shadow more subtle
  extend sidebar scroll area to left wall
  Fix variable reference in $mount sample code. (#501)
  Updated firebase example inputs (#502)
  fix filter function examples, fixes #503
  add vuex migration guide
  update vue alias instructions
  fix sidebar not auto-scrolling on api page
  ...

# Conflicts:
#	src/api/index.md
#	src/examples/firebase.md
#	src/guide/components.md
#	src/guide/events.md
#	src/guide/instance.md
#	src/guide/migration-vue-router.md
#	src/guide/migration.md
#	src/guide/routing.md
#	src/guide/single-file-components.md
#	src/guide/transitions.md
#	themes/vue/layout/partials/ad.ejs
#	themes/vue/source/css/page.styl

Author: dingyiming

src/api/index.md

@@ -77,6 +77,8 @@ type: api
 
   指定组件的渲染和观察期间未捕获错误的处理函数。这个处理函数被调用时，可获取错误信息和 Vue 实例。
 
+  > [Sentry](https://sentry.io), an error tracking service, provides [official integration](https://sentry.io/for/vue/) using this option.
+
 ### keyCodes
 
 - **类型：** `{ [key: string]: number }`
@@ -86,10 +88,14 @@ type: api
 - **用法：**
 
   ``` js
-  Vue.config.keyCodes = { esc: 27 }
+  Vue.config.keyCodes = {
+    v: 86,
+    f1: 112,
+    mediaPlayPause: 179
+  }
   ```
 
-  自定义 v-on 键位别名。
+  给 v-on 自定义键位别名。
 
 ## 全局 API
 
@@ -1173,7 +1179,7 @@ type: api
 
   // 或者，在文档之外渲染并且随后挂载
   var component = new MyComponent().$mount()
-  document.getElementById('app').appendChild(vm.$el)
+  document.getElementById('app').appendChild(component.$el)
   ```
 
 - **另见：**

src/examples/firebase.md

@@ -5,4 +5,4 @@ order: 2
 ---
 
 > 本示例使用 [Firebase](https://firebase.google.com/) 作为数据存储后端，同时在客户端进行数据实时同步（你可以在多个浏览器窗口去打开它来验证）。另外，它通过计算属性实时验证，并且添加／移除选项时触发 CSS 过渡。
-<iframe width="100%" height="500" src="https://jsfiddle.net/yyx990803/hkrxmp0h/embedded/result,html,js,css" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="500" src="https://jsfiddle.net/chrisvfritz/pyLbpzzx/embedded/result,html,js,css" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

src/guide/comparison.md

@@ -1,7 +1,7 @@
 ---
 title: 对比其他框架
 type: guide
-order: 26
+order: 28
 ---
 这个页面无疑是最难编写的，但我们认为它也是非常重要的。或许你曾遇到了一些问题并且已经用其他的框架解决了。你来这里的目的是看看 Vue 是否有更好的解决方案。这也是我们在此想要回答的。
 

src/guide/components.md

@@ -212,7 +212,7 @@ new Vue({
 </script>
 {% endraw %}
 
-### 组合组件
+### 构成组件
 
 组件意味着协同工作，通常父子组件会是这样的关系：组件 A 在它的模版中使用了组件 B 。它们之间必然需要相互通信：父组件要给子组件传递数据，子组件需要将它内部发生的事情告知给父组件。然而，在一个良好定义的接口中尽可能将父子组件解耦是很重要的。这保证了每个组件可以在相对隔离的环境中书写和理解，也大幅提高了组件的可维护性和可重用性。
 

src/guide/deployment.md

@@ -0,0 +1,60 @@
+---
+title: Deploying For Production
+type: guide
+order: 20
+---
+
+## Stripping Out Warnings
+
+The minified standalone build of Vue has already stripped out all the warnings for you for a smaller file size, but when you are using tools like Webpack or Browserify, you will need some additional configuration to achieve this.
+
+### Webpack
+
+Use Webpack's [DefinePlugin](http://webpack.github.io/docs/list-of-plugins.html#defineplugin) to indicate a production environment, so that warning blocks can be automatically dropped by UglifyJS during minification. Example config:
+
+``` js
+var webpack = require('webpack')
+
+module.exports = {
+  // ...
+  plugins: [
+    // ...
+    new webpack.DefinePlugin({
+      'process.env': {
+        NODE_ENV: '"production"'
+      }
+    }),
+    new webpack.optimize.UglifyJsPlugin({
+      compress: {
+        warnings: false
+      }
+    })
+  ]
+}
+```
+
+### Browserify
+
+- Run your bundling command with `NODE_ENV` set to `"production"`. This tells `vueify` to avoid including hot-reload and development related code.
+- Apply a global [envify](https://github.com/hughsk/envify) transform to your bundle. This allows the minifier to strip out all the warnings in Vue's source code wrapped in env variable conditional blocks. For example:
+
+
+``` bash
+NODE_ENV=production browserify -g envify -e main.js | uglifyjs -c -m > build.js
+```
+
+- To extract styles to a separate css file use a extract-css plugin which is included in vueify.
+
+``` bash
+NODE_ENV=production browserify -g envify -p [ vueify/plugins/extract-css -o build.css ] -e main.js | uglifyjs -c -m > build.js
+```
+
+## Tracking Runtime Errors
+
+If a runtime error occurs during a component's render, it will be passed to the global `Vue.config.errorHandler` config function if it has been set. It might be a good idea to leverage this hook together with an error-tracking service like [Sentry](https://sentry.io), which provides [an official integration](https://sentry.io/for/vue/) for Vue.
+
+## Extracting CSS
+
+When using [Single-File Components](./single-file-components.html), the `<style>` tags are injected dynamically at runtime during development. In production you may want to extract the styles across all components into a single CSS file. For details on how to achieve this, consult the respective documentation for [vue-loader](http://vue-loader.vuejs.org/en/configurations/extract-css.html) and [vueify](https://github.com/vuejs/vueify#css-extraction).
+
+The official `webpack` template from `vue-cli` has this already configured out of the box.

src/guide/events.md

@@ -175,7 +175,7 @@ methods: {
 <form v-on:submit.prevent="onSubmit"></form>
 
 <!-- 修饰符可以串联  -->
-<a v-on:click.stop.prevent="doThat">
+<a v-on:click.stop.prevent="doThat"></a>
 
 <!-- 只有修饰符 -->
 <form v-on:submit.prevent></form>
@@ -218,13 +218,7 @@ methods: {
 - left
 - right
 
-同样支持单字母按键别名。
-
-``` html
-<input v-on:keyup.v="say('That is the first letter in Vue')">
-```
-
-在必要时，甚至可以自定义按键别名:
+可以通过全局 `config.keyCodes` 对象[自定义按键修饰符别名](/api/#keyCodes)：
 
 ``` js
 // 可以使用 @keyup.f1

src/guide/forms.md

@@ -36,7 +36,7 @@ new Vue({
 
 ``` html
 <span>Multiline message is:</span>
-<p>{{ message }}</p>
+<p style="white-space: pre">{{ message }}</p>
 <br>
 <textarea v-model="message" placeholder="add multiple lines"></textarea>
 ```

src/guide/installation.md

@@ -59,7 +59,7 @@ $ npm install vue
 ``` js
 resolve: {
   alias: {
-    vue: 'vue/dist/vue.js'
+    'vue$': 'vue/dist/vue.js'
   }
 }
 ```

src/guide/instance.md

@@ -73,7 +73,7 @@ vm.$watch('a', function (newVal, oldVal) {
 })
 ```
 
-<p class="tip">注意，不要在实例属性或者回调函数中（如 `vm.$watch('a', newVal => this.myMethod())`）使用箭头函数。原因是箭头函数绑定父上下文，所以 `this` 不会像预想的一样是 Vue 实例，而是 `this.myMethod` 未被定义。</p>
+<p class="tip">注意，不要在实例属性或者回调函数中（如 `vm.$watch('a', newVal => this.myMethod())`）使用[箭头函数](https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Functions/Arrow_functions)。因为箭头函数绑定父上下文，所以 `this` 不会像预想的一样是 Vue 实例，而是 `this.myMethod` 未被定义。</p>
 
 实例属性和方法的完整列表中查阅 [API 参考](/api)。
 

src/guide/join.md

@@ -1,7 +1,7 @@
 ---
 title: 加入Vue.js社区
 type: guide
-order: 27
+order: 29
 ---
 
 Vue.js 的社区正在急速增长中，如果你正在阅读本文，这是你准备好加入 Vue.js 社区的大好机会。欢迎！

src/guide/migration-vue-router.md

@@ -1,13 +1,51 @@
 ---
 title: 从Vue Router 0.7.x迁移
 type: guide
-order: 25
+order: 26
 ---
 
 > 只有Vue Router 2与Vue 2是相互兼容的，所以如果你需要更新Vue,你也需要更新Vue Router。这也就是我们在主文档中将迁移路径的内容添加进来的原因。
 如果想要进一步了解新Vue Router的使用详情，请移步 [Vue Router docs](http://router.vuejs.org/en/).
 
-<p class="tip">以下的弃用名单应该相对完整，但是迁移助手会不定期更新以保证赶上更新的进度.</p>
+
+## Router Initialization
+
+### `router.start` <sup>deprecated</sup>
+
+There is no longer a special API to initialize an app with Vue Router. That means instead of:
+
+``` js
+router.start({
+  template: '<router-view></router-view>'
+}, '#app')
+```
+
+You'll just pass a router property to a Vue instance:
+
+``` js
+new Vue({
+  el: '#app',
+  router: router,
+  template: '<router-view></router-view>'
+})
+```
+
+Or, if you're using the runtime-only build of Vue:
+
+``` js
+new Vue({
+  el: '#app',
+  router: router,
+  render: h => h('router-view')
+})
+```
+
+{% raw %}
+<div class="upgrade-path">
+  <h4>Upgrade Path</h4>
+  <p>Run the <a href="https://github.com/vuejs/vue-migration-helper">migration helper</a> on your codebase to find examples of <code>router.start</code> being called.</p>
+</div>
+{% endraw %}
 
 ## Route 定义
 
@@ -92,14 +130,14 @@ router.match = createMatcher(
 </div>
 {% endraw %}
 
-### `subroutes` <sup>弃用</sup>
+### `subRoutes` <sup>弃用</sup>
 
 [重命名为`children`](http://router.vuejs.org/en/essentials/nested-routes.html)出于与Vue以及其他路由库的一致性考虑.
 
 {% raw %}
 <div class="upgrade-path">
   <h4>升级路径</h4>
-  <p>运行<a href="https://github.com/vuejs/vue-migration-helper">迁移助手</a>命令去寻找示例<code>subroutes</code>的选项.</p>
+  <p>运行 <a href="https://github.com/vuejs/vue-migration-helper">迁移助手</a>命令去寻找示例 <code>subRoutes</code> 的选项。</p>
 </div>
 {% endraw %}
 
@@ -162,6 +200,44 @@ alias: ['/manage', '/administer', '/administrate']
 </div>
 {% endraw %}
 
+### Arbitrary Route Properties
+
+Arbitrary route properties must now be scoped under the new meta property, to avoid conflicts with future features. So for example, if you had defined:
+
+``` js
+'/admin': {
+  component: AdminPanel,
+  requiresAuth: true
+}
+```
+
+Then you would now update it to:
+
+``` js
+{
+  path: '/admin',
+  component: AdminPanel,
+  meta: {
+    requiresAuth: true
+  }
+}
+```
+
+Then when later accessing this property on a route, you will still go through meta. For example:
+
+``` js
+if (route.meta.requiresAuth) {
+  // ...
+}
+```
+
+{% raw %}
+<div class="upgrade-path">
+  <h4>Upgrade Path</h4>
+  <p>Run the <a href="https://github.com/vuejs/vue-migration-helper">migration helper</a> on your codebase to find examples of arbitrary route properties not scoped under meta.</p>
+</div>
+{% endraw %}
+
 ## Route 匹配
 
 路由匹配现在使用[path-to-regexp](https://github.com/pillarjs/path-to-regexp)这个包,这将会使得工作与之前相比更加灵活.
@@ -232,12 +308,12 @@ alias: ['/manage', '/administer', '/administrate']
 
 ### `router.go`
 
-[重命名为`router.push`](http://router.vuejs.org/en/essentials/navigation.html#routerpushlocation) 出于在[HTML5 History API](https://developer.mozilla.org/en-US/docs/Web/API/History_API)与语使用的一致性原则.
+为了与 [HTML5 History API](https://developer.mozilla.org/en-US/docs/Web/API/History_API) 保持一致性，`router.go` 已经被用来作为 [后退/前进导航](https://router.vuejs.org/en/essentials/navigation.html#routergon)，[`router.push` ](http://router.vuejs.org/en/essentials/navigation.html#routerpushlocation) 用来导向特殊页面。
 
 {% raw %}
 <div class="upgrade-path">
   <h4>升级路径</h4>
-  <p>运行<a href="https://github.com/vuejs/vue-migration-helper">迁移助手</a>命令去寻找<code>router.go</code>指令被调用的示例</p>
+  <p>运行<a href="https://github.com/vuejs/vue-migration-helper">迁移助手</a>命令, 寻找 <code>router.go</code> 和 <code>router.push</code> 指令被调用的示例</p>
 </div>
 {% endraw %}
 
@@ -456,20 +532,22 @@ data: function () {
 },
 watch: {
   '$route': function () {
-    this.isLoading = true
-    this.fetchData().then(() => {
-      this.isLoading = false
+    var self = this
+    self.isLoading = true
+    self.fetchData().then(function () {
+      self.isLoading = false
     })
   }
 },
 methods: {
   fetchData: function () {
+    var self = this
     return axios.get('/api/posts')
       .then(function (response) {
-        this.posts = response.data.posts
+        self.posts = response.data.posts
       })
       .catch(function (error) {
-        this.fetchError = error
+        self.fetchError = error
       })
   }
 }