From 58cd8f3f4e29df5cb2c6ec62fa95ea3969d90fba Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Wed, 3 Aug 2016 12:10:44 -0400
Subject: [PATCH] use jekyll-feed for default site RSS feed

---
 lib/jekyll/commands/new.rb    |  6 +++---
 lib/site_template/_config.yml |  2 ++
 lib/site_template/feed.xml    | 30 ------------------------------
 3 files changed, 5 insertions(+), 33 deletions(-)
 delete mode 100644 lib/site_template/feed.xml

diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb
index 9c3d06eb8c1..ada77242e88 100644
--- a/lib/jekyll/commands/new.rb
+++ b/lib/jekyll/commands/new.rb
@@ -80,9 +80,9 @@ def gemfile_contents
 # gem "github-pages", group: :jekyll_plugins
 
 # If you have any plugins, put them here!
-# group :jekyll_plugins do
-#   gem "jekyll-github-metadata", "~> 1.0"
-# end
+group :jekyll_plugins do
+   gem "jekyll-feed", "~> 0.6"
+end
 RUBY
         end
 
diff --git a/lib/site_template/_config.yml b/lib/site_template/_config.yml
index 9bed54e4b23..9a17fc3d36e 100644
--- a/lib/site_template/_config.yml
+++ b/lib/site_template/_config.yml
@@ -27,3 +27,5 @@ github_username:  jekyll
 # Build settings
 markdown: kramdown
 theme: minima
+gems:
+  - jekyll-feed
diff --git a/lib/site_template/feed.xml b/lib/site_template/feed.xml
deleted file mode 100644
index a6628bd842a..00000000000
--- a/lib/site_template/feed.xml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-layout: null
----
-<?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
-  <channel>
-    <title>{{ site.title | xml_escape }}</title>
-    <description>{{ site.description | xml_escape }}</description>
-    <link>{{ site.url }}{{ site.baseurl }}/</link>
-    <atom:link href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" rel="self" type="application/rss+xml"/>
-    <pubDate>{{ site.time | date_to_rfc822 }}</pubDate>
-    <lastBuildDate>{{ site.time | date_to_rfc822 }}</lastBuildDate>
-    <generator>Jekyll v{{ jekyll.version }}</generator>
-    {% for post in site.posts limit:10 %}
-      <item>
-        <title>{{ post.title | xml_escape }}</title>
-        <description>{{ post.content | xml_escape }}</description>
-        <pubDate>{{ post.date | date_to_rfc822 }}</pubDate>
-        <link>{{ post.url | prepend: site.baseurl | prepend: site.url }}</link>
-        <guid isPermaLink="true">{{ post.url | prepend: site.baseurl | prepend: site.url }}</guid>
-        {% for tag in post.tags %}
-        <category>{{ tag | xml_escape }}</category>
-        {% endfor %}
-        {% for cat in post.categories %}
-        <category>{{ cat | xml_escape }}</category>
-        {% endfor %}
-      </item>
-    {% endfor %}
-  </channel>
-</rss>