Merge branch '2.0'

* 2.0: (113 commits)
  fix typos in guide introduction
  update version select
  update deploy URL and CNAME
  update example fiddles
  add vue-router migration guide
  improve Vue.extend API docs (vuejs#422)
  tweak index
  fix support page mobile sidebar
  tweak mobile
  update runtime build info
  tweak position
  responsive css
  redesign homepage
  2.0.0-rc.8
  update makefile
  update src links
  Update index.md (vuejs#421)
  vm.$slots documentation improvement (vuejs#419)
  Minor grammar / typo change (vuejs#417)
  add note about lack of async loading in browserify
  ...

Author: dingyiming

Makefile

@@ -3,13 +3,12 @@ all: update deploy
 deploy:
 	rm -f db.json
 	hexo generate
-	cp -R ./todomvc public/examples
 	hexo deploy
 
 update:
 	cd ../vue && \
 		git checkout -- dist && \
-		git checkout next && \
+		git checkout dev && \
 		npm run build
 	cp ../vue/dist/vue.min.js themes/vue/source/js/vue.min.js
 	cp ../vue/dist/vue.js themes/vue/source/js/vue.js

_config.yml

@@ -97,7 +97,7 @@ markdown:
 ## Docs: http://zespia.tw/hexo/docs/deployment.html
 deploy:
   type: git
-  repository: git@github.com:vuejs/rc.vuejs.org.git
+  repository: git@github.com:vuejs/vuejs.org.git
 
 feed:
   type: atom

assets/lifecycle.ai

@@ -6,7 +6,7 @@
     "version": "3.2.2"
   },
   "dependencies": {
-    "hexo": "^3.2.0",
+    "hexo": "^3.2.2",
     "hexo-deployer-git": "0.1.0",
     "hexo-generator-archive": "^0.1.4",
     "hexo-generator-category": "^0.1.3",
@@ -18,4 +18,4 @@
     "hexo-renderer-stylus": "^0.3.1",
     "hexo-server": "^0.2.0"
   }
-}
+}

package.json

@@ -1 +1 @@
-rc.vuejs.org
+vuejs.org