diff --git a/src/guide/migration/custom-elements-interop.md b/src/guide/migration/custom-elements-interop.md index afc1f88b5b..1135dc87ab 100644 --- a/src/guide/migration/custom-elements-interop.md +++ b/src/guide/migration/custom-elements-interop.md @@ -7,7 +7,7 @@ badges: ## Overview -- **BREAKING:** Custom elements whitelisting is now performed during template compilation, and should be configured via compiler options instead of runtime config. +- **BREAKING:** The checks to determine whether tags should be treated as custom elements are now performed during template compilation, and should be configured via compiler options instead of runtime config. - **BREAKING:** Special `is` prop usage is restricted to the reserved `` tag only. - **NEW:** There is new `v-is` directive to support 2.x use cases where `is` was used on native elements to work around native HTML parsing restrictions. @@ -21,7 +21,7 @@ If we want to add a custom element defined outside of Vue (e.g. using the Web Co ### 2.x Syntax -In Vue 2.x, whitelisting tags as custom elements was done via `Vue.config.ignoredElements`: +In Vue 2.x, configuring tags as custom elements was done via `Vue.config.ignoredElements`: ```js // This will make Vue ignore custom element defined outside of Vue diff --git a/src/guide/migration/introduction.md b/src/guide/migration/introduction.md index c9a0d0300f..21258e2011 100644 --- a/src/guide/migration/introduction.md +++ b/src/guide/migration/introduction.md @@ -89,7 +89,7 @@ The following consists a list of breaking changes from 2.x: ### Custom Elements -- [Custom elements whitelisting is now performed during template compilation](/guide/migration/custom-elements-interop.html) +- [Custom element checks are now performed during template compilation](/guide/migration/custom-elements-interop.html) - [Special `is` prop usage is restricted to the reserved `` tag only](/guide/migration/custom-elements-interop.html#customized-built-in-elements) ### Other Minor Changes diff --git a/src/guide/template-syntax.md b/src/guide/template-syntax.md index ca460876c0..9b2c55a555 100644 --- a/src/guide/template-syntax.md +++ b/src/guide/template-syntax.md @@ -206,4 +206,4 @@ Unless you have a "someattr" property in your instance, your code won't work. #### JavaScript Expressions -Template expressions are sandboxed and only have access to a [whitelist of globals](https://github.com/vuejs/vue-next/blob/master/packages/shared/src/globalsWhitelist.ts#L3) such as `Math` and `Date`. You should not attempt to access user defined globals in template expressions. +Template expressions are sandboxed and only have access to a [restricted list of globals](https://github.com/vuejs/vue-next/blob/master/packages/shared/src/globalsWhitelist.ts#L3) such as `Math` and `Date`. You should not attempt to access user defined globals in template expressions.