Merge pull request emberjs#226 from michaelrkn/patch-1

Change "resource" to "route" in Naming Conventions

Author: trek

source/concepts/naming-conventions.md

@@ -199,7 +199,7 @@ anything!
 
 ## Nesting
 
-You can nest routes under a `resource`.
+You can nest routes:
 
 ```javascript
 export default Ember.Router.extend().map(function(){
@@ -209,6 +209,7 @@ export default Ember.Router.extend().map(function(){
   });
 });
 ```
+
 Here are the naming conventions for each of the routes defined in
 this router: