Merge pull request #1 from vuejs/master

Sync with master

Author: Alex-Sokolov

en/basic.md

@@ -30,7 +30,7 @@ const renderer = require('vue-server-renderer').createRenderer()
 renderer.renderToString(app, (err, html) => {
   if (err) throw err
   console.log(html)
-  // => <p data-server-rendered="true">hello world</p>
+  // => <div data-server-rendered="true">hello world</div>
 })
 ```
 

en/build-config.md

@@ -8,7 +8,7 @@ The server config is meant for generating the server bundle that will be passed
 
 ``` js
 const merge = require('webpack-merge')
-const nodeExternals = require('wepback-node-externals')
+const nodeExternals = require('webpack-node-externals')
 const baseConfig = require('./webpack.base.config.js')
 const VueSSRServerPlugin = require('vue-server-renderer/server-plugin')