Merge commit 'dbc92f9ba96031d9cfb8fa8ec186ebe1f72c173a' into feature/ui-update-Oct2019

# Conflicts:
#	package-lock.json
#	package.json
#	src/CNAME
#	src/v2/api/index.md
#	src/v2/guide/class-and-style.md
#	src/v2/guide/comparison.md
#	src/v2/guide/components-registration.md
#	src/v2/guide/components-slots.md
#	src/v2/guide/components.md
#	src/v2/guide/computed.md
#	src/v2/guide/conditional.md
#	src/v2/guide/custom-directive.md
#	src/v2/guide/deployment.md
#	src/v2/guide/events.md
#	src/v2/guide/filters.md
#	src/v2/guide/forms.md
#	src/v2/guide/index.md
#	src/v2/guide/installation.md
#	src/v2/guide/instance.md
#	src/v2/guide/join.md
#	src/v2/guide/list.md
#	src/v2/guide/migration-vue-router.md
#	src/v2/guide/migration.md
#	src/v2/guide/mixins.md
#	src/v2/guide/plugins.md
#	src/v2/guide/reactivity.md
#	src/v2/guide/render-function.md
#	src/v2/guide/single-file-components.md
#	src/v2/guide/ssr.md
#	src/v2/guide/state-management.md
#	src/v2/guide/syntax.md
#	src/v2/guide/transitioning-state.md
#	src/v2/guide/transitions.md
#	src/v2/guide/typescript.md
#	src/v2/guide/unit-testing.md
#	src/v2/style-guide/index.md
#	themes/vue/_config.yml
#	themes/vue/layout/index.ejs
#	themes/vue/layout/page.ejs
#	themes/vue/layout/partials/ecosystem_dropdown.ejs
#	themes/vue/layout/partials/language_dropdown.ejs
#	themes/vue/layout/partials/learn_dropdown.ejs
#	themes/vue/layout/partials/sidebar.ejs
#	themes/vue/layout/partials/sponsors.ejs
#	themes/vue/layout/partials/sponsors_sidebar.ejs
#	themes/vue/layout/partials/support_vue_dropdown.ejs
#	themes/vue/layout/partials/toc.ejs
#	themes/vue/layout/search-page.ejs
#	themes/vue/layout/sponsors-page.ejs
#	themes/vue/source/css/_common.styl
#	themes/vue/source/css/_header.styl
#	themes/vue/source/css/_sponsors-page.styl
#	themes/vue/source/css/_sponsors-sidebar.styl
#	themes/vue/source/css/index.styl
#	themes/vue/source/css/page.styl
#	themes/vue/source/images/2mhost.png
#	themes/vue/source/images/actualize.png
#	themes/vue/source/images/bit.png
#	themes/vue/source/images/htmlburger.png
#	themes/vue/source/images/itunescn.png
#	themes/vue/source/images/jsfiddle.png
#	themes/vue/source/images/juejin.png
#	themes/vue/source/images/monterail.png
#	themes/vue/source/images/neds.png
#	themes/vue/source/images/someline.png
#	themes/vue/source/images/strikingly.png
#	themes/vue/source/images/tde.png
#	themes/vue/source/images/tmvuejs2.png
#	themes/vue/source/images/valuecoders.png
#	themes/vue/source/js/common.js

Author: hakoiko

.editorconfig

@@ -0,0 +1,7 @@
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true

.gitignore

@@ -6,3 +6,4 @@ node_modules/
 public/
 .deploy*/
 src/_drafts
+package-lock.json

.nvmrc

@@ -0,0 +1 @@
+v8.9.4

README.md

