diff --git a/content/templates/rss.md b/content/templates/rss.md
index e7d64f3f5..f68a2e104 100644
--- a/content/templates/rss.md
+++ b/content/templates/rss.md
@@ -5,7 +5,7 @@ description: Hugo ships with its own RSS 2.0 template that requires almost no co
 date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
-keywords: [rss, xml]
+keywords: [rss, xml, templates]
 categories: [templates]
 menu:
   docs:
@@ -20,12 +20,7 @@ toc: true
 
 ## RSS Template Lookup Order
 
-You can use a single RSS template to generate all of your RSS feeds or create a specific template for each individual feed.
-
-1. `/layouts/section/<section>.rss.xml`
-2. `/layouts/_default/rss.xml`
-3. `/themes/<theme>/layouts/section/<section>.rss.xml`
-4. `/themes/<theme>/layouts/_default/rss.xml`
+See [Template Lookup](/templates/lookup-order/).
 
 {{% note "Hugo Ships with an RSS Template" %}}
 Hugo ships with its own [RSS 2.0 template](#the-embedded-rss-xml). The embedded template will be sufficient for most use cases.
diff --git a/content/templates/shortcode-templates.md b/content/templates/shortcode-templates.md
index 9770eb392..31e866414 100644
--- a/content/templates/shortcode-templates.md
+++ b/content/templates/shortcode-templates.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [templates]
-keywords: [shortcodes]
+keywords: [shortcodes,templates]
 menu:
   docs:
     parent: "templates"
diff --git a/content/templates/single-page-templates.md b/content/templates/single-page-templates.md
index 127a157a2..79e1312b2 100644
--- a/content/templates/single-page-templates.md
+++ b/content/templates/single-page-templates.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-04-06
 categories: [templates]
-keywords: [page]
+keywords: [page,templates]
 menu:
   docs:
     parent: "templates"
diff --git a/content/templates/sitemap-template.md b/content/templates/sitemap-template.md
index 309d85e75..98a4c2b1d 100644
--- a/content/templates/sitemap-template.md
+++ b/content/templates/sitemap-template.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [templates]
-keywords: [sitemap, xml]
+keywords: [sitemap, xml, templates]
 menu:
   docs:
     parent: "templates"
diff --git a/content/templates/taxonomy-templates.md b/content/templates/taxonomy-templates.md
index e187c2e02..f3b349a39 100644
--- a/content/templates/taxonomy-templates.md
+++ b/content/templates/taxonomy-templates.md
@@ -6,7 +6,7 @@ date: 2017-02-01
 publishdate: 2017-02-01
 lastmod: 2017-02-01
 categories: [templates]
-keywords: [taxonomies,metadata,front matter,terms]
+keywords: [taxonomies,metadata,front matter,terms,templates]
 menu:
   docs:
     parent: "templates"