From 0fd8f96b3d0b5eef47a0bb6cdf33fc8fe9274bcb Mon Sep 17 00:00:00 2001
From: Chris Fritz <chrisvfritz@gmail.com>
Date: Sat, 20 May 2017 10:51:27 -0400
Subject: [PATCH] add is attribute to API

---
 src/v2/api/index.md | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/v2/api/index.md b/src/v2/api/index.md
index 91e762aa64..cf299fcf3e 100644
--- a/src/v2/api/index.md
+++ b/src/v2/api/index.md
@@ -1785,7 +1785,7 @@ All lifecycle hooks automatically have their `this` context bound to the instanc
 
   <!-- prop binding. "prop" must be declared in my-component. -->
   <my-component :prop="someThing"></my-component>
-  
+
   <!-- pass down parent props in common with a child component -->
   <child-component v-bind="$props"></child-component>
 
@@ -1958,6 +1958,31 @@ All lifecycle hooks automatically have their `this` context bound to the instanc
 
 - **See also:** [Named Slots](../guide/components.html#Named-Slots)
 
+### is
+
+- **Expects:** `string`
+
+  Used for [dynamic components](../guide/components.html#Dynamic-Components) and to work around [limitations of in-DOM templates](../guide/components.html#DOM-Template-Parsing-Caveats).
+
+  For example:
+
+  ``` html
+  <!-- component changes when currentView changes -->
+  <component v-bind:is="currentView"></component>
+
+  <!-- necessary because <my-row> would be invalid inside -->
+  <!-- a <table> element and so would be hoisted out      -->
+  <table>
+    <tr is="my-row"></tr>
+  </table>
+  ```
+
+  For detailed usage, follow the links in the description above.
+
+- **See also:**
+  - [Dynamic Components](../guide/components.html#Dynamic-Components)
+  - [DOM Template Parsing Caveats](../guide/components.html#DOM-Template-Parsing-Caveats)
+
 ## Built-In Components
 
 ### component