From ab31983122a68933f4c2be140599957911b68095 Mon Sep 17 00:00:00 2001
From: i-give-up <freemium.model@gmail.com>
Date: Fri, 22 Sep 2017 14:55:19 +0800
Subject: [PATCH] Update frontmatter.md (#6371)

Merge pull request 6371
---
 docs/_docs/frontmatter.md | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/docs/_docs/frontmatter.md b/docs/_docs/frontmatter.md
index cf5aad13f14..b2b7699cdbe 100644
--- a/docs/_docs/frontmatter.md
+++ b/docs/_docs/frontmatter.md
@@ -65,9 +65,23 @@ front matter of a page or post.
 
           If set, this specifies the layout file to use. Use the layout file
           name without the file extension. Layout files must be placed in the
-          <code>_layouts</code> directory.
+          <code>_layouts</code> directory. 
 
         </p>
+        <ul>
+          <li>
+            Using <code>null</code> will produce a file without using a layout 
+            file. However this is overridden if the file is a post/document and has a 
+            layout defined in the <a href="../configuration/#front-matter-defaults">
+            frontmatter defaults</a>.
+          </li>
+          <li>
+            Starting from version 3.5.0, using <code>none</code> in a post/document will
+            produce a file without using a layout file regardless of frontmatter defaults.
+            Using <code>none</code> in a page, however, will cause Jekyll to attempt to
+            use a layout named "none".
+          </li>
+        </ul>
       </td>
     </tr>
     <tr>