5 files changed, 47 insertions, 41 deletions
diff --git a/docs/content/taxonomies/displaying.md b/docs/content/taxonomies/displaying.md
index 118fc8f23..3abe6bed2 100644
--- a/docs/content/taxonomies/displaying.md
+++ b/docs/content/taxonomies/displaying.md
@@ -1,14 +1,15 @@
 ---
-title:  "Displaying Taxonomies"
-date: "2013-07-01"
-linktitle: "Displaying"
-aliases: ["/indexes/displaying/"]
-weight: 20
+aliases:
+- /indexes/displaying/
+date: 2013-07-01
+linktitle: Displaying
 menu:
   main:
-    parent: 'taxonomy'
-prev: "/taxonomies/usage"
-next: "/taxonomies/templates"
+    parent: taxonomy
+next: /taxonomies/templates
+prev: /taxonomies/usage
+title: Displaying Taxonomies
+weight: 20
 ---
 
 There are four common ways you can display the data in your
diff --git a/docs/content/taxonomies/ordering.md b/docs/content/taxonomies/ordering.md
index 632bd1dc8..b5e178d98 100644
--- a/docs/content/taxonomies/ordering.md
+++ b/docs/content/taxonomies/ordering.md
@@ -1,15 +1,16 @@
 ---
-title: "Ordering Taxonomies"
-date: "2013-07-01"
-linktitle: "Ordering"
-aliases: ["/indexes/ordering/"]
-weight: 60
+aliases:
+- /indexes/ordering/
+date: 2013-07-01
+linktitle: Ordering
 menu:
   main:
-    identifier: "Ordering Taxonomies"
-    parent: 'taxonomy'
-prev: "/taxonomies/templates"
-next: "/extras/aliases"
+    identifier: Ordering Taxonomies
+    parent: taxonomy
+next: /extras/aliases
+prev: /taxonomies/templates
+title: Ordering Taxonomies
+weight: 60
 ---
 
 Hugo provides the ability to both:
diff --git a/docs/content/taxonomies/overview.md b/docs/content/taxonomies/overview.md
index b9244ef59..472159d28 100644
--- a/docs/content/taxonomies/overview.md
+++ b/docs/content/taxonomies/overview.md
@@ -1,15 +1,18 @@
 ---
-title: "Taxonomy Overview"
-linktitle: "Overview"
-date: "2013-07-01"
-aliases: ["/indexes/overview/","/doc/indexes/", "/extras/indexes"]
-weight: 10
+aliases:
+- /indexes/overview/
+- /doc/indexes/
+- /extras/indexes
+date: 2013-07-01
+linktitle: Overview
 menu:
   main:
-    parent: 'taxonomy'
-    identifier: 'taxonomy overview'
-prev: "/templates/404"
-next: "/taxonomies/usage"
+    identifier: taxonomy overview
+    parent: taxonomy
+next: /taxonomies/usage
+prev: /templates/404
+title: Taxonomy Overview
+weight: 10
 ---
 
 Hugo includes support for user defined groupings of content called
diff --git a/docs/content/taxonomies/templates.md b/docs/content/taxonomies/templates.md
index 969d27a1a..43e27a6aa 100644
--- a/docs/content/taxonomies/templates.md
+++ b/docs/content/taxonomies/templates.md
@@ -1,14 +1,15 @@
 ---
-title: "Taxonomy Templates"
-date: "2013-07-01"
-linktitle: "Templates"
-aliases: ["/indexes/templates/"]
-weight: 30
+aliases:
+- /indexes/templates/
+date: 2013-07-01
+linktitle: Templates
 menu:
   main:
-    parent: 'taxonomy'
-prev: "/templates/displaying"
-next: "/taxonomies/ordering"
+    parent: taxonomy
+next: /taxonomies/ordering
+prev: /templates/displaying
+title: Taxonomy Templates
+weight: 30
 ---
 
 There are two different templates that the use of taxonomies will require you to provide.
diff --git a/docs/content/taxonomies/usage.md b/docs/content/taxonomies/usage.md
index 49ac2b06f..1b16e5580 100644
--- a/docs/content/taxonomies/usage.md
+++ b/docs/content/taxonomies/usage.md
@@ -1,13 +1,13 @@
 ---
-title: "Using Taxonomies"
-linktitle: "Usage"
-date: "2014-05-26"
-weight: 15
+date: 2014-05-26
+linktitle: Usage
 menu:
   main:
-    parent: 'taxonomy'
-prev: "/taxonomies/overview"
-next: "/taxonomies/displaying"
+    parent: taxonomy
+next: /taxonomies/displaying
+prev: /taxonomies/overview
+title: Using Taxonomies
+weight: 15
 ---
 
 ## Defining taxonomies for a site