From 109c326136166699d3c99e9e822b6109316b6200 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pyapar@gmail.com>
Date: Wed, 20 Feb 2019 13:05:56 +0330
Subject: [PATCH] merge master into dev (#219)

---
 docs/helpers.md | 2 +-
 docs/options.md | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/helpers.md b/docs/helpers.md
index d1d98bf..9094546 100644
--- a/docs/helpers.md
+++ b/docs/helpers.md
@@ -17,7 +17,7 @@ Example: (`plugins/axios.js`)
 ```js
 export default function ({ $axios, redirect }) {
   $axios.onError(error => {
-    if(error.code === 500) {
+    if(error.response.status === 500) {
       redirect('/sorry')
     }
   })
diff --git a/docs/options.md b/docs/options.md
index fed0e75..36746ce 100644
--- a/docs/options.md
+++ b/docs/options.md
@@ -18,6 +18,8 @@ Base URL which is used and prepended to make requests in server side.
 
 Environment variable `API_URL` can be used to **override** `baseURL`.
 
+**Note:** `baseURL` and `proxy` doesn't work together, you need to use `prefix` instead.
+
 ### `browserBaseURL`
 
 * Default: `baseURL` (or `prefix` when `options.proxy` is enabled)