add layout as function

nuxt · Mar 24, 2017 · 2bfb234 · 2bfb234
1 parent be36811
commit 2bfb234
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/en/api/pages-layout.md b/en/api/pages-layout.md
@@ -7,13 +7,17 @@ description: Every file (first level) in the layouts directory will create a cus
 
 > Every file (first level) in the layouts directory will create a custom layout accessible with the layout property in the page component.
 
-- **Type:** `String` (default: `'default'`)
+- **Type:** `String` or `Function` (default: `'default'`)
 
 Use the `layout` key in your pages components to define which layout to use:
 
 ```js
 export default {
-  layout: 'blog'
+  layout: 'blog',
+  // OR
+  layout (context) {
+    return 'blog'
+  }
 }
 ```
 

diff --git a/en/guide/routing.md b/en/guide/routing.md
@@ -111,7 +111,7 @@ More information about the validate method: [API Pages validate](/api/pages-vali
 
 Nuxt.js lets you create nested route by using the children routes of vue-router.
 
-To define a nested route, you need to create a Vue file with the **same name as the directory** which contain your children views.
+To define the parent component of a nested route, you need to create a Vue file with the **same name as the directory** which contain your children views.
 
 <p class="Alert Alert--info">Don't forget to write `<nuxt-child/>` inside the parent component (.vue file).</p>