Merge branch 'master' of github.com:simulatedgreg/electron-vue

SimulatedGREG · SimulatedGREG · commit d4b97b225b2c · 2017-06-03T03:51:20.000-05:00
diff --git a/docs/en/faqs.md b/docs/en/faqs.md
@@ -7,6 +7,7 @@
 * [Why did `npm run lint` end with an error?](#why-did-npm-run-lint-end-with-an-error)
 * [Why can't I load my app in a web browser?](#why-cant-i-load-my-app-in-a-web-browser)
 * [How do I import `jquery`?](#how-do-import-jquery)
+* [How can I debug the `main` process?](#how-can-i-debug-the-main-process)
 
 ---
 
@@ -46,3 +47,9 @@ The default nature of eslint is to print linting errors to console, and if there
 
 If you are wanting to use `bootstrap`, I'm going to have to stop you right there. Using both `vue` and `jquery` in the same environment is a bad practice and leads to the two frameworks colliding with each other. I would highly recommend using a `bootstrap` alternative that uses `vue` for its JavaScript functionality. Some recommendations include [`bootstrap-vue`](https://github.com/bootstrap-vue/bootstrap-vue) and [`vue-strap`](https://github.com/yuche/vue-strap). For whatever reason you must use `jquery`, seek guidance from `webpack`'s documentation about the `ProvidePlugin` or see [\#192](https://github.com/SimulatedGREG/electron-vue/issues/192).
 
+## How can I debug the `main` process?
+
+When using `electron@^1.7.2` you can open up Google Chrome, head to `chrome://inspect`, and then pop open the remote electron process while your application is running in development mode.
+
+[Electron Documentation](https://github.com/electron/electron/blob/master/docs/tutorial/debugging-main-process.md)
+
diff --git a/docs/en/new-releases.md b/docs/en/new-releases.md
@@ -18,7 +18,7 @@ Major updates of electron-vue will be made through GitHub Milestones and will in
 * Migration to single `package.json` structure
 * Travis CI / AppVeyor configs for `electron-builder` users
 * Minimal web output of `renderer` process
-* Migration to `axiox`
+* Migration to `axios`
 * Full support for `main` process bundling
 * Rewrite of development and build scripts
 * Migration to `babili` to remove the need of transpiling down completely to ES5
