Merge branch 'master' of github.com:vuejs/vuejs.org

Author: yyx990803

src/guide/components.md

@@ -23,7 +23,7 @@ To use this constructor as a component, you need to **register** it with `Vue.co
 Vue.component('my-component', MyComponent)
 ```
 
-Note that Vue.js does not enforce the [W3C rules](http://www.w3.org/TR/custom-elements/#concepts) for custom tag-names (all-lowercase, must contain a hyphen) though following this convention is considered good practice.
+<p class="tip">Note that Vue.js does not enforce the [W3C rules](http://www.w3.org/TR/custom-elements/#concepts) for custom tag-names (all-lowercase, must contain a hyphen) though following this convention is considered good practice.</p>
 
 Once registered, the component can now be used in a parent instance's template as a custom element, `<my-component>`. Make sure the component is registered **before** you instantiate your root Vue instance. Here's the full example:
 

themes/vue/layout/index.ejs

@@ -117,9 +117,9 @@
   <ul>
     <li>Extendable Data bindings</li>
     <li>Plain JS object models</li>
-    <li>API that simply makes sense</li>
-    <li>Build UI by composing components</li>
-    <li>Mix &amp; matching small libraries</li>
+    <li>APIs that simply make sense</li>
+    <li>Building UIs by composing components</li>
+    <li>Mixing &amp; matching small libraries</li>
   </ul>
 </div>
 <div id="footer">