From 985f03112630634e33cd808a4376c0d439f3c793 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 17 Jul 2017 13:14:00 -0400
Subject: [PATCH] Backport guard-against-type-error-in-absolute-url from #6280
 to 3.5-stable [merge conflicts]

---
 History.markdown                              | 19 ++++------
 docs/_docs/history.md                         | 37 +++++++++++++++++++
 .../2017-07-17-jekyll-3-5-1-released.markdown | 19 ++++++++++
 docs/latest_version.txt                       |  2 +-
 lib/jekyll/version.rb                         |  2 +-
 5 files changed, 66 insertions(+), 13 deletions(-)
 create mode 100644 docs/_posts/2017-07-17-jekyll-3-5-1-released.markdown

diff --git a/History.markdown b/History.markdown
index c5aae12b987..59613ea8ff0 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,4 +1,9 @@
-## HEAD
+## 3.5.1 / 2017-07-17
+
+### Minor Enhancements
+
+  * Use Warn for deprecation messages (#6192)
+  * site template: Use plugins key instead of gems  (#6045)
 
 ### Bug Fixes
 
@@ -16,6 +21,8 @@
   * Add {%raw%} to Liquid example on site (#6179)
   * Added improved Pug plugin - removed 404 Jade plugin (#6174)
   * Linking the link (#6210)
+  * Small correction in documentation for includes (#6193)
+  * Fix docs site page margin (#6214)
 
 ### Development Fixes
 
@@ -23,16 +30,6 @@
   * Test with Ruby 2.4.1-1 on AppVeyor (#6176)
   * set minimum requirement for jekyll-feed (#6184)
 
-### Minor Enhancements
-
-  * Use Warn for deprecation messages (#6192)
-  * site template: Use plugins key instead of gems  (#6045)
-
-### Site Enhancements
-
-  * Small correction in documentation for includes (#6193)
-  * Fix docs site page margin (#6214)
-
 ## 3.5.0 / 2017-06-18
 
 ### Minor Enhancements
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index c2ba544a1e4..e5832bf0998 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -4,6 +4,43 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 3.5.1 / 2017-07-17
+{: #v3-5-1}
+
+### Minor Enhancements
+{: #minor-enhancements-v3-5-1}
+
+- Use Warn for deprecation messages ([#6192]({{ site.repository }}/issues/6192))
+- site template: Use plugins key instead of gems  ([#6045]({{ site.repository }}/issues/6045))
+
+### Bug Fixes
+{: #bug-fixes-v3-5-1}
+
+- Backward compatiblize URLFilters module ([#6163]({{ site.repository }}/issues/6163))
+- Static files contain front matter default keys when `to_liquid`'d  ([#6162]({{ site.repository }}/issues/6162))
+- Always normalize the result of the `relative_url` filter ([#6185]({{ site.repository }}/issues/6185))
+
+### Documentation
+
+- Update reference to trouble with OS X/macOS ([#6139]({{ site.repository }}/issues/6139))
+- added BibSonomy plugin ([#6143]({{ site.repository }}/issues/6143))
+- add plugins for multiple page pagination ([#6055]({{ site.repository }}/issues/6055))
+- Update minimum Ruby version in installation.md ([#6164]({{ site.repository }}/issues/6164))
+- [docs] Add information about finding a collection in `site.collections` ([#6165]({{ site.repository }}/issues/6165))
+- Add {%raw%} to Liquid example on site ([#6179]({{ site.repository }}/issues/6179))
+- Added improved Pug plugin - removed 404 Jade plugin ([#6174]({{ site.repository }}/issues/6174))
+- Linking the link ([#6210]({{ site.repository }}/issues/6210))
+- Small correction in documentation for includes ([#6193]({{ site.repository }}/issues/6193))
+- Fix docs site page margin ([#6214]({{ site.repository }}/issues/6214))
+
+### Development Fixes
+{: #development-fixes-v3-5-1}
+
+- Add jekyll doctor to GitHub Issue Template ([#6169]({{ site.repository }}/issues/6169))
+- Test with Ruby 2.4.1-1 on AppVeyor ([#6176]({{ site.repository }}/issues/6176))
+- set minimum requirement for jekyll-feed ([#6184]({{ site.repository }}/issues/6184))
+
+
 ## 3.5.0 / 2017-06-18
 {: #v3-5-0}
 
diff --git a/docs/_posts/2017-07-17-jekyll-3-5-1-released.markdown b/docs/_posts/2017-07-17-jekyll-3-5-1-released.markdown
new file mode 100644
index 00000000000..c7fef1bbfcb
--- /dev/null
+++ b/docs/_posts/2017-07-17-jekyll-3-5-1-released.markdown
@@ -0,0 +1,19 @@
+---
+title: 'Jekyll 3.5.1 Released'
+date: 2017-07-17 12:40:37 -0400
+author: parkr
+version: 3.5.1
+categories: [release]
+---
+
+We've released a few bugfixes in the form of v3.5.1 today:
+
+- Some plugins stopped functioning properly due to a NoMethodError for `registers` on NilClass. That's been fixed.
+- A bug in `relative_url` when `baseurl` is `nil` caused URL's to come out wrong. Squashed.
+- Static files' liquid representations should now have all the keys you were expecting when serialized into JSON.
+
+We apologize for the breakages! We're working diligently to improve how we test our plugins with Jekyll core to prevent breakages in the future.
+
+More details in [the history](/docs/history/#v3-5-1). Many thanks to all the contributors to Jekyll v3.5.1: Adam Voss, ashmaroli, Ben Balter, Coby Chapple, Doug Beney, Fadhil, Florian Thomas, Frank Taillandier, James, jaybe, Joshua Byrd, Kevin Plattret, & Robert Jäschke.
+
+Happy Jekylling!
diff --git a/docs/latest_version.txt b/docs/latest_version.txt
index 1545d966571..d5c0c991428 100644
--- a/docs/latest_version.txt
+++ b/docs/latest_version.txt
@@ -1 +1 @@
-3.5.0
+3.5.1
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 0af816ca2ca..8a8b2b30c11 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = "3.5.0".freeze
+  VERSION = "3.5.1".freeze
 end