@@ -1,7 +1,11 @@
-# vuejs.org
+# vuejs.org
 
 This site is built with [hexo](http://hexo.io/). Site content is written in Markdown format located in `src`. Pull requests welcome!
 
+## Writing
+
+See the [Vue Docs Writing Guide](https://github.com/vuejs/vuejs.org/blob/master/writing-guide.md) for our rules and recommendations on writing and maintaining documentation.
+
 ## Developing
 
 ``` bash
@@ -11,26 +15,27 @@ $ npm start # dev server at http://localhost:4000
 
 ## Deploying
 
-The site is deployed using GitHub pages, therefore you need push access to the vuejs.org repo to run the deploy script:
+The site is automatically deployed when commits land in `master`, via [Netlify](https://www.netlify.com/).
 
-``` bash
-$ npm run deploy
-```
+If you are the maintainer of a community translation fork and would like to deploy via Netlify instead of GitHub pages, please ping @yyx990803 in an issue to request a Netlify team membership and DNS update.
 
-If you are working on a fork and deploying to a different URL, you need to update the following accordingly:
+## On Translations
 
-- `url` and `deploy` sections in `_config.yml`
-- `src/CNAME`
+Translations for this documentation project are currently maintained in separate repositories forked from this original one.
 
-## On Translations
+### Arabic
 
-Translation for this documentation project are currently maintained in separate repositories forked from this original one.
+Arabic translation is maintained by [Interstellar Club](https://github.com/InterstellarClub)
+
+* Translation Repo - [/interstellarClub/ar.vuejs.org](https://github.com/interstellarClub/ar.vuejs.org)
+* Primary Maintainers :
+    * [Ilyes Chouia](https://github.com/celyes)
+    * [Ahmed Aissaoui](https://github.com/Aissaoui-Ahmed)
 
 ### French
 
 French translation is maintained by Vuejs-FR.
-
-* Translation Repo — [/vuejs-fr/vuejs.org](https://github.com/vuejs-fr/vuejs.org)
+* Translation Repo - [/vuejs-fr/vuejs.org](https://github.com/vuejs-fr/vuejs.org)
 
 ### Italian
 
@@ -42,6 +47,10 @@ Japanese translation is maintained by [Vue.js japan user group](https://github.c
 
 * Translation Repo - [/vuejs/jp.vuejs.org](https://github.com/vuejs/jp.vuejs.org)
 * Primary maintainer - [kazupon](https://github.com/kazupon)
+* Secondary Maintainers:
+    * [re-fort](https://github.com/re-fort)
+    * [potato4d](https://github.com/potato4d)
+    * [oohira](https://github.com/oohira)
 
 ### Korean
 
@@ -54,6 +63,13 @@ Korean translation is maintained by [Vue.js Korean User group](https://github.co
 
 * Translation Repo - [/vuejs/cn.vuejs.org](https://github.com/vuejs/cn.vuejs.org)
 
+### Persian (Farsi)
+
+Persian translation is maintained by VueJS-fa.
+
+* Translation Repo - [/vuejs-fa/fa.vuejs.org](https://github.com/vuejs-fa/fa.vuejs.org)
+* Primary maintainer - [Pooya Parsa](https://github.com/pi0)
+
 ### Português-Br
 
 Português-Br translation is maintained by [Vuejs-Br](https://github.com/vuejs-br).
@@ -64,25 +80,41 @@ Português-Br translation is maintained by [Vuejs-Br](https://github.com/vuejs-b
 
 Russian translation is maintained by Translation Gang.
 
-* Translation Repo — [/translation-gang/ru.vuejs.org](https://github.com/translation-gang/ru.vuejs.org)
+* Translation Repo - [/translation-gang/ru.vuejs.org](https://github.com/translation-gang/ru.vuejs.org)
 * Primary maintainer - [Grigoriy Beziuk](https://gbezyuk.github.io)
 
 ### Spanish
 
-Spanish translation is maintained by VueJS-ES.
+* Translation Repo - [/1950Labs/vuejs.org](https://github.com/1950Labs/vuejs.org)
+* Spanish translation is maintained by:
 
-* Translation Repo - [/vuejs-es/vuejs.org](https://github.com/vuejs-es/vuejs.org)
+[1950Labs](https://1950labs.com) & [Vue.js Montevideo](https://www.meetup.com/Montevideo-Vue-JS-Meetup/):
 
-### Persian (Farsi)
+- [Leonel More](https://github.com/leonelmore) | [Twitter](https://twitter.com/leonelmore)
+- [Sebastián Camacho](https://github.com/sxcamacho) | [Twitter](https://twitter.com/sxcamacho)
+- [Diana Rodríguez](https://github.com/alphacentauri82) | [Twitter](https://twitter.com/cotufa82)
+- [Alejandro Parada](https://github.com/alejandro8605)
+- [José Javier Señaris](https://github.com/pepesenaris) | [Twitter](https://twitter.com/pepesenaris)
+- [Federico Kauffman](https://github.com/fedekau) | [Twitter](https://twitter.com/fedekauffman)
+- [Fabián Larrañaga](https://github.com/FLarra) | [Twitter](https://twitter.com/FLarraa)
+- [Pablo Marcano](https://github.com/Pablosky12) | [Twitter](https://twitter.com/stiv_ml)
+- [Nicolás Tinte](https://github.com/Tintef) | [Twitter](https://twitter.com/NicoTinte)
+- [Diego Barreiro](https://github.com/faliure)
+- [Matías Verdier](https://github.com/MatiasVerdier) | [Twitter](https://twitter.com/matiasvj)
+- [Pablo Kz](https://github.com/pabloKz)
+- [Leonardo Fagundez](https://github.com/lfgdzdev) | [Twitter](https://twitter.com/Lfgdz)
 
-Persian translation is maintained by VueJS-fa.
 
-* Translation Repo - [/vuejs-fa/fa.vuejs.org](https://github.com/vuejs-fa/fa.vuejs.org)
-* Primary maintainer - [Pooya Parsa](https://github.com/pi0)
+### Vietnamese
+
+Vietnamese translation is maintained by [Vue.js Vietnam User group](https://github.com/vuejs-vn/).
+
+* Translation Repo: [/vuejs-vn/vuejs.org](https://github.com/vuejs-vn/vuejs.org)
+* Primary maintainer - [phanan](https://github.com/phanan)
 
 ### Want to help with the translation?
 
-If you feel okay with translating sorta alone, you can fork the repo, create a "work-in-progress" issue to inform others that you're doing the translation, and go for it.
+If you feel okay with translating quite alone, you can fork the repo, post a comment on the [Community Translation Announcements](https://github.com/vuejs/vuejs.org/issues/2015) issue page to inform others that you're doing the translation and go for it.
 
 If you are more of a team player, Translation Gang might be for you. Let us know somehow that you're ready to join this international open-source translators community. Feel free to contact [Grigoriy Beziuk](https://gbezyuk.github.io) or anybody else from [the team](https://github.com/orgs/translation-gang/people).
 

_config.yml

@@ -1,6 +1,6 @@
 # Hexo Configuration
-## Docs: http://zespia.tw/hexo/docs/configuration.html
-## Source: https://github.com/tommy351/hexo/
+## Docs: https://hexo.io/docs/
+## Source: https://github.com/hexojs/hexo
 
 # Site
 title: Vue.js
@@ -39,6 +39,7 @@ highlight:
   enable: true
   line_number: false
   tab_replace:
+  hljs: true
 
 # Category & Tag
 default_category: uncategorized
@@ -77,8 +78,8 @@ pagination_dir: page
 disqus_shortname:
 
 # Extensions
-## Plugins: https://github.com/tommy351/hexo/wiki/Plugins
-## Themes: https://github.com/tommy351/hexo/wiki/Themes
+## Plugins: https://github.com/hexojs/hexo/wiki/Plugins
+## Themes: https://github.com/hexojs/hexo/wiki/Themes
 theme: vue
 exclude_generator:
 
@@ -135,7 +136,7 @@ offline:
         origin: maxcdn.bootstrapcdn.com
 
 # Deployment
-## Docs: http://zespia.tw/hexo/docs/deployment.html
+## Docs: https://hexo.io/docs/one-command-deployment
 deploy:
   type: git
   repository: [email protected]:vuejs-kr/kr.vuejs.org.git