Port forward the release information for v3.1.4

History.markdown

@@ -101,6 +101,17 @@
   * Add pubstorm deployment instructions to docs (#4881)
   * Corrected pagination docs for hidden: true feature (#4903)
 
+## 3.1.4 / 2016-05-18
+
+### Bug Fixes
+
+  * Add `ExcerptDrop` and remove excerpt's ability to refer to itself in Liquid (#4907)
+  * Configuration permalink fix where `collections.posts.permalink` inherits properly from `permalink` only when it doesn't exist (#4910)
+  * Add `Configuration.from` to make it easier to build configs from just a hash
+  * Sorting `site.collections` in Liquid by label (#4910)
+  * Fix bug where `layout` in Liquid would inherit from previously-rendered layouts' metadatas (#4909)
+  * Fix bug where `layout` in Liquid would override in the wrong direction (more-specific layouts' data were overwritten by their parent layouts' data; this has now been reversed) (#4909)
+
 ## 3.1.3 / 2016-04-18
 
   * Fix defaults for Documents to lookup defaults based on `relative_path` instead of `url` (#4807)

lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '3.1.2'
+  VERSION = '3.1.4'
 end

site/_docs/history.md

@@ -5,6 +5,20 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 3.1.4 / 2016-05-18
+{: #v3-1-4}
+
+### Bug Fixes
+{: #bug-fixes-v3-1-4}
+
+- Add `ExcerptDrop` and remove excerpt's ability to refer to itself in Liquid ([#4907]({{ site.repository }}/issues/4907))
+- Configuration permalink fix where `collections.posts.permalink` inherits properly from `permalink` only when it doesn't exist ([#4910]({{ site.repository }}/issues/4910))
+- Add `Configuration.from` to make it easier to build configs from just a hash
+- Sorting `site.collections` in Liquid by label ([#4910]({{ site.repository }}/issues/4910))
+- Fix bug where `layout` in Liquid would inherit from previously-rendered layouts' metadatas ([#4909]({{ site.repository }}/issues/4909))
+- Fix bug where `layout` in Liquid would override in the wrong direction (more-specific layouts' data were overwritten by their parent layouts' data; this has now been reversed) ([#4909]({{ site.repository }}/issues/4909))
+
+
 ## 3.1.3 / 2016-04-18
 {: #v3-1-3}
 

site/_posts/2016-05-18-jekyll-3-1-4-released.markdown

@@ -0,0 +1,26 @@
+---
+layout: news_item
+title: 'Jekyll 3.1.4 "Stability Sam" Released'
+date: 2016-05-18 16:50:37 -0700
+author: parkr
+version: 3.1.4
+categories: [release]
+---
+
+Hey Jekyllites!
+
+Today, we released v3.1.4 in an effort to bring more stability to the v3.1.x series. This bugfix release consists of:
+
+* A fix for `layout` in Liquid where values would carry over from one document to the next
+* A fix for `layout` in Liquid where a parent layout (e.g. `default` or `base`) would overwrite the metadata of the child layout (e.g. `post` or `special`).
+* A fix where `page.excerpt` referencing its excerpt would cause an infinite loop of recursive horror.
+* We added `Configuration.from` and the great permalink fix from [v3.0.4](/news/2016/04/19/jekyll-3-0-4-released/) to the v3.1.x series
+* `site.collections` in Liquid is now sorted alphabetically by label, so `docs` shows up before `posts` reliably.
+
+The fixes for `layout` may not be seamless for everyone, but we believe they will be the "right thing to do" going forward.
+
+We are alwawys striving to make Jekyll more straight-forward to use. Please do open an issue if you believe an aspect of Jekyll's user experience isn't up to par.
+
+For a full history of our changes, [see the changelog](/docs/history/#v3-1-4).
+
+As always, Happy Jekylling!

site/latest_version.txt

@@ -1 +1 @@
-3.1.2
+3.1.4