Updated global config

Author: FadyMak

src/api/index.md

@@ -6,7 +6,7 @@ type: api
 
 `Vue.config` is an object containing Vue's global configurations. You can modify its properties listed below before bootstrapping your application:
 
-### debug
+### silent
 
 - **Type:** `Boolean`
 
@@ -15,89 +15,79 @@ type: api
 - **Usage:**
 
   ``` js
-  Vue.config.debug = true
+  Vue.config.silent = true
   ```
 
-  When in debug mode, Vue will:
-
-  1. Print stack traces for all warnings.
-
-  2. Make all anchor nodes visible in the DOM as Comment nodes. This makes it easier to inspect the structure of the rendered result.
-
-  <p class="tip">Debug mode is only available in development build.</p>
+  Suppress all Vue logs and warnings.
 
-### delimiters
+### optionMergeStrategies
 
-- **Type:** `Array<String>`
+- **Type:** `Object`
 
-- **Default:** `{% raw %}["{{", "}}"]{% endraw %}`
+- **Default:** `{}`
 
 - **Usage:**
 
   ``` js
-  // ES6 template string style
-  Vue.config.delimiters = ['${', '}']
-  ```
-
-  Change the plain text interpolation delimiters.
-
-### unsafeDelimiters
-
-- **Type:** `Array<String>`
-
-- **Default:** `{% raw %}["{{{", "}}}"]{% endraw %}`
+  Vue.config.optionMergeStrategies._my_option = function (parent, child, vm) {
+    return child + 1
+  }
 
-- **Usage:**
+  const Profile = Vue.extend({
+    _my_option: 1
+  })
 
-  ``` js
-  // make it look more dangerous
-  Vue.config.unsafeDelimiters = ['{!!', '!!}']
+  // Profile.options._my_option = 2
   ```
 
-  Change the raw HTML interpolation delimiters.
+  Define custom merging strategies for options.
 
-### silent
+  The merge strategy receives the value of that option defined on the parent and child instances as the first and second arguments, respectively. The context Vue instance is passed as the third argument.
+
+### devtools
 
 - **Type:** `Boolean`
 
-- **Default:** `false`
+- **Default:** `true` (`false` in production builds)
 
 - **Usage:**
 
   ``` js
-  Vue.config.silent = true
+  // make sure to set this synchronously immediately after loading Vue
+  Vue.config.devtools = true
   ```
 
-  Suppress all Vue.js logs and warnings.
+  Configure whether to allow [vue-devtools](https://github.com/vuejs/vue-devtools) inspection. This option's default value is `true` in development builds and `false` in production builds. You can set it to `true` to enable inspection for production builds.
 
-### async
+### errorHandler
 
-- **Type:** `Boolean`
+- **Type:** `Function`
 
-- **Default:** `true`
+- **Default:** Error is thrown in place
 
 - **Usage:**
 
   ``` js
-  Vue.config.async = false
+  Vue.config.errorHandler = function (err, vm) {
+    // handle error
+  }
   ```
 
-  When async mode is off, Vue will perform all DOM updates synchronously upon detecting data change. This may help with debugging in some scenarios, but could also cause degraded performance and affect the order in which watcher callbacks are called. **`async: false` is not recommended in production.**
+  Assign a handler for uncaught errors during component render and watchers. The handler gets called with the error and the Vue instance.
 
-### devtools
+### keyCodes
 
-- **Type:** `Boolean`
+- **Type:** `Object`
 
-- **Default:** `true` (`false` in production builds)
+- **Default:** `{}`
 
 - **Usage:**
 
   ``` js
-  // make sure to set this synchronously immediately after loading Vue
-  Vue.config.devtools = true
+  Vue.config.keyCodes = { esc: 27 }
   ```
 
-  Configure whether to allow [vue-devtools](https://github.com/vuejs/vue-devtools) inspection. This option's default value is `true` in development builds and `false` in production builds. You can set it to `true` to enable inspection for production builds.
+  Define custom key aliases for v-on.
 
 ## Global API