diff --git a/content/_index.md b/content/_index.md
index 50895b360..c2f034da0 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -40,4 +40,5 @@ sections:
     image: /images/home-page-templating-example.png
     copy: "Hugo's Go-based templating provides just the right amount of logic to build anything from the simple to complex. If you prefer Jade/Pug-like syntax, you can also use Amber, Ace, or any combination of the three."
 ---
+
 Hugo is one of the most popular open-source static site generators. With its amazing speed and flexibility, Hugo makes building websites fun again.
diff --git a/content/content-management/custom-outputs.md b/content/templates/custom-outputs.md
similarity index 94%
rename from content/content-management/custom-outputs.md
rename to content/templates/custom-outputs.md
index 41753a577..98dd24583 100644
--- a/content/content-management/custom-outputs.md
+++ b/content/templates/custom-outputs.md
@@ -1,6 +1,6 @@
 ---
 title: Custom Outputs
-linktitle: Custom Outputs
+linktitle: Custom Output Templates
 description: Hugo can output content in multiple formats to make quick work of
 date: 2017-03-22
 publishdate: 2017-03-22
@@ -9,20 +9,16 @@ categories: [content management]
 tags: ["amp","outputs"]
 menu:
   docs:
-    parent: "content-management"
+    parent: "templatesd"
     weight: 100
   quicklinks:
 weight: 100	#rem
 draft: false
-aliases: [/extras/custom-output-types/]
+aliases: [/extras/custom-output-types/,/content-management/custom-outputs/]
 toc: true
 wip: true
 ---
 
-{{% warning %}}
-Custom output formats is a major feature being released with v20. The following copy is taken from the original proposal and spec and is therefore far from complete.
-{{% /warning %}}
-
 ## Media Type
 
 We add a  media type (also known as MIME type and content type). This is a two-part identifier for file formats and format contents transmitted on the Internet.