diff --git a/archetypes/default.md b/archetypes/default.md
index f30f01f74..e325a7d99 100644
--- a/archetypes/default.md
+++ b/archetypes/default.md
@@ -10,4 +10,4 @@ weight: 00
 slug: ""
 aliases: []
 toc: false
----
\ No newline at end of file
+---
diff --git a/content/content-management/front-matter.md b/content/content-management/front-matter.md
index bc4ccd885..7edcb4b81 100644
--- a/content/content-management/front-matter.md
+++ b/content/content-management/front-matter.md
@@ -108,7 +108,7 @@ There are a few predefined variables that Hugo is aware of. See [Page Variables]
 : the meta keywords for the content.
 
 `layout`
-: the layout Hugo should select from the [lookup order][lookup] when rendering the content.
+: the layout Hugo should select from the [lookup order][lookup] when rendering the content. If a `type` is not specified in the front matter, Hugo will look for the layout of the same name in the layout directory that corresponds with a content's section.
 
 `lastmod`
 : the datetime at which the content was last modified.
@@ -119,6 +119,9 @@ There are a few predefined variables that Hugo is aware of. See [Page Variables]
 `markup`
 : **experimental**; specify `"rst"` for reStructuredText (requires`rst2html`) or `"md"` (default) for Markdown.
 
+`outputs`
+: allows you to specify output formats specific to the content. See [output formats][outputs]
+
 `publishdate`
 : if in the future, content will not be rendered unless the `--buildFuture` flag is passed to `hugo`.
 
@@ -184,9 +187,10 @@ It's possible to set some options for Markdown rendering in a content's front ma
 [content type]: /content-management/types/
 [contentorg]: /content-management/organization/
 [json]: /documents/ecma-404-json-spec.pdf "Specification for JSON, JavaScript Object Notation"
-[lists]: /templates/lists/#ordering-content
-[lookup]: /templates/lookup-order/
+[lists]: /templates/lists/#ordering-content "See how to order content in list pages; for example, templates that look to specific _index.md for content and front matter."
+[lookup]: /templates/lookup-order/ "Hugo traverses your templates in a specific order when rendering content to allow for DRYer templating."
 [ordering]: /templates/lists/ "Hugo provides multiple ways to sort and order your content in list templates"
+[outputs]: /templates/output-formats/ "With the release of v22, you can output your content to any text format using Hugo's familiar templating"
 [pagevars]: /variables/page/
 [section]: /content-management/sections/
 [taxweight]: /content-management/taxonomies/
diff --git a/content/templates/output-formats.md b/content/templates/output-formats.md
index 29b07a891..4c3f430d3 100644
--- a/content/templates/output-formats.md
+++ b/content/templates/output-formats.md
@@ -1,6 +1,6 @@
 ---
 title: Custom Output Formats
-linktitle: Output Formats
+linktitle: Custom Output Formats
 description: Hugo can output content in multiple formats, including calendar events, e-book formats, Google AMP, and JSON search indexes, while allowing extensibility for any format your site needs.
 date: 2017-03-22
 publishdate: 2017-03-22