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
- _layouts
directory.
+ _layouts
directory.
null
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
+ frontmatter defaults.
+ none
in a post/document will
+ produce a file without using a layout file regardless of frontmatter defaults.
+ Using none
in a page, however, will cause Jekyll to attempt to
+ use a layout named "none".
+