updates

Author: yyx990803

source/api/directives.md

@@ -147,7 +147,7 @@ Example inehriting individual properties (using the same data):
 
 ## Literal Directives
 
-> Literal directives treat their attribute value as a plain string; they do not attempt to bind themselves to anything. All they do is executing the `bind()` function with the string value once.
+> Literal directives treat their attribute value as a plain string; they do not attempt to bind themselves to anything. All they do is executing the `bind()` function with the string value once. Literal directives accept mustache expressions inside their value, but these expressions will be evaludated only once on first compile and do not react to data changes.
 
 ### v-component
 
@@ -159,7 +159,7 @@ Only respected when used in combination with `v-component`, `v-with` or `v-repea
 
 ### v-partial
 
-Replace the element's innerHTML with a registered partial. Partials can be registered with `Vue.partial()` or passed inside the `partials` option. You can also use this syntax:
+Replace the element's innerHTML with a registered partial. Partials can be registered with `Vue.partial()` or passed inside the `partials` option. You can also use this syntax (which doesn't support expressions):
 
 ``` html
 <div>&#123;&#123;> my-partial&#125;&#125;</div>

source/api/instance-methods.md

@@ -3,7 +3,7 @@ type: api
 order: 4
 ---
 
-## Data Changes
+## Data
 
 > You can observe data changes on a ViewModel. Note that all watch callbacks fire asynchronously. In addition, value changes are batched within an event loop. This means when a value changes multiple times within a single event loop, the callback will be fired only once with the latest value.
 
@@ -21,6 +21,19 @@ Watch a keypath on the vm's data object for changes and call the callback with t
 
 Stop watching the given keypath. If a callback is given only that callback gets unwatched.
 
+### vm.$get( keypath )
+
+- **keypath** `String`
+
+Retrieve a data value from the vm given a keypath. Non-existent paths always return `undefined`.
+
+### vm.$set( keypath, value )
+
+- **keypath** `String`
+- **value** `*`
+
+Set a data value on the vm given a keypath. If the path doesn't exist it will be created.
+
 ## Cross-ViewModel Events
 
 > Each vm is also an event emitter. When you have multiple nested ViewModels, you can use the event system to communicate between them.

source/guide/composition.md

@@ -1,11 +1,11 @@
-title: Composing ViewModels
+title: Composing Components
 type: guide
 order: 10
 ---
 
 ## Registering a Component
 
-Vue.js allows you to treat registered ViewModel constructors as reusable components. To register a component, use the global `Vue.component()` method:
+Vue.js allows you to treat registered ViewModel constructors as reusable components that is conceptually similar to [Web Components](http://www.w3.org/TR/components-intro/), without requiring any polyfills. To register a component, use the global `Vue.component()` method:
 
 ``` js
 var MyComponent = Vue.extend({
@@ -28,12 +28,14 @@ Then you can use it in a parent ViewModel's template:
 <div v-component="my-component"></div>
 ```
 
-If you prefer, all registered components can also be used in the form of a custom element tag:
+If you prefer, components can also be used in the form of a custom element tag:
 
 ``` html
 <my-component></my-component>
 ```
 
+<p class="tip">To avoid naming collisions with native elements and stay consistent with the W3C Custom Elements specification, the component's ID **must** contain a hyphen `-` to be usable as a custom tag.</p>
+
 ## Partials and {&#123;>yield&#125;}
 
 You can use partials in templates with {&#123;>partial-id&#125;}, which inserts the partial registered via `Vue.partial('partial-id', '...')`. But there is a special reserved partial ID: `yield`. Basically, the `yield` partial inside a template serves as a insertion point for the original, pre-compile content inside the element. This syntax allows components to be easily nested and composed while maintaining their custom markup. For example:

source/guide/directives.md

@@ -64,7 +64,17 @@ Some directives don't create data bindings - they simply take the attribute valu
 <div v-component="my-component"></div>
 ```
 
-Here `"my-component"` is not a data property - it's a string ID that Vue.js uses to lookup the corresponding Component constructor. A full list of literal directives can be found in the [API reference](/api/directives.html#literal-directives).
+Here `"my-component"` is not a data property - it's a string ID that Vue.js uses to lookup the corresponding Component constructor.
+
+Since Vue.js 0.9.4, you can also use mustache expressions inside literal directives. This allows you to dynamically resolve the type of component you want to use:
+
+``` html
+<div v-component="{&#123; isOwner ? 'owner-panel' : 'guest-panel' &#125;}"></div>
+```
+
+<p class="tip">Mustache expressions inside literal directives are evaluated only once. After the directive has been compiled, it will no longer react to value changes.</p>
+
+A full list of literal directives can be found in the [API reference](/api/directives.html#literal-directives).
 
 ## Empty Directives