From dc894e41aff2aac876cd5e1b4beeef714d20f47f Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 29 Jul 2014 19:02:51 -0400
Subject: [PATCH] Prep for v2.2.0 release.

---
 History.markdown                              | 10 +++++
 lib/jekyll/version.rb                         |  2 +-
 .../2014-07-29-jekyll-2-2-0-released.markdown | 19 +++++++++
 site/docs/history.md                          | 39 +++++++++++++++++++
 4 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 site/_posts/2014-07-29-jekyll-2-2-0-released.markdown

diff --git a/History.markdown b/History.markdown
index 71d9bd9b..12461652 100644
--- a/History.markdown
+++ b/History.markdown
@@ -2,6 +2,16 @@
 
 ### Major Enhancements
 
+### Minor Enhancements
+
+### Bug Fixes
+
+### Development Fixes
+
+### Site Enhancements
+
+## 2.2.0 / 2014-07-29
+
 ### Minor Enhancements
 
   * Throw a warning if the specified layout does not exist (#2620)
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 68c9a40b..f6525aec 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '2.1.1'
+  VERSION = '2.2.0'
 end
diff --git a/site/_posts/2014-07-29-jekyll-2-2-0-released.markdown b/site/_posts/2014-07-29-jekyll-2-2-0-released.markdown
new file mode 100644
index 00000000..9410df62
--- /dev/null
+++ b/site/_posts/2014-07-29-jekyll-2-2-0-released.markdown
@@ -0,0 +1,19 @@
+---
+layout: news_item
+title: 'Jekyll 2.2.0 Released'
+date: 2014-07-29 18:59:13 -0400
+author: parkr
+version: 2.2.0
+categories: [release]
+---
+
+Jekyll 2.2.0 contains a few key updates:
+
+1. A warning will now fire if you specify a layout in any of your pages or
+    posts that doesn't exist.
+2. Certain Pygments options are now whitelisted in safe mode
+3. Categories in a post's path are now respected (i.e. folders in `_posts`
+   will now work properly).
+
+As always, a full list of the updates are on the
+[history page](/docs/history#v2-2-0). Happy Jekylling!
diff --git a/site/docs/history.md b/site/docs/history.md
index c78945b5..35f18250 100644
--- a/site/docs/history.md
+++ b/site/docs/history.md
@@ -5,6 +5,45 @@ permalink: "/docs/history/"
 prev_section: contributing
 ---
 
+## 2.2.0 / 2014-07-29
+{: #v2-2-0}
+
+### Minor Enhancements
+{: #minor-enhancements-v2-2-0}
+
+- Throw a warning if the specified layout does not exist ([#2620]({{ site.repository }}/issues/2620))
+- Whitelist Pygments options in safe mode ([#2642]({{ site.repository }}/issues/2642))
+
+### Bug Fixes
+{: #bug-fixes-v2-2-0}
+
+- Remove unnecessary `Jekyll::Tags::IncludeTag#blank?` method ([#2625]({{ site.repository }}/issues/2625))
+- Categories in the path are ignored ([#2633]({{ site.repository }}/issues/2633))
+
+### Development Fixes
+{: #development-fixes-v2-2-0}
+
+- Refactoring Errors & Requires of Third-Party stuff ([#2591]({{ site.repository }}/issues/2591))
+- Add further tests for categories ([#2584]({{ site.repository }}/issues/2584))
+- Proof site with html-proofer on change ([#2605]({{ site.repository }}/issues/2605))
+- Fix up bug in [#2605]({{ site.repository }}/issues/2605) which caused proofing the site not to function ([#2608]({{ site.repository }}/issues/2608))
+- Use `bundle exec` in `script/proof` ([#2610]({{ site.repository }}/issues/2610))
+
+### Site Enhancements
+{: #site-enhancements-v2-2-0}
+
+- Update Kramdown urls ([#2588]({{ site.repository }}/issues/2588))
+- Add `Jekyll::AutolinkEmail` and `Jekyll::GitMetadata` to the list of
+    third-party plugins ([#2596]({{ site.repository }}/issues/2596))
+- Fix a bunch of broken links in the site ([#2601]({{ site.repository }}/issues/2601))
+- Replace dead links with working links ([#2611]({{ site.repository }}/issues/2611))
+- Add jekyll-hook to deployment methods ([#2617]({{ site.repository }}/issues/2617))
+- Added kramdown-with-pygments plugin to the list of third-party plugins ([#2623]({{ site.repository }}/issues/2623))
+- Update outdated "Extras" page and remove duplicate documentation ([#2622]({{ site.repository }}/issues/2622))
+- Add co2 plugin to list of third-party plugins ([#2639]({{ site.repository }}/issues/2639))
+- Attempt to clarify the way Sass imports happen ([#2642]({{ site.repository }}/issues/2642))
+
+
 ## 2.1.1 / 2014-07-01
 {: #v2-1-1}