From f39f1169847f590b390249827892d65ea5c22944 Mon Sep 17 00:00:00 2001
From: Dave Goodchild <dave@davegoodchild.co.uk>
Date: Tue, 7 Nov 2017 09:06:54 +0100
Subject: [PATCH 1/2] Update index.md

Adding a tip relating to the fact that v-html content is unaffected by scoped styling, and explaining an example way around it.
---
 src/v2/api/index.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/v2/api/index.md b/src/v2/api/index.md
index 33abc848f7..0b79040387 100644
--- a/src/v2/api/index.md
+++ b/src/v2/api/index.md
@@ -1686,6 +1686,8 @@ type: api
 
   <p class="tip">Dynamically rendering arbitrary HTML on your website can be very dangerous because it can easily lead to [XSS attacks](https://en.wikipedia.org/wiki/Cross-site_scripting). Only use `v-html` on trusted content and **never** on user-provided content.</p>
 
+  <p class="tip">Using `scoped` styles will not work with this directive because the content isn't created by Vue's rendering system, it simply uses `innerHTML`. Instead, if you are using Vue template files, you can define multiple `<style>` tags. Most of your `(S)CSS` (or whatever flavour you are using) would go in `<style lang="scss" scoped>` and then only styles specific to `v-html` related content that cannot be scoped can go in `<style lang="scss">`.</p>
+
 - **Example:**
 
   ```html

From 0b1ca2ff925199a9724de3946f71dee623ebe540 Mon Sep 17 00:00:00 2001
From: Chris Fritz <chrisvfritz@gmail.com>
Date: Tue, 7 Nov 2017 19:27:34 -0500
Subject: [PATCH 2/2] Revise note about v-html and scoped styles

---
 src/v2/api/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/v2/api/index.md b/src/v2/api/index.md
index 0b79040387..0f861b8ab4 100644
--- a/src/v2/api/index.md
+++ b/src/v2/api/index.md
@@ -1686,7 +1686,7 @@ type: api
 
   <p class="tip">Dynamically rendering arbitrary HTML on your website can be very dangerous because it can easily lead to [XSS attacks](https://en.wikipedia.org/wiki/Cross-site_scripting). Only use `v-html` on trusted content and **never** on user-provided content.</p>
 
-  <p class="tip">Using `scoped` styles will not work with this directive because the content isn't created by Vue's rendering system, it simply uses `innerHTML`. Instead, if you are using Vue template files, you can define multiple `<style>` tags. Most of your `(S)CSS` (or whatever flavour you are using) would go in `<style lang="scss" scoped>` and then only styles specific to `v-html` related content that cannot be scoped can go in `<style lang="scss">`.</p>
+  <p class="tip">In [single-file components](../guide/single-file-components.html), `scoped` styles will not apply to content inside `v-html`, because that HTML is not processed by Vue's template compiler. In you want to target `v-html` content with scoped CSS, you can instead use [CSS modules](https://vue-loader.vuejs.org/en/features/css-modules.html) or an additional, global `<style>` element with a manual scoping strategy such as BEM.</p>
 
 - **Example:**