Merge pull request #4819 from jekyll/release-posts

Release posts for v3.0.4 and v3.1.3

site/_docs/history.md

@@ -5,6 +5,13 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 3.1.3 / 2016-04-18
+{: #v3-1-3}
+
+- Fix defaults for Documents to lookup defaults based on `relative_path` instead of `url` ([#4807]({{ site.repository }}/issues/4807))
+- Use SSLEnable instead of EnableSSL and make URL HTTPS (WEBrick) ([#4693]({{ site.repository }}/issues/4693))
+
+
 ## 3.1.2 / 2016-02-19
 {: #v3-1-2}
 
@@ -168,6 +175,13 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Correct Minor spelling error ([#4394]({{ site.repository }}/issues/4394))
 
 
+## 3.0.4 / 2016-04-18
+{: #v3-0-4}
+
+- Fix defaults for Documents to lookup defaults based on `relative_path` instead of `url` ([#4806]({{ site.repository }}/issues/4806))
+- Configuration: allow users to specify a `collections.posts.permalink` directly without `permalink` clobbering it ([#4753]({{ site.repository }}/issues/4753))
+
+
 ## 3.0.3 / 2016-02-08
 {: #v3-0-3}
 

site/_posts/2016-04-19-jekyll-3-0-4-released.markdown

@@ -0,0 +1,24 @@
+---
+layout: news_item
+title: 'Jekyll 3.0.4 Released'
+date: 2016-04-19 10:26:12 -0700
+author: parkr
+version: 3.0.4
+categories: [release]
+---
+
+v3.0.4 is a patch release which fixes the follow two issues:
+
+- Front matter defaults may not have worked for collection documents and posts due to a problem where they were looked up by their URL rather than their path relative to the site source
+- Configuration for the posts permalink might be borked when a user specified a value for `collections.posts.permalink` directly. This forced the use of `permalink` at the top level, which also affected pages. To configure a permalink _just for posts_, you can do so with:
+
+{% highlight yaml %}
+collections:
+  posts:
+    output: true
+    permalink: /blog/:year/:title/
+{% endhighlight %}
+
+Both of these issues have been resolved. For more information, check out [the full history](/docs/history/#v3-0-4).
+
+Happy Jekylling!

site/_posts/2016-04-19-jekyll-3-1-3-released.markdown

@@ -0,0 +1,18 @@
+---
+layout: news_item
+title: 'Jekyll 3.1.3 Released'
+date: 2016-04-19 10:26:16 -0700
+author: parkr
+version: 3.1.3
+categories: [release]
+---
+
+v3.1.3 is a patch release which fixes the follow two issues:
+
+- Front matter defaults may not have worked for collection documents and posts due to a problem where they were looked up by their URL rather than their path relative to the site source
+- Running `jekyll serve` with SSL enabled was broken due to a bad configuration.
+
+Both of these issues have been resolved. For more information, check out [the full history](/docs/history/#v3-1-3).
+
+Happy Jekylling!
+