From 685cdbe124c339c839cb76715bd78559ea071b0a Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 1 Jul 2014 20:21:58 -0400
Subject: [PATCH 1/2] Release Jekyll v2.1.1

---
 History.markdown                              | 13 ++++++++----
 lib/jekyll/version.rb                         |  2 +-
 .../2014-07-01-jekyll-2-1-1-released.markdown | 20 +++++++++++++++++++
 3 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 site/_posts/2014-07-01-jekyll-2-1-1-released.markdown

diff --git a/History.markdown b/History.markdown
index ee73923f..04f6df63 100644
--- a/History.markdown
+++ b/History.markdown
@@ -4,15 +4,20 @@
 
 ### Minor Enhancements
 
-  * Patch read vulnerabilities for data & confirm none for layouts (#2563)
-  * Update Maruku dependency to allow use of the latest version (#2576)
+### Bug Fixes
+
+### Development Fixes
+
+### Site Enhancements
+
+## 2.1.1 / 2014-07-01
 
 ### Bug Fixes
 
+  * Patch read vulnerabilities for data & confirm none for layouts (#2563)
+  * Update Maruku dependency to allow use of the latest version (#2576)
   * Remove conditional assignment from document URL to prevent stale urls (#2575)
 
-### Development Fixes
-
 ### Site Enhancements
 
   * Add vertical margin to `highlight` to separate code blocks (#2558)
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index b61af28b..68c9a40b 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end
diff --git a/site/_posts/2014-07-01-jekyll-2-1-1-released.markdown b/site/_posts/2014-07-01-jekyll-2-1-1-released.markdown
new file mode 100644
index 00000000..fe000ed3
--- /dev/null
+++ b/site/_posts/2014-07-01-jekyll-2-1-1-released.markdown
@@ -0,0 +1,20 @@
+---
+layout: news_item
+title: 'Jekyll 2.1.1 Released'
+date: 2014-07-01 20:16:43 -0400
+author: parkr
+version: 2.1.1
+categories: [release]
+---
+
+This is a security release for Jekyll 2.1.0. It covers two vulnerabilities:
+
+1. One in the reading of data
+2. One in the `layouts` setting
+
+They were identified in Jekyll 1.5.1 and has been confirmed as patched
+in this version and the version used by GitHub Pages. If you are in the
+business of building Jekyll sites, please ensure you upgrade to 2.1.1 as
+soon as possible.
+
+For more, check out [`jekyll/jekyll#2563`](https://github.com/jekyll/jekyll/pull/2563).

From 9df9edc4c725e94b201e460adb31360844198d1c Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 10 Jul 2014 09:43:55 -0700
Subject: [PATCH 2/2] Finished the Jekyll 2.1.1 release post. [ci skip]

---
 .../_posts/2014-07-01-jekyll-2-1-1-released.markdown | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/site/_posts/2014-07-01-jekyll-2-1-1-released.markdown b/site/_posts/2014-07-01-jekyll-2-1-1-released.markdown
index fe000ed3..81423539 100644
--- a/site/_posts/2014-07-01-jekyll-2-1-1-released.markdown
+++ b/site/_posts/2014-07-01-jekyll-2-1-1-released.markdown
@@ -7,7 +7,10 @@ version: 2.1.1
 categories: [release]
 ---
 
-This is a security release for Jekyll 2.1.0. It covers two vulnerabilities:
+This is a minor release for Jekyll 2.1.0. It fixes a couple bugs and
+introduces fixes for a couple security-related issues.
+
+It covers two security vulnerabilities:
 
 1. One in the reading of data
 2. One in the `layouts` setting
@@ -18,3 +21,10 @@ business of building Jekyll sites, please ensure you upgrade to 2.1.1 as
 soon as possible.
 
 For more, check out [`jekyll/jekyll#2563`](https://github.com/jekyll/jekyll/pull/2563).
+
+Additionally, the dependency on Maruku has been loosened and a bug was
+fixed with document URLs.
+
+As always, check out the [full changelog](/docs/history/) for more info!
+
+Happy Jekylling!