Merge pull request #227 from crswll/component-param-attributes

Added the param attributes for <component> to the API and gave `keep-alive` a header in the guide...

Author: yyx990803

src/api/index.md

@@ -970,7 +970,7 @@ type: api
 ### vm.$watch( expOrFn, callback, [options] )
 
 - **Arguments:**
-  - `{String|Function} expOrFn`
+  - `{String | Function} expOrFn`
   - `{Function} callback`
   - `{Object} [options]`
     - `{Boolean} deep`
@@ -1290,7 +1290,7 @@ type: api
 ### vm.$appendTo( elementOrSelector, [callback] )
 
 - **Arguments:**
-  - `{Element|String} elementOrSelector`
+  - `{Element | String} elementOrSelector`
   - `{Function} [callback]`
 
 - **Returns:** `vm` - the instance itself
@@ -1302,7 +1302,7 @@ type: api
 ### vm.$before( elementOrSelector, [callback] )
 
 - **Arguments:**
-  - `{Element|String} elementOrSelector`
+  - `{Element | String} elementOrSelector`
   - `{Function} [callback]`
 
 - **Returns:** `vm` - the instance itself
@@ -1314,7 +1314,7 @@ type: api
 ### vm.$after( elementOrSelector, [callback] )
 
 - **Arguments:**
-  - `{Element|String} elementOrSelector`
+  - `{Element | String} elementOrSelector`
   - `{Function} [callback]`
 
 - **Returns:** `vm` - the instance itself
@@ -1373,7 +1373,7 @@ type: api
 ### vm.$mount( [elementOrSelector] )
 
 - **Arguments:**
-  - `{Element|String} [elementOrSelector]`
+  - `{Element | String} [elementOrSelector]`
 
 - **Returns:** `vm` - the instance itself
 
@@ -1784,6 +1784,10 @@ type: api
 - **Attributes:**
   - `is`
 
+- **Param Attributes:**
+  - [`keep-alive`](/guide/components.html#keep-alive)
+  - [`transition-mode`](/guide/components.html#transition-mode)
+
 - **Usage:**
 
   Alternative syntax for invoking components. Primarily used for dynamic components with the `is` attribute:

src/guide/components.md

@@ -652,6 +652,7 @@ new Vue({
   <!-- component changes when vm.currentview changes! -->
 </component>
 ```
+### `keep-alive`
 
 If you want to keep the switched-out components alive so that you can preserve its state or avoid re-rendering, you can add a `keep-alive` directive param: