From 6ce912e9573893babb6ca9b0e3aa1377f9804373 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 2 Sep 2017 10:38:07 -0400
Subject: [PATCH 001/161] Use a Schwartzian transform with custom sorting
 (#6342)

Merge pull request 6342
---
 benchmark/schwartzian_transform.rb | 115 +++++++++++++++++++++++++++++
 lib/jekyll/filters.rb              |  29 +++++---
 2 files changed, 133 insertions(+), 11 deletions(-)
 create mode 100644 benchmark/schwartzian_transform.rb

diff --git a/benchmark/schwartzian_transform.rb b/benchmark/schwartzian_transform.rb
new file mode 100644
index 00000000000..76c53e44e32
--- /dev/null
+++ b/benchmark/schwartzian_transform.rb
@@ -0,0 +1,115 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# The Ruby documentation for #sort_by describes what's called a Schwartzian transform:
+#
+#  > A more efficient technique is to cache the sort keys (modification times in this case)
+#  > before the sort. Perl users often call this approach a Schwartzian transform, after
+#  > Randal Schwartz. We construct a temporary array, where each element is an array
+#  > containing our sort key along with the filename. We sort this array, and then extract
+#  > the filename from the result.
+#  > This is exactly what sort_by does internally.
+#
+# The well-documented efficiency of sort_by is a good reason to use it. However, when a property
+# does not exist on an item being sorted, it can cause issues (no nil's allowed!)
+# In Jekyll::Filters#sort_input, we extract the property in each iteration of #sort,
+# which is quite inefficient! How inefficient? This benchmark will tell you just how, and how much
+# it can be improved by using the Schwartzian transform. Thanks, Randall!
+
+require 'benchmark/ips'
+require 'minitest'
+require File.expand_path("../lib/jekyll", __dir__)
+
+def site
+  @site ||= Jekyll::Site.new(
+    Jekyll.configuration("source" => File.expand_path("../docs", __dir__))
+  ).tap(&:reset).tap(&:read)
+end
+
+def site_docs
+  site.collections["docs"].docs.dup
+end
+
+def sort_by_property_directly(docs, meta_key)
+  docs.sort! do |apple, orange|
+    apple_property = apple[meta_key]
+    orange_property = orange[meta_key]
+
+    if !apple_property.nil? && !orange_property.nil?
+      apple_property <=> orange_property
+    elsif !apple_property.nil? && orange_property.nil?
+      -1
+    elsif apple_property.nil? && !orange_property.nil?
+      1
+    else
+      apple <=> orange
+    end
+  end
+end
+
+def schwartzian_transform(docs, meta_key)
+  docs.collect! { |d|
+    [d[meta_key], d]
+  }.sort! { |apple, orange|
+    if !apple[0].nil? && !orange[0].nil?
+      apple.first <=> orange.first
+    elsif !apple[0].nil? && orange[0].nil?
+      -1
+    elsif apple[0].nil? && !orange[0].nil?
+      1
+    else
+      apple[-1] <=> orange[-1]
+    end
+  }.collect! { |d| d[-1] }
+end
+
+# Before we test efficiency, do they produce the same output?
+class Correctness
+  include Minitest::Assertions
+
+  require "pp"
+  define_method :mu_pp, &:pretty_inspect
+
+  attr_accessor :assertions
+
+  def initialize(docs, property)
+    @assertions = 0
+    @docs = docs
+    @property = property
+  end
+
+  def assert!
+    assert sort_by_property_directly(@docs, @property).is_a?(Array), "sort_by_property_directly must return an array"
+    assert schwartzian_transform(@docs, @property).is_a?(Array), "schwartzian_transform must return an array"
+    assert_equal sort_by_property_directly(@docs, @property),
+      schwartzian_transform(@docs, @property)
+    puts "Yeah, ok, correctness all checks out for property #{@property.inspect}"
+  end
+end
+
+Correctness.new(site_docs, "redirect_from".freeze).assert!
+Correctness.new(site_docs, "title".freeze).assert!
+
+# First, test with a property only a handful of documents have.
+Benchmark.ips do |x|
+  x.config(time: 10, warmup: 5)
+  x.report('sort_by_property_directly with sparse property') do
+    sort_by_property_directly(site_docs, "redirect_from".freeze)
+  end
+  x.report('schwartzian_transform with sparse property') do
+    schwartzian_transform(site_docs, "redirect_from".freeze)
+  end
+  x.compare!
+end
+
+# Next, test with a property they all have.
+Benchmark.ips do |x|
+  x.config(time: 10, warmup: 5)
+  x.report('sort_by_property_directly with non-sparse property') do
+    sort_by_property_directly(site_docs, "title".freeze)
+  end
+  x.report('schwartzian_transform with non-sparse property') do
+    schwartzian_transform(site_docs, "title".freeze)
+  end
+  x.compare!
+end
diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 35ed4d9f63e..686995e195f 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -335,19 +335,26 @@ def inspect(input)
     end
 
     private
+
+    # Sort the input Enumerable by the given property.
+    # If the property doesn't exist, return the sort order respective of
+    # which item doesn't have the property.
+    # We also utilize the Schwartzian transform to make this more efficient.
     def sort_input(input, property, order)
-      input.sort do |apple, orange|
-        apple_property = item_property(apple, property)
-        orange_property = item_property(orange, property)
-
-        if !apple_property.nil? && orange_property.nil?
-          - order
-        elsif apple_property.nil? && !orange_property.nil?
-          + order
-        else
-          apple_property <=> orange_property
+      input.map { |item| [item_property(item, property), item] }
+        .sort! do |apple_info, orange_info|
+          apple_property = apple_info.first
+          orange_property = orange_info.first
+
+          if !apple_property.nil? && orange_property.nil?
+            - order
+          elsif apple_property.nil? && !orange_property.nil?
+            + order
+          else
+            apple_property <=> orange_property
+          end
         end
-      end
+        .map!(&:last)
     end
 
     private

From b6853bf9389261d25b410d86a41d2b8f06f63a41 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sat, 2 Sep 2017 10:38:09 -0400
Subject: [PATCH 002/161] Update history to reflect merge of #6342 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 50ba202e33d..2517194e670 100644
--- a/History.markdown
+++ b/History.markdown
@@ -24,6 +24,7 @@
   * Add support for Rouge 2, in addition to Rouge 1 (#5919)
   * Allow `yield` to logger methods &amp; bail early on no-op messages (#6315)
   * Update mime-types. (#6336)
+  * Use a Schwartzian transform with custom sorting (#6342)
 
 ### Bug Fixes
 

From 579f9ee1dd657de8bf6bed0cc4620012a5bc74fe Mon Sep 17 00:00:00 2001
From: Ohad Schneider <ohad188@gmail.com>
Date: Mon, 4 Sep 2017 23:54:28 +0300
Subject: [PATCH 003/161] Fix precedence docs (#6346)

Merge pull request 6346
---
 docs/_docs/configuration.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/_docs/configuration.md b/docs/_docs/configuration.md
index 057e4ee29f8..6d74fdbb50c 100644
--- a/docs/_docs/configuration.md
+++ b/docs/_docs/configuration.md
@@ -518,7 +518,7 @@ defaults:
   -
     scope:
       path: ""
-      type: "posts"
+      type: "pages"
     values:
       layout: "my-site"
   -
@@ -530,7 +530,7 @@ defaults:
       author: "Mr. Hyde"
 ```
 
-With these defaults, all posts would use the `my-site` layout. Any html files that exist in the `projects/` folder will use the `project` layout, if it exists. Those files will also have the `page.author` [liquid variable](../variables/) set to `Mr. Hyde`.
+With these defaults, all pages would use the `my-site` layout. Any html files that exist in the `projects/` folder will use the `project` layout, if it exists. Those files will also have the `page.author` [liquid variable](../variables/) set to `Mr. Hyde`.
 
 ```yaml
 collections:
@@ -553,7 +553,7 @@ In this example, the `layout` is set to `default` inside the
 
 Jekyll will apply all of the configuration settings you specify in the `defaults` section of your `_config.yml` file. However, you can choose to override settings from other scope/values pair by specifying a more specific path for the scope.
 
-You can see that in the second to last example above. First, we set the default layout to `my-site`. Then, using a more specific path, we set the default layout for files in the `projects/` path to `project`. This can be done with any value that you would set in the page or post front matter.
+You can see that in the second to last example above. First, we set the default page layout to `my-site`. Then, using a more specific path, we set the default layout for pages in the `projects/` path to `project`. This can be done with any value that you would set in the page or post front matter.
 
 Finally, if you set defaults in the site configuration by adding a `defaults` section to your `_config.yml` file, you can override those settings in a post or page file. All you need to do is specify the settings in the post or page front matter. For example:
 

From 22f2724a1f117a94cc16d18c499a93d5915ede4f Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Mon, 4 Sep 2017 16:54:29 -0400
Subject: [PATCH 004/161] Update history to reflect merge of #6346 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 2517194e670..c915515d246 100644
--- a/History.markdown
+++ b/History.markdown
@@ -57,6 +57,7 @@
   * Docs: `site.url` behavior on development and production environments (#6270)
   * Fix typo in site.url section of variables.md :-[ (#6337)
   * Docs: updates (#6343)
+  * Fix precedence docs (#6346)
 
 ### Site Enhancements
 

From 1637f29d6c37ebcc1149d11384cbac0a842ade99 Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Wed, 6 Sep 2017 12:52:34 -0400
Subject: [PATCH 005/161] Alias Drop#invoke_drop to Drop#[] (#6338)

Merge pull request 6338
---
 lib/jekyll/drops/drop.rb |  3 +-
 test/test_drop.rb        | 76 +++++++++++++++++++++++++++++++---------
 2 files changed, 61 insertions(+), 18 deletions(-)

diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb
index 09623ef9ac0..600e68a00e0 100644
--- a/lib/jekyll/drops/drop.rb
+++ b/lib/jekyll/drops/drop.rb
@@ -55,6 +55,7 @@ def [](key)
           fallback_data[key]
         end
       end
+      alias_method :invoke_drop, :[]
 
       # Set a field in the Drop. If mutable, sets in the mutations and
       # returns. If not mutable, checks first if it's trying to override a
@@ -103,7 +104,7 @@ def content_methods
       #
       # Returns true if the given key is present
       def key?(key)
-        if self.class.mutable
+        if self.class.mutable?
           @mutations.key?(key)
         else
           !key.nil? && (respond_to?(key) || fallback_data.key?(key))
diff --git a/test/test_drop.rb b/test/test_drop.rb
index eb23feb0f20..7bcd39714f1 100644
--- a/test/test_drop.rb
+++ b/test/test_drop.rb
@@ -2,6 +2,18 @@
 
 require "helper"
 
+class DropFixture < Jekyll::Drops::Drop
+  mutable true
+
+  def foo
+    "bar"
+  end
+
+  def fallback_data
+    @fallback_data ||= {}
+  end
+end
+
 class TestDrop < JekyllUnitTest
   context "a document drop" do
     setup do
@@ -12,37 +24,67 @@ class TestDrop < JekyllUnitTest
       @document = @site.collections["methods"].docs.detect do |d|
         d.relative_path == "_methods/configuration.md"
       end
-      @drop = @document.to_liquid
+      @document_drop = @document.to_liquid
+      @drop = DropFixture.new({})
     end
 
     should "reject 'nil' key" do
       refute @drop.key?(nil)
     end
 
-    should "raise KeyError if key is not found and no default provided" do
-      assert_raises KeyError do
-        @drop.fetch("not_existing_key")
-      end
+    should "return values for #[]" do
+      assert_equal "bar", @drop["foo"]
     end
 
-    should "fetch value without default" do
-      assert_equal "Jekyll.configuration", @drop.fetch("title")
+    should "return values for #invoke_drop" do
+      assert_equal "bar", @drop.invoke_drop("foo")
     end
 
-    should "fetch default if key is not found" do
-      assert_equal "default", @drop.fetch("not_existing_key", "default")
-    end
+    context "mutations" do
+      should "return mutations for #[]" do
+        @drop["foo"] = "baz"
+        assert_equal "baz", @drop["foo"]
+      end
 
-    should "fetch default boolean value correctly" do
-      assert_equal false, @drop.fetch("bar", false)
+      should "return mutations for #invoke_drop" do
+        @drop["foo"] = "baz"
+        assert_equal "baz", @drop.invoke_drop("foo")
+      end
     end
 
-    should "fetch default value from block if key is not found" do
-      assert_equal "default bar", @drop.fetch("bar") { |el| "default #{el}" }
-    end
+    context "fetch" do
+      should "raise KeyError if key is not found and no default provided" do
+        assert_raises KeyError do
+          @document_drop.fetch("not_existing_key")
+        end
+      end
 
-    should "fetch default value from block first if both argument and block given" do
-      assert_equal "baz", @drop.fetch("bar", "default") { "baz" }
+      should "fetch value without default" do
+        assert_equal "Jekyll.configuration", @document_drop.fetch("title")
+      end
+
+      should "fetch default if key is not found" do
+        assert_equal "default", @document_drop.fetch("not_existing_key", "default")
+      end
+
+      should "fetch default boolean value correctly" do
+        assert_equal false, @document_drop.fetch("bar", false)
+      end
+
+      should "fetch default value from block if key is not found" do
+        assert_equal "default bar", @document_drop.fetch("bar") { |el| "default #{el}" }
+      end
+
+      should "fetch default value from block first if both argument and block given" do
+        assert_equal "baz", @document_drop.fetch("bar", "default") { "baz" }
+      end
+
+      should "not change mutability when fetching" do
+        assert @drop.class.mutable?
+        @drop["foo"] = "baz"
+        assert_equal "baz", @drop.fetch("foo")
+        assert @drop.class.mutable?
+      end
     end
   end
 end

From 8b47fb1f7a85d518a21f5fcfd3b20df18c60bf7a Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Wed, 6 Sep 2017 12:52:36 -0400
Subject: [PATCH 006/161] Update history to reflect merge of #6338 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index c915515d246..0594a674a6b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -25,6 +25,7 @@
   * Allow `yield` to logger methods &amp; bail early on no-op messages (#6315)
   * Update mime-types. (#6336)
   * Use a Schwartzian transform with custom sorting (#6342)
+  * Alias Drop#invoke_drop to Drop#[] (#6338)
 
 ### Bug Fixes
 

From 2b6330b6862cbd3fbad663f4a92279b1ab12deeb Mon Sep 17 00:00:00 2001
From: ashmaroli <ashmaroli@users.noreply.github.com>
Date: Fri, 15 Sep 2017 20:27:50 +0530
Subject: [PATCH 007/161] bump rubies on Travis (#6366)

Merge pull request 6366
---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 00e21f93e19..2cfe51b7697 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,11 +5,11 @@ language: ruby
 sudo: false
 
 rvm:
-  - &ruby1 2.4.1
-  - &ruby2 2.3.4
-  - &ruby3 2.2.7
+  - &ruby1 2.4.2
+  - &ruby2 2.3.5
+  - &ruby3 2.2.8
   - &ruby4 2.1.10
-  - &jruby jruby-9.1.7.0
+  - &jruby jruby-9.1.13.0
 
 matrix:
   include:

From e9f2d85767fed1beab07291faaa2dcdd532482eb Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Fri, 15 Sep 2017 10:57:51 -0400
Subject: [PATCH 008/161] Update history to reflect merge of #6366 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 0594a674a6b..98866d258fd 100644
--- a/History.markdown
+++ b/History.markdown
@@ -12,6 +12,7 @@
   * script/backport-pr: commit message no longer includes the `#` (#6289)
   * Add Add CODEOWNERS file to help automate reviews. (#6320)
   * Fix builds on codeclimate (#6333)
+  * Bump rubies on Travis (#6366)
 
 ### Minor Enhancements
 

From e3ee9ba1132f9eaac272cdcf77fc1293a383bbb9 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flo@florianthomas.net>
Date: Wed, 20 Sep 2017 20:04:36 +0100
Subject: [PATCH 009/161] add note to contributing docs about `script/console`
 (#6349)

Merge pull request 6349
---
 .github/CONTRIBUTING.markdown | 4 ++++
 docs/_docs/contributing.md    | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/.github/CONTRIBUTING.markdown b/.github/CONTRIBUTING.markdown
index fe53b2f3682..14cbecc10e0 100644
--- a/.github/CONTRIBUTING.markdown
+++ b/.github/CONTRIBUTING.markdown
@@ -111,6 +111,10 @@ If your contribution changes any Jekyll behavior, make sure to update the docume
 
 * Don't bump the Gem version in your pull request (if you don't know what that means, you probably didn't).
 
+* You can use the command `script/console` to start a REPL to explore the result of
+Jekyll's methods. It also provides you with helpful methods to quickly create a
+site or configuration. [Feel free to check it out!](https://github.com/jekyll/jekyll/blob/master/script/console)
+
 ## Running tests locally
 
 ### Test Dependencies
diff --git a/docs/_docs/contributing.md b/docs/_docs/contributing.md
index b0b85e0f31c..391378f5e3a 100644
--- a/docs/_docs/contributing.md
+++ b/docs/_docs/contributing.md
@@ -118,6 +118,10 @@ If your contribution changes any Jekyll behavior, make sure to update the docume
 
 * Don't bump the Gem version in your pull request (if you don't know what that means, you probably didn't).
 
+* You can use the command `script/console` to start a REPL to explore the result of
+Jekyll's methods. It also provides you with helpful methods to quickly create a
+site or configuration. [Feel free to check it out!](https://github.com/jekyll/jekyll/blob/master/script/console)
+
 ## Running tests locally
 
 ### Test Dependencies

From fa49c023358c3d587399b938e861f48d58e17ff4 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Wed, 20 Sep 2017 15:04:37 -0400
Subject: [PATCH 010/161] Update history to reflect merge of #6349 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 98866d258fd..6cc8a9cad1e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -60,6 +60,7 @@
   * Fix typo in site.url section of variables.md :-[ (#6337)
   * Docs: updates (#6343)
   * Fix precedence docs (#6346)
+  * add note to contributing docs about `script/console` (#6349)
 
 ### Site Enhancements
 

From b802093f157457b7976af693c34e420227237888 Mon Sep 17 00:00:00 2001
From: Frank Taillandier <frank.taillandier@gmail.com>
Date: Wed, 20 Sep 2017 21:05:40 +0200
Subject: [PATCH 011/161] fix permalink example (#6375)

Merge pull request 6375
---
 docs/_docs/permalinks.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/permalinks.md b/docs/_docs/permalinks.md
index 42e68e85ff8..1a8afebac9b 100644
--- a/docs/_docs/permalinks.md
+++ b/docs/_docs/permalinks.md
@@ -322,7 +322,7 @@ The permalink setting in your configuration file specifies the permalink style u
 
 For example:
 
-* A permalink style of `/:categories/:year/:month/:day/:title.html` for posts becomes `/:title.html` for pages and collections.
+* A permalink style of `/:categories/:year/:month/:day/:title.:output_ext` for posts becomes `/:title.html` for pages and collections.
 * A permalink style of `pretty` (or `/:categories/:year/:month/:day/:title/`), which omits the file extension and contains a trailing slash, will update page and collection permalinks to also omit the file extension and contain a trailing slash: `/:title/`.
 * A permalink style of `date`, which contains a trailing file extension, will update page permalinks to also contain a trailing file extension: `/:title.html`. But no time or category information will be included.
 

From 66e2d38d586d053f9733d59360d9b795712ad4ac Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Wed, 20 Sep 2017 15:05:42 -0400
Subject: [PATCH 012/161] Update history to reflect merge of #6375 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 6cc8a9cad1e..4b1b49fe552 100644
--- a/History.markdown
+++ b/History.markdown
@@ -61,6 +61,7 @@
   * Docs: updates (#6343)
   * Fix precedence docs (#6346)
   * add note to contributing docs about `script/console` (#6349)
+  * Docs: Fix permalink example (#6375)
 
 ### Site Enhancements
 

From a5fd0c0b262be8fca4674f3f5f186e1d6a3f96be Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Thu, 21 Sep 2017 15:57:24 -0400
Subject: [PATCH 013/161] Mutable drops should fallback to their own methods
 when a mutation isn't present (#6350)

Merge pull request 6350
---
 lib/jekyll/drops/drop.rb |  8 ++--
 test/test_drop.rb        | 79 +++++++++++++++++++++++++++-------------
 2 files changed, 57 insertions(+), 30 deletions(-)

diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb
index 600e68a00e0..1cc9c465ac4 100644
--- a/lib/jekyll/drops/drop.rb
+++ b/lib/jekyll/drops/drop.rb
@@ -104,11 +104,9 @@ def content_methods
       #
       # Returns true if the given key is present
       def key?(key)
-        if self.class.mutable?
-          @mutations.key?(key)
-        else
-          !key.nil? && (respond_to?(key) || fallback_data.key?(key))
-        end
+        return false if key.nil?
+        return true if self.class.mutable? && @mutations.key?(key)
+        respond_to?(key) || fallback_data.key?(key)
       end
 
       # Generates a list of keys with user content as their values.
diff --git a/test/test_drop.rb b/test/test_drop.rb
index 7bcd39714f1..5c46d81dc77 100644
--- a/test/test_drop.rb
+++ b/test/test_drop.rb
@@ -10,12 +10,12 @@ def foo
   end
 
   def fallback_data
-    @fallback_data ||= {}
+    @fallback_data ||= { "baz" => "buzz" }
   end
 end
 
 class TestDrop < JekyllUnitTest
-  context "a document drop" do
+  context "Drops" do
     setup do
       @site = fixture_site({
         "collections" => ["methods"],
@@ -52,38 +52,67 @@ class TestDrop < JekyllUnitTest
       end
     end
 
-    context "fetch" do
-      should "raise KeyError if key is not found and no default provided" do
-        assert_raises KeyError do
-          @document_drop.fetch("not_existing_key")
+    context "a document drop" do
+      context "fetch" do
+        should "raise KeyError if key is not found and no default provided" do
+          assert_raises KeyError do
+            @document_drop.fetch("not_existing_key")
+          end
         end
-      end
 
-      should "fetch value without default" do
-        assert_equal "Jekyll.configuration", @document_drop.fetch("title")
-      end
+        should "fetch value without default" do
+          assert_equal "Jekyll.configuration", @document_drop.fetch("title")
+        end
 
-      should "fetch default if key is not found" do
-        assert_equal "default", @document_drop.fetch("not_existing_key", "default")
-      end
+        should "fetch default if key is not found" do
+          assert_equal "default", @document_drop.fetch("not_existing_key", "default")
+        end
 
-      should "fetch default boolean value correctly" do
-        assert_equal false, @document_drop.fetch("bar", false)
-      end
+        should "fetch default boolean value correctly" do
+          assert_equal false, @document_drop.fetch("bar", false)
+        end
+
+        should "fetch default value from block if key is not found" do
+          assert_equal "default bar", @document_drop.fetch("bar") { |el| "default #{el}" }
+        end
+
+        should "fetch default value from block first if both argument and block given" do
+          assert_equal "baz", @document_drop.fetch("bar", "default") { "baz" }
+        end
 
-      should "fetch default value from block if key is not found" do
-        assert_equal "default bar", @document_drop.fetch("bar") { |el| "default #{el}" }
+        should "not change mutability when fetching" do
+          assert @drop.class.mutable?
+          @drop["foo"] = "baz"
+          assert_equal "baz", @drop.fetch("foo")
+          assert @drop.class.mutable?
+        end
       end
+    end
+
+    context "key?" do
+      context "a mutable drop" do
+        should "respond true for native methods" do
+          assert @drop.key? "foo"
+        end
+
+        should "respond true for mutable keys" do
+          @drop["bar"] = "baz"
+          assert @drop.key? "bar"
+        end
 
-      should "fetch default value from block first if both argument and block given" do
-        assert_equal "baz", @document_drop.fetch("bar", "default") { "baz" }
+        should "return true for fallback data" do
+          assert @drop.key? "baz"
+        end
       end
 
-      should "not change mutability when fetching" do
-        assert @drop.class.mutable?
-        @drop["foo"] = "baz"
-        assert_equal "baz", @drop.fetch("foo")
-        assert @drop.class.mutable?
+      context "a document drop" do
+        should "respond true for native methods" do
+          assert @document_drop.key? "collection"
+        end
+
+        should "return true for fallback data" do
+          assert @document_drop.key? "title"
+        end
       end
     end
   end

From 97d4437179f087d2194ca77cdb88274eaf9c97c7 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Thu, 21 Sep 2017 15:57:26 -0400
Subject: [PATCH 014/161] Update history to reflect merge of #6350 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 4b1b49fe552..14bec6f78d6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -40,6 +40,7 @@
   * delegate `StaticFile#to_json` to `StaticFile#to_liquid` (#6273)
   * Fix Drop#key? so it can handle a nil argument (#6281)
   * Guard against type error in absolute url (#6280)
+  * Mutable drops should fallback to their own methods when a mutation isn&#39;t present (#6350)
 
 ### Documentation
 

From 47bcbfb65431fcb2a1a45e84088d132075e10496 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flo@florianthomas.net>
Date: Thu, 21 Sep 2017 21:30:23 +0100
Subject: [PATCH 015/161] skip adding binary files as posts (#6344)

Merge pull request 6344
---
 lib/jekyll/readers/post_reader.rb | 11 ++++++++---
 test/test_site.rb                 | 30 +++++++++++++++++++++++++-----
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/lib/jekyll/readers/post_reader.rb b/lib/jekyll/readers/post_reader.rb
index 510192793b0..0663c658e42 100644
--- a/lib/jekyll/readers/post_reader.rb
+++ b/lib/jekyll/readers/post_reader.rb
@@ -36,10 +36,15 @@ def read_posts(dir)
     def read_publishable(dir, magic_dir, matcher)
       read_content(dir, magic_dir, matcher).tap { |docs| docs.each(&:read) }
         .select do |doc|
-          site.publisher.publish?(doc).tap do |will_publish|
-            if !will_publish && site.publisher.hidden_in_the_future?(doc)
-              Jekyll.logger.debug "Skipping:", "#{doc.relative_path} has a future date"
+          if doc.content.valid_encoding?
+            site.publisher.publish?(doc).tap do |will_publish|
+              if !will_publish && site.publisher.hidden_in_the_future?(doc)
+                Jekyll.logger.debug "Skipping:", "#{doc.relative_path} has a future date"
+              end
             end
+          else
+            Jekyll.logger.debug "Skipping:", "#{doc.relative_path} is no valid UTF-8"
+            false
           end
         end
     end
diff --git a/test/test_site.rb b/test/test_site.rb
index f50990e0511..81b20f7ad09 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -3,6 +3,22 @@
 require "helper"
 
 class TestSite < JekyllUnitTest
+  def with_image_as_post
+    tmp_image_path = File.join(source_dir, "_posts", "2017-09-01-jekyll-sticker.jpg")
+    FileUtils.cp File.join(Dir.pwd, "docs", "img", "jekyll-sticker.jpg"), tmp_image_path
+    yield
+  ensure
+    FileUtils.rm tmp_image_path
+  end
+
+  def read_posts
+    @site.posts.docs.concat(PostReader.new(@site).read_posts(""))
+    posts = Dir[source_dir("_posts", "**", "*")]
+    posts.delete_if do |post|
+      File.directory?(post) && !(post =~ Document::DATE_FILENAME_MATCHER)
+    end
+  end
+
   context "configuring sites" do
     should "have an array for plugins by default" do
       site = Site.new default_configuration
@@ -227,14 +243,18 @@ def generate(site)
     end
 
     should "read posts" do
-      @site.posts.docs.concat(PostReader.new(@site).read_posts(""))
-      posts = Dir[source_dir("_posts", "**", "*")]
-      posts.delete_if do |post|
-        File.directory?(post) && !(post =~ Document::DATE_FILENAME_MATCHER)
-      end
+      posts = read_posts
       assert_equal posts.size - @num_invalid_posts, @site.posts.size
     end
 
+    should "skip posts with invalid encoding" do
+      with_image_as_post do
+        posts = read_posts
+        num_invalid_posts = @num_invalid_posts + 1
+        assert_equal posts.size - num_invalid_posts, @site.posts.size
+      end
+    end
+
     should "read pages with YAML front matter" do
       abs_path = File.expand_path("about.html", @site.source)
       assert_equal true, Utils.has_yaml_header?(abs_path)

From c9ac5fee94f440dcf4a7fd5c5d08ef562de9ad5c Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Thu, 21 Sep 2017 16:30:25 -0400
Subject: [PATCH 016/161] Update history to reflect merge of #6344 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 14bec6f78d6..64f6c0722ee 100644
--- a/History.markdown
+++ b/History.markdown
@@ -41,6 +41,7 @@
   * Fix Drop#key? so it can handle a nil argument (#6281)
   * Guard against type error in absolute url (#6280)
   * Mutable drops should fallback to their own methods when a mutation isn&#39;t present (#6350)
+  * skip adding binary files as posts (#6344)
 
 ### Documentation
 

From ca3a56b37c7359964900d441582d8913adca8b74 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 21 Sep 2017 16:31:37 -0400
Subject: [PATCH 017/161] Fix typo in debug message. cc #6344

---
 lib/jekyll/readers/post_reader.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jekyll/readers/post_reader.rb b/lib/jekyll/readers/post_reader.rb
index 0663c658e42..b0dc30326b5 100644
--- a/lib/jekyll/readers/post_reader.rb
+++ b/lib/jekyll/readers/post_reader.rb
@@ -43,7 +43,7 @@ def read_publishable(dir, magic_dir, matcher)
               end
             end
           else
-            Jekyll.logger.debug "Skipping:", "#{doc.relative_path} is no valid UTF-8"
+            Jekyll.logger.debug "Skipping:", "#{doc.relative_path} is not valid UTF-8"
             false
           end
         end

From 211a59532981406457a42303c8a4a2d201dc3aa8 Mon Sep 17 00:00:00 2001
From: ashmaroli <ashmaroli@users.noreply.github.com>
Date: Fri, 22 Sep 2017 02:06:26 +0530
Subject: [PATCH 018/161] Don't break if bundler is not installed (#6377)

Merge pull request 6377
---
 lib/jekyll/commands/new.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb
index b1c8bb0bc4b..e784f24ac27 100644
--- a/lib/jekyll/commands/new.rb
+++ b/lib/jekyll/commands/new.rb
@@ -128,7 +128,12 @@ def scaffold_path
 
         def after_install(path, options = {})
           unless options["blank"] || options["skip-bundle"]
-            bundle_install path
+            begin
+              require "bundler"
+              bundle_install path
+            rescue LoadError
+              Jekyll.logger.info "Could not load Bundler. Bundle install skipped."
+            end
           end
 
           Jekyll.logger.info "New jekyll site installed in #{path.cyan}."
@@ -136,7 +141,6 @@ def after_install(path, options = {})
         end
 
         def bundle_install(path)
-          Jekyll::External.require_with_graceful_fail "bundler"
           Jekyll.logger.info "Running bundle install in #{path.cyan}..."
           Dir.chdir(path) do
             process, output = Jekyll::Utils::Exec.run("bundle", "install")

From 738fc558963faf3c37fc397715d01baf798922d5 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Thu, 21 Sep 2017 16:36:28 -0400
Subject: [PATCH 019/161] Update history to reflect merge of #6377 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 64f6c0722ee..1bed8887ab6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -42,6 +42,7 @@
   * Guard against type error in absolute url (#6280)
   * Mutable drops should fallback to their own methods when a mutation isn&#39;t present (#6350)
   * skip adding binary files as posts (#6344)
+  * Don&#39;t break if bundler is not installed (#6377)
 
 ### Documentation
 

From ec3a7b9078ef998259f7ef5c79ac4a02eada378f Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 21 Sep 2017 16:49:02 -0400
Subject: [PATCH 020/161] Add Jekyll 3.6.0 release post

---
 .../2017-09-21-jekyll-3-6-0-released.markdown   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 docs/_posts/2017-09-21-jekyll-3-6-0-released.markdown

diff --git a/docs/_posts/2017-09-21-jekyll-3-6-0-released.markdown b/docs/_posts/2017-09-21-jekyll-3-6-0-released.markdown
new file mode 100644
index 00000000000..0a468673694
--- /dev/null
+++ b/docs/_posts/2017-09-21-jekyll-3-6-0-released.markdown
@@ -0,0 +1,17 @@
+---
+title: 'Jekyll turns 3.6!'
+date: 2017-09-21 16:38:20 -0400
+author: parkr
+version: 3.6.0
+categories: [release]
+---
+
+Another much-anticipated release of Jekyll. This release comes with it Rouge 2 support, but note you can continue to use Rouge 1 if you'd prefer. We also now require Ruby 2.1.0 as 2.0.x is no longer supported by the Ruby team.
+
+Otherwise, it's a massive bug-fix release! A few bugs were found and squashed with our `Drop` implementation. We're using the Schwartzian transform to speed up our custom sorting (thanks, Perl community!). We now protect against images that are named like posts and we generally worked on guarding our code to enforce requirements, instead of assuming the input was as expected.
+
+Please let us know if you find any bugs! You can see [the full history here](/docs/history/#v3-6-0).
+
+Many thanks to our contributors who helped make this release possible: Aleksander Kuś, André Jaenisch, Antonio Argote, ashmaroli, Ben Balter, Bogdan, Bradley Meck, David Zhang, Florian Thomas, Frank Taillandier, Jordon Bedwell, Joshua Byrd, Kyle Zhao, lymaconsulting, Maciej Bembenista, Matt Sturgeon, Natanael Arndt, Ohad Schneider, Pat Hawks, Pedro Lamas, and Sid Verma.
+
+As always, Happy Jekylling!

From 3feafed56c0f6e816500510ea7a83bfac962e188 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 21 Sep 2017 17:30:21 -0400
Subject: [PATCH 021/161] Release :gem: 3.6.0

---
 History.markdown              | 41 +++++++++---------
 docs/_docs/code_of_conduct.md | 55 ++++++++++++++++++++++++
 docs/_docs/contributing.md    |  5 +--
 docs/_docs/history.md         | 81 +++++++++++++++++++++++++++++++++++
 docs/latest_version.txt       |  2 +-
 lib/jekyll/version.rb         |  2 +-
 6 files changed, 160 insertions(+), 26 deletions(-)
 create mode 100644 docs/_docs/code_of_conduct.md

diff --git a/History.markdown b/History.markdown
index 1bed8887ab6..537fcfeccf6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,18 +1,4 @@
-## HEAD
-
-### Development Fixes
-
-  * Strip unnecessary leading whitespace in template (#6228)
-  * Users should be installing patch versions. (#6198)
-  * fix tests (#6240)
-  * Define path with __dir__ (#6087)
-  * exit site.process sooner (#6239)
-  * make flakey test more robust (#6277)
-  * Add a quick test for DataReader (#6284)
-  * script/backport-pr: commit message no longer includes the `#` (#6289)
-  * Add Add CODEOWNERS file to help automate reviews. (#6320)
-  * Fix builds on codeclimate (#6333)
-  * Bump rubies on Travis (#6366)
+## 3.6.0 / 2017-09-21
 
 ### Minor Enhancements
 
@@ -26,22 +12,22 @@
   * Allow `yield` to logger methods &amp; bail early on no-op messages (#6315)
   * Update mime-types. (#6336)
   * Use a Schwartzian transform with custom sorting (#6342)
-  * Alias Drop#invoke_drop to Drop#[] (#6338)
+  * Alias `Drop#invoke_drop` to `Drop#[]` (#6338)
 
 ### Bug Fixes
 
   * `Deprecator`: fix typo for `--serve` command (#6229)
   * `Reader#read_directories`: guard against an entry not being a directory (#6226)
   * kramdown: symbolize keys in-place (#6247)
-  * Call to_s on site.url before attempting to concatenate strings (#6253)
+  * Call `to_s` on site.url before attempting to concatenate strings (#6253)
   * Enforce Style/FrozenStringLiteralComment (#6265)
   * Update theme-template README to note &#39;assets&#39; directory (#6257)
-  * Memoize the return value of Document#url (#6266)
+  * Memoize the return value of `Document#url` (#6266)
   * delegate `StaticFile#to_json` to `StaticFile#to_liquid` (#6273)
-  * Fix Drop#key? so it can handle a nil argument (#6281)
+  * Fix `Drop#key?` so it can handle a nil argument (#6281)
   * Guard against type error in absolute url (#6280)
   * Mutable drops should fallback to their own methods when a mutation isn&#39;t present (#6350)
-  * skip adding binary files as posts (#6344)
+  * Skip adding binary files as posts (#6344)
   * Don&#39;t break if bundler is not installed (#6377)
 
 ### Documentation
@@ -72,6 +58,21 @@
   * Customizing url in collection elements clarified (#6264)
   * Plugins is the new gems (#6326)
 
+### Development Fixes
+
+  * Strip unnecessary leading whitespace in template (#6228)
+  * Users should be installing patch versions. (#6198)
+  * Fix tests (#6240)
+  * Define path with `__dir__` (#6087)
+  * exit site.process sooner (#6239)
+  * make flakey test more robust (#6277)
+  * Add a quick test for DataReader (#6284)
+  * script/backport-pr: commit message no longer includes the `#` (#6289)
+  * Add Add CODEOWNERS file to help automate reviews. (#6320)
+  * Fix builds on codeclimate (#6333)
+  * Bump rubies on Travis (#6366)
+
+
 ## 3.5.2 / 2017-08-12
 
 ### Bug Fixes
diff --git a/docs/_docs/code_of_conduct.md b/docs/_docs/code_of_conduct.md
new file mode 100644
index 00000000000..1cd0bdbc525
--- /dev/null
+++ b/docs/_docs/code_of_conduct.md
@@ -0,0 +1,55 @@
+---
+title: Code of Conduct
+permalink: "/docs/code_of_conduct/"
+note: This file is autogenerated. Edit /CODE_OF_CONDUCT.markdown instead.
+redirect_from: "/conduct/index.html"
+editable: false
+---
+
+As contributors and maintainers of this project, and in the interest of
+fostering an open and welcoming community, we pledge to respect all people who
+contribute through reporting issues, posting feature requests, updating
+documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic
+  addresses, without explicit permission
+* Other unethical or unprofessional conduct
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, project maintainers commit themselves to
+fairly and consistently applying these principles to every aspect of managing
+this project. Project maintainers who do not follow or enforce the Code of
+Conduct may be permanently removed from the project team.
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by opening an issue or contacting a project maintainer. All complaints
+will be reviewed and investigated and will result in a response that is deemed
+necessary and appropriate to the circumstances. Maintainers are obligated to
+maintain confidentiality with regard to the reporter of an incident.
+
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 1.3.0, available at
+[http://contributor-covenant.org/version/1/3/0/][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/3/0/
diff --git a/docs/_docs/contributing.md b/docs/_docs/contributing.md
index 391378f5e3a..b8a838a752a 100644
--- a/docs/_docs/contributing.md
+++ b/docs/_docs/contributing.md
@@ -8,10 +8,7 @@ Hi there! Interested in contributing to Jekyll? We'd love your help. Jekyll is a
 
 ## Where to get help or report a problem
 
-* If you have a question about using Jekyll, start a discussion on [Jekyll Talk](https://talk.jekyllrb.com).
-* If you think you've found a bug within a Jekyll plugin, open an issue in that plugin's repository.
-* If you think you've found a bug within Jekyll itself, [open an issue](https://github.com/jekyll/jekyll/issues/new).
-* More resources are listed on our [Help page](https://jekyllrb.com/help/).
+See [the support guidelines](SUPPORT.md)
 
 ## Ways to contribute
 
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index d64d0b1c0e5..20b98b5c810 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -4,6 +4,87 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 3.6.0 / 2017-09-21
+{: #v3-6-0}
+
+### Minor Enhancements
+{: #minor-enhancements-v3-6-0}
+
+- Ignore final newline in folded YAML string ([#6054]({{ site.repository }}/issues/6054))
+- Add URL checks to Doctor ([#5760]({{ site.repository }}/issues/5760))
+- Fix serving files that clash with directories ([#6222]({{ site.repository }}/issues/6222)) ([#6231]({{ site.repository }}/issues/6231))
+- Bump supported Ruby version to `>= 2.1.0` ([#6220]({{ site.repository }}/issues/6220))
+- set `LiquidError#template_name` for errors in included file ([#6206]({{ site.repository }}/issues/6206))
+- Access custom config array throughout session ([#6200]({{ site.repository }}/issues/6200))
+- Add support for Rouge 2, in addition to Rouge 1 ([#5919]({{ site.repository }}/issues/5919))
+- Allow `yield` to logger methods &amp; bail early on no-op messages ([#6315]({{ site.repository }}/issues/6315))
+- Update mime-types. ([#6336]({{ site.repository }}/issues/6336))
+- Use a Schwartzian transform with custom sorting ([#6342]({{ site.repository }}/issues/6342))
+- Alias `Drop#invoke_drop` to `Drop#[]` ([#6338]({{ site.repository }}/issues/6338))
+
+### Bug Fixes
+{: #bug-fixes-v3-6-0}
+
+- `Deprecator`: fix typo for `--serve` command ([#6229]({{ site.repository }}/issues/6229))
+- `Reader#read_directories`: guard against an entry not being a directory ([#6226]({{ site.repository }}/issues/6226))
+- kramdown: symbolize keys in-place ([#6247]({{ site.repository }}/issues/6247))
+- Call `to_s` on site.url before attempting to concatenate strings ([#6253]({{ site.repository }}/issues/6253))
+- Enforce Style/FrozenStringLiteralComment ([#6265]({{ site.repository }}/issues/6265))
+- Update theme-template README to note &[#39]({{ site.repository }}/issues/39);assets&[#39]({{ site.repository }}/issues/39); directory ([#6257]({{ site.repository }}/issues/6257))
+- Memoize the return value of `Document#url` ([#6266]({{ site.repository }}/issues/6266))
+- delegate `StaticFile#to_json` to `StaticFile#to_liquid` ([#6273]({{ site.repository }}/issues/6273))
+- Fix `Drop#key?` so it can handle a nil argument ([#6281]({{ site.repository }}/issues/6281))
+- Guard against type error in absolute url ([#6280]({{ site.repository }}/issues/6280))
+- Mutable drops should fallback to their own methods when a mutation isn&[#39]({{ site.repository }}/issues/39);t present ([#6350]({{ site.repository }}/issues/6350))
+- Skip adding binary files as posts ([#6344]({{ site.repository }}/issues/6344))
+- Don&[#39]({{ site.repository }}/issues/39);t break if bundler is not installed ([#6377]({{ site.repository }}/issues/6377))
+
+### Documentation
+
+- Fix a typo in `custom-404-page.md` ([#6218]({{ site.repository }}/issues/6218))
+- Docs: fix links to issues in History.markdown ([#6255]({{ site.repository }}/issues/6255))
+- Update deprecated gems key to plugins. ([#6262]({{ site.repository }}/issues/6262))
+- Fixes minor typo in post text ([#6283]({{ site.repository }}/issues/6283))
+- Execute build command using bundle. ([#6274]({{ site.repository }}/issues/6274))
+- name unification - buddy details ([#6317]({{ site.repository }}/issues/6317))
+- name unification - application index ([#6318]({{ site.repository }}/issues/6318))
+- trim and relocate plugin info across docs ([#6311]({{ site.repository }}/issues/6311))
+- update Jekyll&[#39]({{ site.repository }}/issues/39);s README ([#6321]({{ site.repository }}/issues/6321))
+- add SUPPORT file for GitHub ([#6324]({{ site.repository }}/issues/6324))
+- Rename CODE_OF_CONDUCT to show in banner ([#6325]({{ site.repository }}/issues/6325))
+- Docs : illustrate page.id for a collection&[#39]({{ site.repository }}/issues/39);s document ([#6329]({{ site.repository }}/issues/6329))
+- Docs: post&[#39]({{ site.repository }}/issues/39);s date can be overriden in YAML front matter ([#6334]({{ site.repository }}/issues/6334))
+- Docs: `site.url` behavior on development and production environments ([#6270]({{ site.repository }}/issues/6270))
+- Fix typo in site.url section of variables.md :-[ ([#6337]({{ site.repository }}/issues/6337))
+- Docs: updates ([#6343]({{ site.repository }}/issues/6343))
+- Fix precedence docs ([#6346]({{ site.repository }}/issues/6346))
+- add note to contributing docs about `script/console` ([#6349]({{ site.repository }}/issues/6349))
+- Docs: Fix permalink example ([#6375]({{ site.repository }}/issues/6375))
+
+### Site Enhancements
+{: #site-enhancements-v3-6-0}
+
+- Adding DevKit helpers ([#6225]({{ site.repository }}/issues/6225))
+- Customizing url in collection elements clarified ([#6264]({{ site.repository }}/issues/6264))
+- Plugins is the new gems ([#6326]({{ site.repository }}/issues/6326))
+
+### Development Fixes
+{: #development-fixes-v3-6-0}
+
+- Strip unnecessary leading whitespace in template ([#6228]({{ site.repository }}/issues/6228))
+- Users should be installing patch versions. ([#6198]({{ site.repository }}/issues/6198))
+- Fix tests ([#6240]({{ site.repository }}/issues/6240))
+- Define path with `__dir__` ([#6087]({{ site.repository }}/issues/6087))
+- exit site.process sooner ([#6239]({{ site.repository }}/issues/6239))
+- make flakey test more robust ([#6277]({{ site.repository }}/issues/6277))
+- Add a quick test for DataReader ([#6284]({{ site.repository }}/issues/6284))
+- script/backport-pr: commit message no longer includes the `#` ([#6289]({{ site.repository }}/issues/6289))
+- Add Add CODEOWNERS file to help automate reviews. ([#6320]({{ site.repository }}/issues/6320))
+- Fix builds on codeclimate ([#6333]({{ site.repository }}/issues/6333))
+- Bump rubies on Travis ([#6366]({{ site.repository }}/issues/6366))
+
+
+
 ## 3.5.2 / 2017-08-12
 {: #v3-5-2}
 
diff --git a/docs/latest_version.txt b/docs/latest_version.txt
index 87ce492908a..40c341bdcdb 100644
--- a/docs/latest_version.txt
+++ b/docs/latest_version.txt
@@ -1 +1 @@
-3.5.2
+3.6.0
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 3a69700216e..6e0c1cf6ca6 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jekyll
-  VERSION = "3.6.0.pre.beta1".freeze
+  VERSION = "3.6.0".freeze
 end

From 09b849938d04e3aa6005b7c95ecd2c2b9d2b299c Mon Sep 17 00:00:00 2001
From: Oliver Steele <steele@osteele.com>
Date: Fri, 22 Sep 2017 02:54:38 -0400
Subject: [PATCH 022/161] Doc y_day in docs/permalinks (#6244)

Merge pull request 6244
---
 docs/_docs/permalinks.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/_docs/permalinks.md b/docs/_docs/permalinks.md
index 1a8afebac9b..31515b6b4ea 100644
--- a/docs/_docs/permalinks.md
+++ b/docs/_docs/permalinks.md
@@ -116,6 +116,14 @@ The following table lists the template variables available for permalinks. You c
         </p>
       </td>
     </tr>
+    <tr>
+      <td>
+        <p><code>y_day</code></p>
+      </td>_
+      <td>
+        <p>Day of the year from the post's filename, with leading zeros.</p>
+      </td>
+    </tr>
     <tr>
       <td>
         <p><code>short_year</code></p>

From dc4acbc66c0c309bb7fd50b7d4041c6920f59dad Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Fri, 22 Sep 2017 02:54:39 -0400
Subject: [PATCH 023/161] Update history to reflect merge of #6244 [ci skip]

---
 History.markdown | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/History.markdown b/History.markdown
index 537fcfeccf6..ee169f1fbe4 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,3 +1,9 @@
+## HEAD
+
+### Documentation
+
+  * Doc y_day in docs/permalinks (#6244)
+
 ## 3.6.0 / 2017-09-21
 
 ### Minor Enhancements
@@ -72,7 +78,6 @@
   * Fix builds on codeclimate (#6333)
   * Bump rubies on Travis (#6366)
 
-
 ## 3.5.2 / 2017-08-12
 
 ### Bug Fixes

From ab31983122a68933f4c2be140599957911b68095 Mon Sep 17 00:00:00 2001
From: i-give-up <freemium.model@gmail.com>
Date: Fri, 22 Sep 2017 14:55:19 +0800
Subject: [PATCH 024/161] Update frontmatter.md (#6371)

Merge pull request 6371
---
 docs/_docs/frontmatter.md | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/docs/_docs/frontmatter.md b/docs/_docs/frontmatter.md
index cf5aad13f14..b2b7699cdbe 100644
--- a/docs/_docs/frontmatter.md
+++ b/docs/_docs/frontmatter.md
@@ -65,9 +65,23 @@ front matter of a page or post.
 
           If set, this specifies the layout file to use. Use the layout file
           name without the file extension. Layout files must be placed in the
-          <code>_layouts</code> directory.
+          <code>_layouts</code> directory. 
 
         </p>
+        <ul>
+          <li>
+            Using <code>null</code> will produce a file without using a layout 
+            file. However this is overridden if the file is a post/document and has a 
+            layout defined in the <a href="../configuration/#front-matter-defaults">
+            frontmatter defaults</a>.
+          </li>
+          <li>
+            Starting from version 3.5.0, using <code>none</code> in a post/document will
+            produce a file without using a layout file regardless of frontmatter defaults.
+            Using <code>none</code> in a page, however, will cause Jekyll to attempt to
+            use a layout named "none".
+          </li>
+        </ul>
       </td>
     </tr>
     <tr>

From 7dccfcf2b5086c23ee84ee9bf72e836fd575a4fd Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Fri, 22 Sep 2017 02:55:21 -0400
Subject: [PATCH 025/161] Update history to reflect merge of #6371 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index ee169f1fbe4..3e3192ef688 100644
--- a/History.markdown
+++ b/History.markdown
@@ -3,6 +3,7 @@
 ### Documentation
 
   * Doc y_day in docs/permalinks (#6244)
+  * Update frontmatter.md (#6371)
 
 ## 3.6.0 / 2017-09-21
 

From 9d7f0c1f852c101f49ee70795044b7f96038db42 Mon Sep 17 00:00:00 2001
From: ashmaroli <ashmaroli@users.noreply.github.com>
Date: Fri, 22 Sep 2017 13:08:05 +0530
Subject: [PATCH 026/161] elaborate on excluding items from processing (#6136)

Merge pull request 6136
---
 docs/_docs/troubleshooting.md | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/docs/_docs/troubleshooting.md b/docs/_docs/troubleshooting.md
index 48163fdc5bb..2259e04d389 100644
--- a/docs/_docs/troubleshooting.md
+++ b/docs/_docs/troubleshooting.md
@@ -195,10 +195,37 @@ That is: defaults are overridden by options specified in `_config.yml`,
 and flags specified at the command-line will override all other settings
 specified elsewhere.
 
-If you encounter an error in building the site, with the error message
-"'0000-00-00-welcome-to-jekyll.markdown.erb' does not have a valid date in the
-YAML front matter." try including the line `exclude: [vendor]`
-in `_config.yml`.
+**Note: From v3.3.0 onward, Jekyll does not process `node_modules` and certain subdirectories within `vendor`, by default. But, by having an `exclude:` array defined explicitly in the config file overrides this default setting, which results in some users to encounter an error in building the site, with the following error message:**
+
+```
+    ERROR: YOUR SITE COULD NOT BE BUILT:
+    ------------------------------------
+    Invalid date '<%= Time.now.strftime('%Y-%m-%d %H:%M:%S %z') %>':
+    Document 'vendor/bundle/gems/jekyll-3.4.3/lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb'
+    does not have a valid date in the YAML front matter.
+```
+
+Simply adding `vendor/bundle` to the `exclude:` list will solve this problem but will lead to having other sub-directories under `/vendor/` (and also `/node_modules/`, if present) be processed to the destination folder `_site`.
+
+
+The proper solution is to incorporate the default setting for `exclude:` rather than override it completely:
+
+For versions upto `v3.4.3`, the `exclude:` setting must look like following:
+
+```yaml
+exclude:
+  - Gemfile
+  - Gemfile.lock
+  - node_modules
+  - vendor/bundle/
+  - vendor/cache/
+  - vendor/gems/
+  - vendor/ruby/
+  - any_additional_item # any user-specific listing goes at the end
+```
+
+From `v3.5` onward, `Gemfile` and `Gemfile.lock` are also excluded by default. So, in most cases there is no need to define another `exclude:` array in the config file. So an existing definition can either be modified as above, or removed completely, or simply commented out to enable easy edits in future.
+
 
 ## Markup Problems
 

From e083f93ed80ea45baa7a433e47dca4167cdc6fa1 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Fri, 22 Sep 2017 03:38:07 -0400
Subject: [PATCH 027/161] Update history to reflect merge of #6136 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 3e3192ef688..4c466d7745f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -4,6 +4,7 @@
 
   * Doc y_day in docs/permalinks (#6244)
   * Update frontmatter.md (#6371)
+  * Elaborate on excluding items from processing (#6136)
 
 ## 3.6.0 / 2017-09-21
 

From 00bad8bfe50379ee608fcc35719991af3240f7ab Mon Sep 17 00:00:00 2001
From: ashmaroli <ashmaroli@users.noreply.github.com>
Date: Fri, 22 Sep 2017 18:36:32 +0530
Subject: [PATCH 028/161] Bump rubocop to use `v0.50.x` (#6368)

Merge pull request 6368
---
 .rubocop.yml                                      | 14 +++++++++++---
 Gemfile                                           |  2 +-
 jekyll.gemspec                                    |  1 -
 lib/jekyll.rb                                     |  4 ++--
 lib/jekyll/commands/doctor.rb                     |  2 +-
 lib/jekyll/commands/serve/servlet.rb              |  2 +-
 lib/jekyll/configuration.rb                       |  1 -
 lib/jekyll/converters/markdown.rb                 |  4 ++--
 lib/jekyll/converters/markdown/kramdown_parser.rb |  2 ++
 lib/jekyll/convertible.rb                         |  1 -
 lib/jekyll/document.rb                            |  1 -
 lib/jekyll/drops/collection_drop.rb               |  1 -
 lib/jekyll/drops/document_drop.rb                 |  1 -
 lib/jekyll/drops/drop.rb                          |  1 -
 lib/jekyll/drops/excerpt_drop.rb                  |  1 -
 lib/jekyll/drops/jekyll_drop.rb                   |  1 -
 lib/jekyll/drops/site_drop.rb                     |  1 -
 lib/jekyll/drops/unified_payload_drop.rb          |  1 -
 lib/jekyll/drops/url_drop.rb                      |  1 -
 lib/jekyll/reader.rb                              |  3 +--
 lib/jekyll/readers/collection_reader.rb           |  2 +-
 lib/jekyll/renderer.rb                            |  1 -
 lib/jekyll/site.rb                                | 15 +++++++--------
 lib/jekyll/tags/highlight.rb                      |  8 ++++----
 lib/jekyll/tags/include.rb                        |  9 ++++-----
 lib/jekyll/tags/link.rb                           |  4 ++--
 lib/jekyll/tags/post_url.rb                       |  8 ++++----
 test/test_ansi.rb                                 |  2 +-
 test/test_utils.rb                                |  1 +
 29 files changed, 45 insertions(+), 50 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index ea3aa1062fc..8f961cf589f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -21,7 +21,7 @@ Layout/EmptyLinesAroundAccessModifier:
 Layout/EmptyLinesAroundModuleBody:
   Enabled: false
 Layout/EndOfLine:
-  EnforcedStyle: lf
+  EnforcedStyle: native
 Layout/ExtraSpacing:
   AllowForAlignment: true
 Layout/FirstParameterIndentation:
@@ -44,10 +44,14 @@ Layout/SpaceInsideBrackets:
   Enabled: false
 Lint/EndAlignment:
   Severity: error
+Lint/RescueWithoutErrorClass:
+  Enabled: false
 Lint/UnreachableCode:
   Severity: error
 Lint/UselessAccessModifier:
   Enabled: false
+Lint/Void:
+  Enabled: false
 Metrics/AbcSize:
   Max: 21
 Metrics/BlockLength:
@@ -82,6 +86,10 @@ Metrics/ParameterLists:
   Max: 4
 Metrics/PerceivedComplexity:
   Max: 8
+Naming/FileName:
+  Enabled: false
+Naming/HeredocDelimiterNaming:
+  Enabled: false
 Security/MarshalLoad:
   Exclude:
     - !ruby/regexp /test\/.*.rb$/
@@ -109,8 +117,8 @@ Style/Documentation:
     - !ruby/regexp /features\/.*.rb$/
 Style/DoubleNegation:
   Enabled: false
-Style/FileName:
-  Enabled: false
+Style/Encoding:
+  EnforcedStyle: when_needed
 Style/GuardClause:
   Enabled: false
 Style/HashSyntax:
diff --git a/Gemfile b/Gemfile
index 216c2626f19..c94d4ff3969 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,7 +30,7 @@ group :test do
   gem "nokogiri", RUBY_VERSION >= "2.2" ? "~> 1.7" : "~> 1.7.0"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 0.49.1"
+  gem "rubocop", "~> 0.50.0"
   gem "test-dependency-theme", :path => File.expand_path("test/fixtures/test-dependency-theme", __dir__)
   gem "test-theme", :path => File.expand_path("test/fixtures/test-theme", __dir__)
 
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 606d09daae4..ddbb36e8854 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 lib = File.expand_path("lib", __dir__)
diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index fb5db3d43e1..cdcab8bda5b 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -119,7 +119,7 @@ def configuration(override = {})
     # timezone - the IANA Time Zone
     #
     # Returns nothing
-    # rubocop:disable Style/AccessorMethodName
+    # rubocop:disable Naming/AccessorMethodName
     def set_timezone(timezone)
       ENV["TZ"] = if Utils::Platforms.really_windows?
                     Utils::WinTZ.calculate(timezone)
@@ -127,7 +127,7 @@ def set_timezone(timezone)
                     timezone
                   end
     end
-    # rubocop:enable Style/AccessorMethodName
+    # rubocop:enable Naming/AccessorMethodName
 
     # Public: Fetch the logger instance for this Jekyll process.
     #
diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb
index 1ef87e714d5..c10ee5963ca 100644
--- a/lib/jekyll/commands/doctor.rb
+++ b/lib/jekyll/commands/doctor.rb
@@ -86,7 +86,7 @@ def fsnotify_buggy?(_site)
         def urls_only_differ_by_case(site)
           urls_only_differ_by_case = false
           urls = case_insensitive_urls(site.pages + site.docs_to_write, site.dest)
-          urls.each do |_case_insensitive_url, real_urls|
+          urls.each_value do |real_urls|
             next unless real_urls.uniq.size > 1
             urls_only_differ_by_case = true
             Jekyll.logger.warn "Warning:", "The following URLs only differ" \
diff --git a/lib/jekyll/commands/serve/servlet.rb b/lib/jekyll/commands/serve/servlet.rb
index b661940c30a..2e41b697524 100644
--- a/lib/jekyll/commands/serve/servlet.rb
+++ b/lib/jekyll/commands/serve/servlet.rb
@@ -27,7 +27,7 @@ def search_file(req, res, basename)
           super || super(req, res, ".html") || super(req, res, "#{basename}.html")
         end
 
-        # rubocop:disable Style/MethodName
+        # rubocop:disable Naming/MethodName
         def do_GET(req, res)
           rtn = super
           validate_and_ensure_charset(req, res)
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index a9965d29f5b..7fbe15cf9df 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 module Jekyll
diff --git a/lib/jekyll/converters/markdown.rb b/lib/jekyll/converters/markdown.rb
index 3e53992104d..857b6ecf73e 100644
--- a/lib/jekyll/converters/markdown.rb
+++ b/lib/jekyll/converters/markdown.rb
@@ -27,7 +27,7 @@ def setup
       # Rubocop does not allow reader methods to have names starting with `get_`
       # To ensure compatibility, this check has been disabled on this method
       #
-      # rubocop:disable Style/AccessorMethodName
+      # rubocop:disable Naming/AccessorMethodName
       def get_processor
         case @config["markdown"].downcase
         when "redcarpet" then return RedcarpetParser.new(@config)
@@ -37,7 +37,7 @@ def get_processor
           custom_processor
         end
       end
-      # rubocop:enable Style/AccessorMethodName
+      # rubocop:enable Naming/AccessorMethodName
 
       # Public: Provides you with a list of processors, the ones we
       # support internally and the ones that you have provided to us (if you
diff --git a/lib/jekyll/converters/markdown/kramdown_parser.rb b/lib/jekyll/converters/markdown/kramdown_parser.rb
index d1f93c63f09..a9650cc7939 100644
--- a/lib/jekyll/converters/markdown/kramdown_parser.rb
+++ b/lib/jekyll/converters/markdown/kramdown_parser.rb
@@ -42,12 +42,14 @@ def convert(content)
         end
 
         private
+        # rubocop:disable Performance/HashEachMethods
         def make_accessible(hash = @config)
           hash.keys.each do |key|
             hash[key.to_sym] = hash[key]
             make_accessible(hash[key]) if hash[key].is_a?(Hash)
           end
         end
+        # rubocop:enable Performance/HashEachMethods
 
         # config[kramdown][syntax_higlighter] >
         #   config[kramdown][enable_coderay] >
diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index aea33fdcb86..6b20548292e 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 require "set"
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index d42e544c62f..0877ca12421 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 module Jekyll
diff --git a/lib/jekyll/drops/collection_drop.rb b/lib/jekyll/drops/collection_drop.rb
index 2c9c01320ea..e1d7da95978 100644
--- a/lib/jekyll/drops/collection_drop.rb
+++ b/lib/jekyll/drops/collection_drop.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 module Jekyll
diff --git a/lib/jekyll/drops/document_drop.rb b/lib/jekyll/drops/document_drop.rb
index 7796980c7a4..727997810f3 100644
--- a/lib/jekyll/drops/document_drop.rb
+++ b/lib/jekyll/drops/document_drop.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 module Jekyll
diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb
index 1cc9c465ac4..92978af1962 100644
--- a/lib/jekyll/drops/drop.rb
+++ b/lib/jekyll/drops/drop.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 module Jekyll
diff --git a/lib/jekyll/drops/excerpt_drop.rb b/lib/jekyll/drops/excerpt_drop.rb
index 06f8ae7d016..0362d9304ee 100644
--- a/lib/jekyll/drops/excerpt_drop.rb
+++ b/lib/jekyll/drops/excerpt_drop.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 module Jekyll
diff --git a/lib/jekyll/drops/jekyll_drop.rb b/lib/jekyll/drops/jekyll_drop.rb
index 1686da418f1..8a56b9ee76d 100644
--- a/lib/jekyll/drops/jekyll_drop.rb
+++ b/lib/jekyll/drops/jekyll_drop.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 module Jekyll
diff --git a/lib/jekyll/drops/site_drop.rb b/lib/jekyll/drops/site_drop.rb
index 20b0332a43c..632f81ce118 100644
--- a/lib/jekyll/drops/site_drop.rb
+++ b/lib/jekyll/drops/site_drop.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 module Jekyll
diff --git a/lib/jekyll/drops/unified_payload_drop.rb b/lib/jekyll/drops/unified_payload_drop.rb
index 833443a46f9..52647f98bf6 100644
--- a/lib/jekyll/drops/unified_payload_drop.rb
+++ b/lib/jekyll/drops/unified_payload_drop.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 module Jekyll
diff --git a/lib/jekyll/drops/url_drop.rb b/lib/jekyll/drops/url_drop.rb
index e67d24d47b8..0571558bf4e 100644
--- a/lib/jekyll/drops/url_drop.rb
+++ b/lib/jekyll/drops/url_drop.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 module Jekyll
diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index 5804d1f963a..7b5c3b158ea 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 require "csv"
@@ -25,7 +24,7 @@ def read
 
     # Sorts posts, pages, and static files.
     def sort_files!
-      site.collections.values.each { |c| c.docs.sort! }
+      site.collections.each_value { |c| c.docs.sort! }
       site.pages.sort_by!(&:name)
       site.static_files.sort_by!(&:relative_path)
     end
diff --git a/lib/jekyll/readers/collection_reader.rb b/lib/jekyll/readers/collection_reader.rb
index 7d605f421c4..77c700976f7 100644
--- a/lib/jekyll/readers/collection_reader.rb
+++ b/lib/jekyll/readers/collection_reader.rb
@@ -14,7 +14,7 @@ def initialize(site)
     #
     # Returns nothing.
     def read
-      site.collections.each do |_, collection|
+      site.collections.each_value do |collection|
         collection.read unless SPECIAL_COLLECTIONS.include?(collection.label)
       end
     end
diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index 5a2d32a8d27..3a6fdebd24d 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 module Jekyll
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 54155d0c8e2..a771477d176 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 require "csv"
@@ -85,11 +84,11 @@ def print_stats
     #
     # Returns nothing
     def reset
-      if config["time"]
-        self.time = Utils.parse_date(config["time"].to_s, "Invalid time in _config.yml.")
-      else
-        self.time = Time.now
-      end
+      self.time = if config["time"]
+                    Utils.parse_date(config["time"].to_s, "Invalid time in _config.yml.")
+                  else
+                    Time.now
+                  end
       self.layouts = {}
       self.pages = []
       self.static_files = []
@@ -238,7 +237,7 @@ def post_attr_hash(post_attr)
       posts.docs.each do |p|
         p.data[post_attr].each { |t| hash[t] << p } if p.data[post_attr]
       end
-      hash.values.each { |posts| posts.sort!.reverse! }
+      hash.each_value { |posts| posts.sort!.reverse! }
       hash
     end
 
@@ -449,7 +448,7 @@ def configure_file_read_opts
 
     private
     def render_docs(payload)
-      collections.each do |_, collection|
+      collections.each_value do |collection|
         collection.docs.each do |document|
           if regenerator.regenerate?(document)
             document.output = Jekyll::Renderer.new(self, document, payload).run
diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb
index 687f9b717b3..683e3b2b456 100644
--- a/lib/jekyll/tags/highlight.rb
+++ b/lib/jekyll/tags/highlight.rb
@@ -18,13 +18,13 @@ def initialize(tag_name, markup, tokens)
           @lang = Regexp.last_match(1).downcase
           @highlight_options = parse_options(Regexp.last_match(2))
         else
-          raise SyntaxError, <<-eos
+          raise SyntaxError, <<-MSG
 Syntax Error in tag 'highlight' while parsing the following markup:
 
   #{markup}
 
 Valid syntax: highlight <lang> [linenos]
-eos
+MSG
         end
       end
 
@@ -95,14 +95,14 @@ def render_pygments(code, is_safe)
         )
 
         if highlighted_code.nil?
-          Jekyll.logger.error <<eos
+          Jekyll.logger.error <<-MSG
 There was an error highlighting your code:
 
 #{code}
 
 While attempting to convert the above code, Pygments.rb returned an unacceptable value.
 This is usually a timeout problem solved by running `jekyll build` again.
-eos
+MSG
           raise ArgumentError, "Pygments.rb returned an unacceptable value "\
           "when attempting to highlight some code."
         end
diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index b2f6ffb40a2..0032b7d2507 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 module Jekyll
@@ -61,7 +60,7 @@ def parse_params(context)
 
       def validate_file_name(file)
         if file !~ %r!^[a-zA-Z0-9_/\.-]+$! || file =~ %r!\./! || file =~ %r!/\.!
-          raise ArgumentError, <<-eos
+          raise ArgumentError, <<-MSG
 Invalid syntax for include tag. File contains invalid characters or sequences:
 
   #{file}
@@ -70,14 +69,14 @@ def validate_file_name(file)
 
   #{syntax_example}
 
-eos
+MSG
         end
       end
 
       def validate_params
         full_valid_syntax = %r!\A\s*(?:#{VALID_SYNTAX}(?=\s|\z)\s*)*\z!
         unless @params =~ full_valid_syntax
-          raise ArgumentError, <<-eos
+          raise ArgumentError, <<-MSG
 Invalid syntax for include tag:
 
   #{@params}
@@ -86,7 +85,7 @@ def validate_params
 
   #{syntax_example}
 
-eos
+MSG
         end
       end
 
diff --git a/lib/jekyll/tags/link.rb b/lib/jekyll/tags/link.rb
index 77f4da9ca48..b3f5a2ad40c 100644
--- a/lib/jekyll/tags/link.rb
+++ b/lib/jekyll/tags/link.rb
@@ -24,11 +24,11 @@ def render(context)
           return item.url if item.relative_path == "/#{@relative_path}"
         end
 
-        raise ArgumentError, <<eos
+        raise ArgumentError, <<-MSG
 Could not find document '#{@relative_path}' in tag '#{self.class.tag_name}'.
 
 Make sure the document exists and the path is correct.
-eos
+MSG
       end
     end
   end
diff --git a/lib/jekyll/tags/post_url.rb b/lib/jekyll/tags/post_url.rb
index 9a1b8337c91..4fba98149e4 100644
--- a/lib/jekyll/tags/post_url.rb
+++ b/lib/jekyll/tags/post_url.rb
@@ -60,13 +60,13 @@ def initialize(tag_name, post, tokens)
         begin
           @post = PostComparer.new(@orig_post)
         rescue => e
-          raise Jekyll::Errors::PostURLError, <<-eos
+          raise Jekyll::Errors::PostURLError, <<-MSG
 Could not parse name of post "#{@orig_post}" in tag 'post_url'.
 
 Make sure the post exists and the name is correct.
 
 #{e.class}: #{e.message}
-eos
+MSG
         end
       end
 
@@ -90,11 +90,11 @@ def render(context)
           return p.url
         end
 
-        raise Jekyll::Errors::PostURLError, <<-eos
+        raise Jekyll::Errors::PostURLError, <<-MSG
 Could not find post "#{@orig_post}" in tag 'post_url'.
 
 Make sure the post exists and the name is correct.
-eos
+MSG
       end
     end
   end
diff --git a/test/test_ansi.rb b/test/test_ansi.rb
index 9b4fd01668c..e780e0dd521 100644
--- a/test/test_ansi.rb
+++ b/test/test_ansi.rb
@@ -8,7 +8,7 @@ class TestAnsi < JekyllUnitTest
       @subject = Jekyll::Utils::Ansi
     end
 
-    Jekyll::Utils::Ansi::COLORS.each do |color, _val|
+    Jekyll::Utils::Ansi::COLORS.each_key do |color|
       should "respond_to? #{color}" do
         assert @subject.respond_to?(color)
       end
diff --git a/test/test_utils.rb b/test/test_utils.rb
index 1b4d4813b66..638aa16d275 100644
--- a/test/test_utils.rb
+++ b/test/test_utils.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 # frozen_string_literal: true
 
 require "helper"

From c84aef0619a99df26f92db710ec2c6e882b8fafe Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Fri, 22 Sep 2017 09:06:34 -0400
Subject: [PATCH 029/161] Update history to reflect merge of #6368 [ci skip]

---
 History.markdown | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/History.markdown b/History.markdown
index 4c466d7745f..575cb0b6a24 100644
--- a/History.markdown
+++ b/History.markdown
@@ -6,6 +6,10 @@
   * Update frontmatter.md (#6371)
   * Elaborate on excluding items from processing (#6136)
 
+### Development Fixes
+
+  * Bump rubocop to use `v0.50.x` (#6368)
+
 ## 3.6.0 / 2017-09-21
 
 ### Minor Enhancements

From 4359df8e65a2adb1c83ea018015b23663fcb6437 Mon Sep 17 00:00:00 2001
From: Frank Taillandier <frank.taillandier@gmail.com>
Date: Fri, 22 Sep 2017 15:11:23 +0200
Subject: [PATCH 030/161] Docs: Style lists in tables (#6379)

Merge pull request 6379
---
 docs/_sass/_style.scss | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/_sass/_style.scss b/docs/_sass/_style.scss
index 7399c34ef66..666e044b83f 100644
--- a/docs/_sass/_style.scss
+++ b/docs/_sass/_style.scss
@@ -813,7 +813,12 @@ tbody td {
   background-image: linear-gradient(to bottom, rgba(255,255,255,0.1) 0%,rgba(255,255,255,0) 100%);
   filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#1affffff', endColorstr='#00ffffff',GradientType=0 );
 
-  p {
+  ul {
+    padding-left: 1em;
+  }
+
+  p,
+  ul {
     font-size: 16px;
 
     code { font-size: 14px; }

From d9770bb2837d4c933998ebdcb80aab0fe15fbef8 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Fri, 22 Sep 2017 09:11:25 -0400
Subject: [PATCH 031/161] Update history to reflect merge of #6379 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 575cb0b6a24..54a81fe14be 100644
--- a/History.markdown
+++ b/History.markdown
@@ -5,6 +5,7 @@
   * Doc y_day in docs/permalinks (#6244)
   * Update frontmatter.md (#6371)
   * Elaborate on excluding items from processing (#6136)
+  * Docs: Style lists in tables (#6379)
 
 ### Development Fixes
 

From 76014aee2aac900dd2ce7aca3123a158ead033c6 Mon Sep 17 00:00:00 2001
From: Jan Piotrowski <piotrowski+github@gmail.com>
Date: Fri, 22 Sep 2017 15:51:58 +0200
Subject: [PATCH 032/161] Docs: remove duplicate "available" (#6380)

Merge pull request 6380
---
 docs/_docs/permalinks.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/permalinks.md b/docs/_docs/permalinks.md
index 31515b6b4ea..eb534f2d21b 100644
--- a/docs/_docs/permalinks.md
+++ b/docs/_docs/permalinks.md
@@ -354,7 +354,7 @@ As with posts, if you use a permalink style that omits the `.html` file extensio
 
 By default, collections follow a similar structure in the `_site` folder as pages, except that the path is prefaced by the collection name. For example: `collectionname/mypage.html`. For permalink settings that omit the file extension, the path would be `collection_name/mypage/index.html`.
 
-Collections have their own way of setting permalinks. Additionally, collections have unique template variables available available (such as `path` and `output_ext`). See the [Configuring permalinks for collections](../collections/#permalinks) in Collections for more information.
+Collections have their own way of setting permalinks. Additionally, collections have unique template variables available (such as `path` and `output_ext`). See the [Configuring permalinks for collections](../collections/#permalinks) in Collections for more information.
 
 ## Flattening pages in \_site on build
 

From 023775e4eba5e942053bbb54e862cf6038d11a72 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Fri, 22 Sep 2017 09:51:59 -0400
Subject: [PATCH 033/161] Update history to reflect merge of #6380 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 54a81fe14be..1938d0e88f9 100644
--- a/History.markdown
+++ b/History.markdown
@@ -6,6 +6,7 @@
   * Update frontmatter.md (#6371)
   * Elaborate on excluding items from processing (#6136)
   * Docs: Style lists in tables (#6379)
+  * Docs: remove duplicate &#34;available&#34; (#6380)
 
 ### Development Fixes
 

From e5403396b7db1264cc68b8a34d9275f1a1a8cec6 Mon Sep 17 00:00:00 2001
From: ashmaroli <ashmaroli@users.noreply.github.com>
Date: Sun, 24 Sep 2017 01:33:40 +0530
Subject: [PATCH 034/161] Disable default layouts for Pages with a `layout:
 none` declaration (#6182)

Merge pull request 6182
---
 features/rendering.feature | 12 ++++++++----
 lib/jekyll/convertible.rb  | 10 ++++++++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/features/rendering.feature b/features/rendering.feature
index 1d9f2aa949b..e6b80d9e2a6 100644
--- a/features/rendering.feature
+++ b/features/rendering.feature
@@ -49,7 +49,7 @@ Feature: Rendering
     And I should not see "Ahoy, indeed!" in "_site/index.css"
     And I should not see "Ahoy, indeed!" in "_site/index.js"
 
-  Scenario: Ignore defaults and don't place documents with layout set to 'none'
+  Scenario: Ignore defaults and don't place pages and documents with layout set to 'none'
     Given I have a "index.md" page with layout "none" that contains "Hi there, {{ site.author }}!"
     And I have a _trials directory
     And I have a "_trials/no-layout.md" page with layout "none" that contains "Hi there, {{ site.author }}!"
@@ -67,9 +67,11 @@ Feature: Rendering
     And I should not see "Welcome!" in "_site/trials/no-layout.html"
     And I should not see "Check this out!" in "_site/trials/no-layout.html"
     But I should see "Check this out!" in "_site/trials/test.html"
-    And I should see "Welcome!" in "_site/index.html"
+    And I should see "Hi there, John Doe!" in "_site/index.html"
+    And I should not see "Welcome!" in "_site/index.html"
+    And I should not see "Build Warning:" in the build output
 
-  Scenario: Don't place documents with layout set to 'none'
+  Scenario: Don't place pages and documents with layout set to 'none'
     Given I have a "index.md" page with layout "none" that contains "Hi there, {{ site.author }}!"
     And I have a _trials directory
     And I have a "_trials/no-layout.md" page with layout "none" that contains "Hi there, {{ site.author }}!"
@@ -84,8 +86,10 @@ Feature: Rendering
     Then I should get a zero exit status
     And the _site directory should exist
     And I should not see "Welcome!" in "_site/trials/no-layout.html"
+    And I should not see "Welcome!" in "_site/index.html"
     But I should see "Check this out!" in "_site/trials/test.html"
-    And I should see "Welcome!" in "_site/index.html"
+    And I should see "Hi there, John Doe!" in "_site/index.html"
+    And I should not see "Build Warning:" in the build output
 
   Scenario: Render liquid in Sass
     Given I have an "index.scss" page that contains ".foo-bar { color:{{site.color}}; }"
diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index 6b20548292e..45a83c4f827 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -172,9 +172,10 @@ def render_with_liquid?
 
     # Determine whether the file should be placed into layouts.
     #
-    # Returns false if the document is an asset file.
+    # Returns false if the document is an asset file or if the front matter
+    #   specifies `layout: none`
     def place_in_layout?
-      !asset_file?
+      !(asset_file? || no_layout?)
     end
 
     # Checks if the layout specified in the document actually exists
@@ -244,8 +245,13 @@ def [](property)
     end
 
     private
+
     def _renderer
       @_renderer ||= Jekyll::Renderer.new(site, self)
     end
+
+    def no_layout?
+      data["layout"] == "none"
+    end
   end
 end

From 9113e0aa050bae814320dcd99639ea6038f3dccc Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sat, 23 Sep 2017 16:03:42 -0400
Subject: [PATCH 035/161] Update history to reflect merge of #6182 [ci skip]

---
 History.markdown | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/History.markdown b/History.markdown
index 1938d0e88f9..3b13957c664 100644
--- a/History.markdown
+++ b/History.markdown
@@ -12,6 +12,10 @@
 
   * Bump rubocop to use `v0.50.x` (#6368)
 
+### Minor Enhancements
+
+  * Disable default layouts for Pages with a `layout: none` declaration (#6182)
+
 ## 3.6.0 / 2017-09-21
 
 ### Minor Enhancements

From 5f8ba181f05c13078df48a32303d1bd5b67d0dcc Mon Sep 17 00:00:00 2001
From: Frank Taillandier <frank.taillandier@gmail.com>
Date: Sat, 23 Sep 2017 22:11:17 +0200
Subject: [PATCH 036/161] bump Rouge (#6381)

Merge pull request 6381
---
 jekyll.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index ddbb36e8854..74bcd8e3cf7 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("liquid",                "~> 4.0")
   s.add_runtime_dependency("mercenary",             "~> 0.3.3")
   s.add_runtime_dependency("pathutil",              "~> 0.9")
-  rouge_versions = ENV["ROUGE_VERSION"] ? ["~> #{ENV["ROUGE_VERSION"]}"] : [">= 1.7", "< 3"]
+  rouge_versions = ENV["ROUGE_VERSION"] ? ["~> #{ENV["ROUGE_VERSION"]}"] : [">= 1.7", "< 4"]
   s.add_runtime_dependency("rouge",                 *rouge_versions)
   s.add_runtime_dependency("safe_yaml",             "~> 1.0")
 end

From 6f3d7a0034c21b0deb794928a79014a0c3a333e9 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sat, 23 Sep 2017 16:11:19 -0400
Subject: [PATCH 037/161] Update history to reflect merge of #6381 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 3b13957c664..f66625fcda9 100644
--- a/History.markdown
+++ b/History.markdown
@@ -15,6 +15,7 @@
 ### Minor Enhancements
 
   * Disable default layouts for Pages with a `layout: none` declaration (#6182)
+  * Upgrade to Rouge 3 (#6381)
 
 ## 3.6.0 / 2017-09-21
 

From 0331fb41ade8bf1df63fa05bc4bb71a07baf10c3 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 24 Sep 2017 11:50:55 -0400
Subject: [PATCH 038/161] Allow the user to set collections_dir to put all
 collections under one subdirectory (#6331)

Merge pull request 6331
---
 docs/_docs/collections.md   | 25 ++++++++++++++++++-------
 docs/_docs/configuration.md | 13 +++++++------
 lib/jekyll/collection.rb    |  8 ++++++--
 lib/jekyll/configuration.rb |  1 +
 4 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/docs/_docs/collections.md b/docs/_docs/collections.md
index 39bd99eb0d7..f0fed8abd52 100644
--- a/docs/_docs/collections.md
+++ b/docs/_docs/collections.md
@@ -46,6 +46,17 @@ defaults:
       layout: page
 ```
 
+**New**: You can optionally specify a directory if you want to store all your collections
+in the same place:
+
+```yaml
+collections:
+  collections_dir: my_collections
+```
+
+Then Jekyll will look in `my_collections/_books` for the `books` collection, and
+in `my_collections/_recipes` for the `recipes` collection.
+
 ### Step 2: Add your content {#step2}
 
 Create a corresponding folder (e.g. `<source>/_my_collection`) and add
@@ -111,7 +122,7 @@ _my_collection/
 
 each of the following `permalink` configurations will produce the document structure shown below it.
 
-* **Default**  
+* **Default**
   Same as `permalink: /:collection/:path`.
 
   ```
@@ -121,7 +132,7 @@ each of the following `permalink` configurations will produce the document struc
   │       └── some_doc.html
   ...
   ```
-* `permalink: pretty`  
+* `permalink: pretty`
   Same as `permalink: /:collection/:path/`.
 
   ```
@@ -225,7 +236,7 @@ each of the following `permalink` configurations will produce the document struc
 
 Each collection is accessible as a field on the `site` variable. For example, if
 you want to access the `albums` collection found in `_albums`, you'd use
-`site.albums`. 
+`site.albums`.
 
 Each collection is itself an array of documents (e.g., `site.albums` is an array of documents, much like `site.pages` and
 `site.posts`). See the table below for how to access attributes of those documents.
@@ -310,10 +321,10 @@ you specified in your `_config.yml` (if present) and the following information:
 
 <div class="note info">
   <h5>A Hard-Coded Collection</h5>
-  <p>In addition to any collections you create yourself, the 
-  <code>posts</code> collection is hard-coded into Jekyll. It exists whether 
-  you have a <code>_posts</code> directory or not. This is something to note 
-  when iterating through <code>site.collections</code> as you may need to 
+  <p>In addition to any collections you create yourself, the
+  <code>posts</code> collection is hard-coded into Jekyll. It exists whether
+  you have a <code>_posts</code> directory or not. This is something to note
+  when iterating through <code>site.collections</code> as you may need to
   filter it out.</p>
   <p>You may wish to use filters to find your collection:
   <code>{% raw %}{{ site.collections | where: "label", "myCollection" | first }}{% endraw %}</code></p>
diff --git a/docs/_docs/configuration.md b/docs/_docs/configuration.md
index 6d74fdbb50c..0d9c8f72e9d 100644
--- a/docs/_docs/configuration.md
+++ b/docs/_docs/configuration.md
@@ -602,12 +602,13 @@ file or on the command-line.
 
 ```yaml
 # Where things are
-source:       .
-destination:  ./_site
-plugins_dir:  _plugins
-layouts_dir:  _layouts
-data_dir:     _data
-includes_dir: _includes
+source:          .
+destination:     ./_site
+collections_dir: .
+plugins_dir:     _plugins
+layouts_dir:     _layouts
+data_dir:        _data
+includes_dir:    _includes
 collections:
   posts:
     output:   true
diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index ebafea38f97..4a3a70f6018 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -100,7 +100,9 @@ def filtered_entries
     # Returns a String containing the directory name where the collection
     #   is stored on the filesystem.
     def relative_directory
-      @relative_directory ||= "_#{label}"
+      @relative_directory ||= Pathname.new(directory).relative_path_from(
+        Pathname.new(site.source)
+      ).to_s
     end
 
     # The full path to the directory containing the collection.
@@ -108,7 +110,9 @@ def relative_directory
     # Returns a String containing th directory name where the collection
     #   is stored on the filesystem.
     def directory
-      @directory ||= site.in_source_dir(relative_directory)
+      @directory ||= site.in_source_dir(
+        File.join(site.config["collections_dir"], "_#{label}")
+      )
     end
 
     # The full path to the directory containing the collection, with
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 7fbe15cf9df..5c502d6816e 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -8,6 +8,7 @@ class Configuration < Hash
       # Where things are
       "source"              => Dir.pwd,
       "destination"         => File.join(Dir.pwd, "_site"),
+      "collections_dir"     => "",
       "plugins_dir"         => "_plugins",
       "layouts_dir"         => "_layouts",
       "data_dir"            => "_data",

From a9b95e58c6614a2c22a92b68dad5f2ace87a421f Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sun, 24 Sep 2017 11:50:56 -0400
Subject: [PATCH 039/161] Update history to reflect merge of #6331 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index f66625fcda9..17fcc6f3960 100644
--- a/History.markdown
+++ b/History.markdown
@@ -16,6 +16,7 @@
 
   * Disable default layouts for Pages with a `layout: none` declaration (#6182)
   * Upgrade to Rouge 3 (#6381)
+  * Allow the user to set collections_dir to put all collections under one subdirectory (#6331)
 
 ## 3.6.0 / 2017-09-21
 

From e4b456a2ee2faeb849d56a02476502b596daf1b2 Mon Sep 17 00:00:00 2001
From: Frank Taillandier <frank.taillandier@gmail.com>
Date: Mon, 25 Sep 2017 16:41:58 +0200
Subject: [PATCH 040/161] Docs: GitHub Pages instructions (#6384)

Merge pull request 6384
---
 docs/_docs/github-pages.md | 144 ++++++++++++++++---------------------
 1 file changed, 62 insertions(+), 82 deletions(-)

diff --git a/docs/_docs/github-pages.md b/docs/_docs/github-pages.md
index 2d519f68e00..5e03201caa8 100644
--- a/docs/_docs/github-pages.md
+++ b/docs/_docs/github-pages.md
@@ -4,103 +4,82 @@ permalink: /docs/github-pages/
 ---
 
 [GitHub Pages](https://pages.github.com) are public web pages for users,
-organizations, and repositories, that are freely hosted on GitHub's
-`github.io` domain or on a custom domain name of your choice. GitHub Pages are
-powered by Jekyll behind the scenes, so in addition to supporting regular HTML
-content, they’re also a great way to host your Jekyll-powered website for free.
+organizations, and repositories, that are freely hosted on GitHub's `github.io`
+domain or on a custom domain name of your choice. GitHub Pages are powered by
+Jekyll behind the scenes, so they're a great way to host your Jekyll-powered
+website for free.
+
+Your site is automatically generated by GitHub Pages when you push your source
+files. Note that GitHub Pages works equally well for regular HTML content,
+simply because Jekyll treats files without YAML front matter as static assets.
+So if you only need to push generated HTML, you're good to go without any
+further setup.
 
 Never built a website with GitHub Pages before? [See this marvelous guide by
-Jonathan McGlone to get you up and running](http://jmcglone.com/guides/github-pages/).
-This guide will teach you what you need to know about Git, GitHub, and Jekyll to create your very own website on GitHub Pages.
+Jonathan McGlone](http://jmcglone.com/guides/github-pages/) to get you up and
+running. This guide will teach you what you need to know about Git, GitHub, and
+Jekyll to create your very own website on GitHub Pages.
+
+##  The github-pages gem
+
+Our friends at GitHub have provided the
+[github-pages](https://github.com/github/pages-gem) gem which is used to manage
+[Jekyll and its dependencies on GitHub Pages](https://pages.github.com/versions/).
+Using it in your projects means that when you deploy your site to GitHub Pages,
+you will not be caught by unexpected differences between various versions of the
+gems.
+
+Note that GitHub Pages runs in `safe` mode and only allows [a set of whitelisted
+plugins](https://help.github.com/articles/configuring-jekyll-plugins/#default-plugins).
+
+To use the currently-deployed version of the gem in your project, add the
+following to your `Gemfile`:
+
+```ruby
+source "https://rubygems.org"
+
+gem "github-pages", group: :jekyll_plugins
+```
+
+Be sure to run `bundle update` often.
+
+<div class="note">
+  <h5>GitHub Pages Documentation, Help, and Support</h5>
+  <p>
+    For more information about what you can do with GitHub Pages, as well as for
+    troubleshooting guides, you should check out
+    <a href="https://help.github.com/categories/github-pages-basics/">GitHub’s Pages Help section</a>.
+    If all else fails, you should contact <a href="https://github.com/contact">GitHub Support</a>.
+  </p>
+</div>
 
 ### Project Page URL Structure
 
 Sometimes it's nice to preview your Jekyll site before you push your `gh-pages`
 branch to GitHub. However, the subdirectory-like URL structure GitHub uses for
-Project Pages complicates the proper resolution of URLs. In order to assure your site builds properly, use `site.github.url` in your URLs.
+Project Pages complicates the proper resolution of URLs. In order to assure your
+site builds properly, use the handy [URL filters](../templates/#filters):
 
 ```html
 {% raw %}
-<!-- Useful for styles with static names... -->
-<link href="{{ site.github.url }}/path/to/css.css" rel="stylesheet">
-<!-- and for documents/pages whose URLs can change... -->
-[{{ page.title }}]("{{ page.url | prepend: site.github.url }}")
+<!-- For styles with static names... -->
+<link href="{{ "/assets/css/style.css" | relative_url }}" rel="stylesheet">
+<!-- For documents/pages whose URLs can change... -->
+[{{ page.title }}]("{{ page.url | relative_url }}")
 {% endraw %}
 ```
 
 This way you can preview your site locally from the site root on localhost,
-but when GitHub generates your pages from the gh-pages branch all the URLs
+but when GitHub generates your pages from the `gh-pages` branch all the URLs
 will resolve properly.
 
 ## Deploying Jekyll to GitHub Pages
 
 GitHub Pages work by looking at certain branches of repositories on GitHub.
-There are two basic types available: user/organization pages and project pages.
+There are two basic types available: [user/organization and project pages](https://help.github.com/articles/user-organization-and-project-pages/).
 The way to deploy these two types of sites are nearly identical, except for a
 few minor details.
 
-<div class="note protip" markdown="1">
-<div markdown="1">
-</div>
-
-##### Use the `github-pages` gem
-
-Our friends at GitHub have provided the
-[github-pages](https://github.com/github/pages-gem)
-gem which is used to manage Jekyll and its dependencies on
-GitHub Pages. Using it in your projects means that when you deploy
-your site to GitHub Pages, you will not be caught by unexpected
-differences between various versions of the gems. To use the
-currently-deployed version of the gem in your project, add the
-following to your `Gemfile`:
-
-<div class="code-block" markdown="1">
-<div markdown="1">
-</div>
-
-```ruby
-source 'https://rubygems.org'
-
-require 'json'
-require 'open-uri'
-versions = JSON.parse(open('https://pages.github.com/versions.json').read)
-
-gem 'github-pages', versions['github-pages']
-```
-</div>
-
-This will ensure that when you run `bundle install`, you
-have the correct version of the `github-pages` gem.
-
-If that fails, simplify it:
-
-<div class="code-block" markdown="1">
-<div markdown="1">
-</div>
-
-```ruby
-source 'https://rubygems.org'
-
-gem 'github-pages'
-```
-</div>
-
-And be sure to run `bundle update` often.
-
-If you like to install `pages-gem` on Windows you can find instructions by Jens Willmer on
-[how to install github-pages gem on Windows (x64)](https://jwillmer.de/blog/tutorial/how-to-install-jekyll-and-pages-gem-on-windows-10-x46#github-pages-and-plugins).
-</div>
-
-<div class="note info">
-  <h5>Installing <code>github-pages</code> gem on Windows</h5>
-  <p>
-    While Windows is not officially supported, it is possible
-    to install <code>github-pages</code> gem on Windows.
-    Special instructions can be found on our
-    <a href="../windows/#installation">Windows-specific docs page</a>.
-  </p>
-</div>
-
 ### User and Organization Pages
 
 User and organization pages live in a special GitHub repository dedicated to
@@ -140,7 +119,7 @@ Please refer to GitHub official documentation on
 to see more detailed examples.
 
 <div class="note warning">
-  <h5>Source Files Must be in the Root Directory</h5>
+  <h5>Source files must be in the root directory</h5>
   <p>
     GitHub Pages <a href="https://help.github.com/articles/troubleshooting-github-pages-build-failures#source-setting">overrides</a>
     the <a href="/docs/configuration/#global-configuration">“Site Source”</a>
@@ -149,12 +128,13 @@ to see more detailed examples.
   </p>
 </div>
 
-<div class="note">
-  <h5>GitHub Pages Documentation, Help, and Support</h5>
+<div class="note info">
+  <h5>Installing the <code>github-pages</code> gem on Windows</h5>
+
   <p>
-    For more information about what you can do with GitHub Pages, as well as for
-    troubleshooting guides, you should check out
-    <a href="https://help.github.com/categories/github-pages-basics/">GitHub’s Pages Help section</a>.
-    If all else fails, you should contact <a href="https://github.com/contact">GitHub Support</a>.
+    While Windows is not officially supported, it is possible
+    to install the <code>github-pages</code> gem on Windows.
+    Special instructions can be found on our
+    <a href="../windows/#installation">Windows-specific docs page</a>.
   </p>
 </div>

From cfec06cdba69b8eaf728d4a4c52fb91fe8267adb Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Mon, 25 Sep 2017 10:41:59 -0400
Subject: [PATCH 041/161] Update history to reflect merge of #6384 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 17fcc6f3960..a27dceb0fbd 100644
--- a/History.markdown
+++ b/History.markdown
@@ -7,6 +7,7 @@
   * Elaborate on excluding items from processing (#6136)
   * Docs: Style lists in tables (#6379)
   * Docs: remove duplicate &#34;available&#34; (#6380)
+  * Docs: GitHub Pages instructions (#6384)
 
 ### Development Fixes
 

From eadad9eb7ea0a764802a81175a02c1c0487e4d80 Mon Sep 17 00:00:00 2001
From: ashmaroli <ashmaroli@users.noreply.github.com>
Date: Wed, 27 Sep 2017 14:48:13 +0530
Subject: [PATCH 042/161] improve documentation for theme-gem installation
 (#6387)

Merge pull request 6387
---
 docs/_docs/themes.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/_docs/themes.md b/docs/_docs/themes.md
index c79ce54c4e1..2682a9a3f5c 100644
--- a/docs/_docs/themes.md
+++ b/docs/_docs/themes.md
@@ -125,9 +125,19 @@ To install a gem-based theme:
 
 1. Add the theme to your site's `Gemfile`:
 
-   ```sh
+   ```ruby
+   # ./Gemfile
+
    gem "jekyll-theme-awesome"
    ```
+  Or if you've started with the `jekyll new` command, replace `gem "minima", "~> 2.0"` with your theme-gem:
+
+   ```diff
+   # ./Gemfile
+
+   - gem "minima", "~> 2.0"
+   + gem "jekyll-theme-awesome"
+   ```
 
 2. Install the theme:
 

From 528c03c22f748e0cc5e516ea79c9fef4bb8e6df4 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Wed, 27 Sep 2017 05:18:14 -0400
Subject: [PATCH 043/161] Update history to reflect merge of #6387 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index a27dceb0fbd..44c8c4ff5fe 100644
--- a/History.markdown
+++ b/History.markdown
@@ -8,6 +8,7 @@
   * Docs: Style lists in tables (#6379)
   * Docs: remove duplicate &#34;available&#34; (#6380)
   * Docs: GitHub Pages instructions (#6384)
+  * Improve documentation for theme-gem installation (#6387)
 
 ### Development Fixes
 

From 7d36527dfc59b244121a664cc63c88bca4365e0e Mon Sep 17 00:00:00 2001
From: ashmaroli <ashmaroli@users.noreply.github.com>
Date: Wed, 27 Sep 2017 14:49:52 +0530
Subject: [PATCH 044/161] fix diff syntax-highlighting (#6388)

Merge pull request 6388
---
 docs/_sass/_pygments.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_sass/_pygments.scss b/docs/_sass/_pygments.scss
index 2858bcd2fb7..8b2633044c8 100644
--- a/docs/_sass/_pygments.scss
+++ b/docs/_sass/_pygments.scss
@@ -13,11 +13,11 @@
   .cp { color: #cd5c5c} /* Comment.Preproc */
   .c1 { color: #87ceeb} /* Comment.Single */
   .cs { color: #87ceeb} /* Comment.Special */
-  .gd { color: #0000c0; font-weight: bold; background-color: #008080 } /* Generic.Deleted */
+  .gd { color: #ce342c} /* Generic.Deleted */
   .ge { color: #c000c0; text-decoration: underline} /* Generic.Emph */
   .gr { color: #c0c0c0; font-weight: bold; background-color: #c00000 } /* Generic.Error */
   .gh { color: #cd5c5c} /* Generic.Heading */
-  .gi { color: #ffffff; background-color: #0000c0 } /* Generic.Inserted */
+  .gi { color: #27b42c} /* Generic.Inserted */
   span.go { color: #add8e6; font-weight: bold; background-color: #4d4d4d } /* Generic.Output, qualified with span to prevent applying this style to the Go language, see #1153. */
   .gp { color: #ffffff} /* Generic.Prompt */
   .gs { color: #ffffff} /* Generic.Strong */

From 5df6e3f8651e02879aca6c67edf35e5bf8081851 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Wed, 27 Sep 2017 05:19:54 -0400
Subject: [PATCH 045/161] Update history to reflect merge of #6388 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 44c8c4ff5fe..75ab92c91ff 100644
--- a/History.markdown
+++ b/History.markdown
@@ -9,6 +9,7 @@
   * Docs: remove duplicate &#34;available&#34; (#6380)
   * Docs: GitHub Pages instructions (#6384)
   * Improve documentation for theme-gem installation (#6387)
+  * Fix diff syntax-highlighting (#6388)
 
 ### Development Fixes
 

From 7333baf06d2be9775fd6bd3d815bffcd3b69a67b Mon Sep 17 00:00:00 2001
From: Frank Taillandier <frank.taillandier@gmail.com>
Date: Fri, 29 Sep 2017 09:39:19 +0200
Subject: [PATCH 046/161] Upgrade to Cucumber 3.0 (#6395)

Merge pull request 6395
---
 Gemfile                       |  2 +-
 features/support/formatter.rb | 31 ++++++++++++++++++++-----------
 script/cucumber               |  2 +-
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index c94d4ff3969..8ff6d132570 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,7 @@ end
 
 group :test do
   gem "codeclimate-test-reporter", "~> 1.0.5"
-  gem "cucumber", "~> 2.1"
+  gem "cucumber", "~> 3.0"
   gem "jekyll_test_plugin"
   gem "jekyll_test_plugin_malicious"
   # nokogiri v1.8 does not work with ruby 2.1 and below
diff --git a/features/support/formatter.rb b/features/support/formatter.rb
index 745c74ec905..091353ac920 100644
--- a/features/support/formatter.rb
+++ b/features/support/formatter.rb
@@ -59,7 +59,7 @@ def before_feature(_feature)
       #
 
       def feature_element_timing_key(feature_element)
-        "\"#{feature_element.name.to_s.sub("Scenario: ", "")}\" (#{feature_element.location})"
+        "\"#{feature_element.name}\" (#{feature_element.location})"
       end
 
       #
@@ -173,16 +173,8 @@ def after_test_step(test_step, result)
 
       #
 
-      private
-      def print_feature_element_name(keyword, name, source_line, _indent)
-        @io.puts
-
-        names = name.empty? ? [name] : name.each_line.to_a
-        line  = "  #{keyword}: #{names[0]}"
-
-        @io.print(source_line) if @options[:source]
-        @io.print(line)
-        @io.print " "
+      def print_feature_element_name(feature_element)
+        @io.print "\n#{feature_element.location}  Scenario: #{feature_element.name} "
         @io.flush
       end
 
@@ -214,3 +206,20 @@ def print_summary(features)
     end
   end
 end
+
+AfterConfiguration do |config|
+  f = Jekyll::Cucumber::Formatter.new(nil, $stdout, {})
+
+  config.on_event :test_case_started do |event|
+    f.print_feature_element_name(event.test_case)
+    f.before_feature_element(event.test_case)
+  end
+
+  config.on_event :test_case_finished do |event|
+    f.after_feature_element(event.test_case)
+  end
+
+  config.on_event :test_run_finished do
+    f.print_worst_offenders
+  end
+end
diff --git a/script/cucumber b/script/cucumber
index 0f0ef0f7da1..8a419d61941 100755
--- a/script/cucumber
+++ b/script/cucumber
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 time ruby -S bundle exec cucumber \
-  -f Jekyll::Cucumber::Formatter "$@"
+  --format progress "$@"

From 816d59129ddad0b6034166611645f32c94535591 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Fri, 29 Sep 2017 03:39:20 -0400
Subject: [PATCH 047/161] Update history to reflect merge of #6395 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 75ab92c91ff..6c062f9c3bd 100644
--- a/History.markdown
+++ b/History.markdown
@@ -14,6 +14,7 @@
 ### Development Fixes
 
   * Bump rubocop to use `v0.50.x` (#6368)
+  * Upgrade to Cucumber 3.0 (#6395)
 
 ### Minor Enhancements
 

From 7b1c5dfcceb3e11b721c0d07681f53939a66c1db Mon Sep 17 00:00:00 2001
From: Frank Taillandier <frank.taillandier@gmail.com>
Date: Fri, 29 Sep 2017 14:41:39 +0200
Subject: [PATCH 048/161] Docs: Update instructions (#6396)

Merge pull request 6396
---
 docs/_docs/installation.md |  9 +++++++++
 docs/_docs/upgrading.md    | 22 +++++++++++++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/docs/_docs/installation.md b/docs/_docs/installation.md
index 659becc9603..09620027154 100644
--- a/docs/_docs/installation.md
+++ b/docs/_docs/installation.md
@@ -128,8 +128,17 @@ $ gem search jekyll --remote
 
 and you'll search for just the name `jekyll`, and in brackets will be latest version. Another way to check if you have the latest version is to run the command `gem outdated`. This will provide a list of all the gems on your system that need to be updated. If you aren't running the latest version, run this command:
 
+```sh
+$ bundle update jekyll
+```
+
+Alternatively, if you don't have Bundler installed run:
+
 ```sh
 $ gem update jekyll
 ```
 
+Please refer to our [upgrading section](../upgrading/) for major updates
+detailed instructions.
+
 Now that you’ve got everything up-to-date and installed, let’s get to work!
diff --git a/docs/_docs/upgrading.md b/docs/_docs/upgrading.md
index e59187a496d..3029c0724e9 100644
--- a/docs/_docs/upgrading.md
+++ b/docs/_docs/upgrading.md
@@ -4,10 +4,26 @@ title: Upgrading
 permalink: /docs/upgrading/
 ---
 
-Upgrading from an older version of Jekyll? Upgrading to a new major version of Jekyll (e.g. from v2.x to v3.x) may cause some headaches. Take the following guides to aid your upgrade:
+Upgrading from an older version of Jekyll? Upgrading to a new major version of
+Jekyll (e.g. from v2.x to v3.x) may cause some headaches. Take the following
+guides to aid your upgrade:
 
 - [From 0.x to 1.x and 2.x](/docs/upgrading/0-to-2/)
 - [From 2.x to 3.x](/docs/upgrading/2-to-3/)
 
-If you are making a minor update (for example from 3.3.1 to the latest version at the time 3.3.2) run 'bundle update jekyll' when in your site directory. 
-If you would like to update all your gems, run 'bundle update' when in your site directory.
+## Minor updates
+
+<div class="note">
+  <h5>Stay Up to Date</h5>
+  <p>We recommend you update Jekyll as often as possible to benefit from
+  the latest bug fixes.
+  </p>
+</div>
+
+If you followed our setup recommendations and installed [Bundler](http://bundler.io/), run `bundle update jekyll` or simply `bundle update` and all your gems will
+update to the latest versions.
+
+If you don't have Bundler installed, run `gem update jekyll`.
+
+The procedure is similar [if you use the `github-pages`
+gem](https://help.github.com/articles/setting-up-your-github-pages-site-locally-with-jekyll/#keeping-your-site-up-to-date-with-the-github-pages-gem).

From f8762bd5d5a628bec74391a84fb2e3b6683444c6 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Fri, 29 Sep 2017 08:41:41 -0400
Subject: [PATCH 049/161] Update history to reflect merge of #6396 [ci skip]

---
 History.markdown | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/History.markdown b/History.markdown
index 6c062f9c3bd..41074f14635 100644
--- a/History.markdown
+++ b/History.markdown
@@ -22,6 +22,10 @@
   * Upgrade to Rouge 3 (#6381)
   * Allow the user to set collections_dir to put all collections under one subdirectory (#6331)
 
+### Site Enhancements
+
+  * Docs: Update instructions (#6396)
+
 ## 3.6.0 / 2017-09-21
 
 ### Minor Enhancements

From 76c52f43f7419677a62c5ad5bdcaed650ba1d5ac Mon Sep 17 00:00:00 2001
From: ashmaroli <ashmaroli@users.noreply.github.com>
Date: Sat, 30 Sep 2017 04:42:36 +0530
Subject: [PATCH 050/161] add special styling for code-blocks run in shell
 (#6389)

Merge pull request 6389
---
 docs/_sass/_style.scss | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/docs/_sass/_style.scss b/docs/_sass/_style.scss
index 666e044b83f..152b630eec2 100644
--- a/docs/_sass/_style.scss
+++ b/docs/_sass/_style.scss
@@ -682,15 +682,15 @@ h5 > code,
 
 .highlight {
   margin: 1em 0;
-  padding: 10px 0;
   width: 100%;
   overflow: auto;
 }
 
+pre.highlight { padding: 10px 0.5em; }
+
 .highlighter-rouge .highlight {
   @extend .highlight;
   margin: 0;
-  padding: 10px 0.5em;
 }
 
 /* HTML Elements */
@@ -1058,3 +1058,23 @@ code.output {
     background: #454545;
   }
 }
+
+.language-sh {
+  &:before {
+    display: table;
+    padding: 5px 8px;
+    width: 100%;
+    color: #272727;
+    text-shadow: none;
+    font-size: 14px;
+    line-height: 1.25;
+    font-weight: 700;
+    content: "TERMINAL";
+    background: #7a7a7a;
+    border: 1px solid #333;
+    @include border-radius(5px 5px 0 0);
+  }
+  .highlight {
+    @include border-radius(0 0 5px 5px);
+  }
+}

From 4c0f26c8a1deaab81d9d981da2e28f54d633ff16 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Fri, 29 Sep 2017 19:12:37 -0400
Subject: [PATCH 051/161] Update history to reflect merge of #6389 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 41074f14635..a1be9c9b447 100644
--- a/History.markdown
+++ b/History.markdown
@@ -25,6 +25,7 @@
 ### Site Enhancements
 
   * Docs: Update instructions (#6396)
+  * Add special styling for code-blocks run in shell (#6389)
 
 ## 3.6.0 / 2017-09-21
 

From b77cc3f070adf9e2c311f33c630d56b02d337436 Mon Sep 17 00:00:00 2001
From: ashmaroli <ashmaroli@users.noreply.github.com>
Date: Mon, 2 Oct 2017 12:27:54 +0530
Subject: [PATCH 052/161] fix code-block highlighting in docs (#6398)

Merge pull request 6398
---
 docs/_docs/installation.md | 22 +++++++++---------
 docs/_docs/pages.md        |  2 +-
 docs/_docs/permalinks.md   |  2 +-
 docs/_docs/plugins.md      | 46 ++++++++++++++++++++------------------
 docs/_docs/posts.md        |  4 ++--
 docs/_docs/quickstart.md   |  8 +++----
 docs/_docs/themes.md       |  4 ++--
 7 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/docs/_docs/installation.md b/docs/_docs/installation.md
index 09620027154..62377b698bd 100644
--- a/docs/_docs/installation.md
+++ b/docs/_docs/installation.md
@@ -49,7 +49,7 @@ The best way to install Jekyll is via
 simply run the following command to install Jekyll:
 
 ```sh
-$ gem install jekyll
+gem install jekyll
 ```
 
 All of Jekyll’s gem dependencies are automatically installed by the above
@@ -86,11 +86,11 @@ more involved. This gives you the advantage of having the latest and greatest,
 but may be unstable.
 
 ```sh
-$ git clone git://github.com/jekyll/jekyll.git
-$ cd jekyll
-$ script/bootstrap
-$ bundle exec rake build
-$ ls pkg/*.gem | head -n 1 | xargs gem install -l
+git clone git://github.com/jekyll/jekyll.git
+cd jekyll
+script/bootstrap
+bundle exec rake build
+ls pkg/*.gem | head -n 1 | xargs gem install -l
 ```
 
 ## Optional Extras
@@ -116,26 +116,26 @@ Check out [the extras page](../extras/) for more information.
 Before you start developing with Jekyll, you may want to check that you're up to date with the latest version. To find your version of Jekyll, run one of these commands:
 
 ```sh
-$ jekyll --version
-$ gem list jekyll
+jekyll --version
+gem list jekyll
 ```
 
 You can also use [RubyGems](https://rubygems.org/gems/jekyll) to find the current versioning of any gem. But you can also use the `gem` command line tool:
 
 ```sh
-$ gem search jekyll --remote
+gem search jekyll --remote
 ```
 
 and you'll search for just the name `jekyll`, and in brackets will be latest version. Another way to check if you have the latest version is to run the command `gem outdated`. This will provide a list of all the gems on your system that need to be updated. If you aren't running the latest version, run this command:
 
 ```sh
-$ bundle update jekyll
+bundle update jekyll
 ```
 
 Alternatively, if you don't have Bundler installed run:
 
 ```sh
-$ gem update jekyll
+gem update jekyll
 ```
 
 Please refer to our [upgrading section](../upgrading/) for major updates
diff --git a/docs/_docs/pages.md b/docs/_docs/pages.md
index 398d1987d1b..8852bc32b8e 100644
--- a/docs/_docs/pages.md
+++ b/docs/_docs/pages.md
@@ -60,7 +60,7 @@ If you have a lot of pages, you can organize those pages into subfolders. The sa
 
 If you have pages organized into subfolders in your source folder and want to flatten them in the root folder on build, you must add the [permalink]({% link _docs/permalinks.md %}) property directly in your page's front matter like this:
 
-```
+```yaml
 ---
 title: My page
 permalink: mypageurl.html
diff --git a/docs/_docs/permalinks.md b/docs/_docs/permalinks.md
index eb534f2d21b..8b4576eef49 100644
--- a/docs/_docs/permalinks.md
+++ b/docs/_docs/permalinks.md
@@ -360,7 +360,7 @@ Collections have their own way of setting permalinks. Additionally, collections
 
 If you want to flatten your pages (pull them out of subfolders) in the `_site` directory when your site builds (similar to posts), add the `permalink` property to the front matter of each page, with no path specified:
 
-```
+```yaml
 ---
 title: My page
 permalink: mypageurl.html
diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index ae55aa23d01..101c90906a7 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -25,32 +25,36 @@ having to modify the Jekyll source itself.
 You have 3 options for installing plugins:
 
 1. In your site source root, make a `_plugins` directory. Place your plugins
-here. Any file ending in `*.rb` inside this directory will be loaded before
-Jekyll generates your site.
-2. In your `_config.yml` file, add a new array with the key `plugins` and the
-values of the gem names of the plugins you'd like to use. An example:
+   here. Any file ending in `*.rb` inside this directory will be loaded before
+   Jekyll generates your site.
 
+2. In your `_config.yml` file, add a new array with the key `plugins` and the
+   values of the gem names of the plugins you'd like to use. An example:
 
-        plugins:
-          - jekyll-gist
-          - jekyll-coffeescript
-          - jekyll-assets
-          - another-jekyll-plugin
-        # This will require each of these plugins automatically.
+   ```yaml
+   # This will require each of these plugins automatically.
+   plugins:
+     - jekyll-gist
+     - jekyll-coffeescript
+     - jekyll-assets
+     - another-jekyll-plugin
+   ```
 
-    Then install your plugins using `gem install jekyll-gist jekyll-coffeescript jekyll-assets another-jekyll-plugin`
+   Then install your plugins using `gem install jekyll-gist jekyll-coffeescript jekyll-assets another-jekyll-plugin`
 
 3. Add the relevant plugins to a Bundler group in your `Gemfile`. An
-    example:
-
-        group :jekyll_plugins do
-          gem "jekyll-gist"
-          gem "jekyll-coffeescript"
-          gem "jekyll-assets"
-          gem "another-jekyll-plugin"
-        end
+   example:
+
+   ```ruby
+    group :jekyll_plugins do
+      gem "jekyll-gist"
+      gem "jekyll-coffeescript"
+      gem "jekyll-assets"
+      gem "another-jekyll-plugin"
+    end
+   ```
 
-    Now you need to install all plugins from your Bundler group by running single command `bundle install`.
+   Now you need to install all plugins from your Bundler group by running single command `bundle install`.
 
 <div class="note info">
   <h5>
@@ -117,7 +121,6 @@ This is a more complex generator that generates new pages:
 
 ```ruby
 module Jekyll
-
   class CategoryPage < Page
     def initialize(site, base, dir, category)
       @site = site
@@ -146,7 +149,6 @@ module Jekyll
       end
     end
   end
-
 end
 ```
 
diff --git a/docs/_docs/posts.md b/docs/_docs/posts.md
index e3a749d5a5e..76c84d3746d 100644
--- a/docs/_docs/posts.md
+++ b/docs/_docs/posts.md
@@ -26,7 +26,7 @@ To create a new post, all you need to do is create a file in the `_posts`
 directory. How you name files in this folder is important. Jekyll requires blog
 post files to be named according to the following format:
 
-```sh
+```
 YEAR-MONTH-DAY-title.MARKUP
 ```
 
@@ -34,7 +34,7 @@ Where `YEAR` is a four-digit number, `MONTH` and `DAY` are both two-digit
 numbers, and `MARKUP` is the file extension representing the format used in the
 file. For example, the following are examples of valid post filenames:
 
-```sh
+```
 2011-12-31-new-years-eve-is-awesome.md
 2012-09-12-how-to-write-a-blog.md
 ```
diff --git a/docs/_docs/quickstart.md b/docs/_docs/quickstart.md
index 08d2fd5f620..024e9839cff 100644
--- a/docs/_docs/quickstart.md
+++ b/docs/_docs/quickstart.md
@@ -8,16 +8,16 @@ If you already have a full [Ruby](https://www.ruby-lang.org/en/downloads/) devel
 
 ```sh
 # Install Jekyll and Bundler gems through RubyGems
-~ $ gem install jekyll bundler
+gem install jekyll bundler
 
 # Create a new Jekyll site at ./myblog
-~ $ jekyll new myblog
+jekyll new myblog
 
 # Change into your new directory
-~ $ cd myblog
+cd myblog
 
 # Build the site on the preview server
-~/myblog $ bundle exec jekyll serve
+bundle exec jekyll serve
 
 # Now browse to http://localhost:4000
 ```
diff --git a/docs/_docs/themes.md b/docs/_docs/themes.md
index 2682a9a3f5c..ac4d3830c29 100644
--- a/docs/_docs/themes.md
+++ b/docs/_docs/themes.md
@@ -47,7 +47,7 @@ To locate a theme's files on your computer:
 
 2. Open the theme's directory in Finder or Explorer:
 
-   ```shell
+   ```sh
    # On MacOS
    open $(bundle show minima)
    # On Windows
@@ -147,7 +147,7 @@ To install a gem-based theme:
 
 3. Add the following to your site's `_config.yml` to activate the theme:
 
-   ```sh
+   ```yaml
    theme: jekyll-theme-awesome
    ```
 

From b11ad8ea774e1249ee1f78264ac4aa9ea46f8db2 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Mon, 2 Oct 2017 02:57:56 -0400
Subject: [PATCH 053/161] Update history to reflect merge of #6398 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index a1be9c9b447..c996eae6c34 100644
--- a/History.markdown
+++ b/History.markdown
@@ -10,6 +10,7 @@
   * Docs: GitHub Pages instructions (#6384)
   * Improve documentation for theme-gem installation (#6387)
   * Fix diff syntax-highlighting (#6388)
+  * Fix code-block highlighting in docs (#6398)
 
 ### Development Fixes
 

From 77bb9267ac2ae30998f7975564477f48f42fb8f1 Mon Sep 17 00:00:00 2001
From: Kenton Hansen <himself@kentonhansen.com>
Date: Mon, 2 Oct 2017 08:47:05 -0500
Subject: [PATCH 054/161] Docs: Filtering Posts with categories, tags, or other
 variables (#6399)

Merge pull request 6399
---
 docs/_docs/posts.md | 47 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/docs/_docs/posts.md b/docs/_docs/posts.md
index 76c84d3746d..0dd7f110891 100644
--- a/docs/_docs/posts.md
+++ b/docs/_docs/posts.md
@@ -78,7 +78,7 @@ digital assets along with your text content. While the syntax for linking to
 these resources differs between Markdown and Textile, the problem of working
 out where to store these files in your site is something everyone will face.
 
-There are a number of ways to include digital assets in Jekyll. 
+There are a number of ways to include digital assets in Jekyll.
 One common solution is to create a folder in the root of the project directory
 called something like `assets` or `downloads`, into which any images, downloads
 or other resources are placed. Then, from within any post, they can be linked
@@ -155,6 +155,51 @@ you wish to access the currently-rendering page/posts's variables (the
 variables of the post/page that has the `for` loop in it), use the `page`
 variable instead.
 
+## Displaying post categories or tags
+
+Hey, that's pretty neat, but what about showing just some of your posts that are
+related to each other? For that you can use any of the [variables definable in
+Front Matter](https://jekyllrb.com/docs/frontmatter/). In the "typical post"
+section you can see how to define categories. Simply add the categories to your
+Front Matter as a [yaml
+list](https://en.wikipedia.org/wiki/YAML#Basic_components).
+
+Now that your posts have a category or multiple categories, you can make a page
+or a template displaying just the posts in those categories you specify. Here's
+a basic example of how to create a list of posts from a specific category.
+
+First, in the `_layouts` directory create a new file called `category.html` - in
+that file put (at least) the following:
+```html
+---
+layout: page
+---
+{% for post in site.categories[page.category] %}
+    <a href="{{ post.url | prepend: site.baseurl }}">
+      {{ post.title }}
+    </a>
+<hr>
+{% endfor %}
+```
+
+Next, in the root directory of your Jekyll install, create a new directory
+called `category` and then create a file for each category you want to list. For
+example, if you have a category `blog` then create a file in the new directory
+called `blog.html` with at least
+
+```text
+---
+layout: category
+title: Blog
+category: blog
+---
+```
+
+In this case, the listing pages will be accessible at `{baseurl}/category/blog.html`
+
+While this example is done with categories, you can easily extend your lists to
+filter by tags or any other variable created with extensions.
+
 ## Post excerpts
 
 Each post automatically takes the first block of text, from the beginning of

From ac575a0c50bda8c32134848afa69bacf0cad1244 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Mon, 2 Oct 2017 09:47:07 -0400
Subject: [PATCH 055/161] Update history to reflect merge of #6399 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index c996eae6c34..960c48868c1 100644
--- a/History.markdown
+++ b/History.markdown
@@ -11,6 +11,7 @@
   * Improve documentation for theme-gem installation (#6387)
   * Fix diff syntax-highlighting (#6388)
   * Fix code-block highlighting in docs (#6398)
+  * Docs: Filtering Posts with categories, tags, or other variables (#6399)
 
 ### Development Fixes
 

From fe5fb5beb72e82f3ee38226a1ba1d1210e4b213b Mon Sep 17 00:00:00 2001
From: Kenton Hansen <himself@kentonhansen.com>
Date: Mon, 2 Oct 2017 09:32:47 -0500
Subject: [PATCH 056/161] Fixes formatting on pre-formatted text. (#6405)

Merge pull request 6405
---
 docs/_docs/posts.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/posts.md b/docs/_docs/posts.md
index 0dd7f110891..2079c9db262 100644
--- a/docs/_docs/posts.md
+++ b/docs/_docs/posts.md
@@ -170,7 +170,7 @@ a basic example of how to create a list of posts from a specific category.
 
 First, in the `_layouts` directory create a new file called `category.html` - in
 that file put (at least) the following:
-```html
+```
 ---
 layout: page
 ---

From ac3e6b384f80c4726f0eac19a6f1a73ee7376d62 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Mon, 2 Oct 2017 10:32:48 -0400
Subject: [PATCH 057/161] Update history to reflect merge of #6405 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 960c48868c1..cacf0032049 100644
--- a/History.markdown
+++ b/History.markdown
@@ -12,6 +12,7 @@
   * Fix diff syntax-highlighting (#6388)
   * Fix code-block highlighting in docs (#6398)
   * Docs: Filtering Posts with categories, tags, or other variables (#6399)
+  * Fixes formatting on pre-formatted text. (#6405)
 
 ### Development Fixes
 

From 85aebe9b9041b8dec2a1c3072d86af2091463e7e Mon Sep 17 00:00:00 2001
From: Frank Taillandier <frank.taillandier@gmail.com>
Date: Tue, 3 Oct 2017 09:52:13 +0200
Subject: [PATCH 058/161] Docs: updates (#6407)

Merge pull request 6407
---
 .github/CONTRIBUTING.markdown                 | 16 +++-
 docs/_config.yml                              |  1 -
 docs/_docs/collections.md                     |  2 +-
 docs/_docs/continuous-integration/circleci.md |  4 +-
 .../_docs/continuous-integration/travis-ci.md |  2 +-
 docs/_docs/contributing.md                    | 16 +++-
 docs/_docs/datafiles.md                       | 13 ++-
 docs/_docs/frontmatter.md                     | 12 +--
 docs/_docs/github-pages.md                    |  4 +-
 docs/_docs/includes.md                        | 59 +++++++++----
 docs/_docs/index.md                           |  2 +-
 docs/_docs/pagination.md                      | 18 ++--
 docs/_docs/plugins.md                         |  4 +-
 docs/_docs/posts.md                           | 82 +++++++++++--------
 docs/_docs/static_files.md                    | 12 +--
 docs/_docs/templates.md                       | 32 ++++----
 docs/_docs/themes.md                          |  8 +-
 docs/_docs/troubleshooting.md                 |  4 +-
 docs/_docs/upgrading/0-to-2.md                |  2 +-
 docs/_docs/upgrading/2-to-3.md                | 13 +--
 docs/_docs/usage.md                           | 29 +++----
 docs/_docs/windows.md                         | 38 ++++-----
 .../2014-12-22-jekyll-2-5-3-released.markdown |  2 +-
 docs/_sass/_pygments.scss                     | 12 +--
 .../convert-existing-site-to-jekyll.md        |  2 +-
 docs/_tutorials/custom-404-page.md            | 11 +--
 docs/_tutorials/navigation.md                 | 55 +++++++++----
 docs/_tutorials/orderofinterpretation.md      | 48 +++++++----
 docs/community/index.md                       |  6 +-
 29 files changed, 299 insertions(+), 210 deletions(-)

diff --git a/.github/CONTRIBUTING.markdown b/.github/CONTRIBUTING.markdown
index 14cbecc10e0..91d18e7f65b 100644
--- a/.github/CONTRIBUTING.markdown
+++ b/.github/CONTRIBUTING.markdown
@@ -121,19 +121,27 @@ site or configuration. [Feel free to check it out!](https://github.com/jekyll/je
 
 To run the test suite and build the gem you'll need to install Jekyll's dependencies by running the following command:
 
-<pre class="highlight"><code>$ script/bootstrap</code></pre>
+```sh
+script/bootstrap
+```
 
 Before you make any changes, run the tests and make sure that they pass (to confirm your environment is configured properly):
 
-<pre class="highlight"><code>$ script/cibuild</code></pre>
+```sh
+script/cibuild
+```
 
 If you are only updating a file in `test/`, you can use the command:
 
-<pre class="highlight"><code>$ script/test test/blah_test.rb</code></pre>
+```sh
+script/test test/blah_test.rb
+```
 
 If you are only updating a `.feature` file, you can use the command:
 
-<pre class="highlight"><code>$ script/cucumber features/blah.feature</code></pre>
+```sh
+script/cucumber features/blah.feature
+```
 
 Both `script/test` and `script/cucumber` can be run without arguments to
 run its entire respective suite.
diff --git a/docs/_config.yml b/docs/_config.yml
index 044cb386c95..130ed1a327a 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -8,7 +8,6 @@ google_analytics_id: UA-50755011-1
 google_site_verification: onQcXpAvtHBrUI5LlroHNE_FP0b2qvFyPq7VZw36iEY
 
 repository: https://github.com/jekyll/jekyll
-help_url: https://github.com/jekyll/jekyll-help
 
 timezone: America/Los_Angeles
 
diff --git a/docs/_docs/collections.md b/docs/_docs/collections.md
index f0fed8abd52..3d42bd88342 100644
--- a/docs/_docs/collections.md
+++ b/docs/_docs/collections.md
@@ -454,7 +454,7 @@ works:
 
 Every album in the collection could be listed on a single page with a template:
 
-```html
+```liquid
 {% raw %}
 {% for album in site.albums %}
   <h2>{{ album.title }}</h2>
diff --git a/docs/_docs/continuous-integration/circleci.md b/docs/_docs/continuous-integration/circleci.md
index fede484a2d1..4dd2905383e 100644
--- a/docs/_docs/continuous-integration/circleci.md
+++ b/docs/_docs/continuous-integration/circleci.md
@@ -40,7 +40,7 @@ CircleCI detects when `Gemfile` is present is will automatically run `bundle ins
 
 The most basic test that can be run is simply seeing if `jekyll build` actually works. This is a blocker, a dependency if you will,  for other tests you might run on the generate site. So we'll run Jekyll, via Bundler, in the `dependencies` phase.
 
-```
+```yaml
 dependencies:
   post:
     - bundle exec jekyll build
@@ -63,7 +63,7 @@ test:
 
 When you put it all together, here's an example of what that `circle.yml` file could look like:
 
-```
+```yaml
 machine:
   environment:
     NOKOGIRI_USE_SYSTEM_LIBRARIES: true # speeds up installation of html-proofer
diff --git a/docs/_docs/continuous-integration/travis-ci.md b/docs/_docs/continuous-integration/travis-ci.md
index 91323958024..cbff5267e2e 100644
--- a/docs/_docs/continuous-integration/travis-ci.md
+++ b/docs/_docs/continuous-integration/travis-ci.md
@@ -49,7 +49,7 @@ Some options can be specified via command-line switches. Check out the
 For example to avoid testing external sites, use this command:
 
 ```sh
-$ bundle exec htmlproofer ./_site --disable-external
+bundle exec htmlproofer ./_site --disable-external
 ```
 
 ### The HTML Proofer Library
diff --git a/docs/_docs/contributing.md b/docs/_docs/contributing.md
index b8a838a752a..5cf0398c63c 100644
--- a/docs/_docs/contributing.md
+++ b/docs/_docs/contributing.md
@@ -125,19 +125,27 @@ site or configuration. [Feel free to check it out!](https://github.com/jekyll/je
 
 To run the test suite and build the gem you'll need to install Jekyll's dependencies by running the following command:
 
-<pre class="highlight"><code>$ script/bootstrap</code></pre>
+```sh
+script/bootstrap
+```
 
 Before you make any changes, run the tests and make sure that they pass (to confirm your environment is configured properly):
 
-<pre class="highlight"><code>$ script/cibuild</code></pre>
+```sh
+script/cibuild
+```
 
 If you are only updating a file in `test/`, you can use the command:
 
-<pre class="highlight"><code>$ script/test test/blah_test.rb</code></pre>
+```sh
+script/test test/blah_test.rb
+```
 
 If you are only updating a `.feature` file, you can use the command:
 
-<pre class="highlight"><code>$ script/cucumber features/blah.feature</code></pre>
+```sh
+script/cucumber features/blah.feature
+```
 
 Both `script/test` and `script/cucumber` can be run without arguments to
 run its entire respective suite.
diff --git a/docs/_docs/datafiles.md b/docs/_docs/datafiles.md
index 671a32060b9..f59715198c1 100644
--- a/docs/_docs/datafiles.md
+++ b/docs/_docs/datafiles.md
@@ -56,8 +56,8 @@ determines the variable name).
 
 You can now render the list of members in a template:
 
-```html
 {% raw %}
+```liquid
 <ul>
 {% for member in site.data.members %}
   <li>
@@ -67,8 +67,8 @@ You can now render the list of members in a template:
   </li>
 {% endfor %}
 </ul>
-{% endraw %}
 ```
+{% endraw %}
 
 {: .note .info }
 If your Jekyll site has a lot of pages, such as with documentation websites, see the detailed examples in [how to build robust navigation for your site]({% link _tutorials/navigation.md %}).
@@ -106,8 +106,8 @@ members:
 The organizations can then be accessed via `site.data.orgs`, followed by the
 file name:
 
-```html
 {% raw %}
+```liquid
 <ul>
 {% for org_hash in site.data.orgs %}
 {% assign org = org_hash[1] %}
@@ -119,8 +119,8 @@ file name:
   </li>
 {% endfor %}
 </ul>
-{% endraw %}
 ```
+{% endraw %}
 
 ## Example: Accessing a specific author
 
@@ -136,8 +136,8 @@ dave:
 
 The author can then be specified as a page variable in a post's frontmatter:
 
-```html
 {% raw %}
+```liquid
 ---
 title: sample post
 author: dave
@@ -149,8 +149,7 @@ author: dave
   title="{{ author.name }}">
     {{ author.name }}
 </a>
-
-{% endraw %}
 ```
+{% endraw %}
 
 For information on how to build robust navigation for your site (especially if you have a documentation website or another type of Jekyll site with a lot of pages to organize), see [Navigation](/tutorials/navigation).
diff --git a/docs/_docs/frontmatter.md b/docs/_docs/frontmatter.md
index b2b7699cdbe..761c8bb5089 100644
--- a/docs/_docs/frontmatter.md
+++ b/docs/_docs/frontmatter.md
@@ -65,13 +65,13 @@ front matter of a page or post.
 
           If set, this specifies the layout file to use. Use the layout file
           name without the file extension. Layout files must be placed in the
-          <code>_layouts</code> directory. 
+          <code>_layouts</code> directory.
 
         </p>
         <ul>
           <li>
-            Using <code>null</code> will produce a file without using a layout 
-            file. However this is overridden if the file is a post/document and has a 
+            Using <code>null</code> will produce a file without using a layout
+            file. However this is overridden if the file is a post/document and has a
             layout defined in the <a href="../configuration/#front-matter-defaults">
             frontmatter defaults</a>.
           </li>
@@ -129,14 +129,14 @@ data that is sent to the Liquid templating engine during the conversion. For
 instance, if you set a title, you can use that in your layout to set the page
 title:
 
-```html
+```liquid
 <!DOCTYPE HTML>
 <html>
   <head>
     <title>{% raw %}{{ page.title }}{% endraw %}</title>
   </head>
   <body>
-    ...
+    …
 ```
 
 ## Predefined Variables for Posts
@@ -167,7 +167,7 @@ These are available out-of-the-box to be used in the front matter for a post.
     </tr>
     <tr>
       <td>
-        <p style="margin-bottom: 5px;"><code>category</code></p>
+        <p><code>category</code></p>
         <p><code>categories</code></p>
       </td>
       <td>
diff --git a/docs/_docs/github-pages.md b/docs/_docs/github-pages.md
index 5e03201caa8..01af5e50e41 100644
--- a/docs/_docs/github-pages.md
+++ b/docs/_docs/github-pages.md
@@ -60,14 +60,14 @@ branch to GitHub. However, the subdirectory-like URL structure GitHub uses for
 Project Pages complicates the proper resolution of URLs. In order to assure your
 site builds properly, use the handy [URL filters](../templates/#filters):
 
-```html
 {% raw %}
+```liquid
 <!-- For styles with static names... -->
 <link href="{{ "/assets/css/style.css" | relative_url }}" rel="stylesheet">
 <!-- For documents/pages whose URLs can change... -->
 [{{ page.title }}]("{{ page.url | relative_url }}")
-{% endraw %}
 ```
+{% endraw %}
 
 This way you can preview your site locally from the site root on localhost,
 but when GitHub generates your pages from the `gh-pages` branch all the URLs
diff --git a/docs/_docs/includes.md b/docs/_docs/includes.md
index b7eb17cc4a2..948720474ab 100644
--- a/docs/_docs/includes.md
+++ b/docs/_docs/includes.md
@@ -5,9 +5,11 @@ permalink: /docs/includes/
 
 The `include` tag allows you to include the content from another file stored in the `_includes` folder:
 
+{% raw %}
 ```liquid
-{% raw %}{% include footer.html %}{% endraw %}
+{% include footer.html %}
 ```
+{% endraw %}
 
 Jekyll will look for the referenced file (in this case, `footer.html`) in the `_includes` directory at the root of your source directory and insert its contents.
 
@@ -15,9 +17,11 @@ Jekyll will look for the referenced file (in this case, `footer.html`) in the `_
 
 You can choose to include file fragments relative to the current file by using the `include_relative` tag:
 
+{% raw %}
 ```liquid
-{% raw %}{% include_relative somedir/footer.html %}{% endraw %}
+{% include_relative somedir/footer.html %}
 ```
+{% endraw %}
 
 You won't need to place your included content within the `_includes` directory. Instead,
 the inclusion is specifically relative to the file where the tag is being used. For example,
@@ -42,9 +46,11 @@ my_variable: footer_company_a.html
 
 You could then reference that variable in your include:
 
+{% raw %}
 ```liquid
-{% raw %}{% include {{ page.my_variable }} %}{% endraw %}
+{% include {{ page.my_variable }} %}
 ```
+{% endraw %}
 
 In this example, the include would insert the file `footer_company_a.html` from the `_includes/footer_company_a.html` directory.
 
@@ -52,18 +58,22 @@ In this example, the include would insert the file `footer_company_a.html` from
 
 You can also pass parameters to an include. For example, suppose you have a file called `note.html` in your `_includes` folder that contains this formatting:
 
+{% raw %}
 ```liquid
-{% raw %}<div markdown="span" class="alert alert-info" role="alert">
+<div markdown="span" class="alert alert-info" role="alert">
 <i class="fa fa-info-circle"></i> <b>Note:</b>
 {{ include.content }}
-</div>{% endraw %}
+</div>
 ```
+{% endraw %}
 
 The `{% raw %}{{ include.content }}{% endraw %}` is a parameter that gets populated when you call the include and specify a value for that parameter, like this:
 
+{% raw %}
 ```liquid
-{% raw %}{% include note.html content="This is my sample note." %} {% endraw %}
+{% include note.html content="This is my sample note." %}
 ```
+{% endraw %}
 
 The value of `content` (which is `This is my sample note`) will be inserted into the {% raw %}`{{ include.content }}`{% endraw %} parameter.
 
@@ -82,14 +92,16 @@ For example, suppose you have a special image syntax with complex formatting, an
 
 You could templatize this content in your include and make each value available as a parameter, like this:
 
+{% raw %}
 ```liquid
-{% raw %}<figure>
+<figure>
    <a href="{{ include.url }}">
    <img src="{{ include.file }}" style="max-width: {{ include.max-width }};"
       alt="{{ include.alt }}"/>
    <figcaption>{{ include.caption }}</figcaption>
-</figure>{% endraw %}
+</figure>
 ```
+{% endraw %}
 
 This include contains 5 parameters:
 
@@ -101,15 +113,17 @@ This include contains 5 parameters:
 
 Here's an example that passes all the parameters to this include (the include file is named `image.html`):
 
+{% raw %}
 ```liquid
-{% raw %}{% include image.html url="http://jekyllrb.com"
+{% include image.html url="http://jekyllrb.com"
 max-width="200px" file="logo.png" alt="Jekyll logo"
-caption="This is the Jekyll logo." %} {% endraw %}
+caption="This is the Jekyll logo." %}
 ```
+{% endraw %}
 
 The result is the original HTML code shown earlier.
 
-To safeguard situations where users don't supply a value for the parameter, you can use [Liquid's default filter](https://help.shopify.com/themes/liquid/filters/additional-filters#default).
+To safeguard situations where users don't supply a value for the parameter, you can use [Liquid's default filter](https://shopify.github.io/liquid/filters/default/).
 
 Overall, you can create includes that act as templates for a variety of uses &mdash; inserting audio or video clips, alerts, special formatting, and more. However, note that you should avoid using too many includes, as this will slow down the build time of your site. For example, don't use includes every time you insert an image. (The above technique shows a use case for special images.)
 
@@ -121,16 +135,21 @@ The string you pass to your include parameter can't contain curly braces. For ex
 
 If you want to include this variable in your parameter that you pass to an include, you need to store the entire parameter as a variable before passing it to the include. You can use `capture` tags to create the variable:
 
+{% raw %}
 ```liquid
-{% raw %}{% capture download_note %}The latest version of
-{{ site.product_name }} is now available.{% endcapture %}{% endraw %}
+{% capture download_note %}
+The latest version of {{ site.product_name }} is now available.
+{% endcapture %}
 ```
+{% endraw %}
 
 Then pass this captured variable into the parameter for the include. Omit the quotation marks around the parameter content because it's no longer a string (it's a variable):
 
+{% raw %}
 ```liquid
-{% raw %}{% include note.html content=download_note %}{% endraw %}
+{% include note.html content=download_note %}
 ```
+{% endraw %}
 
 ### Passing references to YAML files as parameter values
 
@@ -150,18 +169,22 @@ Here's an example. In the `_data` folder, suppose you have a YAML file called `p
 
 In the `_includes` folder, assume you have a file called `spotlight.html` with this code:
 
+{% raw %}
 ```liquid
-{% raw %}{% for person in include.participants %}
+{% for person in include.participants %}
 {% if person.login_age == "new" %}
 {{ person.name }}
 {% endif %}
-{% endfor %}{% endraw %}
+{% endfor %}
 ```
+{% endraw %}
 
 Now when you insert the `spotlight.html` include file, you can submit the YAML file as a parameter:
 
+{% raw %}
+```liquid
+{% include spotlight.html participants=site.data.profiles %}
 ```
-{% raw %}{% include spotlight.html participants=site.data.profiles %}{% endraw %}
-```
+{% endraw %}
 
 In this instance, `site.data.profiles` gets inserted in place of {% raw %}`include.participants`{% endraw %} in the include file, and the Liquid logic processes. The result will be `Jane Doe`.
diff --git a/docs/_docs/index.md b/docs/_docs/index.md
index ff5e8ccedcf..f5077201d0a 100644
--- a/docs/_docs/index.md
+++ b/docs/_docs/index.md
@@ -15,7 +15,7 @@ development of Jekyll itself.
 Jekyll is a simple, blog-aware, static site generator. It takes a template
 directory containing raw text files in various formats, runs it through
 a converter (like [Markdown](https://daringfireball.net/projects/markdown/))
-and our [Liquid](https://github.com/Shopify/liquid/wiki) renderer, and
+and our [Liquid](https://shopify.github.io/liquid/) renderer, and
 spits out a complete, ready-to-publish static website suitable
 for serving with your favorite web server. Jekyll also happens to be the engine
 behind [GitHub Pages](https://pages.github.com), which means you can use Jekyll
diff --git a/docs/_docs/pagination.md b/docs/_docs/pagination.md
index c60b47e0360..41a3a8a26e5 100644
--- a/docs/_docs/pagination.md
+++ b/docs/_docs/pagination.md
@@ -24,7 +24,7 @@ your `_config.yml` under `plugins`. For Jekyll 2, this is standard.
 
 ## Enable pagination
 
-To enable pagination for your blog, add a line to the `_config.yml` file that
+To enable pagination for posts on your blog, add a line to the `_config.yml` file that
 specifies how many items should be displayed per page:
 
 ```yaml
@@ -55,6 +55,14 @@ directory.
   </p>
 </div>
 
+<div class="note info">
+  <h5>Pagination for categories, tags and collections</h5>
+  <p>
+    The more recent <a href="https://github.com/sverrirs/jekyll-paginate-v2">jekyll-paginate-v2</a> plugin supports more features. See the <a href="https://github.com/sverrirs/jekyll-paginate-v2/tree/master/examples">pagination examples</a> in the repository.
+    <strong>This plugin is not supported by GitHub Pages</strong>.
+  </p>
+</div>
+
 ## Liquid Attributes Available
 
 The pagination plugin exposes the `paginator` liquid object with the following
@@ -145,8 +153,8 @@ the `paginator` variable that will now be available to you. You’ll probably
 want to do this in one of the main pages of your site. Here’s one example of a
 simple way of rendering paginated Posts in a HTML file:
 
-```html
 {% raw %}
+```liquid
 ---
 layout: default
 title: My Blog
@@ -177,8 +185,8 @@ title: My Blog
     <span class="next ">Next</span>
   {% endif %}
 </div>
-{% endraw %}
 ```
+{% endraw %}
 
 <div class="note warning">
   <h5>Beware the page one edge-case</h5>
@@ -192,8 +200,8 @@ title: My Blog
 The following HTML snippet should handle page one, and render a list of each
 page with links to all but the current page.
 
-```html
 {% raw %}
+```liquid
 {% if paginator.total_pages > 1 %}
 <div class="pagination">
   {% if paginator.previous_page %}
@@ -219,5 +227,5 @@ page with links to all but the current page.
   {% endif %}
 </div>
 {% endif %}
-{% endraw %}
 ```
+{% endraw %}
diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 101c90906a7..284c3cb9c0e 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -387,11 +387,11 @@ Liquid::Template.register_tag('render_time', Jekyll::RenderTimeTag)
 In the example above, we can place the following tag anywhere in one of our
 pages:
 
-```ruby
 {% raw %}
+```ruby
 <p>{% render_time page rendered at: %}</p>
-{% endraw %}
 ```
+{% endraw %}
 
 And we would get something like this on the page:
 
diff --git a/docs/_docs/posts.md b/docs/_docs/posts.md
index 2079c9db262..854fb665335 100644
--- a/docs/_docs/posts.md
+++ b/docs/_docs/posts.md
@@ -80,53 +80,52 @@ out where to store these files in your site is something everyone will face.
 
 There are a number of ways to include digital assets in Jekyll.
 One common solution is to create a folder in the root of the project directory
-called something like `assets` or `downloads`, into which any images, downloads
+called something like `assets`, into which any images, files
 or other resources are placed. Then, from within any post, they can be linked
 to using the site’s root as the path for the asset to include. Again, this will
 depend on the way your site’s (sub)domain and path are configured, but here are
-some examples (in Markdown) of how you could do this using the `site.url`
-variable in a post.
+some examples in Markdown of how you could do this using the `absolute_url`
+filter in a post.
 
 Including an image asset in a post:
 
-```text
+{% raw %}
+```markdown
 ... which is shown in the screenshot below:
-![My helpful screenshot]({% raw %}{{ site.url }}{% endraw %}/assets/screenshot.jpg)
+![My helpful screenshot]({{ "/assets/screenshot.jpg" | absolute_url }})
 ```
+{% endraw %}
 
 Linking to a PDF for readers to download:
 
-```text
-... you can [get the PDF]({% raw %}{{ site.url }}{% endraw %}/assets/mydoc.pdf) directly.
+{% raw %}
+```markdown
+... you can [get the PDF]({{ "/assets/mydoc.pdf" | absolute_url }}) directly.
 ```
+{% endraw %}
+
+<div class="info">
 
-<div class="note">
-  <h5>ProTip™: Link using just the site root URL</h5>
-  <p>
-    You can skip the <code>{% raw %}{{ site.url }}{% endraw %}</code> variable
-    if you <strong>know</strong> your site will only ever be displayed at the
-    root URL of your domain. In this case you can reference assets directly with
-    just <code>/path/file.jpg</code>.
-  </p>
 </div>
 
 ## A typical post
 
 Jekyll can handle many different iterations of the idea you might associate with a "post," however a standard blog style post, including a Title, Layout, Publishing Date, and Categories might look like this:
 
-```
+```markdown
 ---
 layout: post
 title:  "Welcome to Jekyll!"
 date:   2015-11-17 16:16:01 -0600
 categories: jekyll update
 ---
+
 You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `bundle exec jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated.
 
 To add new posts, simply add a file in the `_posts` directory that follows the convention `YYYY-MM-DD-name-of-post.ext` and includes the necessary front matter. Take a look at the source for this post to get an idea about how it works.
-
 ```
-Everything in between the first and second `---` are part of the YAML Front Matter, and everything after the second `---` will be rendered with Markdown and show up as "Content."
+
+Everything in between the first and second `---` are part of the YAML Front Matter, and everything after the second `---` will be rendered with Markdown and show up as "Content".
 
 ## Displaying an index of posts
 
@@ -136,15 +135,17 @@ you have a list of posts somewhere. Creating an index of posts on another page
 language](https://docs.shopify.com/themes/liquid/basics) and its tags. Here’s a
 basic example of how to create a list of links to your blog posts:
 
+{% raw %}
 ```html
 <ul>
-  {% raw %}{% for post in site.posts %}{% endraw %}
+  {% for post in site.posts %}
     <li>
-      <a href="{% raw %}{{ post.url }}{% endraw %}">{% raw %}{{ post.title }}{% endraw %}</a>
+      <a href="{{ post.url }}">{{ post.title }}</a>
     </li>
-  {% raw %}{% endfor %}{% endraw %}
+  {% endfor %}
 </ul>
 ```
+{% endraw %}
 
 Of course, you have full control over how (and where) you display your posts,
 and how you structure your site. You should read more about [how templates
@@ -170,24 +171,27 @@ a basic example of how to create a list of posts from a specific category.
 
 First, in the `_layouts` directory create a new file called `category.html` - in
 that file put (at least) the following:
-```
+
+{% raw %}
+```liquid
 ---
 layout: page
 ---
+
 {% for post in site.categories[page.category] %}
-    <a href="{{ post.url | prepend: site.baseurl }}">
+    <a href="{{ post.url | absolute_url }}">
       {{ post.title }}
     </a>
-<hr>
 {% endfor %}
 ```
+{% endraw %}
 
 Next, in the root directory of your Jekyll install, create a new directory
 called `category` and then create a file for each category you want to list. For
 example, if you have a category `blog` then create a file in the new directory
 called `blog.html` with at least
 
-```text
+```yaml
 ---
 layout: category
 title: Blog
@@ -208,31 +212,35 @@ Take the above example of an index of posts. Perhaps you want to include
 a little hint about the post's content by adding the first paragraph of each of
 your posts:
 
-```html
+{% raw %}
+```liquid
 <ul>
-  {% raw %}{% for post in site.posts %}{% endraw %}
+  {% for post in site.posts %}
     <li>
-      <a href="{% raw %}{{ post.url }}{% endraw %}">{% raw %}{{ post.title }}{% endraw %}</a>
-      {% raw %}{{ post.excerpt }}{% endraw %}
+      <a href="{{ post.url }}">{{ post.title }}</a>
+      {{ post.excerpt }}
     </li>
-  {% raw %}{% endfor %}{% endraw %}
+  {% endfor %}
 </ul>
 ```
+{% endraw %}
 
 Because Jekyll grabs the first paragraph you will not need to wrap the excerpt
 in `p` tags, which is already done for you. These tags can be removed with the
 following if you'd prefer:
 
-```html
-{% raw %}{{ post.excerpt | remove: '<p>' | remove: '</p>' }}{% endraw %}
+{% raw %}
+```liquid
+{{ post.excerpt | remove: '<p>' | remove: '</p>' }}
 ```
+{% endraw %}
 
 If you don't like the automatically-generated post excerpt, it can be
 explicitly overridden by adding an `excerpt` value to your post's YAML
 Front Matter. Alternatively, you can choose to define a custom
 `excerpt_separator` in the post's YAML front matter:
 
-```text
+```yaml
 ---
 excerpt_separator: <!--more-->
 ---
@@ -259,8 +267,9 @@ Jekyll also has built-in support for syntax highlighting of code snippets using
 either Pygments or Rouge, and including a code snippet in any post is easy.
 Just use the dedicated Liquid tag as follows:
 
-```text
-{% raw %}{% highlight ruby %}{% endraw %}
+{% raw %}
+```liquid
+{% highlight ruby %}
 def show
   @widget = Widget(params[:id])
   respond_to do |format|
@@ -268,8 +277,9 @@ def show
     format.json { render json: @widget }
   end
 end
-{% raw %}{% endhighlight %}{% endraw %}
+{% endhighlight %}
 ```
+{% endraw %}
 
 And the output will look like this:
 
diff --git a/docs/_docs/static_files.md b/docs/_docs/static_files.md
index a4dda58892d..7b712c13505 100644
--- a/docs/_docs/static_files.md
+++ b/docs/_docs/static_files.md
@@ -66,13 +66,13 @@ following metadata:
 </table>
 </div>
 
-Note that in the above table, `file` can be anything. It's simply an arbitrarily set variable used in your own logic (such as in a for loop). It isn't a global site or page variable. 
+Note that in the above table, `file` can be anything. It's simply an arbitrarily set variable used in your own logic (such as in a for loop). It isn't a global site or page variable.
 
 ## Add front matter to static files
 
-Although you can't directly add front matter values to static files, you can set front matter values through the [defaults property](../configuration/#front-matter-defaults) in your configuration file. When Jekyll builds the site, it will use the front matter values you set. 
+Although you can't directly add front matter values to static files, you can set front matter values through the [defaults property](../configuration/#front-matter-defaults) in your configuration file. When Jekyll builds the site, it will use the front matter values you set.
 
-Here's an example: 
+Here's an example:
 
 In your `_config.yml` file, add the following values to the `defaults` property:
 
@@ -88,11 +88,13 @@ This assumes that your Jekyll site has a folder path of `assets/img` where  you
 
 Suppose you want to list all your image assets as contained in `assets/img`. You could use this for loop to look in the `static_files` object and get all static files that have this front matter property:
 
+{% raw %}
 ```liquid
-{% raw %}{% assign image_files = site.static_files | where: "image", true %}
+{% assign image_files = site.static_files | where: "image", true %}
 {% for myimage in image_files %}
   {{ myimage.path }}
-{% endfor %}{% endraw %}
+{% endfor %}
 ```
+{% endraw %}
 
 When you build your site, the output will list the path to each file that meets this front matter condition.
diff --git a/docs/_docs/templates.md b/docs/_docs/templates.md
index c37b93b5b97..c36f09107a0 100644
--- a/docs/_docs/templates.md
+++ b/docs/_docs/templates.md
@@ -428,9 +428,11 @@ The default is `default`. They are as follows (with what they filter):
 
 If you have small page snippets that you want to include in multiple places on your site, save the snippets as *include files* and insert them where required, by using the `include` tag:
 
+{% raw %}
 ```liquid
-{% raw %}{% include footer.html %}{% endraw %}
+{% include footer.html %}
 ```
+{% endraw %}
 
 Jekyll expects all *include files* to be placed in an `_includes` directory at the root of your source directory. In the above example, this will embed the contents of `_includes/footer.html` into the calling file.
 
@@ -451,15 +453,15 @@ languages](http://pygments.org/languages/)
 
 To render a code block with syntax highlighting, surround your code as follows:
 
-```liquid
 {% raw %}
+```liquid
 {% highlight ruby %}
 def foo
   puts 'foo'
 end
 {% endhighlight %}
-{% endraw %}
 ```
+{% endraw %}
 
 The argument to the `highlight` tag (`ruby` in the example above) is the
 language identifier. To find the appropriate identifier to use for the language
@@ -474,15 +476,15 @@ Including the `linenos` argument will force the highlighted code to include line
 numbers. For instance, the following code block would include line numbers next
 to each line:
 
-```liquid
 {% raw %}
+```liquid
 {% highlight ruby linenos %}
 def foo
   puts 'foo'
 end
 {% endhighlight %}
-{% endraw %}
 ```
+{% endraw %}
 
 #### Stylesheets for syntax highlighting
 
@@ -503,25 +505,25 @@ To link to a post, a page, collection item, or file, the `link` tag will generat
 
 You must include the file's original extension when using the `link` tag. Here are some examples:
 
-```liquid
 {% raw %}
+```liquid
 {{ site.baseurl }}{% link _collection/name-of-document.md %}
 {{ site.baseurl }}{% link _posts/2016-07-26-name-of-post.md %}
 {{ site.baseurl }}{% link news/index.html %}
 {{ site.baseurl }}{% link /assets/files/doc.pdf %}
-{% endraw %}
 ```
+{% endraw %}
 
 You can also use the `link` tag to create a link in Markdown as follows:
 
-```liquid
 {% raw %}
+```liquid
 [Link to a document]({{ site.baseurl }}{% link _collection/name-of-document.md %})
 [Link to a post]({{ site.baseurl }}{% link _posts/2016-07-26-name-of-post.md %})
 [Link to a page]({{ site.baseurl }}{% link news/index.html %})
 [Link to a file]({{ site.baseurl }}{% link /assets/files/doc.pdf %})
-{% endraw %}
 ```
+{% endraw %}
 
 (Including `{% raw %}{{ site.baseurl }}{% endraw %}` is optional &mdash; it depends on whether you want to preface the page URL with the `baseurl` value.)
 
@@ -539,26 +541,26 @@ Note you cannot add filters to `link` tags. For example, you cannot append a str
 
 If you want to include a link to a post on your site, the `post_url` tag will generate the correct permalink URL for the post you specify.
 
-```liquid
 {% raw %}
+```liquid
 {{ site.baseurl }}{% post_url 2010-07-21-name-of-post %}
-{% endraw %}
 ```
+{% endraw %}
 
 If you organize your posts in subdirectories, you need to include subdirectory path to the post:
 
-```liquid
 {% raw %}
+```liquid
 {{ site.baseurl }}{% post_url /subdir/2010-07-21-name-of-post %}
-{% endraw %}
 ```
+{% endraw %}
 
 There is no need to include the file extension when using the `post_url` tag.
 
 You can also use this tag to create a link to a post in Markdown as follows:
 
-```liquid
 {% raw %}
+```liquid
 [Name of Link]({{ site.baseurl }}{% post_url 2010-07-21-name-of-post %})
-{% endraw %}
 ```
+{% endraw %}
diff --git a/docs/_docs/themes.md b/docs/_docs/themes.md
index ac4d3830c29..6907ffb0c00 100644
--- a/docs/_docs/themes.md
+++ b/docs/_docs/themes.md
@@ -88,7 +88,7 @@ With a clear understanding of the theme's files, you can now override any theme
 
 Let's say, for a second example, you want to override Minima's footer. In your Jekyll site, create an `_includes` folder and add a file in it called `footer.html`. Jekyll will now use your site's `footer.html` file instead of the `footer.html` file from the Minima theme gem.
 
-To modify any stylesheet you must take the extra step of also copying the main sass file (`_sass/minima.scss` in the Minima theme) into the `_sass` directory in your site's source. 
+To modify any stylesheet you must take the extra step of also copying the main sass file (`_sass/minima.scss` in the Minima theme) into the `_sass` directory in your site's source.
 
 Jekyll will look first to your site's content before looking to the theme's defaults for any requested file in the following folders:
 
@@ -218,13 +218,15 @@ _sass
 
 Your theme's styles can be included in the user's stylesheet using the `@import` directive.
 
+{% raw %}
 ```css
-{% raw %}@import "{{ site.theme }}";{% endraw %}
+@import "{{ site.theme }}";
 ```
+{% endraw %}
 
 ### Theme-gem dependencies
 
-From `v3.5`, Jekyll will automatically require all whitelisted `runtime_dependencies` of your theme-gem even if they're not explicitly included under the `gems` array in the site's config file. (NOTE: whitelisting is only required when building or serving with the `--safe` option.)
+From `v3.5`, Jekyll will automatically require all whitelisted `runtime_dependencies` of your theme-gem even if they're not explicitly included under the `plugins` array in the site's config file. (Note: whitelisting is only required when building or serving with the `--safe` option.)
 
 With this, the end-user need not keep track of the plugins required to be included in their config file for their theme-gem to work as intended.
 
diff --git a/docs/_docs/troubleshooting.md b/docs/_docs/troubleshooting.md
index 2259e04d389..d57cfacfa0a 100644
--- a/docs/_docs/troubleshooting.md
+++ b/docs/_docs/troubleshooting.md
@@ -65,7 +65,7 @@ sudo emerge -av dev-ruby/rubygems
 On Windows, you may need to install [RubyInstaller
 DevKit](https://wiki.github.com/oneclick/rubyinstaller/development-kit).
 
-On Android (with Termux) you can install all requirements by running: 
+On Android (with Termux) you can install all requirements by running:
 
 ```sh
 apt update && apt install libffi-dev clang ruby-dev make
@@ -261,7 +261,7 @@ The issue is caused by trying to copy a non-existing symlink.
 <div class="note">
   <h5>Please report issues you encounter!</h5>
   <p>
-  If you come across a bug, please <a href="{{ site.help_url }}/issues/new">create an issue</a>
+  If you come across a bug, please <a href="{{ site.repository }}/issues/new">create an issue</a>
   on GitHub describing the problem and any work-arounds you find so we can
   document it here for others.
   </p>
diff --git a/docs/_docs/upgrading/0-to-2.md b/docs/_docs/upgrading/0-to-2.md
index 5f9d2320b80..31548339335 100644
--- a/docs/_docs/upgrading/0-to-2.md
+++ b/docs/_docs/upgrading/0-to-2.md
@@ -9,7 +9,7 @@ and 2.0 that you'll want to know about.
 Before we dive in, go ahead and fetch the latest version of Jekyll:
 
 ```sh
-$ gem update jekyll
+gem update jekyll
 ```
 
 <div class="note feature">
diff --git a/docs/_docs/upgrading/2-to-3.md b/docs/_docs/upgrading/2-to-3.md
index 2b1b13573c6..c12a1a91f41 100644
--- a/docs/_docs/upgrading/2-to-3.md
+++ b/docs/_docs/upgrading/2-to-3.md
@@ -3,20 +3,21 @@ title: Upgrading from 2.x to 3.x
 permalink: /docs/upgrading/2-to-3/
 ---
 
-Upgrading from an older version of Jekyll? A few things have changed in 3.0
+Upgrading from an older version of Jekyll? A few things have changed in Jekyll 3
 that you'll want to know about.
 
 Before we dive in, go ahead and fetch the latest version of Jekyll:
 
 ```sh
-$ gem update jekyll
+gem update jekyll
 ```
 
-Please note: Jekyll 3.2 requires Ruby version >= 2.1
+Since v3.2 Jekyll requires Ruby version >= 2.1
+{: .note .warning }
 
 <div class="note feature">
-  <h5 markdown="1">Diving in</h5>
-  <p markdown="1">Want to get a new Jekyll site up and running quickly? Simply
+  <h5>Diving in</h5>
+  <p>Want to get a new Jekyll site up and running quickly? Simply
    run <code>jekyll new SITENAME</code> to create a new folder with a bare bones
    Jekyll site.</p>
 </div>
@@ -68,7 +69,7 @@ generate when running `jekyll build` or `jekyll serve`.
   <h5>Future Posts on GitHub Pages</h5>
   <p>
     An exception to the above rule are GitHub Pages sites, where the <code>--future</code> flag remains <em>enabled</em>
-    by default to maintain historical consistency for those sites. 
+    by default to maintain historical consistency for those sites.
   </p>
 </div>
 
diff --git a/docs/_docs/usage.md b/docs/_docs/usage.md
index f4123aed3fd..dc273b29e90 100644
--- a/docs/_docs/usage.md
+++ b/docs/_docs/usage.md
@@ -7,22 +7,22 @@ The Jekyll gem makes a `jekyll` executable available to you in your Terminal
 window. You can use this command in a number of ways:
 
 ```sh
-$ jekyll build
+jekyll build
 # => The current folder will be generated into ./_site
 
-$ jekyll build --destination <destination>
+jekyll build --destination <destination>
 # => The current folder will be generated into <destination>
 
-$ jekyll build --source <source> --destination <destination>
+jekyll build --source <source> --destination <destination>
 # => The <source> folder will be generated into <destination>
 
-$ jekyll build --watch
+jekyll build --watch
 # => The current folder will be generated into ./_site,
 #    watched for changes, and regenerated automatically.
 ```
 
 <div class="note info">
-  <h5>Changes to _config.yml are not included during automatic regeneration.</h5>
+  <h5>Changes to <code>_config.yml</code> are not included during automatic regeneration.</h5>
   <p>
     The <code>_config.yml</code> master configuration file contains global configurations
     and variable definitions that are read once at execution time. Changes made to <code>_config.yml</code>
@@ -52,25 +52,22 @@ Jekyll also comes with a built-in development server that will allow you to
 preview what the generated site will look like in your browser locally.
 
 ```sh
-$ jekyll serve
+jekyll serve
 # => A development server will run at http://localhost:4000/
 # Auto-regeneration: enabled. Use `--no-watch` to disable.
 
-$ jekyll serve --detach
+jekyll serve --detach
 # => Same as `jekyll serve` but will detach from the current terminal.
 #    If you need to kill the server, you can `kill -9 1234` where "1234" is the PID.
 #    If you cannot find the PID, then do, `ps aux | grep jekyll` and kill the instance.
 ```
-
-<div class="note info">
-  <h5>Be aware of default behavior</h5>
-  <p>
-    As of version 2.4, the <code>serve</code> command will watch for changes automatically. To disable this, you can use <code>jekyll serve --no-watch</code>, which preserves the old behavior.
-  </p>
+<div class="note tip">
+  <h5>Livereload</h5>
+  <p>If you want to enable Livereload, you can enable the <a href="https://github.com/RobertDeRose/jekyll-livereload">jekyll-livereload</a> plugin in a <a href="../configuration/#build-command-options">development config file</a>.</p>
 </div>
 
 ```sh
-$ jekyll serve --no-watch
+jekyll serve --no-watch
 # => Same as `jekyll serve` but will not watch for changes.
 ```
 
@@ -89,8 +86,8 @@ destination: _deploy
 Then the following two commands will be equivalent:
 
 ```sh
-$ jekyll build
-$ jekyll build --source _source --destination _deploy
+jekyll build
+jekyll build --source _source --destination _deploy
 ```
 
 For more about the possible configuration options, see the
diff --git a/docs/_docs/windows.md b/docs/_docs/windows.md
index 9f21b6edf8b..d1a30b2752f 100644
--- a/docs/_docs/windows.md
+++ b/docs/_docs/windows.md
@@ -17,17 +17,17 @@ If you are using Windows 10 Anniversary Update, the easiest way to run Jekyll is
 
 First let's make sure all our packages / repositories are up to date. Open a new Command Prompt instance, and type the following:
 
-```
+```sh
 bash
 ```
 Your Command Prompt instance should now be a Bash instance. Now we must update our repo lists and packages.
 
-```
+```sh
 sudo apt-get update -y && sudo apt-get upgrade -y
 ```
 Now we can install Ruby. To do this we will use a repository from [BrightBox](https://www.brightbox.com/docs/ruby/ubuntu/), which hosts optimized versions of Ruby for Ubuntu.
 
-```
+```sh
 sudo apt-add-repository ppa:brightbox/ruby-ng
 sudo apt-get update
 sudo apt-get install ruby2.3 ruby2.3-dev build-essential
@@ -35,19 +35,19 @@ sudo apt-get install ruby2.3 ruby2.3-dev build-essential
 
 Next let's update our Ruby gems:
 
-```
+```sh
 sudo gem update
 ```
 
 Now all that is left to do is install Jekyll.
 
-```
+```sh
 sudo gem install jekyll bundler
 ```
 
 Check if Jekyll installed properly by running:
 
-```
+```sh
 jekyll -v
 ```
 
@@ -55,7 +55,7 @@ jekyll -v
 
 To start a new project named `my_blog`, just run:
 
-```
+```sh
 jekyll new my_blog
 ```
 
@@ -122,14 +122,14 @@ This gem is also needed in the github-pages and to get it running on Windows x64
 
 **Note:** In the current [pre release][nokogiriFails] it works out of the box with Windows x64 but this version is not referenced in the github-pages.
 
-`choco install libxml2 -Source "https://www.nuget.org/api/v2/"`{:.language-ruby}
+```sh
+choco install libxml2 -Source "https://www.nuget.org/api/v2/"
 
-`choco install libxslt -Source "https://www.nuget.org/api/v2/"`{:.language-ruby}
+choco install libxslt -Source "https://www.nuget.org/api/v2/"
 
-`choco install libiconv -Source "https://www.nuget.org/api/v2/"`{:.language-ruby}
+choco install libiconv -Source "https://www.nuget.org/api/v2/
 
-```ruby
- gem install nokogiri --^
+gem install nokogiri --^
    --with-xml2-include=C:\Chocolatey\lib\libxml2.2.7.8.7\build\native\include^
    --with-xml2-lib=C:\Chocolatey\lib\libxml2.redist.2.7.8.7\build\native\bin\v110\x64\Release\dynamic\cdecl^
    --with-iconv-include=C:\Chocolatey\lib\libiconv.1.14.0.11\build\native\include^
@@ -138,7 +138,7 @@ This gem is also needed in the github-pages and to get it running on Windows x64
    --with-xslt-lib=C:\Chocolatey\lib\libxslt.redist.1.1.28.0\build\native\bin\v110\x64\Release\dynamic
 ```
 
-#### Install github-pages 
+#### Install github-pages
 
   * Open command prompt and install [Bundler][]: `gem install bundler`
   * Create a file called `Gemfile` without any extension in your root directory of your blog
@@ -165,14 +165,10 @@ In the future the installation process of the github-pages should be as simple a
 [Bundler]: http://bundler.io/ "Ruby Dependencie Manager"
 [nokogiriReleases]: https://github.com/sparklemotion/nokogiri/releases "Nokogiri Releases"
 
----
-
 For a more conventional way of installing Jekyll you can follow this [complete guide to install Jekyll 3 on Windows by Sverrir Sigmundarson][windows-installjekyll3].
 
 Optionally you can use [Autoinstall Jekyll for Windows][fastjekyll-autoinstall].
 
----
-
 [windows-installjekyll3]: https://labs.sverrirs.com/jekyll/
 [fastjekyll-autoinstall]: https://github.com/KeJunMao/fastjekyll#autoinstall-jekyll-for-windows
 
@@ -185,11 +181,11 @@ Jekyll. This is especially relevant when you're running Jekyll on Windows.
 Additionally, you might need to change the code page of the console window to UTF-8 in case you get a "Liquid Exception: Incompatible character encoding" error during the site generation process. It can be done with the following command:
 
 ```sh
-$ chcp 65001
+chcp 65001
 ```
 
 
-## Time-Zone Management 
+## Time-Zone Management
 
 Since Windows doesn't have a native source of zoneinfo data, the Ruby Interpreter would not understand IANA Timezones and hence using them had the `TZ` environment variable default to UTC/GMT 00:00.
 Though Windows users could alternatively define their blog's timezone by setting the key to use POSIX format of defining timezones, it wasn't as user-friendly when it came to having the clock altered to changing DST-rules.
@@ -205,9 +201,9 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 [IANA-database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 
 
-## Auto Regeneration 
+## Auto Regeneration
 
-As of v1.3.0, Jekyll uses the `listen` gem to watch for changes when the `--watch` switch is specified during a build or serve. While `listen` has built-in support for UNIX systems, it may require an extra gem for compatibility with Windows.
+Jekyll uses the `listen` gem to watch for changes when the `--watch` switch is specified during a build or serve. While `listen` has built-in support for UNIX systems, it may require an extra gem for compatibility with Windows.
 
 Add the following to the Gemfile for your site if you have issues with auto-regeneration on Windows alone:
 
diff --git a/docs/_posts/2014-12-22-jekyll-2-5-3-released.markdown b/docs/_posts/2014-12-22-jekyll-2-5-3-released.markdown
index 491007cdd1d..d2c9b13d3a6 100644
--- a/docs/_posts/2014-12-22-jekyll-2-5-3-released.markdown
+++ b/docs/_posts/2014-12-22-jekyll-2-5-3-released.markdown
@@ -10,7 +10,7 @@ Happy Holidays, everyone.
 
 Jekyll v2.5.3 is a quick patch release, containing some minor fixes. See the
 [full history](/docs/history/) for more info. If you notice any problems,
-please [let us know]({{ site.help_url }}).
+please [let us know]({{ site.repository }}).
 
 This release also marks the start of Jekyll 3 development. I wrote about it
 over on my personal blog: [Jekyll 3 &mdash; The Road Ahead](https://byparker.com/blog/2014/jekyll-3-the-road-ahead/).
diff --git a/docs/_sass/_pygments.scss b/docs/_sass/_pygments.scss
index 8b2633044c8..4b45bf60521 100644
--- a/docs/_sass/_pygments.scss
+++ b/docs/_sass/_pygments.scss
@@ -8,7 +8,7 @@
   .n { color: #ffffff} /* Name */
   .o { color: #ffffff} /* Operator */
   .x { color: #ffffff} /* Other */
-  .p { color: #ffffff} /* Punctuation */
+  .p { color: #98b9ef} /* Punctuation */
   .cm { color: #87ceeb} /* Comment.Multiline */
   .cp { color: #cd5c5c} /* Comment.Preproc */
   .c1 { color: #87ceeb} /* Comment.Single */
@@ -45,7 +45,7 @@
   .nx { color: #ffffff} /* Name.Other */
   .py { color: #ffffff} /* Name.Property */
   .nt { color: #f0e68c} /* Name.Tag */
-  .nv { color: #98fb98} /* Name.Variable */
+  .nv { color: #88d472} /* Name.Variable */
   .ow { color: #ffffff} /* Operator.Word */
   .w { color: #ffffff} /* Text.Whitespace */
   .mf { color: #ffffff} /* Literal.Number.Float */
@@ -69,10 +69,6 @@
   .vi { color: #98fb98} /* Name.Variable.Instance */
   .il { color: #ffffff} /* Literal.Number.Integer.Long */
   .bash .nv {
-    -webkit-user-select: none;
-       -moz-user-select: none;
-        -ms-user-select: none;
-         -o-user-select: none;
-            user-select: none;
+    user-select: none;
   }
-}
\ No newline at end of file
+}
diff --git a/docs/_tutorials/convert-existing-site-to-jekyll.md b/docs/_tutorials/convert-existing-site-to-jekyll.md
index 2a6db34d323..379edc2e02d 100644
--- a/docs/_tutorials/convert-existing-site-to-jekyll.md
+++ b/docs/_tutorials/convert-existing-site-to-jekyll.md
@@ -306,7 +306,7 @@ At minimum, a layout should contain `{% raw %}{{ content }}{% endraw %}`, which
 
 ### For loops
 
-By the way, let's pause here to look at the `for` loop logic a little more closely. [For loops in Liquid](https://help.shopify.com/themes/liquid/tags/iteration-tags#for) are one of the most commonly used Liquid tags. *For loops* let you iterate through content in your Jekyll site and build out a result. The `for` loop also has [certain properties available](https://help.shopify.com/themes/liquid/objects/for-loops) (like first or last iteration) based on the loop's position in the loop as well.
+By the way, let's pause here to look at the `for` loop logic a little more closely. [For loops in Liquid](https://shopify.github.io/liquid/tags/iteration/) are one of the most commonly used Liquid tags. *For loops* let you iterate through content in your Jekyll site and build out a result. The `for` loop also has [certain properties available](https://help.shopify.com/themes/liquid/objects/for-loops) (like first or last iteration) based on the loop's position in the loop as well.
 
 We've only scratched the surface of what you can do with `for` loops in retrieving posts. For example, if you wanted to display posts from a specific category, you could do so by adding a `categories` property to your post's front matter and then look in those categories. Further, you could limit the number of results by adding a `limit` property. Here's an example:
 
diff --git a/docs/_tutorials/custom-404-page.md b/docs/_tutorials/custom-404-page.md
index 2512618e2ef..244982d2708 100644
--- a/docs/_tutorials/custom-404-page.md
+++ b/docs/_tutorials/custom-404-page.md
@@ -15,7 +15,7 @@ Simply add a `404.md` or `404.html` at the root of your site's source directory
 
 If you plan to organize your files under subdirectories, the error page should have the following Front Matter Data, set: `permalink: /404.html`. This is to ensure that the compiled `404.html` resides at the root of your processed site, where it'll be picked by the server.
 
-```
+```markdown
 ---
 # example 404.md
 
@@ -34,19 +34,19 @@ Apache Web Servers load a configuration file named [`.htaccess`](http://www.htac
 
 Simply add the following to your `.htaccess` file.
 
-```
+```apache
 ErrorDocument 404 /404.html
 ```
 
 With an `.htaccess` file, you have the freedom to place your error page within a subdirectory.
 
-```
+```apache
 ErrorDocument 404 /error_pages/404.html
 ```
 
 Where the path is relative to your site's domain.
 
-More info on configuring Apache Error Pages can found in [official documentation](https://httpd.apache.org/docs/current/mod/core.html#errordocument). 
+More info on configuring Apache Error Pages can found in [official documentation](https://httpd.apache.org/docs/current/mod/core.html#errordocument).
 
 
 ## Hosting on Nginx server
@@ -55,7 +55,7 @@ The procedure is just as simple as configuring Apache servers, but slightly diff
 
 Add the following to the nginx configuration file, `nginx.conf`, which is usually located inside `/etc/nginx/` or `/etc/nginx/conf/`:
 
-```
+```nginx
 server {
   error_page 404 /404.html;
   location  /404.html {
@@ -63,4 +63,5 @@ server {
   }
 }
 ```
+
 The `location` directive prevents users from directly browsing the 404.html page.
diff --git a/docs/_tutorials/navigation.md b/docs/_tutorials/navigation.md
index 94d79d0e8ed..45fdb9878b4 100644
--- a/docs/_tutorials/navigation.md
+++ b/docs/_tutorials/navigation.md
@@ -91,12 +91,14 @@ Suppose you wanted to sort the list by the `title`. To do this, convert the refe
 
 **Liquid**
 
+{% raw %}
 ```liquid
-{% raw %}{% assign doclist = site.data.samplelist.docs | sort: 'title'  %}
+{% assign doclist = site.data.samplelist.docs | sort: 'title'  %}
 {% for item in doclist %}
     <li><a href="{{ item.url }}" alt="{{ item.title }}">{{ item.title }}</a></li>
-{% endfor %}{% endraw %}
+{% endfor %}
 ```
+{% endraw %}
 
 **Result**
 
@@ -110,9 +112,11 @@ The items now appear in alphabetical order. The `sort` property in the Liquid fi
 
 See the [Liquid array filter](https://help.shopify.com/themes/liquid/filters/array-filters) for more filter options. Note that you can't simply use this syntax:
 
+{% raw %}
 ```liquid
-{% raw %}{% for item in site.data.samplelist.docs | sort: "title" %}{% endfor %}{% endraw %}
+{% for item in site.data.samplelist.docs | sort: "title" %}{% endfor %}
 ```
+{% endraw %}
 
 You have to convert `site.data.samplelist.docs` to a variable first using either `assign` or `capture` tags.
 
@@ -152,16 +156,18 @@ toc:
 
 **Liquid**
 
+{% raw %}
 ```liquid
-{% raw %}{% for item in site.data.samplelist.toc %}
+{% for item in site.data.samplelist.toc %}
     <h3>{{ item.title }}</h3>
       <ul>
         {% for entry in item.subfolderitems %}
           <li><a href="{{ entry.url }}">{{ entry.page }}</a></li>
         {% endfor %}
       </ul>
-  {% endfor %}{% endraw %}
+  {% endfor %}
 ```
+{% endraw %}
 
 **Result**
 <div class="highlight result">
@@ -242,8 +248,9 @@ toc2:
 
 **Liquid**
 
+{% raw %}
 ```liquid
-{% raw %}<div>
+<div>
 {% if site.data.samplelist.toc2[0] %}
   {% for item in site.data.samplelist.toc2 %}
     <h3>{{ item.title }}</h3>
@@ -263,8 +270,9 @@ toc2:
       {% endif %}
     {% endfor %}
 {% endif %}
-</div>{% endraw %}
+</div>
 ```
+{% endraw %}
 
 **Result**
 
@@ -327,13 +335,16 @@ sidebar: toc
 
 **Liquid**
 
+{% raw %}
 ```liquid
-{% raw %}<ul>
+<ul>
     {% for item in site.data.samplelist[page.sidebar] %}
       <li><a href="{{ item.url }}">{{ item.title }}</a></li>
     {% endfor %}
-</ul>{% endraw %}
+</ul>
 ```
+{% endraw %}
+
 **Result**
 
 <div class="highlight result">
@@ -361,13 +372,15 @@ In addition to inserting items from the YAML data file into your list, you also
 ```
 **Liquid**
 
+{% raw %}
 ```liquid
-{% raw %}{% for item in site.data.samplelist.docs %}
+{% for item in site.data.samplelist.docs %}
     <li class="{% if item.url == page.url %}active{% endif %}">
       <a href="{{ item.url }}">{{ item.title }}</a>
     </li>
-{% endfor %}{% endraw %}
+{% endfor %}
 ```
+{% endraw %}
 
 **Result**
 
@@ -412,15 +425,17 @@ docs2:
 
 **Liquid**
 
+{% raw %}
 ```liquid
-{% raw %}<ul>
+<ul>
     {% for item in site.data.samplelist.docs2 %}
       {% if item.version == 1 %}
         <li><a href="{{ item.url }}">{{ item.title }}</a></li>
       {% endif %}
     {% endfor %}
-</ul>{% endraw %}
+</ul>
 ```
+{% endraw %}
 
 **Result**
 
@@ -491,16 +506,18 @@ Note that even though `category` is used in the doc front matter, `category` is
 
 If you wanted to simply get all docs in the collection for a specific category, you could use a `for` loop with an `if` condition to check for a specific category:
 
+{% raw %}
 ```liquid
-{% raw %}<h3>Getting Started</h3>
+<h3>Getting Started</h3>
 <ul>
     {% for doc in site.docs %}
       {% if doc.category == "getting-started" %}
         <li><a href="{{ doc.url }}">{{ doc.title }}</a></li>
       {% endif %}
     {% endfor %}
-</ul>{% endraw %}
+</ul>
 ```
+{% endraw %}
 
 The result would be as follows:
 
@@ -523,8 +540,9 @@ Here's the code for getting lists of pages grouped under their corresponding cat
 
 **Liquid**
 
+{% raw %}
 ```liquid
-{% raw %}{% assign mydocs = site.docs | group_by: 'category' %}
+{% assign mydocs = site.docs | group_by: 'category' %}
 {% for cat in mydocs %}
 <h2>{{ cat.name | capitalize }}</h2>
     <ul>
@@ -533,8 +551,9 @@ Here's the code for getting lists of pages grouped under their corresponding cat
         <li><a href="{{ item.url }}">{{ item.title }}</a></li>
       {% endfor %}
     </ul>
-{% endfor %}{% endraw %}
+{% endfor %}
 ```
+{% endraw %}
 
 **Result**
 
@@ -574,6 +593,6 @@ After getting the category name, we assign the variable `items` for the docs and
 
 The `for item in items` loop looks through each `item` and gets the `title` and `url` to form the list item link.
 
-For more details on the `group_by` filter, see [Jekyll's Templates documentation](https://jekyllrb.com/docs/templates/) as well as [this Siteleaf tutorial](https://www.siteleaf.com/blog/advanced-liquid-group-by/). For more details on the `sort` filter, see [sort](https://help.shopify.com/themes/liquid/filters/array-filters#sort) in Liquid's documentation.
+For more details on the `group_by` filter, see [Jekyll's Templates documentation](https://jekyllrb.com/docs/templates/) as well as [this Siteleaf tutorial](https://www.siteleaf.com/blog/advanced-liquid-group-by/). For more details on the `sort` filter, see [sort](https://shopify.github.io/liquid/filters/sort/) in Liquid's documentation.
 
 Whether you use properties in your doc's front matter to retrieve your pages or a YAML data file, in both cases you can programmatically build a more robust navigation for your site.
diff --git a/docs/_tutorials/orderofinterpretation.md b/docs/_tutorials/orderofinterpretation.md
index 8cf9da557b0..b0ea0ec7f0d 100644
--- a/docs/_tutorials/orderofinterpretation.md
+++ b/docs/_tutorials/orderofinterpretation.md
@@ -37,15 +37,19 @@ The following scenarios highlight potential problems you might encounter. These
 
 In your layout file (`_layouts/default.html`), suppose you have a variable assigned:
 
+{% raw %}
+```liquid
+{% assign myvar = "joe" %}
 ```
-{% raw %}{% assign myvar = "joe" %}{% endraw %}
-```
+{% endraw %}
 
 On a page that uses the layout, you reference that variable:
 
+{% raw %}
+```liquid
+{{ myvar }}
 ```
-{% raw %}{{ myvar }}{% endraw %}
-```
+{% endraw %}
 
 The variable won't render because the page's order of interpretation is to render Liquid first and later process the Layout. When the Liquid rendering happens, the variable assignment isn't available.
 
@@ -63,9 +67,11 @@ This is a list:
 
 You include the file into an HTML file as follows:
 
+{% raw %}
 ```liquid
-{% raw %}{% include mycontent.md %}{% endraw %}
+{% include mycontent.md %}
 ```
+{% endraw %}
 
 The Markdown is not processed because first the Liquid (`include` tag) gets processed, inserting `mycontent.md` into the HTML file. *Then* the Markdown would get processed.
 
@@ -75,11 +81,13 @@ To make the code work, use HTML formatting in includes that are inserted into HT
 
 Note that `highlight` tags don't require Markdown to process. Suppose your include contains the following:
 
+{% raw %}
 ```liquid
-{% raw %}{% highlight javascript %}
+{% highlight javascript %}
 console.log('alert');
-{% endhighlight %}{% endraw %}
+{% endhighlight %}
 ```
+{% endraw %}
 
 The `highlight` tag *is* Liquid. (Liquid passes the content to Rouge or Pygments for syntax highlighting.) As a result, this code will actually convert to HTML with syntax highlighting. Jekyll does not need the Markdown filter to process `highlight` tags.
 
@@ -87,8 +95,9 @@ The `highlight` tag *is* Liquid. (Liquid passes the content to Rouge or Pygments
 
 Suppose you try to mix Liquid's `assign` tag with JavaScript, like this:
 
+{% raw %}
 ```javascript
-{% raw %}<button onclick="someFunction()">Click me</button>
+<button onclick="someFunction()">Click me</button>
 
 <p id="intro"></p>
 
@@ -97,15 +106,17 @@ Suppose you try to mix Liquid's `assign` tag with JavaScript, like this:
 function someFunction() {
     document.getElementById("intro").innerHTML = someContent;
 }
-</script>{% endraw %}
+</script>
 ```
+{% endraw %}
 
 This won't work because the `assign` tag is only available during the Liquid rendering phase of the site. In this JavaScript example, the script executes when a user clicks a button ("Click me") on the HTML page. At that time, the Liquid logic is no longer available, so the `assign` tag wouldn't return anything.
 
 However, you can use Jekyll's site variables or Liquid to *populate* a script that is executed at a later time. For example, suppose you have the following property in your front matter: `someContent: "This is some content"`. You could do this:
 
+{% raw %}
 ```js
-{% raw %}<button onclick="someFunction()">Click me</button>
+<button onclick="someFunction()">Click me</button>
 
 <p id="intro"></p>
 
@@ -114,8 +125,9 @@ However, you can use Jekyll's site variables or Liquid to *populate* a script th
 function someFunction() {
     document.getElementById("intro").innerHTML = "{{ page.someContent }}";
 }
-</script>{% endraw %}
+</script>
 ```
+{% endraw %}
 
 When Jekyll builds the site, this `someContent` property populates the script's values, converting `{% raw %}{{ page.someContent }}{% endraw %}` to `"This is some content"`.
 
@@ -127,17 +139,21 @@ There's one more detail to remember: Liquid does not render when embedded in YAM
 
 For example, suppose you have a `highlight` tag in your `_data/mydata.yml` file:
 
-```
-{% raw %}myvalue: >
+{% raw %}
+```liquid
+myvalue: >
   {% highlight javascript %}
   console.log('alert');
-  {% endhighlight %}{% endraw %}
+  {% endhighlight %}
 ```
+{% endraw %}
 
 On a page, you try to insert the value:
 
+{% raw %}
+```liquid
+{{ site.data.mydata.myvalue }}
 ```
-{% raw %}{{ site.data.mydata.myvalue }}{% endraw %}
-```
+{% endraw %}
 
 This would render only as a string rather than a code sample with syntax highlighting. To make the code render, consider using an include instead.
diff --git a/docs/community/index.md b/docs/community/index.md
index 3df84c37590..fb3c8e408f6 100644
--- a/docs/community/index.md
+++ b/docs/community/index.md
@@ -4,9 +4,11 @@ title: Community
 permalink: /community/
 ---
 
+## Jekyllconf
+
 [JekyllConf](http://jekyllconf.com) is a free, online conference for all things Jekyll hosted by [CloudCannon](http://cloudcannon.com). Each year members of the Jekyll community speak about interesting use cases, tricks they've learned, or meta Jekyll topics.
 
-## Featured
+### Featured
 {% assign random = site.time | date: "%s%N" | modulo: site.data.jekyllconf-talks.size %}
 {% assign featured = site.data.jekyllconf-talks[random] %}
 
@@ -17,7 +19,7 @@ permalink: /community/
 
 {% assign talks = site.data.jekyllconf-talks | group_by: 'year' %}
 {% for year in talks reversed %}
-## {{ year.name }}
+### {{ year.name }}
     {% for talk in year.items %}
  * [{{ talk.topic }}](https://youtu.be/{{ talk.youtube_id }}) - [{{ talk.speaker }}](https://twitter.com/{{ talk.twitter_handle }})
     {% endfor %}

From a20d13d6b5fa6167f8a87f5a7aecbe20214e6c15 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Tue, 3 Oct 2017 03:52:14 -0400
Subject: [PATCH 059/161] Update history to reflect merge of #6407 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index cacf0032049..ff9792e2459 100644
--- a/History.markdown
+++ b/History.markdown
@@ -13,6 +13,7 @@
   * Fix code-block highlighting in docs (#6398)
   * Docs: Filtering Posts with categories, tags, or other variables (#6399)
   * Fixes formatting on pre-formatted text. (#6405)
+  * Docs: updates (#6407)
 
 ### Development Fixes
 

From 6c6c8b071ca6f5b624c0d8a73d4d60900c61105d Mon Sep 17 00:00:00 2001
From: ashmaroli <ashmaroli@users.noreply.github.com>
Date: Tue, 3 Oct 2017 13:26:42 +0530
Subject: [PATCH 060/161] Fix docs for the new `collections_dir` feature
 (#6408)

Merge pull request 6408
---
 docs/_docs/collections.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/_docs/collections.md b/docs/_docs/collections.md
index 3d42bd88342..c29a83d5b57 100644
--- a/docs/_docs/collections.md
+++ b/docs/_docs/collections.md
@@ -46,12 +46,18 @@ defaults:
       layout: page
 ```
 
-**New**: You can optionally specify a directory if you want to store all your collections
+**From `v3.7.0`**: You can optionally specify a directory if you want to store all your collections
 in the same place:
 
 ```yaml
+collections_dir: my_collections
 collections:
-  collections_dir: my_collections
+  books:
+    foo: bar
+    output: true
+  recipes:
+    foo: baz
+    output: true
 ```
 
 Then Jekyll will look in `my_collections/_books` for the `books` collection, and

From 50de153c697c3eec6c335dacb99cedd74dd633ff Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Tue, 3 Oct 2017 03:56:43 -0400
Subject: [PATCH 061/161] Update history to reflect merge of #6408 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index ff9792e2459..e0b6a9d6bbe 100644
--- a/History.markdown
+++ b/History.markdown
@@ -14,6 +14,7 @@
   * Docs: Filtering Posts with categories, tags, or other variables (#6399)
   * Fixes formatting on pre-formatted text. (#6405)
   * Docs: updates (#6407)
+  * Docs: Fix `collections_dir` example (#6408)
 
 ### Development Fixes
 

From f38cf2efdbf68b23cb0a622886d10694335ebef0 Mon Sep 17 00:00:00 2001
From: Kewin Dousse <me@protectator.ch>
Date: Wed, 4 Oct 2017 13:18:50 +0200
Subject: [PATCH 062/161] Renaming duplicate of "Scenario 6" to "Scenario 7"
 (#6411)

Merge pull request 6411
---
 docs/_tutorials/navigation.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_tutorials/navigation.md b/docs/_tutorials/navigation.md
index 45fdb9878b4..455128d031f 100644
--- a/docs/_tutorials/navigation.md
+++ b/docs/_tutorials/navigation.md
@@ -401,7 +401,7 @@ In this case, assume `Deployment` is the current page.
 
 To make sure the `item.url` (stored in the YAML file) matches the `page.url`, it can be helpful to print the `{% raw %}{{ page.url }}{% endraw %}` to the page.
 
-## Scenario 6: Including items conditionally
+## Scenario 7: Including items conditionally
 
 You might want to include items conditionally in your list. For example, maybe you have multiple site outputs and only want to include the sidebar item for certain outputs. You can add properties in each list item and then use those properties to conditionally include the content.
 
@@ -448,7 +448,7 @@ docs2:
 
 The `Deployment` page is excluded because its `version` is `2`.
 
-## Scenario 7: Retrieving items based on front matter properties
+## Scenario 8: Retrieving items based on front matter properties
 
 If you don't want to store your navigation items in a YAML file in your `_data` folder, you can use `for` loops to look through the YAML front matter of each page or collection and get the content based on properties in the front matter.
 

From 7fb10e12bfa7517d0f78bfdc967ab0afef8794a5 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Wed, 4 Oct 2017 07:18:52 -0400
Subject: [PATCH 063/161] Update history to reflect merge of #6411 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index e0b6a9d6bbe..5173fdd7847 100644
--- a/History.markdown
+++ b/History.markdown
@@ -15,6 +15,7 @@
   * Fixes formatting on pre-formatted text. (#6405)
   * Docs: updates (#6407)
   * Docs: Fix `collections_dir` example (#6408)
+  * Docs: Renaming duplicate of &#34;Scenario 6&#34; to &#34;Scenario 7&#34; (#6411)
 
 ### Development Fixes
 

From 1d29f505c0dedffe0ef2915e640537f63a315d65 Mon Sep 17 00:00:00 2001
From: Frank Taillandier <frank.taillandier@gmail.com>
Date: Wed, 4 Oct 2017 17:36:37 +0200
Subject: [PATCH 064/161] Mark collection_dir as unreleased (#6412)

Merge pull request 6412
---
 docs/_docs/collections.md | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/docs/_docs/collections.md b/docs/_docs/collections.md
index c29a83d5b57..a15cd71ab65 100644
--- a/docs/_docs/collections.md
+++ b/docs/_docs/collections.md
@@ -46,22 +46,14 @@ defaults:
       layout: page
 ```
 
-**From `v3.7.0`**: You can optionally specify a directory if you want to store all your collections
-in the same place:
+<div class="note unreleased">
+  <h5>Gather your collections</h5>
 
-```yaml
-collections_dir: my_collections
-collections:
-  books:
-    foo: bar
-    output: true
-  recipes:
-    foo: baz
-    output: true
-```
+  <p>From <code>v3.7.0</code> you can optionally specify a directory to store all your collections in the same place with <code>collections_dir: my_collections</code></p>
 
-Then Jekyll will look in `my_collections/_books` for the `books` collection, and
-in `my_collections/_recipes` for the `recipes` collection.
+  <p>Then Jekyll will look in <code>my_collections/_books</code> for the <code>books</code> collection, and
+  in <code>my_collections/_recipes</code> for the <code>recipes</code> collection.</p>
+</div>
 
 ### Step 2: Add your content {#step2}
 

From 4a2ab9247c63ae05962f9b502eb22e3d9b7fec83 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Wed, 4 Oct 2017 11:36:38 -0400
Subject: [PATCH 065/161] Update history to reflect merge of #6412 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 5173fdd7847..22dd37ba764 100644
--- a/History.markdown
+++ b/History.markdown
@@ -16,6 +16,7 @@
   * Docs: updates (#6407)
   * Docs: Fix `collections_dir` example (#6408)
   * Docs: Renaming duplicate of &#34;Scenario 6&#34; to &#34;Scenario 7&#34; (#6411)
+  * Docs: Mark `collection_dir` as unreleased (#6412)
 
 ### Development Fixes
 

From d48412401ae1fef5259d562312797cf7376c9538 Mon Sep 17 00:00:00 2001
From: Matt Rogers <codemattr@gmail.com>
Date: Sat, 7 Oct 2017 18:54:32 -0500
Subject: [PATCH 066/161] Provide a better default hash for tracking liquid
 stats (#6417)

Merge pull request 6417
---
 lib/jekyll/liquid_renderer.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/jekyll/liquid_renderer.rb b/lib/jekyll/liquid_renderer.rb
index a79f06bd3c8..547fa4c7f3d 100644
--- a/lib/jekyll/liquid_renderer.rb
+++ b/lib/jekyll/liquid_renderer.rb
@@ -22,19 +22,16 @@ def file(filename)
       )
 
       LiquidRenderer::File.new(self, filename).tap do
-        @stats[filename] ||= {}
-        @stats[filename][:count] ||= 0
+        @stats[filename] ||= new_profile_hash
         @stats[filename][:count] += 1
       end
     end
 
     def increment_bytes(filename, bytes)
-      @stats[filename][:bytes] ||= 0
       @stats[filename][:bytes] += bytes
     end
 
     def increment_time(filename, time)
-      @stats[filename][:time] ||= 0.0
       @stats[filename][:time] += time
     end
 
@@ -45,5 +42,10 @@ def stats_table(n = 50)
     def self.format_error(e, path)
       "#{e.message} in #{path}"
     end
+
+    private
+    def new_profile_hash
+      Hash.new { |hash, key| hash[key] = 0 }
+    end
   end
 end

From a7a7373281661ce7ae3b3c77b656114433a55a00 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sat, 7 Oct 2017 19:54:34 -0400
Subject: [PATCH 067/161] Update history to reflect merge of #6417 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 22dd37ba764..66be80bef2a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -22,6 +22,7 @@
 
   * Bump rubocop to use `v0.50.x` (#6368)
   * Upgrade to Cucumber 3.0 (#6395)
+  * Provide a better default hash for tracking liquid stats (#6417)
 
 ### Minor Enhancements
 

From ffc29618a176eba87d649b0e73ce6391c5f962dc Mon Sep 17 00:00:00 2001
From: Frank Taillandier <frank.taillandier@gmail.com>
Date: Sun, 8 Oct 2017 15:50:09 +0200
Subject: [PATCH 068/161] Link to Support (#6415)

Merge pull request 6415
---
 .github/CONTRIBUTING.markdown            |  2 +-
 .github/{SUPPORT.md => SUPPORT.markdown} |  0
 docs/_docs/contributing.md               |  2 +-
 docs/_docs/history.md                    |  1 -
 docs/_docs/support.md                    | 24 ++++++++++++++++++++++++
 rake/site.rake                           |  7 ++++++-
 6 files changed, 32 insertions(+), 4 deletions(-)
 rename .github/{SUPPORT.md => SUPPORT.markdown} (100%)
 create mode 100644 docs/_docs/support.md

diff --git a/.github/CONTRIBUTING.markdown b/.github/CONTRIBUTING.markdown
index 91d18e7f65b..f1c19732b09 100644
--- a/.github/CONTRIBUTING.markdown
+++ b/.github/CONTRIBUTING.markdown
@@ -4,7 +4,7 @@ Hi there! Interested in contributing to Jekyll? We'd love your help. Jekyll is a
 
 ## Where to get help or report a problem
 
-See [the support guidelines](SUPPORT.md)
+See [the support guidelines](https://jekyllrb.com/docs/support/)
 
 ## Ways to contribute
 
diff --git a/.github/SUPPORT.md b/.github/SUPPORT.markdown
similarity index 100%
rename from .github/SUPPORT.md
rename to .github/SUPPORT.markdown
diff --git a/docs/_docs/contributing.md b/docs/_docs/contributing.md
index 5cf0398c63c..f1c643d3f71 100644
--- a/docs/_docs/contributing.md
+++ b/docs/_docs/contributing.md
@@ -8,7 +8,7 @@ Hi there! Interested in contributing to Jekyll? We'd love your help. Jekyll is a
 
 ## Where to get help or report a problem
 
-See [the support guidelines](SUPPORT.md)
+See [the support guidelines](https://jekyllrb.com/docs/support/)
 
 ## Ways to contribute
 
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 20b98b5c810..9c4e9def971 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -84,7 +84,6 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Bump rubies on Travis ([#6366]({{ site.repository }}/issues/6366))
 
 
-
 ## 3.5.2 / 2017-08-12
 {: #v3-5-2}
 
diff --git a/docs/_docs/support.md b/docs/_docs/support.md
new file mode 100644
index 00000000000..d22331879e1
--- /dev/null
+++ b/docs/_docs/support.md
@@ -0,0 +1,24 @@
+---
+title: Support
+permalink: "/docs/support/"
+note: This file is autogenerated. Edit /.github/SUPPORT.markdown instead.
+---
+
+## Getting Help
+
+**Jekyll's issue tracker is not a support forum.**
+
+If you're looking for support for Jekyll, there are a lot of options:
+
+* Read [Jekyll Documentation](https://jekyllrb.com/docs/home/)
+* If you have a question about using Jekyll, start a discussion on [Jekyll Forum](https://talk.jekyllrb.com/) or [StackOverflow](https://stackoverflow.com/questions/tagged/jekyll)
+* Chat with Jekyllers &mdash; Join [our Gitter channel](https://gitter.im/jekyll/jekyll) or [our IRC channel on Freenode](irc:irc.freenode.net/jekyll)
+
+There are a bunch of helpful community members on these services that should be willing to point you in the right direction.
+
+## Report a bug
+
+* If you think you've found a bug within a Jekyll plugin, open an issue in that plugin's repository &mdash; First [look for the plugin on rubygems](https://rubygems.org/) then click on the `Homepage` link to access the plugin repository.
+* If you think you've found a bug within Jekyll itself, [open an issue](https://github.com/jekyll/jekyll/issues/new).
+
+Happy Jekyllin'!
diff --git a/rake/site.rake b/rake/site.rake
index 15680b15afe..10d48c52651 100644
--- a/rake/site.rake
+++ b/rake/site.rake
@@ -7,7 +7,7 @@
 #############################################################################
 
 namespace :site do
-  task :generated_pages => [:history, :version_file, :conduct, :contributing]
+  task :generated_pages => [:history, :version_file, :conduct, :contributing, :support]
 
   desc "Generate and view the site locally"
   task :preview => :generated_pages do
@@ -77,6 +77,11 @@ namespace :site do
     siteify_file(".github/CONTRIBUTING.markdown", "title" => "Contributing")
   end
 
+  desc "Copy the support file"
+  task :support do
+    siteify_file(".github/SUPPORT.markdown", "title" => "Support")
+  end
+
   desc "Write the site latest_version.txt file"
   task :version_file do
     File.open("#{docs_folder}/latest_version.txt", "wb") { |f| f.puts(version) } unless version =~ %r!(beta|rc|alpha)!i

From 79194b5ad03235ce1cd5705d1d9ceff14bfbdd8b Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sun, 8 Oct 2017 09:50:10 -0400
Subject: [PATCH 069/161] Update history to reflect merge of #6415 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 66be80bef2a..a142f8da155 100644
--- a/History.markdown
+++ b/History.markdown
@@ -17,6 +17,7 @@
   * Docs: Fix `collections_dir` example (#6408)
   * Docs: Renaming duplicate of &#34;Scenario 6&#34; to &#34;Scenario 7&#34; (#6411)
   * Docs: Mark `collection_dir` as unreleased (#6412)
+  * Docs: Fix link to SUPPORT (#6415)
 
 ### Development Fixes
 

From 1a2625443dfe62c1eb6706974bb089fa1b86eb52 Mon Sep 17 00:00:00 2001
From: Giraffe Academy <giraffeacademy@gmail.com>
Date: Sun, 8 Oct 2017 07:41:10 -0700
Subject: [PATCH 070/161] docs: Added new tutorial to tutorials section on docs
 (#6406)

Merge pull request 6406
---
 docs/_data/tutorials.yml              |  1 +
 docs/_tutorials/video-walkthroughs.md | 35 +++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 docs/_tutorials/video-walkthroughs.md

diff --git a/docs/_data/tutorials.yml b/docs/_data/tutorials.yml
index a394345bbd4..3c2a9a66bda 100644
--- a/docs/_data/tutorials.yml
+++ b/docs/_data/tutorials.yml
@@ -1,6 +1,7 @@
 - title: Tutorials
   tutorials:
   - home
+  - video-walkthroughs
   - navigation
   - orderofinterpretation
   - custom-404-page
diff --git a/docs/_tutorials/video-walkthroughs.md b/docs/_tutorials/video-walkthroughs.md
new file mode 100644
index 00000000000..c673434aab3
--- /dev/null
+++ b/docs/_tutorials/video-walkthroughs.md
@@ -0,0 +1,35 @@
+---
+layout: tutorials
+permalink: /tutorials/video-walkthroughs/
+title: Video Walkthroughs
+---
+
+[Giraffe Academy](https://www.youtube.com/c/GiraffeAcademy) has a series of videos that will walk you through the basics of using Jekyll. In this series you'll learn everything from installing Jekyll on your computer and setting up your first site, to using more complex features like variables, layouts and conditionals.
+
+<div class="videoWrapper" >
+     <iframe src="https://www.youtube.com/embed/T1itpPvFWHI?rel=0" frameborder="0" allowfullscreen></iframe>
+</div>
+
+## List of Lessons
+
+1. [Introduction to Jekyll (see above)](https://www.youtube.com/watch?v=T1itpPvFWHI&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB&index=1)
+2. [Mac Installation](https://www.youtube.com/watch?v=WhrU9m82Wm8&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB&index=2)
+3. [Windows Installation](https://www.youtube.com/watch?v=LfP7Y9Ja6Qc&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB&index=3)
+4. [Creating a Site](https://www.youtube.com/watch?v=pxua_1vyFck&index=4&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB)
+5. [Front Matter](https://www.youtube.com/watch?v=ZtEbGztktvc&index=5&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB)
+6. [Writing Posts](https://www.youtube.com/watch?v=gsYqPL9EFwQ&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB&index=6)
+7. [Working With Drafts](https://www.youtube.com/watch?v=X8jXkW3k2Jg&index=7&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB)
+8. [Creating Pages](https://www.youtube.com/watch?v=1na-IWfv08M&index=8&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB)
+9. [Permalinks](https://www.youtube.com/watch?v=938jDG_YPdc&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB&index=9)
+10. [Front Matter Defaults](https://www.youtube.com/watch?v=CLCaJJ1zUHU&index=10&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB)
+11. [Themes](https://www.youtube.com/watch?v=NoRS2D-cyko&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB&index=11)
+12. [Layouts](https://www.youtube.com/watch?v=bDQsGdCWv4I&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB&index=12)
+13. [Variables](https://www.youtube.com/watch?v=nLJBF2KiOZw&index=13&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB)
+14. [Includes](https://www.youtube.com/watch?v=HfcJeRby2a8&index=14&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB)
+15. [Looping Through Posts](https://www.youtube.com/watch?v=6N1X5XffuUA&index=15&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB)
+16. [Conditionals](https://www.youtube.com/watch?v=iNZBEki_x6o&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB&index=16)
+17. [Data Files](https://www.youtube.com/watch?v=M6b0KmLB-pM&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB&index=17)
+18. [Static Files](https://www.youtube.com/watch?v=knWjmVlVpso&index=18&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB)
+19. [Hosting on Github Pages](https://www.youtube.com/watch?v=fqFjuX4VZmU&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB&index=19)
+
+

From 2606e01d5b56d9d6600c643d9f5f7e398e6ebf6b Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sun, 8 Oct 2017 10:41:12 -0400
Subject: [PATCH 071/161] Update history to reflect merge of #6406 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index a142f8da155..76d6b5db31d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -18,6 +18,7 @@
   * Docs: Renaming duplicate of &#34;Scenario 6&#34; to &#34;Scenario 7&#34; (#6411)
   * Docs: Mark `collection_dir` as unreleased (#6412)
   * Docs: Fix link to SUPPORT (#6415)
+  * Docs: Added new tutorial to tutorials section on docs (#6406)
 
 ### Development Fixes
 

From a78b518f830a45769fc762ad59ba82c1d4c98f9b Mon Sep 17 00:00:00 2001
From: Alexey Pelykh <alexey.pelykh@gmail.com>
Date: Mon, 9 Oct 2017 13:52:19 +0300
Subject: [PATCH 072/161] Scope path glob (#6268)

Merge pull request 6268
---
 docs/_docs/configuration.md        | 15 +++++++++++++++
 lib/jekyll/frontmatter_defaults.rb | 21 ++++++++++++++++++---
 test/test_front_matter_defaults.rb | 24 ++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/docs/_docs/configuration.md b/docs/_docs/configuration.md
index 0d9c8f72e9d..cd0f20583f2 100644
--- a/docs/_docs/configuration.md
+++ b/docs/_docs/configuration.md
@@ -549,6 +549,21 @@ defaults:
 In this example, the `layout` is set to `default` inside the
 [collection](../collections/) with the name `my_collection`.
 
+It is also possible to use glob patterns when matching defaults. For example, it is possible to set specific layout for each `special-page.html` in any subfolder of `section` folder.
+
+```yaml
+collections:
+  my_collection:
+    output: true
+
+defaults:
+  -
+    scope:
+      path: "section/*/special-page.html"
+    values:
+      layout: "specific-layout"
+```
+
 ### Precedence
 
 Jekyll will apply all of the configuration settings you specify in the `defaults` section of your `_config.yml` file. However, you can choose to override settings from other scope/values pair by specifying a more specific path for the scope.
diff --git a/lib/jekyll/frontmatter_defaults.rb b/lib/jekyll/frontmatter_defaults.rb
index fc1bcc2d867..f6b89f6bb60 100644
--- a/lib/jekyll/frontmatter_defaults.rb
+++ b/lib/jekyll/frontmatter_defaults.rb
@@ -100,12 +100,27 @@ def applies?(scope, path, type)
     def applies_path?(scope, path)
       return true if !scope.key?("path") || scope["path"].empty?
 
-      scope_path = Pathname.new(scope["path"])
-      Pathname.new(sanitize_path(path)).ascend do |ascended_path|
-        if ascended_path.to_s == scope_path.to_s
+      sanitized_path = Pathname.new(sanitize_path(path))
+
+      site_path = Pathname.new(@site.source)
+      rel_scope_path = Pathname.new(scope["path"])
+      abs_scope_path = File.join(@site.source, rel_scope_path)
+      Dir.glob(abs_scope_path).each do |scope_path|
+        scope_path = Pathname.new(scope_path).relative_path_from site_path
+        return true if path_is_subpath?(sanitized_path, scope_path)
+      end
+
+      path_is_subpath?(sanitized_path, rel_scope_path)
+    end
+
+    def path_is_subpath?(path, parent_path)
+      path.ascend do |ascended_path|
+        if ascended_path.to_s == parent_path.to_s
           return true
         end
       end
+
+      false
     end
 
     # Determines whether the scope applies to type.
diff --git a/test/test_front_matter_defaults.rb b/test/test_front_matter_defaults.rb
index 9bf9629a9ed..b1773ba0ecb 100644
--- a/test/test_front_matter_defaults.rb
+++ b/test/test_front_matter_defaults.rb
@@ -27,6 +27,30 @@ class TestFrontMatterDefaults < JekyllUnitTest
     end
   end
 
+  context "A site with full front matter defaults (glob)" do
+    setup do
+      @site = fixture_site({
+        "defaults" => [{
+          "scope"  => {
+            "path" => "contacts/*.html",
+            "type" => "page",
+          },
+          "values" => {
+            "key" => "val",
+          },
+        },],
+      })
+      @site.process
+      @affected = @site.pages.find { |page| page.relative_path == "contacts/bar.html" }
+      @not_affected = @site.pages.find { |page| page.relative_path == "about.html" }
+    end
+
+    should "affect only the specified path and type" do
+      assert_equal @affected.data["key"], "val"
+      assert_nil @not_affected.data["key"]
+    end
+  end
+
   context "A site with front matter type pages and an extension" do
     setup do
       @site = fixture_site({

From b13a6161edf8805e7b15a59a74964ded879941a8 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Mon, 9 Oct 2017 06:52:20 -0400
Subject: [PATCH 073/161] Update history to reflect merge of #6268 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 76d6b5db31d..ecfc913fc72 100644
--- a/History.markdown
+++ b/History.markdown
@@ -31,6 +31,7 @@
   * Disable default layouts for Pages with a `layout: none` declaration (#6182)
   * Upgrade to Rouge 3 (#6381)
   * Allow the user to set collections_dir to put all collections under one subdirectory (#6331)
+  * Scope path glob (#6268)
 
 ### Site Enhancements
 

From 2b9bb2306ac3560f6c70ad1df9128411d8cd461a Mon Sep 17 00:00:00 2001
From: Goulven Champenois <goulvench@gmail.com>
Date: Mon, 9 Oct 2017 15:15:55 +0200
Subject: [PATCH 074/161] Fix list appearance by adding missing `ol` tag
 (#6421)

Merge pull request 6421
---
 docs/_tutorials/navigation.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/docs/_tutorials/navigation.md b/docs/_tutorials/navigation.md
index 455128d031f..8fc6fe5dd58 100644
--- a/docs/_tutorials/navigation.md
+++ b/docs/_tutorials/navigation.md
@@ -94,18 +94,22 @@ Suppose you wanted to sort the list by the `title`. To do this, convert the refe
 {% raw %}
 ```liquid
 {% assign doclist = site.data.samplelist.docs | sort: 'title'  %}
+<ol>
 {% for item in doclist %}
     <li><a href="{{ item.url }}" alt="{{ item.title }}">{{ item.title }}</a></li>
 {% endfor %}
+</ol>
 ```
 {% endraw %}
 
 **Result**
 
 <div class="highlight result">
-   <li><a href="#" alt="Configuration">Configuration</a></li>
-   <li><a href="#" alt="Deployment">Deployment</a></li>
-   <li><a href="#" alt="Introduction">Introduction</a></li>
+   <ol>
+      <li><a href="#" alt="Configuration">Configuration</a></li>
+      <li><a href="#" alt="Deployment">Deployment</a></li>
+      <li><a href="#" alt="Introduction">Introduction</a></li>
+   </ol>
 </div>
 
 The items now appear in alphabetical order. The `sort` property in the Liquid filter applies to the `title`, which is an actual property in the list. If `title` weren't a property, we would need to sort by another property.
@@ -427,7 +431,7 @@ docs2:
 
 {% raw %}
 ```liquid
-<ul>
+  <ul>
     {% for item in site.data.samplelist.docs2 %}
       {% if item.version == 1 %}
         <li><a href="{{ item.url }}">{{ item.title }}</a></li>

From 1bb36ebc9e9336c2b02c006f21b22bcb2a7bf38c Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Mon, 9 Oct 2017 09:15:56 -0400
Subject: [PATCH 075/161] Update history to reflect merge of #6421 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index ecfc913fc72..32c0cfa97b5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -19,6 +19,7 @@
   * Docs: Mark `collection_dir` as unreleased (#6412)
   * Docs: Fix link to SUPPORT (#6415)
   * Docs: Added new tutorial to tutorials section on docs (#6406)
+  * Fix list appearance by adding missing `ol` tag (#6421)
 
 ### Development Fixes
 

From b3d607f264bea8450d4f3814f5dd64073fee57b8 Mon Sep 17 00:00:00 2001
From: Goulven Champenois <goulvench@gmail.com>
Date: Wed, 11 Oct 2017 22:26:59 +0200
Subject: [PATCH 076/161] Explain how to override output collection index page
 (#6424)

Merge pull request 6424
---
 docs/_docs/collections.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/docs/_docs/collections.md b/docs/_docs/collections.md
index a15cd71ab65..0b59b7db6d1 100644
--- a/docs/_docs/collections.md
+++ b/docs/_docs/collections.md
@@ -87,6 +87,20 @@ For example, if you have `_my_collection/some_subdir/some_doc.md`,
 it will be rendered using Liquid and the Markdown converter of your
 choice and written out to `<dest>/my_collection/some_subdir/some_doc.html`.
 
+If you wish a specific page to be shown when accessing `/my_collection/`,
+simply add `permalink: /my_collection/index.html` to a page.
+To list items from the collection, on that page or any other, you can use:
+
+{% raw %}
+```liquid
+{% for item in site.my_collection %}
+  <h2>{{ item.title }}</h2>
+  <p>{{ item.description }}</p>
+  <p><a href="{{ item.url }}">{{ item.title }}</a></p>
+{% endfor %}
+```
+{% endraw %}
+
 <div class="note info">
   <h5>Don't forget to add YAML for processing</h5>
   <p>

From 3f694695e1c419eebafd05cc3f5b644db023d27a Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Wed, 11 Oct 2017 16:27:01 -0400
Subject: [PATCH 077/161] Update history to reflect merge of #6424 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 32c0cfa97b5..f58a24f367c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -20,6 +20,7 @@
   * Docs: Fix link to SUPPORT (#6415)
   * Docs: Added new tutorial to tutorials section on docs (#6406)
   * Fix list appearance by adding missing `ol` tag (#6421)
+  * Explain how to override output collection index page (#6424)
 
 ### Development Fixes
 

From 5f1b881c914f42b2ba23b666bcd36cf0f51bfbc9 Mon Sep 17 00:00:00 2001
From: Edward Shen <6173958+edward-shen@users.noreply.github.com>
Date: Thu, 12 Oct 2017 03:51:52 -0400
Subject: [PATCH 078/161] Added github-cards to the list of plugins (#6425)

Merge pull request 6425
---
 docs/_docs/plugins.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 284c3cb9c0e..7d218b4ef58 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -887,6 +887,7 @@ You can find a few useful plugins at the following locations:
 - [Jekyll If File Exists](https://github.com/k-funk/jekyll-if-file-exists): A Jekyll Plugin that checks if a file exists with an if/else block.
 - [BibSonomy](https://github.com/rjoberon/bibsonomy-jekyll): Jekyll
   plugin to generate publication lists from [BibSonomy](https://www.bibsonomy.org/).
+- [github-cards](https://github.com/edward-shen/github-cards): Creates styleable Github cards for your Github projects.
 
 
 #### Collections

From 72debf854b57bf13d7bd3ec4a6dfe7147909be72 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Thu, 12 Oct 2017 03:51:53 -0400
Subject: [PATCH 079/161] Update history to reflect merge of #6425 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index f58a24f367c..cffcd6d337c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -21,6 +21,7 @@
   * Docs: Added new tutorial to tutorials section on docs (#6406)
   * Fix list appearance by adding missing `ol` tag (#6421)
   * Explain how to override output collection index page (#6424)
+  * Added github-cards to the list of plugins (#6425)
 
 ### Development Fixes
 

From a5f8cb74dceab80a0050777c5571cf8dc9bd0065 Mon Sep 17 00:00:00 2001
From: Frank Taillandier <frank.taillandier@gmail.com>
Date: Mon, 16 Oct 2017 02:51:05 +0200
Subject: [PATCH 080/161] Docs: Contacts for CoC violation (#6429)

Merge pull request 6429
---
 README.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.markdown b/README.markdown
index 1350d019e0b..7dac7786cb9 100644
--- a/README.markdown
+++ b/README.markdown
@@ -45,7 +45,7 @@ conduct.
 Please adhere to this code of conduct in any interactions you have in the
 Jekyll community. It is strictly enforced on all official Jekyll
 repositories, websites, and resources. If you encounter someone violating
-these terms, please let a [team captain](https://github.com/orgs/jekyll/teams/affinity-team-captains/members) know and we will address it as soon as possible.
+these terms, please let one of our core team members [Olivia](mailto:olivia@jekyllrb.com?subject=Jekyll%20CoC%20Violation), [Pat](mailto:pat@jekyllrb.com?subject=Jekyll%20CoC%20Violation), [Matt](mailto:matt@jekyllrb.com?subject=Jekyll%20CoC%20Violation) or [Parker](mailto:parker@jekyllrb.com?subject=Jekyll%20CoC%20Violation) know and we will address it as soon as possible.
 
 ## Diving In
 

From 5ebfbe042dc1d9cfb26c9bdc87d9bee52d1ff852 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sun, 15 Oct 2017 20:51:07 -0400
Subject: [PATCH 081/161] Update history to reflect merge of #6429 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index cffcd6d337c..d3b633f4f4c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -28,6 +28,7 @@
   * Bump rubocop to use `v0.50.x` (#6368)
   * Upgrade to Cucumber 3.0 (#6395)
   * Provide a better default hash for tracking liquid stats (#6417)
+  * Docs: CoC violation correspondants (#6429)
 
 ### Minor Enhancements
 

From 640c5137c24af4de344def073cfd31412766eb5a Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Tue, 17 Oct 2017 17:14:05 -0400
Subject: [PATCH 082/161] Update history to reflect merge of #6339 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index d3b633f4f4c..2ba42fcb3d3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -29,6 +29,7 @@
   * Upgrade to Cucumber 3.0 (#6395)
   * Provide a better default hash for tracking liquid stats (#6417)
   * Docs: CoC violation correspondants (#6429)
+  * add failing test for non-utf8 encoding (#6339)
 
 ### Minor Enhancements
 

From c6b890698c5e5e4e3e09b2d13bd4dd8cd9add658 Mon Sep 17 00:00:00 2001
From: Pat Hawks <pat@pathawks.com>
Date: Tue, 17 Oct 2017 19:36:16 -0500
Subject: [PATCH 083/161] Add configuration for first-timers bot (#6431)

Merge pull request 6431
---
 .github/first-timers-issue-template.md | 44 ++++++++++++++++++++++++++
 .github/first-timers.yml               |  6 ++++
 2 files changed, 50 insertions(+)
 create mode 100644 .github/first-timers-issue-template.md
 create mode 100644 .github/first-timers.yml

diff --git a/.github/first-timers-issue-template.md b/.github/first-timers-issue-template.md
new file mode 100644
index 00000000000..9a54d9c7d52
--- /dev/null
+++ b/.github/first-timers-issue-template.md
@@ -0,0 +1,44 @@
+### 🆕🐥☝ First Timers Only.
+
+This issue is reserved for people who never contributed to Open Source before. We know that the process of creating a pull request is the biggest barrier for new contributors. This issue is for you 💝
+
+[About First Timers Only](http://www.firsttimersonly.com/).
+
+### 🤔 What you will need to know.
+
+Nothing. This issue is meant to welcome you to Open Source :) We are happy to walk you through the process.
+
+### 📋 Step by Step
+
+- [ ] 👌 **Join the team**: Add yourself to a Jekyll affinity team.
+
+  Go to [teams.jekyllrb.com](https://teams.jekyllrb.com/) join a team that best fits your interests. Once you click the link to join a team, you will soon recieve an email inviting you to join the Jekyll organization.
+
+- [ ] 🙋 **Claim this issue**: Comment below.
+
+  Leave a comment that you have claimed this issue.
+
+- [ ] 📝 **Update** the file [$FILENAME]($BRANCH_URL) in the `$REPO` repository (press the little pen Icon) and edit the line as shown below.
+
+
+```diff
+$DIFF
+```
+
+
+- [ ] 💾 **Commit** your changes
+
+- [ ] 🔀 **Start a Pull Request**. There are two ways how you can start a pull request:
+
+  1. If you are familiar with the terminal or would like to learn it, [here is a great tutorial](https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github) on how to send a pull request using the terminal.
+
+  2. You can [edit files directly in your browser](https://help.github.com/articles/editing-files-in-your-repository/)
+
+- [ ] 🏁 **Done** Ask in comments for a review :)
+
+### 🤔❓ Questions
+
+Leave a comment below!
+
+
+This issue was created by [First-Timers-Bot](https://github.com/hoodiehq/first-timers-bot).
diff --git a/.github/first-timers.yml b/.github/first-timers.yml
new file mode 100644
index 00000000000..9f866d72324
--- /dev/null
+++ b/.github/first-timers.yml
@@ -0,0 +1,6 @@
+repository: jekyll
+labels:
+  - good first issue
+  - help-wanted
+  - first-time-only
+template: .github/first-timers-issue-template.md

From e0a97b5f12956f314ea59d55f784c2c0ffe62100 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Tue, 17 Oct 2017 20:36:18 -0400
Subject: [PATCH 084/161] Update history to reflect merge of #6431 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 2ba42fcb3d3..c562b63e722 100644
--- a/History.markdown
+++ b/History.markdown
@@ -30,6 +30,7 @@
   * Provide a better default hash for tracking liquid stats (#6417)
   * Docs: CoC violation correspondants (#6429)
   * add failing test for non-utf8 encoding (#6339)
+  * Add configuration for first-timers bot (#6431)
 
 ### Minor Enhancements
 

From 363bd6c7ebc197f9cbf2d8bff444b9cd190fe558 Mon Sep 17 00:00:00 2001
From: Frank Taillandier <frank.taillandier@gmail.com>
Date: Wed, 18 Oct 2017 05:15:26 +0200
Subject: [PATCH 085/161] Problematic UTF+bom files (#6322)

Merge pull request 6322
---
 lib/jekyll/site.rb                            |   1 +
 lib/jekyll/utils.rb                           |   3 ++
 test/source/_encodings/UTF8CRLFandBOM.md      |  11 +++++++
 .../_encodings/Unicode16LECRLFandBOM.md       | Bin 0 -> 1556 bytes
 test/test_document.rb                         |  29 ++++++++++++++++++
 test/test_utils.rb                            |  13 +++++---
 6 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100755 test/source/_encodings/UTF8CRLFandBOM.md
 create mode 100755 test/source/_encodings/Unicode16LECRLFandBOM.md

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index a771477d176..ebf78b1564d 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -444,6 +444,7 @@ def configure_include_paths
     def configure_file_read_opts
       self.file_read_opts = {}
       self.file_read_opts[:encoding] = config["encoding"] if config["encoding"]
+      self.file_read_opts = Jekyll::Utils.merged_file_read_opts(self, {})
     end
 
     private
diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index 70605a34c18..2f5f55dcdcd 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -301,6 +301,9 @@ def safe_glob(dir, patterns, flags = 0)
     # and a given param
     def merged_file_read_opts(site, opts)
       merged = (site ? site.file_read_opts : {}).merge(opts)
+      if merged[:encoding] && !merged[:encoding].start_with?("bom|")
+        merged[:encoding] = "bom|#{merged[:encoding]}"
+      end
       if merged["encoding"] && !merged["encoding"].start_with?("bom|")
         merged["encoding"] = "bom|#{merged["encoding"]}"
       end
diff --git a/test/source/_encodings/UTF8CRLFandBOM.md b/test/source/_encodings/UTF8CRLFandBOM.md
new file mode 100755
index 00000000000..36390cc3464
--- /dev/null
+++ b/test/source/_encodings/UTF8CRLFandBOM.md
@@ -0,0 +1,11 @@
+---
+layout: post
+title:  "UTF8CRLFandBOM"
+date:   2017-04-05 16:16:01 -0800
+categories: bom
+---
+This file was created with CR/LFs, and encoded as UTF8 with a BOM
+
+You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `bundle exec jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated.
+
+To add new posts, simply add a file in the `_posts` directory that follows the convention `YYYY-MM-DD-name-of-post.ext` and includes the necessary front matter. Take a look at the source for this post to get an idea about how it works.
diff --git a/test/source/_encodings/Unicode16LECRLFandBOM.md b/test/source/_encodings/Unicode16LECRLFandBOM.md
new file mode 100755
index 0000000000000000000000000000000000000000..8941716a1d06a4095648425f505cda26421ffa09
GIT binary patch
literal 1556
zcma)+OK;Oq5QS%r#1CM1#Tthc@u<4wxoJT{VbK){w%dd{c4fz;`SZZ}X5zRlQiZM@
z`_7%2Gw00Q{P~?3>#;qu$`-b>#(LY>i6y(%cc*X8Hn!4JS?MRqp4vC7Wy|GL$a-Y2
z?VWwKQ~RhawQO(gi=D}j=t8#5AvW0yn=0asaHsate_siY94E3I`|pt~oFD6%dX{{j
z<x-ffuuD}(oj<f+yT{07W=nZ=I=#@Fx|3}ck0n=hxzAO&9d1i~!Qi=b=<J#H!6eDM
zJ}@OB^4wJ*38&WCXH^5&Yk3u(W$U%%ju187kAyjRr^>O>ih4h|jw`QXtc9$F^H?Y%
zRGv6{ls*@FZ%<OC9KoGlB<B~{Lsy4-qvNf7=Jx&2^G>^@$dzlAD;~{vHj(v{zNu&F
zDuy0`QhLNjr|=kSM(<30>SeDE_0W^fJ^2EGeW{i9b4XR_MjtL^?;Jlka)Ld1g%9VB
z&aB;krwDjmXq6sYd#y~zP6+gYY}C(GP|aGkaTCB~*4Tp_F|cK>f<dcT&gPy4U80+%
z-6&VClb?ED2`hR8<JNxZcmB_`a3jfv2Czp_P)p?wts)YghFK+oN;2n$YPFtL=S(Fz
z#*UBbGoyG0!gyzbS+BVm?r@<VFljt9;Sj+@Cdb+8Jxo|=3C3EsO1PshJZ__aJgEIY
za~R%mB2VL5Hc}?~5M85JwJS@9SH7b!=lhlE|LIIRz1Pa*xlo<VX`_tUfyG3&8^v=U
z2924gT$sIhho(dAXq~&QlQ%bp`dY`PR%VbJPDdu%&$PeNE_AQt*J#h~_WX6S_KF~L
o@TKEm-oMi^gLIwvxF0L862%vqoA`fEibb#Crf#)sh0G263&_$6Jpcdz

literal 0
HcmV?d00001

diff --git a/test/test_document.rb b/test/test_document.rb
index 42ba3c5748b..6ce71230680 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -7,6 +7,15 @@ def assert_equal_value(key, one, other)
     assert_equal(one[key], other[key])
   end
 
+  def setup_encoded_document(filename)
+    site = fixture_site("collections" => ["encodings"])
+    site.process
+    Document.new(site.in_source_dir(File.join("_encodings", filename)), {
+      :site       => site,
+      :collection => site.collections["encodings"],
+    }).tap(&:read)
+  end
+
   context "a document in a collection" do
     setup do
       @site = fixture_site({
@@ -529,4 +538,24 @@ def assert_equal_value(key, one, other)
       assert_equal true, File.file?(@dest_file)
     end
   end
+
+  context "a document with UTF-8 CLRF" do
+    setup do
+      @document = setup_encoded_document "UTF8CRLFandBOM.md"
+    end
+
+    should "not throw an error" do
+      Jekyll::Renderer.new(@document.site, @document).render_document
+    end
+  end
+
+  context "a document with UTF-16LE CLRF" do
+    setup do
+      @document = setup_encoded_document "Unicode16LECRLFandBOM.md"
+    end
+
+    should "not throw an error" do
+      Jekyll::Renderer.new(@document.site, @document).render_document
+    end
+  end
 end
diff --git a/test/test_utils.rb b/test/test_utils.rb
index 638aa16d275..7d728a89292 100644
--- a/test/test_utils.rb
+++ b/test/test_utils.rb
@@ -387,16 +387,21 @@ class TestUtils < JekyllUnitTest
     should "ignore encoding if it's not there" do
       opts = Utils.merged_file_read_opts(nil, {})
       assert_nil opts["encoding"]
+      assert_nil opts[:encoding]
     end
 
     should "add bom to encoding" do
-      opts = Utils.merged_file_read_opts(nil, { "encoding" => "utf-8" })
-      assert_equal "bom|utf-8", opts["encoding"]
+      opts = { "encoding" => "utf-8", :encoding => "utf-8" }
+      merged = Utils.merged_file_read_opts(nil, opts)
+      assert_equal "bom|utf-8", merged["encoding"]
+      assert_equal "bom|utf-8", merged[:encoding]
     end
 
     should "preserve bom in encoding" do
-      opts = Utils.merged_file_read_opts(nil, { "encoding" => "bom|utf-8" })
-      assert_equal "bom|utf-8", opts["encoding"]
+      opts = { "encoding" => "bom|another", :encoding => "bom|another" }
+      merged = Utils.merged_file_read_opts(nil, opts)
+      assert_equal "bom|another", merged["encoding"]
+      assert_equal "bom|another", merged[:encoding]
     end
   end
 end

From 3715633aaecd15d87a1d3336d3390f41cb417226 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Tue, 17 Oct 2017 23:15:28 -0400
Subject: [PATCH 086/161] Update history to reflect merge of #6322 [ci skip]

---
 History.markdown | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/History.markdown b/History.markdown
index c562b63e722..eb4a32ba9c9 100644
--- a/History.markdown
+++ b/History.markdown
@@ -44,6 +44,10 @@
   * Docs: Update instructions (#6396)
   * Add special styling for code-blocks run in shell (#6389)
 
+### Bug Fixes
+
+  * Problematic UTF+bom files (#6322)
+
 ## 3.6.0 / 2017-09-21
 
 ### Minor Enhancements

From 84c250394ef00aa61ef7ab4d9bfe8be01bf92827 Mon Sep 17 00:00:00 2001
From: bellvat <msirathanarun@gmail.com>
Date: Wed, 18 Oct 2017 19:55:45 -0700
Subject: [PATCH 087/161] Update 'data.layout' as a string. (#6442)

Merge pull request 6442
---
 lib/jekyll/renderer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index 3a6fdebd24d..136a42ad800 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -143,7 +143,7 @@ def invalid_layout?(layout)
     # Returns String rendered content
     def place_in_layouts(content, payload, info)
       output = content.dup
-      layout = layouts[document.data["layout"]]
+      layout = layouts[document.data["layout"].to_s]
       validate_layout(layout)
 
       used = Set.new([layout])

From c0478e290b4acbf6a3f42f25b26a5a71cb68f3b8 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Wed, 18 Oct 2017 22:55:46 -0400
Subject: [PATCH 088/161] Update history to reflect merge of #6442 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index eb4a32ba9c9..e13c5edf3bd 100644
--- a/History.markdown
+++ b/History.markdown
@@ -47,6 +47,7 @@
 ### Bug Fixes
 
   * Problematic UTF+bom files (#6322)
+  * Always treat `data.layout` as a string (#6442)
 
 ## 3.6.0 / 2017-09-21
 

From ae326148cceb312f78c4e35013604a835d8a2f9e Mon Sep 17 00:00:00 2001
From: Maximiliano Kotvinsky <maximiliano.kotvinsky@paragon-labs.com>
Date: Thu, 19 Oct 2017 15:18:30 -0300
Subject: [PATCH 089/161] Add test for layout as string (#6445)

Merge pull request 6445
---
 features/layout_data.feature | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/features/layout_data.feature b/features/layout_data.feature
index c2af5b70ebe..8a10ce87f83 100644
--- a/features/layout_data.feature
+++ b/features/layout_data.feature
@@ -3,6 +3,26 @@ Feature: Layout data
   I want to be able to embed data into my layouts
   In order to make the layouts slightly dynamic
 
+  Scenario: Use custom layout data
+    Given I have a _layouts directory
+    And I have a "_layouts/999.html" file with content:
+      """
+      ---
+      ---
+      {{ content }} layout content
+      """
+    And I have an "index.html" page with layout "custom" that contains "page content"
+    And I have an "index.html" file with content:
+      """
+      ---
+      layout: 999
+      ---
+      page content
+      """
+    When I run jekyll build
+    Then the "_site/index.html" file should exist
+    And I should see "page content layout content" in "_site/index.html"
+
   Scenario: Use custom layout data
     Given I have a _layouts directory
     And I have a "_layouts/custom.html" file with content:

From 32d38e68efb9c5dc23b946de953d415e52b79fbe Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Thu, 19 Oct 2017 14:18:32 -0400
Subject: [PATCH 090/161] Update history to reflect merge of #6445 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index e13c5edf3bd..89e22ad8214 100644
--- a/History.markdown
+++ b/History.markdown
@@ -31,6 +31,7 @@
   * Docs: CoC violation correspondants (#6429)
   * add failing test for non-utf8 encoding (#6339)
   * Add configuration for first-timers bot (#6431)
+  * Add test for layout as string (#6445)
 
 ### Minor Enhancements
 

From e7f1ce2e2b664f8b0ed3d1f9e39f47f9e879026f Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@users.noreply.github.com>
Date: Thu, 19 Oct 2017 14:22:36 -0400
Subject: [PATCH 091/161] Update Rubocop to 0.51.0 (#6444)

Merge pull request 6444
---
 .rubocop.yml                                       | 4 +---
 Gemfile                                            | 2 +-
 features/step_definitions.rb                       | 6 +++---
 lib/jekyll/commands/build.rb                       | 2 +-
 lib/jekyll/configuration.rb                        | 2 +-
 lib/jekyll/converters/markdown/redcarpet_parser.rb | 2 +-
 test/test_filters.rb                               | 1 -
 test/test_kramdown.rb                              | 1 -
 test/test_tags.rb                                  | 1 -
 test/test_utils.rb                                 | 1 -
 10 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 8f961cf589f..f483e1ddc3a 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,6 +1,6 @@
 ---
 AllCops:
-  TargetRubyVersion: 2.0
+  TargetRubyVersion: 2.1
   Include:
     - lib/**/*.rb
   Exclude:
@@ -117,8 +117,6 @@ Style/Documentation:
     - !ruby/regexp /features\/.*.rb$/
 Style/DoubleNegation:
   Enabled: false
-Style/Encoding:
-  EnforcedStyle: when_needed
 Style/GuardClause:
   Enabled: false
 Style/HashSyntax:
diff --git a/Gemfile b/Gemfile
index 8ff6d132570..92f6f45e54e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,7 +30,7 @@ group :test do
   gem "nokogiri", RUBY_VERSION >= "2.2" ? "~> 1.7" : "~> 1.7.0"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 0.50.0"
+  gem "rubocop", "~> 0.51.0"
   gem "test-dependency-theme", :path => File.expand_path("test/fixtures/test-dependency-theme", __dir__)
   gem "test-theme", :path => File.expand_path("test/fixtures/test-theme", __dir__)
 
diff --git a/features/step_definitions.rb b/features/step_definitions.rb
index 29900491989..c69cc0891d3 100644
--- a/features/step_definitions.rb
+++ b/features/step_definitions.rb
@@ -156,7 +156,7 @@
 When(%r!^I run jekyll(.*)$!) do |args|
   run_jekyll(args)
   if args.include?("--verbose") || ENV["DEBUG"]
-    $stderr.puts "\n#{jekyll_run_output}\n"
+    warn "\n#{jekyll_run_output}\n"
   end
 end
 
@@ -165,7 +165,7 @@
 When(%r!^I run bundle(.*)$!) do |args|
   run_bundle(args)
   if args.include?("--verbose") || ENV["DEBUG"]
-    $stderr.puts "\n#{jekyll_run_output}\n"
+    warn "\n#{jekyll_run_output}\n"
   end
 end
 
@@ -174,7 +174,7 @@
 When(%r!^I run gem(.*)$!) do |args|
   run_rubygem(args)
   if args.include?("--verbose") || ENV["DEBUG"]
-    $stderr.puts "\n#{jekyll_run_output}\n"
+    warn "\n#{jekyll_run_output}\n"
   end
 end
 
diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb
index 1bd176b8be4..96a48cdfd6c 100644
--- a/lib/jekyll/commands/build.rb
+++ b/lib/jekyll/commands/build.rb
@@ -96,7 +96,7 @@ def watch(site, options)
             )
           end
         end
-      end # end of class << self
+      end
     end
   end
 end
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 5c502d6816e..575dca6503b 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -207,7 +207,7 @@ def read_config_files(files)
       rescue ArgumentError => err
         Jekyll.logger.warn "WARNING:", "Error reading configuration. " \
                      "Using defaults (and options)."
-        $stderr.puts err
+        warn err
       end
 
       configuration.fix_common_issues.backwards_compatibilize.add_default_collections
diff --git a/lib/jekyll/converters/markdown/redcarpet_parser.rb b/lib/jekyll/converters/markdown/redcarpet_parser.rb
index 35c6e5feef7..7a8c6ec5923 100644
--- a/lib/jekyll/converters/markdown/redcarpet_parser.rb
+++ b/lib/jekyll/converters/markdown/redcarpet_parser.rb
@@ -47,7 +47,7 @@ def block_code(code, lang)
   end
 
   module WithRouge
-    def block_code(code, lang)
+    def block_code(_code, lang)
       code = "<pre>#{super}</pre>"
 
       "<div class=\"highlight\">#{add_code_tags(code, lang)}</div>"
diff --git a/test/test_filters.rb b/test/test_filters.rb
index 0499b73c2df..588a1f30e33 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 require "helper"
diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb
index e1bf15a4b4e..2a12a09074b 100644
--- a/test/test_kramdown.rb
+++ b/test/test_kramdown.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 require "helper"
diff --git a/test/test_tags.rb b/test/test_tags.rb
index 8a7ed7d0e6e..43d83464362 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 require "helper"
diff --git a/test/test_utils.rb b/test/test_utils.rb
index 7d728a89292..01c1d98c613 100644
--- a/test/test_utils.rb
+++ b/test/test_utils.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require "helper"

From 28af8bd85f832ddea1a761f0d109ddcc2ea5f903 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Thu, 19 Oct 2017 14:22:37 -0400
Subject: [PATCH 092/161] Update history to reflect merge of #6444 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 89e22ad8214..ff076ff586f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -32,6 +32,7 @@
   * add failing test for non-utf8 encoding (#6339)
   * Add configuration for first-timers bot (#6431)
   * Add test for layout as string (#6445)
+  * Update Rubocop to 0.51.0 (#6444)
 
 ### Minor Enhancements
 

From 32f8e53a930c894f3d9733e5e703a83b1fff1816 Mon Sep 17 00:00:00 2001
From: olivia <olivia@fastmail.com>
Date: Fri, 20 Oct 2017 11:18:17 +0200
Subject: [PATCH 093/161] add post about diversity (#6447)

Merge pull request 6447
---
 .../2017-10-19-diversity-open-source.markdown | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 docs/_posts/2017-10-19-diversity-open-source.markdown

diff --git a/docs/_posts/2017-10-19-diversity-open-source.markdown b/docs/_posts/2017-10-19-diversity-open-source.markdown
new file mode 100644
index 00000000000..0b1e24eccbb
--- /dev/null
+++ b/docs/_posts/2017-10-19-diversity-open-source.markdown
@@ -0,0 +1,44 @@
+---
+title: "Diversity in Open Source, and Jekyll's role in it"
+date: 2017-10-19 21:33:00 +0200
+author: pup
+categories: [community]
+---
+
+Open Source has a problem with diversity. GitHub recently conducted a [survey](http://opensourcesurvey.org/2017) which revealed that 95% of the respondents were identifying as male. This is even worse than in the tech industry overall, where the percentage is only about 76%. Every other week, there seems to be another case of a maintainer engaging in targeted harassment against minorities. People somehow deem it completely okay to let these things slide, though.
+
+Fortunately, there's a couple of things we can do to make it easier and more comfortable for people that have never contributed to any open source project before, to contribute to our projects.
+
+## Add a Code of Conduct, and enforce it
+
+This might seem like one of the easiest steps to do, but it actually requires a lot of dedication to pull through with. Basically, a Code of Conduct is a document detailing what is and what isn't acceptable behavior in your project. A good Code of Conduct also details enforcement procedures, that means how the person violating the Code of Conduct gets dealt with. This is the point at which I've seen a looooot of projects fail. It's easy enough to copy-paste a Code of Conduct into your project, but it's more important to be clear on how to enforce it. Inconsistent —or worse, nonexistent— enforcement is just going to scare off newcomers even more!
+
+The most widely adopted Code of Conduct is the [Contributor Covenant](https://www.contributor-covenant.org/). It's a very good catch-all document, but it is a bit light in the enforcement section, so I'd recommend to flesh it out by yourself, be it by means of adding contact information or expanding the enforcement rules.
+
+No matter which Code of Conduct you pick, the most important thing is to actually _read it for yourself_. The worst thing in open source is a maintainer that doesn't know when they've violated their own Code of Conduct.
+
+## Document your contributing workflow
+
+The problem that puts people off the most is incomplete or missing documentation, as revealed through GitHub's [open source survey](http://opensourcesurvey.org/2017). A very popular myth in programming is that good code explains itself, which might be true, but only for the person writing it. It's important, especially once you put your project out there for the world to see, to document not only your code, but also the process by which you maintain it. Otherwise, it's going to be extremely hard for newcomers to even figure out where to begin contributing to your project.
+
+Jekyll has [an entire section of its docs](/docs/contributing) dedicated to information on how to contribute for this very reason. Every documentation page has a link to directly edit and improve it on GitHub. It's also important to realize that not all contributions are code. It can be documentation, it can be reviewing pull requests, but it can also just be weighing into issues, and all of this should be recognized in the same way. At Jekyll, out of 397 total merged pull requests in the last year, __204__ were documentation pull requests!
+
+## Create newcomer-friendly issues
+
+For most people new to open source, the biggest hurdle is creating their first pull request. That's why initiatives such as [YourFirstPR](https://twitter.com/yourfirstpr) and [First Timers Only](http://www.firsttimersonly.com/) were started. Recently, [a GitHub bot that automatically creates first-timer friendly issues](https://github.com/hoodiehq/first-timers-bot) was launched, which makes it very easy for maintainers to convert otherwise small or trivial changes into viable pull requests that can be taken on by newcomers! So we decided to give it a shot, and we've created a couple of very easy `first timers only` issues:
+
+- [Issue #6437](https://github.com/jekyll/jekyll/issues/6437)
+- [Issue #6438](https://github.com/jekyll/jekyll/issues/6438)
+- [Issue #6439](https://github.com/jekyll/jekyll/issues/6439)
+
+(There's also an up-to-date listing of all of our `first timers only` issues [here](https://github.com/jekyll/jekyll/issues?q=is%3Aissue+is%3Aopen+label%3Afirst-time-only))
+
+These issues are designed to be taken on only by someone who has had little to no exposure to contributing to open source before, and additionally, project maintainers offer support in case a question arises.
+
+Jekyll is a very big and popular open source project, and we hope that with these special issues, we can help people who haven't contributed to open source before to catch a footing in these unsteady waters.
+
+## Be nice
+
+I know this is a cliche and a overused phrase, but really, it works if you pull through with it. Come to terms with the fact that some people aren't as fast or reliable as you might want to think. Don't get angry when a contributor takes a day longer than you might like them to. Treat new contributors to your project with respect, but also with hospitality. Think twice before you send that comment with slurs in it.
+
+I've been contributing to open source for about 4 years now, and I've had my fair share of horrible, horrible experiences. But Jekyll has historically been a project that has always valued the people contributing to it over the code itself, and I hope we can keep it that way. I also hope that other project maintainers read this and take inspiration from this post. Every project should be more diverse.

From 04e40d133f99e52ad3cdcafb6e62f0c6dba61cfd Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Fri, 20 Oct 2017 05:18:18 -0400
Subject: [PATCH 094/161] Update history to reflect merge of #6447 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index ff076ff586f..f133ce496c9 100644
--- a/History.markdown
+++ b/History.markdown
@@ -22,6 +22,7 @@
   * Fix list appearance by adding missing `ol` tag (#6421)
   * Explain how to override output collection index page (#6424)
   * Added github-cards to the list of plugins (#6425)
+  * add post about diversity (#6447)
 
 ### Development Fixes
 

From 4e561a84e4db0035e988593fbeff8e7a49c0d333 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@users.noreply.github.com>
Date: Fri, 20 Oct 2017 11:41:24 -0400
Subject: [PATCH 095/161] Update release notes for v3.6.1 (#6449)

---
 History.markdown        | 20 ++++++++++++++------
 docs/latest_version.txt |  2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/History.markdown b/History.markdown
index f133ce496c9..b39283fbf3c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -2,11 +2,6 @@
 
 ### Documentation
 
-  * Doc y_day in docs/permalinks (#6244)
-  * Update frontmatter.md (#6371)
-  * Elaborate on excluding items from processing (#6136)
-  * Docs: Style lists in tables (#6379)
-  * Docs: remove duplicate &#34;available&#34; (#6380)
   * Docs: GitHub Pages instructions (#6384)
   * Improve documentation for theme-gem installation (#6387)
   * Fix diff syntax-highlighting (#6388)
@@ -26,7 +21,6 @@
 
 ### Development Fixes
 
-  * Bump rubocop to use `v0.50.x` (#6368)
   * Upgrade to Cucumber 3.0 (#6395)
   * Provide a better default hash for tracking liquid stats (#6417)
   * Docs: CoC violation correspondants (#6429)
@@ -52,6 +46,20 @@
   * Problematic UTF+bom files (#6322)
   * Always treat `data.layout` as a string (#6442)
 
+## 3.6.1 / 2017-10-20
+
+### Documentation
+
+  * Doc y_day in docs/permalinks (#6244)
+  * Update frontmatter.md (#6371)
+  * Elaborate on excluding items from processing (#6136)
+  * Style lists in tables (#6379)
+  * Remove duplicate &#34;available&#34; (#6380)
+
+### Development Fixes
+
+  * Bump rubocop to use `v0.50.x` (#6368)
+
 ## 3.6.0 / 2017-09-21
 
 ### Minor Enhancements
diff --git a/docs/latest_version.txt b/docs/latest_version.txt
index 40c341bdcdb..9575d51bad2 100644
--- a/docs/latest_version.txt
+++ b/docs/latest_version.txt
@@ -1 +1 @@
-3.6.0
+3.6.1

From d5c17b9db06a9aa9e43e9df8eb6323b5d4730cc9 Mon Sep 17 00:00:00 2001
From: Sebastian Kulig <sebam2k4@gmail.com>
Date: Sat, 21 Oct 2017 17:14:47 +0100
Subject: [PATCH 096/161] Update _config.yml (#6457)

Merge pull request 6457
---
 docs/_config.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/_config.yml b/docs/_config.yml
index 130ed1a327a..9525cd7bb28 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -56,4 +56,6 @@ plugins:
 
 exclude:
   - .gitignore
-  - README.md
+  - CNAME
+  - icomoon-selection.json
+  - readme.md

From a674620de616da4e3f22ce16437843fbd1d94f3b Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sat, 21 Oct 2017 12:14:48 -0400
Subject: [PATCH 097/161] Update history to reflect merge of #6457 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index b39283fbf3c..97fd3ce9170 100644
--- a/History.markdown
+++ b/History.markdown
@@ -40,6 +40,7 @@
 
   * Docs: Update instructions (#6396)
   * Add special styling for code-blocks run in shell (#6389)
+  * Update list of files excluded from Docs site (#6457)
 
 ### Bug Fixes
 

From bb9b634a0cb498b9e83df96fdfbb873ddad77b75 Mon Sep 17 00:00:00 2001
From: Pat Hawks <pat@pathawks.com>
Date: Sat, 21 Oct 2017 14:28:32 -0500
Subject: [PATCH 098/161] Update release notes for v3.6.2

---
 History.markdown        | 9 +++++++--
 docs/latest_version.txt | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/History.markdown b/History.markdown
index 97fd3ce9170..14d62f64b60 100644
--- a/History.markdown
+++ b/History.markdown
@@ -26,8 +26,6 @@
   * Docs: CoC violation correspondants (#6429)
   * add failing test for non-utf8 encoding (#6339)
   * Add configuration for first-timers bot (#6431)
-  * Add test for layout as string (#6445)
-  * Update Rubocop to 0.51.0 (#6444)
 
 ### Minor Enhancements
 
@@ -42,6 +40,13 @@
   * Add special styling for code-blocks run in shell (#6389)
   * Update list of files excluded from Docs site (#6457)
 
+## 3.6.2 / 2017-10-21
+
+### Development Fixes
+
+  * Update Rubocop to 0.51.0 (#6444)
+  * Add test for layout as string (#6445)
+
 ### Bug Fixes
 
   * Problematic UTF+bom files (#6322)
diff --git a/docs/latest_version.txt b/docs/latest_version.txt
index 9575d51bad2..b72762837ea 100644
--- a/docs/latest_version.txt
+++ b/docs/latest_version.txt
@@ -1 +1 @@
-3.6.1
+3.6.2

From 48d7dd430597217511919186c57f206711b86510 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@users.noreply.github.com>
Date: Sat, 21 Oct 2017 16:15:24 -0400
Subject: [PATCH 099/161] Update site History (#6460)

Merge pull request 6460
---
 docs/_docs/history.md | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 9c4e9def971..98cbc1a5dfe 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -4,6 +4,39 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 3.6.2 / 2017-10-21
+{: #v3-6-2}
+
+### Development Fixes
+{: #development-fixes-v3-6-2}
+
+- Update Rubocop to 0.51.0 ([#6444]({{ site.repository }}/issues/6444))
+- Add test for layout as string ([#6445]({{ site.repository }}/issues/6445))
+
+### Bug Fixes
+{: #bug-fixes-v3-6-2}
+
+- Problematic UTF+bom files ([#6322]({{ site.repository }}/issues/6322))
+- Always treat `data.layout` as a string ([#6442]({{ site.repository }}/issues/6442))
+
+
+## 3.6.1 / 2017-10-20
+{: #v3-6-1}
+
+### Documentation
+
+- Doc y_day in docs/permalinks ([#6244]({{ site.repository }}/issues/6244))
+- Update frontmatter.md ([#6371]({{ site.repository }}/issues/6371))
+- Elaborate on excluding items from processing ([#6136]({{ site.repository }}/issues/6136))
+- Style lists in tables ([#6379]({{ site.repository }}/issues/6379))
+- Remove duplicate &[#34]({{ site.repository }}/issues/34);available&[#34]({{ site.repository }}/issues/34); ([#6380]({{ site.repository }}/issues/6380))
+
+### Development Fixes
+{: #development-fixes-v3-6-1}
+
+- Bump rubocop to use `v0.50.x` ([#6368]({{ site.repository }}/issues/6368))
+
+
 ## 3.6.0 / 2017-09-21
 {: #v3-6-0}
 

From bdef1820002f3e91ff32021e6b078ab940e24eef Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sat, 21 Oct 2017 16:15:25 -0400
Subject: [PATCH 100/161] Update history to reflect merge of #6460 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 14d62f64b60..9b45a51775f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -39,6 +39,7 @@
   * Docs: Update instructions (#6396)
   * Add special styling for code-blocks run in shell (#6389)
   * Update list of files excluded from Docs site (#6457)
+  * Update site History (#6460)
 
 ## 3.6.2 / 2017-10-21
 

From 1790385c312dc259a86128eda19d8355bab3e906 Mon Sep 17 00:00:00 2001
From: Frank Taillandier <frank.taillandier@gmail.com>
Date: Sat, 21 Oct 2017 23:45:30 +0200
Subject: [PATCH 101/161] Add Jekyll 3.6.2 release post

---
 .../2017-10-21-jekyll-3-6-2-released.markdown | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 docs/_posts/2017-10-21-jekyll-3-6-2-released.markdown

diff --git a/docs/_posts/2017-10-21-jekyll-3-6-2-released.markdown b/docs/_posts/2017-10-21-jekyll-3-6-2-released.markdown
new file mode 100644
index 00000000000..36fc3101da4
--- /dev/null
+++ b/docs/_posts/2017-10-21-jekyll-3-6-2-released.markdown
@@ -0,0 +1,42 @@
+---
+title: 'Jekyll 3.6.2 Released'
+date: 2017-10-21 21:31:40 +0200
+author: dirtyf
+version: 3.6.2
+categories: [release]
+---
+
+3.6.2 is out, it's a tiny patch release and we invite you to run `bundle update`
+if you want to avoid possible build problems with:
+
+* some UTF-8 and UTF-16 encoded files,
+* fully numeric layout names (we convert those to string for you now).
+
+Other changes include updates to our documentation, like this [complete
+video series by Giraffe Academy](../tutorials/video-walkthroughs/) aimed at
+complete beginners. A big thank to Mike for this.
+
+And if you're wondering what happened to version 3.6.1, it was just our new
+release maintainer getting familiar with the release process 😄
+
+We try to release patch releases as quickly as possible and we're already
+working on the next minor version 3.7.0 that will allow you to store all your
+collections in a single directory. Stay tuned.
+
+Theme developers are invited to test the brand new
+[`jekyll-remote-theme`](https://github.com/benbalter/jekyll-remote-theme) plugin
+and give their feedback to @benbalter. This plugin allows you to use any
+GitHub hosted theme as a remote theme!
+
+Once again, many thanks to our contributors who helped make this release possible:
+ashmaroli, bellvat, Frank Taillandier, i-give-up, Jan Piotrowski, Maximiliano
+Kotvinsky, Oliver Steele and Pat Hawks. For some it was their [first
+contribution to open-source]({% link
+_posts/2017-10-19-diversity-open-source.markdown %}) 👏
+
+As it's been nine years this week that Tom Preston-Werner started this project,
+I also wanna seize this opportunity to thank [all of the 732 contributors](https://github.com/jekyll/jekyll/graphs/contributors) who
+helped make it possible for Jekyll to power millions of  around the world
+today.
+
+Happy Birthday Jekyll! 🎂

From 280cf98030136ef497148a9205c67b9227a6e4d7 Mon Sep 17 00:00:00 2001
From: Frank Taillandier <frank.taillandier@gmail.com>
Date: Sat, 21 Oct 2017 23:59:49 +0200
Subject: [PATCH 102/161] Typos

---
 docs/_posts/2017-10-21-jekyll-3-6-2-released.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_posts/2017-10-21-jekyll-3-6-2-released.markdown b/docs/_posts/2017-10-21-jekyll-3-6-2-released.markdown
index 36fc3101da4..3bda5b3739a 100644
--- a/docs/_posts/2017-10-21-jekyll-3-6-2-released.markdown
+++ b/docs/_posts/2017-10-21-jekyll-3-6-2-released.markdown
@@ -17,7 +17,7 @@ video series by Giraffe Academy](../tutorials/video-walkthroughs/) aimed at
 complete beginners. A big thank to Mike for this.
 
 And if you're wondering what happened to version 3.6.1, it was just our new
-release maintainer getting familiar with the release process 😄
+release maintainer getting familiar with the release process. 😄
 
 We try to release patch releases as quickly as possible and we're already
 working on the next minor version 3.7.0 that will allow you to store all your
@@ -36,7 +36,7 @@ _posts/2017-10-19-diversity-open-source.markdown %}) 👏
 
 As it's been nine years this week that Tom Preston-Werner started this project,
 I also wanna seize this opportunity to thank [all of the 732 contributors](https://github.com/jekyll/jekyll/graphs/contributors) who
-helped make it possible for Jekyll to power millions of  around the world
+helped make it possible for Jekyll to power millions of websites around the world
 today.
 
 Happy Birthday Jekyll! 🎂

From 945a24e56837c2682e0f800994e749191d8a9903 Mon Sep 17 00:00:00 2001
From: Vishesh Ruparelia <visheshruparelia18@gmail.com>
Date: Sun, 22 Oct 2017 21:09:08 +0530
Subject: [PATCH 103/161] Update templates.md (#6466)

Merge pull request 6466
---
 docs/_docs/templates.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/_docs/templates.md b/docs/_docs/templates.md
index c36f09107a0..38e55717ee2 100644
--- a/docs/_docs/templates.md
+++ b/docs/_docs/templates.md
@@ -469,6 +469,13 @@ you want to highlight, look for the “short name” on the [Rouge
 wiki](https://github.com/jayferd/rouge/wiki/List-of-supported-languages-and-lexers)
 or the [Pygments' Lexers page](http://pygments.org/docs/lexers/).
 
+<div class="note info">
+  <h5>Jekyll processes all Liquid filters in code blocks</h5>
+  <p>If you are using a language that contains curly braces, you
+    will likely need to place <code>{&#37; raw &#37;}</code> and
+    <code>{&#37; endraw &#37;}</code> tags around your code.</p>
+</div>
+
 #### Line numbers
 
 There is a second argument to `highlight` called `linenos` that is optional.

From bfdbcc39843f45ecf815341f99d748f2d39efe6c Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sun, 22 Oct 2017 11:39:09 -0400
Subject: [PATCH 104/161] Update history to reflect merge of #6466 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 9b45a51775f..e7e51488668 100644
--- a/History.markdown
+++ b/History.markdown
@@ -18,6 +18,7 @@
   * Explain how to override output collection index page (#6424)
   * Added github-cards to the list of plugins (#6425)
   * add post about diversity (#6447)
+  * Docs: Add a note about Liquid and syntax highlighting (#6466)
 
 ### Development Fixes
 

From 2993f9bc99330aa7aad60c525f77528a97879ac5 Mon Sep 17 00:00:00 2001
From: Frank Taillandier <frank.taillandier@gmail.com>
Date: Sun, 22 Oct 2017 20:27:07 +0200
Subject: [PATCH 105/161] Typo

---
 docs/_posts/2017-10-21-jekyll-3-6-2-released.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_posts/2017-10-21-jekyll-3-6-2-released.markdown b/docs/_posts/2017-10-21-jekyll-3-6-2-released.markdown
index 3bda5b3739a..04ca046a22b 100644
--- a/docs/_posts/2017-10-21-jekyll-3-6-2-released.markdown
+++ b/docs/_posts/2017-10-21-jekyll-3-6-2-released.markdown
@@ -14,7 +14,7 @@ if you want to avoid possible build problems with:
 
 Other changes include updates to our documentation, like this [complete
 video series by Giraffe Academy](../tutorials/video-walkthroughs/) aimed at
-complete beginners. A big thank to Mike for this.
+complete beginners. A big thanks to Mike for this.
 
 And if you're wondering what happened to version 3.6.1, it was just our new
 release maintainer getting familiar with the release process. 😄

From 0d8c704921de68d5a1c28898b77ef12ebabfeed2 Mon Sep 17 00:00:00 2001
From: Jon Anning <astromoose@gmail.com>
Date: Mon, 23 Oct 2017 10:27:36 +0200
Subject: [PATCH 106/161] Update first-timers-issue-template.md (#6472)

Merge pull request 6472
---
 .github/first-timers-issue-template.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/first-timers-issue-template.md b/.github/first-timers-issue-template.md
index 9a54d9c7d52..fccc77715de 100644
--- a/.github/first-timers-issue-template.md
+++ b/.github/first-timers-issue-template.md
@@ -12,7 +12,7 @@ Nothing. This issue is meant to welcome you to Open Source :) We are happy to wa
 
 - [ ] 👌 **Join the team**: Add yourself to a Jekyll affinity team.
 
-  Go to [teams.jekyllrb.com](https://teams.jekyllrb.com/) join a team that best fits your interests. Once you click the link to join a team, you will soon recieve an email inviting you to join the Jekyll organization.
+  Go to [teams.jekyllrb.com](https://teams.jekyllrb.com/) and join a team that best fits your interests. Once you click the link to join a team, you will soon recieve an email inviting you to join the Jekyll organization.
 
 - [ ] 🙋 **Claim this issue**: Comment below.
 

From c933ec5a57d2cc52fdeafe0f42ddaf74d2e47fa1 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Mon, 23 Oct 2017 04:27:38 -0400
Subject: [PATCH 107/161] Update history to reflect merge of #6472 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index e7e51488668..4a1cf0d44bc 100644
--- a/History.markdown
+++ b/History.markdown
@@ -27,6 +27,7 @@
   * Docs: CoC violation correspondants (#6429)
   * add failing test for non-utf8 encoding (#6339)
   * Add configuration for first-timers bot (#6431)
+  * Update first-timers-issue-template.md (#6472)
 
 ### Minor Enhancements
 

From e9654c3fea17b3170b69640787bd05cf17ac3e2e Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@users.noreply.github.com>
Date: Mon, 23 Oct 2017 09:12:09 -0400
Subject: [PATCH 108/161] Site: Rename method (#6474)

Merge pull request 6474
---
 Rakefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Rakefile b/Rakefile
index a7d50088d93..2566281f6f5 100644
--- a/Rakefile
+++ b/Rakefile
@@ -72,11 +72,11 @@ def custom_release_header_anchors(markdown)
     _, major, minor, patch = *release_notes.match(header_regexp)
     release_notes
       .gsub(header_regexp, "\\0\n{: #v\\1-\\2-\\3}")
-      .gsub(section_regexp) { |section| "#{section}\n{: ##{sluffigy(section)}-v#{major}-#{minor}-#{patch}}" }
+      .gsub(section_regexp) { |section| "#{section}\n{: ##{slugify(section)}-v#{major}-#{minor}-#{patch}}" }
   end.join("\n## ")
 end
 
-def sluffigy(header)
+def slugify(header)
   header.delete("#").strip.downcase.gsub(%r!\s+!, "-")
 end
 

From 1c64f65f25a2c91d41da8dcb62f19309dbd9054b Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Mon, 23 Oct 2017 09:12:11 -0400
Subject: [PATCH 109/161] Update history to reflect merge of #6474 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 4a1cf0d44bc..e08190112d2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -28,6 +28,7 @@
   * add failing test for non-utf8 encoding (#6339)
   * Add configuration for first-timers bot (#6431)
   * Update first-timers-issue-template.md (#6472)
+  * Site: Rename method (#6474)
 
 ### Minor Enhancements
 

From 3bd808c8b004301569e383867ce6355dfc2af17d Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@users.noreply.github.com>
Date: Mon, 23 Oct 2017 11:59:53 -0400
Subject: [PATCH 110/161] Do not linkify escaped characters as PRs in History
 (#6468)

Merge pull request 6468
---
 Rakefile              |  2 +-
 docs/_docs/history.md | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Rakefile b/Rakefile
index 2566281f6f5..51eb32ce8d3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -46,7 +46,7 @@ def normalize_bullets(markdown)
 end
 
 def linkify_prs(markdown)
-  markdown.gsub(%r!#(\d+)!) do |word|
+  markdown.gsub(%r!(?<\!&)#(\d+)!) do |word|
     "[#{word}]({{ site.repository }}/issues/#{word.delete("#")})"
   end
 end
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 98cbc1a5dfe..6d628241495 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -29,7 +29,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Update frontmatter.md ([#6371]({{ site.repository }}/issues/6371))
 - Elaborate on excluding items from processing ([#6136]({{ site.repository }}/issues/6136))
 - Style lists in tables ([#6379]({{ site.repository }}/issues/6379))
-- Remove duplicate &[#34]({{ site.repository }}/issues/34);available&[#34]({{ site.repository }}/issues/34); ([#6380]({{ site.repository }}/issues/6380))
+- Remove duplicate &#34;available&#34; ([#6380]({{ site.repository }}/issues/6380))
 
 ### Development Fixes
 {: #development-fixes-v3-6-1}
@@ -63,14 +63,14 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - kramdown: symbolize keys in-place ([#6247]({{ site.repository }}/issues/6247))
 - Call `to_s` on site.url before attempting to concatenate strings ([#6253]({{ site.repository }}/issues/6253))
 - Enforce Style/FrozenStringLiteralComment ([#6265]({{ site.repository }}/issues/6265))
-- Update theme-template README to note &[#39]({{ site.repository }}/issues/39);assets&[#39]({{ site.repository }}/issues/39); directory ([#6257]({{ site.repository }}/issues/6257))
+- Update theme-template README to note &#39;assets&#39; directory ([#6257]({{ site.repository }}/issues/6257))
 - Memoize the return value of `Document#url` ([#6266]({{ site.repository }}/issues/6266))
 - delegate `StaticFile#to_json` to `StaticFile#to_liquid` ([#6273]({{ site.repository }}/issues/6273))
 - Fix `Drop#key?` so it can handle a nil argument ([#6281]({{ site.repository }}/issues/6281))
 - Guard against type error in absolute url ([#6280]({{ site.repository }}/issues/6280))
-- Mutable drops should fallback to their own methods when a mutation isn&[#39]({{ site.repository }}/issues/39);t present ([#6350]({{ site.repository }}/issues/6350))
+- Mutable drops should fallback to their own methods when a mutation isn&#39;t present ([#6350]({{ site.repository }}/issues/6350))
 - Skip adding binary files as posts ([#6344]({{ site.repository }}/issues/6344))
-- Don&[#39]({{ site.repository }}/issues/39);t break if bundler is not installed ([#6377]({{ site.repository }}/issues/6377))
+- Don&#39;t break if bundler is not installed ([#6377]({{ site.repository }}/issues/6377))
 
 ### Documentation
 
@@ -82,11 +82,11 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - name unification - buddy details ([#6317]({{ site.repository }}/issues/6317))
 - name unification - application index ([#6318]({{ site.repository }}/issues/6318))
 - trim and relocate plugin info across docs ([#6311]({{ site.repository }}/issues/6311))
-- update Jekyll&[#39]({{ site.repository }}/issues/39);s README ([#6321]({{ site.repository }}/issues/6321))
+- update Jekyll&#39;s README ([#6321]({{ site.repository }}/issues/6321))
 - add SUPPORT file for GitHub ([#6324]({{ site.repository }}/issues/6324))
 - Rename CODE_OF_CONDUCT to show in banner ([#6325]({{ site.repository }}/issues/6325))
-- Docs : illustrate page.id for a collection&[#39]({{ site.repository }}/issues/39);s document ([#6329]({{ site.repository }}/issues/6329))
-- Docs: post&[#39]({{ site.repository }}/issues/39);s date can be overriden in YAML front matter ([#6334]({{ site.repository }}/issues/6334))
+- Docs : illustrate page.id for a collection&#39;s document ([#6329]({{ site.repository }}/issues/6329))
+- Docs: post&#39;s date can be overriden in YAML front matter ([#6334]({{ site.repository }}/issues/6334))
 - Docs: `site.url` behavior on development and production environments ([#6270]({{ site.repository }}/issues/6270))
 - Fix typo in site.url section of variables.md :-[ ([#6337]({{ site.repository }}/issues/6337))
 - Docs: updates ([#6343]({{ site.repository }}/issues/6343))
@@ -255,7 +255,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Be more specific on what to upload ([#6119]({{ site.repository }}/issues/6119))
 - Remove Blank Newlines from "Jekyll on Windows" Page ([#6126]({{ site.repository }}/issues/6126))
 - Link the troubleshooting page in the quickstart page ([#6134]({{ site.repository }}/issues/6134))
-- add documentation about the &[#34]({{ site.repository }}/issues/34);pinned&[#34]({{ site.repository }}/issues/34); label ([#6147]({{ site.repository }}/issues/6147))
+- add documentation about the &#34;pinned&#34; label ([#6147]({{ site.repository }}/issues/6147))
 - docs(JekyllOnWindows): Add a new Installation way ([#6141]({{ site.repository }}/issues/6141))
 - corrected windows.md ([#6149]({{ site.repository }}/issues/6149))
 - Refine documentation for Windows ([#6153]({{ site.repository }}/issues/6153))

From 57ab42a8d018d5c3fb192629185bcb36601260a0 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Mon, 23 Oct 2017 11:59:55 -0400
Subject: [PATCH 111/161] Update history to reflect merge of #6468 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index e08190112d2..fa264db7034 100644
--- a/History.markdown
+++ b/History.markdown
@@ -29,6 +29,7 @@
   * Add configuration for first-timers bot (#6431)
   * Update first-timers-issue-template.md (#6472)
   * Site: Rename method (#6474)
+  * Do not linkify escaped characters as PRs in History (#6468)
 
 ### Minor Enhancements
 

From 8d88ee997ce840054e9ad2e80a8bef9de9687254 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@users.noreply.github.com>
Date: Mon, 23 Oct 2017 15:20:55 -0400
Subject: [PATCH 112/161] Site: Add default twitter card image (#6476)

Merge pull request 6476
---
 docs/_config.yml          |   2 +-
 docs/img/twitter-card.png | Bin 0 -> 72497 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 docs/img/twitter-card.png

diff --git a/docs/_config.yml b/docs/_config.yml
index 9525cd7bb28..d6e4443cf6f 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -24,7 +24,7 @@ defaults:
       type: "posts"
     values:
       layout: "news_item"
-
+      image: /img/twitter-card.png
 
 collections:
   docs:
diff --git a/docs/img/twitter-card.png b/docs/img/twitter-card.png
new file mode 100644
index 0000000000000000000000000000000000000000..23143a5c68f10ee00c2141f74455ca7c5b057466
GIT binary patch
literal 72497
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
IM6N<$f}N3Di2wiq

literal 0
HcmV?d00001


From 4865b902c1ee105b2e214399f95baa410f6c9e82 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Mon, 23 Oct 2017 15:20:57 -0400
Subject: [PATCH 113/161] Update history to reflect merge of #6476 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index fa264db7034..c73b9da27d9 100644
--- a/History.markdown
+++ b/History.markdown
@@ -44,6 +44,7 @@
   * Add special styling for code-blocks run in shell (#6389)
   * Update list of files excluded from Docs site (#6457)
   * Update site History (#6460)
+  * Site: Add default twitter card image (#6476)
 
 ## 3.6.2 / 2017-10-21
 

From e0eff967f34fb04b3159a8bb8e130d7c5f1fab8d Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@users.noreply.github.com>
Date: Thu, 26 Oct 2017 14:21:20 -0400
Subject: [PATCH 114/161] Rely on jekyll-mentions for linking usernames (#6469)

Merge pull request 6469
---
 History.markdown      |   2 +-
 Rakefile              |   8 +--
 docs/_docs/history.md | 126 +++++++++++++++++++++---------------------
 3 files changed, 65 insertions(+), 71 deletions(-)

diff --git a/History.markdown b/History.markdown
index c73b9da27d9..979ddd1e542 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1358,7 +1358,7 @@
 
 ### Site Enhancements
 
-  * Add `@alfredxing` to the `@jekyll/core` team. :tada: (#3218)
+  * Add @alfredxing to the @jekyll/core team. :tada: (#3218)
   * Document the `-q` option for the `build` and `serve` commands (#3149)
   * Fix some minor typos/flow fixes in documentation website content (#3165)
   * Add `keep_files` to configuration documentation (#3162)
diff --git a/Rakefile b/Rakefile
index 51eb32ce8d3..1a01e412d57 100644
--- a/Rakefile
+++ b/Rakefile
@@ -51,14 +51,8 @@ def linkify_prs(markdown)
   end
 end
 
-def linkify_users(markdown)
-  markdown.gsub(%r!(@\w+)!) do |username|
-    "[#{username}](https://github.com/#{username.delete("@")})"
-  end
-end
-
 def linkify(markdown)
-  linkify_users(linkify_prs(markdown))
+  linkify_prs(markdown)
 end
 
 def liquid_escape(markdown)
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 6d628241495..85e493616af 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -911,7 +911,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Bug Fixes
 {: #bug-fixes-v3-1-2}
 
-- Fix syntax highlighting in kramdown by making `[@config](https://github.com/config)` accessible in the Markdown converter. ([#4428]({{ site.repository }}/issues/4428))
+- Fix syntax highlighting in kramdown by making `@config` accessible in the Markdown converter. ([#4428]({{ site.repository }}/issues/4428))
 - `Jekyll.sanitized_path`: sanitizing a questionable path should handle tildes ([#4492]({{ site.repository }}/issues/4492))
 - Fix `titleize` so already capitalized words are not dropped ([#4525]({{ site.repository }}/issues/4525))
 - Permalinks which end in a slash should always output HTML ([#4546]({{ site.repository }}/issues/4546))
@@ -994,7 +994,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Convertible should make layout data accessible via `layout` instead of `page` ([#4205]({{ site.repository }}/issues/4205))
 - Avoid using `Dir.glob` with absolute path to allow special characters in the path ([#4150]({{ site.repository }}/issues/4150))
 - Handle empty config files ([#4052]({{ site.repository }}/issues/4052))
-- Rename `[@options](https://github.com/options)` so that it does not impact Liquid. ([#4173]({{ site.repository }}/issues/4173))
+- Rename `@options` so that it does not impact Liquid. ([#4173]({{ site.repository }}/issues/4173))
 - utils/drops: update Drop to support `Utils.deep_merge_hashes` ([#4289]({{ site.repository }}/issues/4289))
 - Make sure jekyll/drops/drop is loaded first. ([#4292]({{ site.repository }}/issues/4292))
 - Convertible/Page/Renderer: use payload hash accessor & setter syntax for backwards-compatibility ([#4311]({{ site.repository }}/issues/4311))
@@ -1055,7 +1055,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Add documentation for smartify Liquid filter ([#4333]({{ site.repository }}/issues/4333))
 - Fixed broken link to blog on using mathjax with jekyll ([#4344]({{ site.repository }}/issues/4344))
 - Documentation: correct reference in Precedence section of Configuration docs ([#4355]({{ site.repository }}/issues/4355))
-- Add [@jmcglone](https://github.com/jmcglone)'s guide to github-pages doc page ([#4364]({{ site.repository }}/issues/4364))
+- Add @jmcglone's guide to github-pages doc page ([#4364]({{ site.repository }}/issues/4364))
 - Added the Wordpress2Jekyll Wordpress plugin ([#4377]({{ site.repository }}/issues/4377))
 - Add Contentful Extension to list of third-party plugins ([#4390]({{ site.repository }}/issues/4390))
 - Correct Minor spelling error ([#4394]({{ site.repository }}/issues/4394))
@@ -1436,7 +1436,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Site Enhancements
 {: #site-enhancements-v2-5-3}
 
-- Add `[@alfredxing](https://github.com/alfredxing)` to the `[@jekyll](https://github.com/jekyll)/core` team. :tada: ([#3218]({{ site.repository }}/issues/3218))
+- Add @alfredxing to the @jekyll/core team. :tada: ([#3218]({{ site.repository }}/issues/3218))
 - Document the `-q` option for the `build` and `serve` commands ([#3149]({{ site.repository }}/issues/3149))
 - Fix some minor typos/flow fixes in documentation website content ([#3165]({{ site.repository }}/issues/3165))
 - Add `keep_files` to configuration documentation ([#3162]({{ site.repository }}/issues/3162))
@@ -2033,7 +2033,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Fixed typo in datafiles doc page ([#1854]({{ site.repository }}/issues/1854))
 - Clarify how to access `site` in docs ([#1864]({{ site.repository }}/issues/1864))
 - Add closing `<code>` tag to `context.registers[:site]` note ([#1867]({{ site.repository }}/issues/1867))
-- Fix link to [@mojombo](https://github.com/mojombo)'s site source ([#1897]({{ site.repository }}/issues/1897))
+- Fix link to @mojombo's site source ([#1897]({{ site.repository }}/issues/1897))
 - Add `paginate: nil` to default configuration in docs ([#1896]({{ site.repository }}/issues/1896))
 - Add link to our License in the site footer ([#1889]({{ site.repository }}/issues/1889))
 - Add a charset note in "Writing Posts" doc page ([#1902]({{ site.repository }}/issues/1902))
@@ -2500,7 +2500,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Add documentation about `paginate_path` to "Templates" page in docs ([#1129]({{ site.repository }}/issues/1129))
 - Give the quick-start guide its own page ([#1191]({{ site.repository }}/issues/1191))
 - Update ProTip on Installation page in docs to point to all the info about Pygments and the 'highlight' tag. ([#1196]({{ site.repository }}/issues/1196))
-- Run `site/img` through ImageOptim (thanks [@qrush](https://github.com/qrush)!) ([#1208]({{ site.repository }}/issues/1208))
+- Run `site/img` through ImageOptim (thanks @qrush!) ([#1208]({{ site.repository }}/issues/1208))
 - Added Jade Converter to `site/docs/plugins` ([#1210]({{ site.repository }}/issues/1210))
 - Fix location of docs pages in Contributing pages ([#1214]({{ site.repository }}/issues/1214))
 - Add ReadInXMinutes plugin to the plugin list ([#1222]({{ site.repository }}/issues/1222))
@@ -2982,25 +2982,25 @@ note: This file is autogenerated. Edit /History.markdown instead.
 {: #v0-5-3}
 
 - Bug Fixes
-- Solving the permalink bug where non-html files wouldn't work ([@jeffrydegrande](https://github.com/jeffrydegrande))
+- Solving the permalink bug where non-html files wouldn't work (@jeffrydegrande)
 
 
 ## 0.5.2 / 2009-06-24
 {: #v0-5-2}
 
 - Enhancements
-- Added --paginate option to the executable along with a paginator object for the payload ([@calavera](https://github.com/calavera))
+- Added --paginate option to the executable along with a paginator object for the payload (@calavera)
 - Upgraded RedCloth to 4.2.1, which makes `<notextile>` tags work once again.
-- Configuration options set in config.yml are now available through the site payload ([@vilcans](https://github.com/vilcans))
+- Configuration options set in config.yml are now available through the site payload (@vilcans)
 - Posts can now have an empty YAML front matter or none at all (@ bahuvrihi)
 - Bug Fixes
-- Fixing Ruby 1.9 issue that requires `#to_s` on the err object ([@Chrononaut](https://github.com/Chrononaut))
-- Fixes for pagination and ordering posts on the same day ([@ujh](https://github.com/ujh))
-- Made pages respect permalinks style and permalinks in yml front matter ([@eugenebolshakov](https://github.com/eugenebolshakov))
-- Index.html file should always have index.html permalink ([@eugenebolshakov](https://github.com/eugenebolshakov))
-- Added trailing slash to pretty permalink style so Apache is happy ([@eugenebolshakov](https://github.com/eugenebolshakov))
+- Fixing Ruby 1.9 issue that requires `#to_s` on the err object (@Chrononaut)
+- Fixes for pagination and ordering posts on the same day (@ujh)
+- Made pages respect permalinks style and permalinks in yml front matter (@eugenebolshakov)
+- Index.html file should always have index.html permalink (@eugenebolshakov)
+- Added trailing slash to pretty permalink style so Apache is happy (@eugenebolshakov)
 - Bad markdown processor in config fails sooner and with better message (@ gcnovus)
-- Allow CRLFs in yaml front matter ([@juretta](https://github.com/juretta))
+- Allow CRLFs in yaml front matter (@juretta)
 - Added Date#xmlschema for Ruby versions < 1.9
 
 
@@ -3010,15 +3010,15 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Major Enhancements
 {: #major-enhancements-v0-5-1}
 
-- Next/previous posts in site payload ([@pantulis](https://github.com/pantulis), [@tomo](https://github.com/tomo))
+- Next/previous posts in site payload (@pantulis, @tomo)
 - Permalink templating system
 - Moved most of the README out to the GitHub wiki
-- Exclude option in configuration so specified files won't be brought over with generated site ([@duritong](https://github.com/duritong))
+- Exclude option in configuration so specified files won't be brought over with generated site (@duritong)
 - Bug Fixes
 - Making sure config.yaml references are all gone, using only config.yml
-- Fixed syntax highlighting breaking for UTF-8 code ([@henrik](https://github.com/henrik))
-- Worked around RDiscount bug that prevents Markdown from getting parsed after highlight ([@henrik](https://github.com/henrik))
-- CGI escaped post titles ([@Chrononaut](https://github.com/Chrononaut))
+- Fixed syntax highlighting breaking for UTF-8 code (@henrik)
+- Worked around RDiscount bug that prevents Markdown from getting parsed after highlight (@henrik)
+- CGI escaped post titles (@Chrononaut)
 
 
 ## 0.5.0 / 2009-04-07
@@ -3027,21 +3027,21 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Minor Enhancements
 {: #minor-enhancements-v0-5-0}
 
-- Ability to set post categories via YAML ([@qrush](https://github.com/qrush))
-- Ability to set prevent a post from publishing via YAML ([@qrush](https://github.com/qrush))
-- Add textilize filter ([@willcodeforfoo](https://github.com/willcodeforfoo))
-- Add 'pretty' permalink style for wordpress-like urls ([@dysinger](https://github.com/dysinger))
-- Made it possible to enter categories from YAML as an array ([@Chrononaut](https://github.com/Chrononaut))
-- Ignore Emacs autosave files ([@Chrononaut](https://github.com/Chrononaut))
+- Ability to set post categories via YAML (@qrush)
+- Ability to set prevent a post from publishing via YAML (@qrush)
+- Add textilize filter (@willcodeforfoo)
+- Add 'pretty' permalink style for wordpress-like urls (@dysinger)
+- Made it possible to enter categories from YAML as an array (@Chrononaut)
+- Ignore Emacs autosave files (@Chrononaut)
 - Bug Fixes
-- Use block syntax of popen4 to ensure that subprocesses are properly disposed ([@jqr](https://github.com/jqr))
-- Close open4 streams to prevent zombies ([@rtomayko](https://github.com/rtomayko))
-- Only query required fields from the WP Database ([@ariejan](https://github.com/ariejan))
-- Prevent `_posts` from being copied to the destination directory ([@bdimcheff](https://github.com/bdimcheff))
+- Use block syntax of popen4 to ensure that subprocesses are properly disposed (@jqr)
+- Close open4 streams to prevent zombies (@rtomayko)
+- Only query required fields from the WP Database (@ariejan)
+- Prevent `_posts` from being copied to the destination directory (@bdimcheff)
 - Refactors
-- Factored the filtering code into a method ([@Chrononaut](https://github.com/Chrononaut))
-- Fix tests and convert to Shoulda ([@qrush](https://github.com/qrush), [@technicalpickles](https://github.com/technicalpickles))
-- Add Cucumber acceptance test suite ([@qrush](https://github.com/qrush), [@technicalpickles](https://github.com/technicalpickles))
+- Factored the filtering code into a method (@Chrononaut)
+- Fix tests and convert to Shoulda (@qrush, @technicalpickles)
+- Add Cucumber acceptance test suite (@qrush, @technicalpickles)
 
 
 ## 0.4.1
@@ -3049,9 +3049,9 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Minor Enhancements
 {: #minor-enhancements-v--}
 
-- Changed date format on wordpress converter (zeropadding) ([@dysinger](https://github.com/dysinger))
+- Changed date format on wordpress converter (zeropadding) (@dysinger)
 - Bug Fixes
-- Add Jekyll binary as executable to gemspec ([@dysinger](https://github.com/dysinger))
+- Add Jekyll binary as executable to gemspec (@dysinger)
 
 
 ## 0.4.0 / 2009-02-03
@@ -3065,20 +3065,20 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Minor Enhancements
 {: #minor-enhancements-v0-4-0}
 
-- Type importer ([@codeslinger](https://github.com/codeslinger))
-- `site.topics` accessor ([@baz](https://github.com/baz))
-- Add `array_to_sentence_string` filter ([@mchung](https://github.com/mchung))
-- Add a converter for textpattern ([@PerfectlyNormal](https://github.com/PerfectlyNormal))
-- Add a working Mephisto / MySQL converter ([@ivey](https://github.com/ivey))
-- Allowing .htaccess files to be copied over into the generated site ([@briandoll](https://github.com/briandoll))
-- Add option to not put file date in permalink URL ([@mreid](https://github.com/mreid))
-- Add line number capabilities to highlight blocks ([@jcon](https://github.com/jcon))
+- Type importer (@codeslinger)
+- `site.topics` accessor (@baz)
+- Add `array_to_sentence_string` filter (@mchung)
+- Add a converter for textpattern (@PerfectlyNormal)
+- Add a working Mephisto / MySQL converter (@ivey)
+- Allowing .htaccess files to be copied over into the generated site (@briandoll)
+- Add option to not put file date in permalink URL (@mreid)
+- Add line number capabilities to highlight blocks (@jcon)
 - Bug Fixes
-- Fix permalink behavior ([@cavalle](https://github.com/cavalle))
-- Fixed an issue with pygments, markdown, and newlines ([@zpinter](https://github.com/zpinter))
-- Ampersands need to be escaped ([@pufuwozu](https://github.com/pufuwozu), [@ap](https://github.com/ap))
-- Test and fix the site.categories hash ([@zzot](https://github.com/zzot))
-- Fix site payload available to files ([@matrix9180](https://github.com/matrix9180))
+- Fix permalink behavior (@cavalle)
+- Fixed an issue with pygments, markdown, and newlines (@zpinter)
+- Ampersands need to be escaped (@pufuwozu, @ap)
+- Test and fix the site.categories hash (@zzot)
+- Fix site payload available to files (@matrix9180)
 
 
 ## 0.3.0 / 2008-12-24
@@ -3087,19 +3087,19 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Major Enhancements
 {: #major-enhancements-v0-3-0}
 
-- Added `--server` option to start a simple WEBrick server on destination directory ([@johnreilly](https://github.com/johnreilly) and [@mchung](https://github.com/mchung))
+- Added `--server` option to start a simple WEBrick server on destination directory (@johnreilly and @mchung)
 
 ### Minor Enhancements
 {: #minor-enhancements-v0-3-0}
 
-- Added post categories based on directories containing `_posts` ([@mreid](https://github.com/mreid))
+- Added post categories based on directories containing `_posts` (@mreid)
 - Added post topics based on directories underneath `_posts`
-- Added new date filter that shows the full month name ([@mreid](https://github.com/mreid))
-- Merge Post's YAML front matter into its to_liquid payload ([@remi](https://github.com/remi))
+- Added new date filter that shows the full month name (@mreid)
+- Merge Post's YAML front matter into its to_liquid payload (@remi)
 - Restrict includes to regular files underneath `_includes`
 - Bug Fixes
-- Change YAML delimiter matcher so as to not chew up 2nd level markdown headers ([@mreid](https://github.com/mreid))
-- Fix bug that meant page data (such as the date) was not available in templates ([@mreid](https://github.com/mreid))
+- Change YAML delimiter matcher so as to not chew up 2nd level markdown headers (@mreid)
+- Fix bug that meant page data (such as the date) was not available in templates (@mreid)
 - Properly reject directories in `_layouts`
 
 
@@ -3107,13 +3107,13 @@ note: This file is autogenerated. Edit /History.markdown instead.
 {: #v0-2-1}
 
 - Major Changes
-- Use Maruku (pure Ruby) for Markdown by default ([@mreid](https://github.com/mreid))
+- Use Maruku (pure Ruby) for Markdown by default (@mreid)
 - Allow use of RDiscount with `--rdiscount` flag
 
 ### Minor Enhancements
 {: #minor-enhancements-v0-2-1}
 
-- Don't load directory_watcher unless it's needed ([@pjhyett](https://github.com/pjhyett))
+- Don't load directory_watcher unless it's needed (@pjhyett)
 
 
 ## 0.2.0 / 2008-12-14
@@ -3142,10 +3142,10 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Minor Enhancements
 {: #minor-enhancements-v0-1-5}
 
-- Output informative message if RDiscount is not available ([@JackDanger](https://github.com/JackDanger))
+- Output informative message if RDiscount is not available (@JackDanger)
 - Bug Fixes
-- Prevent Jekyll from picking up the output directory as a source ([@JackDanger](https://github.com/JackDanger))
-- Skip `related_posts` when there is only one post ([@JackDanger](https://github.com/JackDanger))
+- Prevent Jekyll from picking up the output directory as a source (@JackDanger)
+- Skip `related_posts` when there is only one post (@JackDanger)
 
 
 ## 0.1.4 / 2008-12-08
@@ -3159,12 +3159,12 @@ note: This file is autogenerated. Edit /History.markdown instead.
 {: #v0-1-3}
 
 - Major Features
-- Markdown support ([@vanpelt](https://github.com/vanpelt))
-- Mephisto and CSV converters ([@vanpelt](https://github.com/vanpelt))
-- Code hilighting ([@vanpelt](https://github.com/vanpelt))
+- Markdown support (@vanpelt)
+- Mephisto and CSV converters (@vanpelt)
+- Code hilighting (@vanpelt)
 - Autobuild
 - Bug Fixes
-- Accept both `\r\n` and `\n` in YAML header ([@vanpelt](https://github.com/vanpelt))
+- Accept both `\r\n` and `\n` in YAML header (@vanpelt)
 
 
 ## 0.1.2 / 2008-11-22

From 08644f1e82d0424ad6b26398af398f1cad15962b Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Thu, 26 Oct 2017 14:21:21 -0400
Subject: [PATCH 115/161] Update history to reflect merge of #6469 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 979ddd1e542..cf55aed536e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -30,6 +30,7 @@
   * Update first-timers-issue-template.md (#6472)
   * Site: Rename method (#6474)
   * Do not linkify escaped characters as PRs in History (#6468)
+  * Rely on jekyll-mentions for linking usernames (#6469)
 
 ### Minor Enhancements
 

From a1d45f97177afcceeb69ca9c8530eadb30049948 Mon Sep 17 00:00:00 2001
From: ashmaroli <ashmaroli@users.noreply.github.com>
Date: Fri, 27 Oct 2017 21:25:07 +0530
Subject: [PATCH 116/161] Add a note on `:jekyll_plugins` group in the docs
 (#6488)

Merge pull request 6488
---
 docs/_docs/plugins.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 7d218b4ef58..ab3ca5ad8a0 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -68,6 +68,24 @@ You have 3 options for installing plugins:
   </p>
 </div>
 
+### The jekyll_plugins group
+
+Jekyll gives this particular group of gems in your `Gemfile` a different
+treatment. Any gem included in this group is loaded before Jekyll starts
+processing the rest of your source directory.
+
+A gem included here will be activated even if its not explicitly listed under
+the `plugins:` key in your site's config file.
+
+<div class="note warning">
+  <p>
+    Gems included in the <code>:jekyll-plugins</code> group are activated
+    regardless of the <code>--safe</code> mode setting. Be careful of what
+    gems are included under this group!
+  </p>
+</div>
+
+
 In general, plugins you make will fall broadly into one of five categories:
 
 1. [Generators](#generators)

From 248bd59f5a387e4bf6a2180c190615a7a537e888 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Fri, 27 Oct 2017 11:55:08 -0400
Subject: [PATCH 117/161] Update history to reflect merge of #6488 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index cf55aed536e..3da36f020b1 100644
--- a/History.markdown
+++ b/History.markdown
@@ -19,6 +19,7 @@
   * Added github-cards to the list of plugins (#6425)
   * add post about diversity (#6447)
   * Docs: Add a note about Liquid and syntax highlighting (#6466)
+  * Add a note on `:jekyll_plugins` group in the docs (#6488)
 
 ### Development Fixes
 

From 52c34060e3311c1d2a369f02b4d2319c1b283f7b Mon Sep 17 00:00:00 2001
From: Frank Taillandier <frank.taillandier@gmail.com>
Date: Fri, 27 Oct 2017 17:59:00 +0200
Subject: [PATCH 118/161] Docs: Avoid FUD (props @Parkr)

---
 docs/_docs/plugins.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index ab3ca5ad8a0..0c1c24d0618 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -80,7 +80,7 @@ the `plugins:` key in your site's config file.
 <div class="note warning">
   <p>
     Gems included in the <code>:jekyll-plugins</code> group are activated
-    regardless of the <code>--safe</code> mode setting. Be careful of what
+    regardless of the <code>--safe</code> mode setting. Be aware of what
     gems are included under this group!
   </p>
 </div>

From a4315fac3bbd7c76d97fa12c426a62decd0d338f Mon Sep 17 00:00:00 2001
From: Gert-jan Theunissen <gurtjun@users.noreply.github.com>
Date: Fri, 27 Oct 2017 18:01:59 +0200
Subject: [PATCH 119/161] Updated custom-404-page.md (#6489)

Merge pull request 6489
---
 docs/_tutorials/custom-404-page.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_tutorials/custom-404-page.md b/docs/_tutorials/custom-404-page.md
index 244982d2708..47efe958247 100644
--- a/docs/_tutorials/custom-404-page.md
+++ b/docs/_tutorials/custom-404-page.md
@@ -58,7 +58,7 @@ Add the following to the nginx configuration file, `nginx.conf`, which is usuall
 ```nginx
 server {
   error_page 404 /404.html;
-  location  /404.html {
+  location = /404.html {
     internal;
   }
 }

From e635489c665aa2c883b03a8c77cb51f1dfae1adc Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Fri, 27 Oct 2017 12:02:01 -0400
Subject: [PATCH 120/161] Update history to reflect merge of #6489 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 3da36f020b1..4fee131e6aa 100644
--- a/History.markdown
+++ b/History.markdown
@@ -20,6 +20,7 @@
   * add post about diversity (#6447)
   * Docs: Add a note about Liquid and syntax highlighting (#6466)
   * Add a note on `:jekyll_plugins` group in the docs (#6488)
+  * Updated custom-404-page.md (#6489)
 
 ### Development Fixes
 

From 39210d00e9ac86266cc65cf1edeefbc8f9729ba7 Mon Sep 17 00:00:00 2001
From: Chris Finazzo <chris.finazzo@gmail.com>
Date: Fri, 27 Oct 2017 12:25:36 -0400
Subject: [PATCH 121/161] Update normalize.css to v7.0.0 (#6491)

Merge pull request 6491
---
 docs/_sass/_normalize.scss | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/docs/_sass/_normalize.scss b/docs/_sass/_normalize.scss
index b26c1009564..fa4e73dd418 100644
--- a/docs/_sass/_normalize.scss
+++ b/docs/_sass/_normalize.scss
@@ -1,4 +1,4 @@
-/*! normalize.css v6.0.0 | MIT License | github.com/necolas/normalize.css */
+/*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */
 
 /* Document
    ========================================================================== */
@@ -18,6 +18,14 @@ html {
 /* Sections
    ========================================================================== */
 
+/**
+ * Remove the margin in all browsers (opinionated).
+ */
+
+body {
+  margin: 0;
+}
+
 /**
  * Add the correct display in IE 9-.
  */
@@ -225,7 +233,8 @@ svg:not(:root) {
    ========================================================================== */
 
 /**
- * Remove the margin in Firefox and Safari.
+ * 1. Change the font styles in all browsers (opinionated).
+ * 2. Remove the margin in Firefox and Safari.
  */
 
 button,
@@ -233,7 +242,10 @@ input,
 optgroup,
 select,
 textarea {
-  margin: 0;
+  font-family: sans-serif; /* 1 */
+  font-size: 100%; /* 1 */
+  line-height: 1.15; /* 1 */
+  margin: 0; /* 2 */
 }
 
 /**
@@ -292,6 +304,14 @@ button:-moz-focusring,
   outline: 1px dotted ButtonText;
 }
 
+/**
+ * Correct the padding in Firefox.
+ */
+
+fieldset {
+  padding: 0.35em 0.75em 0.625em;
+}
+
 /**
  * 1. Correct the text wrapping in Edge and IE.
  * 2. Correct the color inheritance from `fieldset` elements in IE.

From d628d438a84cc9a2c953beae7dad0df3dd0d7600 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Fri, 27 Oct 2017 12:25:37 -0400
Subject: [PATCH 122/161] Update history to reflect merge of #6491 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 4fee131e6aa..3d82bb8fbef 100644
--- a/History.markdown
+++ b/History.markdown
@@ -48,6 +48,7 @@
   * Update list of files excluded from Docs site (#6457)
   * Update site History (#6460)
   * Site: Add default twitter card image (#6476)
+  * Update normalize.css to v7.0.0 (#6491)
 
 ## 3.6.2 / 2017-10-21
 

From 1f8704f8764abe8c38718f772e8a9026b99b74bc Mon Sep 17 00:00:00 2001
From: Andrew Dassonville <dassonville.andrew@gmail.com>
Date: Sat, 28 Oct 2017 07:52:02 -0700
Subject: [PATCH 123/161] Remove `sudo` from macOS troubleshooting instructions
 (#6486)

Merge pull request 6486
---
 docs/_docs/troubleshooting.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/_docs/troubleshooting.md b/docs/_docs/troubleshooting.md
index d57cfacfa0a..4ccc164318b 100644
--- a/docs/_docs/troubleshooting.md
+++ b/docs/_docs/troubleshooting.md
@@ -74,7 +74,7 @@ apt update && apt install libffi-dev clang ruby-dev make
 On macOS, you may need to update RubyGems (using `sudo` only if necessary):
 
 ```sh
-sudo gem update --system
+gem update --system
 ```
 
 If you still have issues, you can download and install new Command Line
@@ -84,11 +84,11 @@ Tools (such as `gcc`) using the following command:
 xcode-select --install
 ```
 
-which may allow you to install native gems using this command (again using
+which may allow you to install native gems using this command (again, using
 `sudo` only if necessary):
 
 ```sh
-sudo gem install jekyll
+gem install jekyll
 ```
 
 Note that upgrading macOS does not automatically upgrade Xcode itself
@@ -103,10 +103,10 @@ With the introduction of System Integrity Protection, several directories
 that were previously writable are now considered system locations and are no
 longer available. Given these changes, there are a couple of simple ways to get
 up and running. One option is to change the location where the gem will be
-installed (again using `sudo` only if necessary):
+installed (again, using `sudo` only if necessary):
 
 ```sh
-sudo gem install -n /usr/local/bin jekyll
+gem install -n /usr/local/bin jekyll
 ```
 
 Alternatively, Homebrew can be installed and used to set up Ruby. This can be

From 63255ae2c165268879ccfabc386120b6da26a18c Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sat, 28 Oct 2017 10:52:03 -0400
Subject: [PATCH 124/161] Update history to reflect merge of #6486 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 3d82bb8fbef..b9620255f49 100644
--- a/History.markdown
+++ b/History.markdown
@@ -21,6 +21,7 @@
   * Docs: Add a note about Liquid and syntax highlighting (#6466)
   * Add a note on `:jekyll_plugins` group in the docs (#6488)
   * Updated custom-404-page.md (#6489)
+  * Remove `sudo` from macOS troubleshooting instructions (#6486)
 
 ### Development Fixes
 

From 9632733efa1a6302e1dc2e5708c5a4fe72c81de5 Mon Sep 17 00:00:00 2001
From: ashmaroli <ashmaroli@users.noreply.github.com>
Date: Sat, 28 Oct 2017 20:54:41 +0530
Subject: [PATCH 125/161] enable 'Lint/RescueWithoutErrorClass' Cop (#6482)

Merge pull request 6482
---
 .rubocop.yml                  | 2 --
 Rakefile                      | 2 +-
 lib/jekyll/commands/doctor.rb | 4 +++-
 lib/jekyll/convertible.rb     | 2 +-
 lib/jekyll/document.rb        | 2 +-
 lib/jekyll/renderer.rb        | 2 +-
 lib/jekyll/tags/include.rb    | 2 +-
 lib/jekyll/tags/post_url.rb   | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index f483e1ddc3a..3a02c8fd0a9 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -44,8 +44,6 @@ Layout/SpaceInsideBrackets:
   Enabled: false
 Lint/EndAlignment:
   Severity: error
-Lint/RescueWithoutErrorClass:
-  Enabled: false
 Lint/UnreachableCode:
   Severity: error
 Lint/UselessAccessModifier:
diff --git a/Rakefile b/Rakefile
index 1a01e412d57..786a2626dc4 100644
--- a/Rakefile
+++ b/Rakefile
@@ -95,7 +95,7 @@ def siteify_file(file, overrides_front_matter = {})
   abort "You seem to have misplaced your #{file} file. I can haz?" unless File.exist?(file)
   title = begin
             File.read(file).match(%r!\A# (.*)$!)[1]
-          rescue
+          rescue NoMethodError
             File.basename(file, ".*").downcase.capitalize
           end
   slug  = File.basename(file, ".markdown").downcase
diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb
index c10ee5963ca..960ee9f9cd3 100644
--- a/lib/jekyll/commands/doctor.rb
+++ b/lib/jekyll/commands/doctor.rb
@@ -135,7 +135,9 @@ def url_exists?(url)
         def url_valid?(url)
           Addressable::URI.parse(url)
           true
-        rescue
+        # Addressable::URI#parse only raises a TypeError
+        # https://git.io/vFfbx
+        rescue TypeError
           Jekyll.logger.warn "Warning:", "The site URL does not seem to be valid, "\
               "check the value of `url` in your config file."
           false
diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index 45a83c4f827..1236d9d1662 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -49,7 +49,7 @@ def read_yaml(base, name, opts = {})
       rescue SyntaxError => e
         Jekyll.logger.warn "YAML Exception reading #{filename}: #{e.message}"
         raise e if self.site.config["strict_front_matter"]
-      rescue => e
+      rescue StandardError => e
         Jekyll.logger.warn "Error reading file #{filename}: #{e.message}"
         raise e if self.site.config["strict_front_matter"]
       end
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 0877ca12421..d39d5d8cae2 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -266,7 +266,7 @@ def read(opts = {})
           merge_defaults
           read_content(opts)
           read_post_data
-        rescue => e
+        rescue StandardError => e
           handle_read_error(e)
         end
       end
diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index 136a42ad800..71e5b87c317 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -96,7 +96,7 @@ def convert(content)
       converters.reduce(content) do |output, converter|
         begin
           converter.convert output
-        rescue => e
+        rescue StandardError => e
           Jekyll.logger.error "Conversion error:",
             "#{converter.class} encountered an error while "\
             "converting '#{document.relative_path}':"
diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index 0032b7d2507..e7464786454 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -184,7 +184,7 @@ def outside_site_source?(path, dir, safe)
 
       def realpath_prefixed_with?(path, dir)
         File.exist?(path) && File.realpath(path).start_with?(dir)
-      rescue
+      rescue StandardError
         false
       end
 
diff --git a/lib/jekyll/tags/post_url.rb b/lib/jekyll/tags/post_url.rb
index 4fba98149e4..db0b3fa06f6 100644
--- a/lib/jekyll/tags/post_url.rb
+++ b/lib/jekyll/tags/post_url.rb
@@ -59,7 +59,7 @@ def initialize(tag_name, post, tokens)
         @orig_post = post.strip
         begin
           @post = PostComparer.new(@orig_post)
-        rescue => e
+        rescue StandardError => e
           raise Jekyll::Errors::PostURLError, <<-MSG
 Could not parse name of post "#{@orig_post}" in tag 'post_url'.
 

From df6608e11dca0e88ca6f6318e202902c85018e06 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sat, 28 Oct 2017 11:24:42 -0400
Subject: [PATCH 126/161] Update history to reflect merge of #6482 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index b9620255f49..62a9245cc53 100644
--- a/History.markdown
+++ b/History.markdown
@@ -34,6 +34,7 @@
   * Site: Rename method (#6474)
   * Do not linkify escaped characters as PRs in History (#6468)
   * Rely on jekyll-mentions for linking usernames (#6469)
+  * Enable `Lint/RescueWithoutErrorClass` Cop (#6482)
 
 ### Minor Enhancements
 

From 8dbe5de66bed81665e3c94fff22f04a3e86acd39 Mon Sep 17 00:00:00 2001
From: Angelika Tyborska <atyborska93@gmail.com>
Date: Sat, 28 Oct 2017 17:34:38 +0200
Subject: [PATCH 127/161] Raise when theme root directory is not available
 (#6455)

Merge pull request 6455
---
 lib/jekyll/theme.rb |  3 ++-
 test/test_theme.rb  | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/theme.rb b/lib/jekyll/theme.rb
index 031c61b1e7a..cf9829ea322 100644
--- a/lib/jekyll/theme.rb
+++ b/lib/jekyll/theme.rb
@@ -16,7 +16,8 @@ def root
       # Otherwise, Jekyll.sanitized path with prepend the unresolved root
       @root ||= File.realpath(gemspec.full_gem_path)
     rescue Errno::ENOENT, Errno::EACCES, Errno::ELOOP
-      nil
+      raise "Path #{gemspec.full_gem_path} does not exist, is not accessible "\
+        "or includes a symbolic link loop"
     end
 
     def includes_path
diff --git a/test/test_theme.rb b/test/test_theme.rb
index 69628dde1ba..bc1f8de6821 100644
--- a/test/test_theme.rb
+++ b/test/test_theme.rb
@@ -64,6 +64,27 @@ def setup
     end
   end
 
+  context "invalid theme" do
+    context "initializing" do
+      setup do
+        stub_gemspec = Object.new
+
+        # the directory for this theme should not exist
+        allow(stub_gemspec).to receive(:full_gem_path)
+          .and_return(File.expand_path("test/fixtures/test-non-existent-theme", __dir__))
+
+        allow(Gem::Specification).to receive(:find_by_name)
+          .with("test-non-existent-theme")
+          .and_return(stub_gemspec)
+      end
+
+      should "raise when getting theme root" do
+        error = assert_raises(RuntimeError) { Theme.new("test-non-existent-theme") }
+        assert_match(%r!fixtures\/test-non-existent-theme does not exist!, error.message)
+      end
+    end
+  end
+
   should "retrieve the gemspec" do
     assert_equal "test-theme-0.1.0", @theme.send(:gemspec).full_name
   end

From b71d9b36b6e87e928572b8bab7931587e4d63572 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sat, 28 Oct 2017 11:34:40 -0400
Subject: [PATCH 128/161] Update history to reflect merge of #6455 [ci skip]

---
 History.markdown | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/History.markdown b/History.markdown
index 62a9245cc53..f1cb23f7084 100644
--- a/History.markdown
+++ b/History.markdown
@@ -52,6 +52,10 @@
   * Site: Add default twitter card image (#6476)
   * Update normalize.css to v7.0.0 (#6491)
 
+### Bug Fixes
+
+  * Raise when theme root directory is not available (#6455)
+
 ## 3.6.2 / 2017-10-21
 
 ### Development Fixes

From 310bbbe5295de04a84ba2bbd6e579044e1a7ccb7 Mon Sep 17 00:00:00 2001
From: Ankit Singhaniya <ankit.singhaniyaz@gmail.com>
Date: Sat, 28 Oct 2017 21:13:32 +0530
Subject: [PATCH 129/161] add formester to the list of saas form backend
 (#6059)

Merge pull request 6059
---
 docs/_docs/resources.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/_docs/resources.md b/docs/_docs/resources.md
index 24a9ab49739..d2a15c8ff8e 100644
--- a/docs/_docs/resources.md
+++ b/docs/_docs/resources.md
@@ -31,6 +31,7 @@ Jekyll's growing use is producing a wide variety of tutorials, frameworks, exten
   - [FormKeep](https://formkeep.com/guides/contact-form-jekyll?utm_source=github&utm_medium=jekyll-docs&utm_campaign=contact-form-jekyll)
   - [Simple Form](https://getsimpleform.com/)
   - [Formingo](https://www.formingo.co/guides/jekyll?utm_source=github&utm_medium=jekyll-docs&utm_campaign=Jekyll%20Documentation)
+  - [Formester](http://www.formester.com)
   - [Staticman](https://staticman.net): Add user-generated content to a Jekyll site (free and open source)
   - [Snipcart](https://snipcart.com/blog/static-site-e-commerce-part-2-integrating-snipcart-with-jekyll): Add a shopping cart to a Jekyll site
   - [Contentful](https://www.contentful.com/ecosystem/jekyll/): use Jekyll together with the API-driven Contentful CMS.

From afcffc78312cd49aa7f78418fd97b79fb3de77a4 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sat, 28 Oct 2017 11:43:33 -0400
Subject: [PATCH 130/161] Update history to reflect merge of #6059 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index f1cb23f7084..c00294617f1 100644
--- a/History.markdown
+++ b/History.markdown
@@ -22,6 +22,7 @@
   * Add a note on `:jekyll_plugins` group in the docs (#6488)
   * Updated custom-404-page.md (#6489)
   * Remove `sudo` from macOS troubleshooting instructions (#6486)
+  * add formester to the list of saas form backend (#6059)
 
 ### Development Fixes
 

From 7de55c6089077b5ad21bc13cb9b4d42d3bfbfb22 Mon Sep 17 00:00:00 2001
From: Jed Fox <git@twopointzero.us>
Date: Sat, 28 Oct 2017 11:46:02 -0400
Subject: [PATCH 131/161] Fix a few minor issues in the docs (#6494)

Merge pull request 6494
---
 docs/_docs/continuous-integration/buddyworks.md | 2 +-
 docs/_docs/continuous-integration/circleci.md   | 2 +-
 docs/_docs/deployment-methods.md                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/_docs/continuous-integration/buddyworks.md b/docs/_docs/continuous-integration/buddyworks.md
index 5cce1f75487..aef1ce8ed53 100644
--- a/docs/_docs/continuous-integration/buddyworks.md
+++ b/docs/_docs/continuous-integration/buddyworks.md
@@ -29,7 +29,7 @@ Whenever you make a push to the selected branch, the Jekyll action runs `jekyll
 
 If you prefer configuration as code over GUI, you can generate a `buddy.yml` that will create a pipeline with the Jekyll action once you push it to the target branch:
 
-```ruby
+```yaml
 - pipeline: "Build and Deploy Jekyll site"
   trigger_mode: "ON_EVERY_PUSH"
   ref_name: "master"
diff --git a/docs/_docs/continuous-integration/circleci.md b/docs/_docs/continuous-integration/circleci.md
index 4dd2905383e..b4aadc616b4 100644
--- a/docs/_docs/continuous-integration/circleci.md
+++ b/docs/_docs/continuous-integration/circleci.md
@@ -25,7 +25,7 @@ The easiest way to manage dependencies for a Jekyll project (with or without Cir
 
 [4]: http://bundler.io/gemfile.html
 
-```yaml
+```ruby
 source 'https://rubygems.org'
 
 ruby '2.4.0'
diff --git a/docs/_docs/deployment-methods.md b/docs/_docs/deployment-methods.md
index 608b0661210..972db33667f 100644
--- a/docs/_docs/deployment-methods.md
+++ b/docs/_docs/deployment-methods.md
@@ -20,7 +20,7 @@ Read this [Jekyll step-by-step guide](https://www.netlify.com/blog/2015/10/28/a-
 
 [Aerobatic](https://www.aerobatic.com) has custom domains, global CDN distribution, basic auth, CORS proxying, and a growing list of plugins all included.
 
-Automating the deployment of a Jekyll site is simple. See our [Jekyll docs](https://www.aerobatic.com/docs/static-site-generators/#jekyll) for more details. Your built `_site` folder is deployed to our highly-available, globally distributed hosting service.
+Automating the deployment of a Jekyll site is simple. See their [Jekyll docs](https://www.aerobatic.com/docs/static-site-generators/#jekyll) for more details. Your built `_site` folder is deployed to their highly-available, globally distributed hosting service.
 
 ## Kickster
 

From 5f37f75d9e077469c355b62fdcff575b52400c09 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sat, 28 Oct 2017 11:46:03 -0400
Subject: [PATCH 132/161] Update history to reflect merge of #6494 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index c00294617f1..5e4fe62ee82 100644
--- a/History.markdown
+++ b/History.markdown
@@ -23,6 +23,7 @@
   * Updated custom-404-page.md (#6489)
   * Remove `sudo` from macOS troubleshooting instructions (#6486)
   * add formester to the list of saas form backend (#6059)
+  * Fix a few minor issues in the docs (#6494)
 
 ### Development Fixes
 

From 49fa2dee0e6584720b4c91ab8537f0f3c6e0a83c Mon Sep 17 00:00:00 2001
From: Brandon Dusseau <brandon.dusseau@gmail.com>
Date: Sat, 28 Oct 2017 11:48:31 -0400
Subject: [PATCH 133/161] Added direct collection access to future collection
 item feature test (#6151)

Merge pull request 6151
---
 features/collections.feature | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/features/collections.feature b/features/collections.feature
index ba663510403..f13f95837f1 100644
--- a/features/collections.feature
+++ b/features/collections.feature
@@ -139,6 +139,28 @@ Feature: Collections
     And the _site directory should exist
     And the "_site/puppies/fido.html" file should not exist
 
+  Scenario: Hidden collection has document with future date, accessed via Liquid
+    Given I have a _puppies directory
+    And I have the following documents under the puppies collection:
+      | title  | date       | content             |
+      | Rover  | 2007-12-31 | content for Rover.  |
+      | Fido   | 2120-12-31 | content for Fido.   |
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+      puppies:
+        output: false
+    """
+    And I have a "index.html" page that contains "Newest puppy: {% assign puppy = site.puppies.last %}{{ puppy.title }}"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "Newest puppy: Rover" in "_site/index.html"
+    When I run jekyll build --future
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "Newest puppy: Fido" in "_site/index.html"
+
   Scenario: All the documents
     Given I have an "index.html" page that contains "All documents: {% for doc in site.documents %}{{ doc.relative_path }} {% endfor %}"
     And I have fixture collections

From f535218a056a4e04769dc84d4682b20316ae466f Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sat, 28 Oct 2017 11:48:33 -0400
Subject: [PATCH 134/161] Update history to reflect merge of #6151 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 5e4fe62ee82..bf3d5a3410d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -37,6 +37,7 @@
   * Do not linkify escaped characters as PRs in History (#6468)
   * Rely on jekyll-mentions for linking usernames (#6469)
   * Enable `Lint/RescueWithoutErrorClass` Cop (#6482)
+  * Added direct collection access to future collection item feature test (#6151)
 
 ### Minor Enhancements
 

From c122a3bda4852e0b12b7beba29cfe5e63b760906 Mon Sep 17 00:00:00 2001
From: Matt Rogers <codemattr@gmail.com>
Date: Sat, 28 Oct 2017 23:33:27 -0500
Subject: [PATCH 135/161] Revert "Update history to reflect merge of #6151 [ci
 skip]"

This reverts commit f535218a056a4e04769dc84d4682b20316ae466f.

From e39f9db593ab47494399310be9b0ef71efbfd933 Mon Sep 17 00:00:00 2001
From: Matt Rogers <codemattr@gmail.com>
Date: Sat, 28 Oct 2017 23:33:27 -0500
Subject: [PATCH 136/161] Revert "Added direct collection access to future
 collection item feature test (#6151)"

This reverts commit 49fa2dee0e6584720b4c91ab8537f0f3c6e0a83c.
---
 features/collections.feature | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/features/collections.feature b/features/collections.feature
index f13f95837f1..ba663510403 100644
--- a/features/collections.feature
+++ b/features/collections.feature
@@ -139,28 +139,6 @@ Feature: Collections
     And the _site directory should exist
     And the "_site/puppies/fido.html" file should not exist
 
-  Scenario: Hidden collection has document with future date, accessed via Liquid
-    Given I have a _puppies directory
-    And I have the following documents under the puppies collection:
-      | title  | date       | content             |
-      | Rover  | 2007-12-31 | content for Rover.  |
-      | Fido   | 2120-12-31 | content for Fido.   |
-    And I have a "_config.yml" file with content:
-    """
-    collections:
-      puppies:
-        output: false
-    """
-    And I have a "index.html" page that contains "Newest puppy: {% assign puppy = site.puppies.last %}{{ puppy.title }}"
-    When I run jekyll build
-    Then I should get a zero exit status
-    And the _site directory should exist
-    And I should see "Newest puppy: Rover" in "_site/index.html"
-    When I run jekyll build --future
-    Then I should get a zero exit status
-    And the _site directory should exist
-    And I should see "Newest puppy: Fido" in "_site/index.html"
-
   Scenario: All the documents
     Given I have an "index.html" page that contains "All documents: {% for doc in site.documents %}{{ doc.relative_path }} {% endfor %}"
     And I have fixture collections

From 0feccde80af01047b850340e2f04991d5eb55c82 Mon Sep 17 00:00:00 2001
From: ashmaroli <ashmaroli@users.noreply.github.com>
Date: Sun, 29 Oct 2017 20:32:45 +0530
Subject: [PATCH 137/161] clean up Rubocop config (#6495)

Merge pull request 6495
---
 .rubocop.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 3a02c8fd0a9..e168064a340 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -38,8 +38,6 @@ Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 Layout/MultilineOperationIndentation:
   EnforcedStyle: indented
-Layout/SpaceAroundOperators:
-  Enabled: true
 Layout/SpaceInsideBrackets:
   Enabled: false
 Lint/EndAlignment:
@@ -100,14 +98,11 @@ Style/Alias:
   Enabled: false
 Style/AndOr:
   Severity: error
-Style/Attr:
-  Enabled: false
 Style/BracesAroundHashParameters:
   Enabled: false
 Style/ClassAndModuleChildren:
   Enabled: false
 Style/FrozenStringLiteralComment:
-  Enabled: true
   EnforcedStyle: always
 Style/Documentation:
   Enabled: false

From c52707bc66671ada1902ca902add1fe900fec03d Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sun, 29 Oct 2017 11:02:47 -0400
Subject: [PATCH 138/161] Update history to reflect merge of #6495 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index bf3d5a3410d..90863d14bb5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -38,6 +38,7 @@
   * Rely on jekyll-mentions for linking usernames (#6469)
   * Enable `Lint/RescueWithoutErrorClass` Cop (#6482)
   * Added direct collection access to future collection item feature test (#6151)
+  * Clean up Rubocop config (#6495)
 
 ### Minor Enhancements
 

From 2ecf50f18f218d3ededa8bc5a520673b361e3d14 Mon Sep 17 00:00:00 2001
From: Jordon Bedwell <jordon@envygeeks.io>
Date: Sun, 29 Oct 2017 15:31:40 -0500
Subject: [PATCH 139/161] Fix #6498: Use Gem to discover the location of
 bundler. (#6499)

Merge pull request 6499
---
 lib/jekyll/commands/new.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb
index e784f24ac27..197f93c8ad2 100644
--- a/lib/jekyll/commands/new.rb
+++ b/lib/jekyll/commands/new.rb
@@ -143,10 +143,13 @@ def after_install(path, options = {})
         def bundle_install(path)
           Jekyll.logger.info "Running bundle install in #{path.cyan}..."
           Dir.chdir(path) do
-            process, output = Jekyll::Utils::Exec.run("bundle", "install")
+            exe = Gem.bin_path("bundler", "bundle")
+            process, output = Jekyll::Utils::Exec.run("ruby", exe, "install")
+
             output.to_s.each_line do |line|
               Jekyll.logger.info("Bundler:".green, line.strip) unless line.to_s.empty?
             end
+
             raise SystemExit unless process.success?
           end
         end

From cc89a838f59cd2159afaddea4d64a1a03141a06a Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sun, 29 Oct 2017 16:31:42 -0400
Subject: [PATCH 140/161] Update history to reflect merge of #6499 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 90863d14bb5..72ef2ba8d70 100644
--- a/History.markdown
+++ b/History.markdown
@@ -39,6 +39,7 @@
   * Enable `Lint/RescueWithoutErrorClass` Cop (#6482)
   * Added direct collection access to future collection item feature test (#6151)
   * Clean up Rubocop config (#6495)
+  * Fix #6498: Use Gem to discover the location of bundler. (#6499)
 
 ### Minor Enhancements
 

From aa959cef8abc5057141c0653a760b1b0b85f02ad Mon Sep 17 00:00:00 2001
From: Jordon Bedwell <jordon@envygeeks.io>
Date: Mon, 30 Oct 2017 13:54:06 -0500
Subject: [PATCH 141/161] Allow plugins to modify the obsolete files. (#6502)

Merge pull request 6502
---
 lib/jekyll/cleaner.rb | 4 +++-
 lib/jekyll/hooks.rb   | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/cleaner.rb b/lib/jekyll/cleaner.rb
index fee6418a99c..cbcedcecf81 100644
--- a/lib/jekyll/cleaner.rb
+++ b/lib/jekyll/cleaner.rb
@@ -24,7 +24,9 @@ def cleanup!
     #
     # Returns an Array of the file and directory paths
     def obsolete_files
-      (existing_files - new_files - new_dirs + replaced_files).to_a
+      out = (existing_files - new_files - new_dirs + replaced_files).to_a
+      Jekyll::Hooks.trigger :clean, :on_obsolete, out
+      out
     end
 
     # Private: The metadata file storing dependency tree and build history
diff --git a/lib/jekyll/hooks.rb b/lib/jekyll/hooks.rb
index 8007edff59c..64496b53119 100644
--- a/lib/jekyll/hooks.rb
+++ b/lib/jekyll/hooks.rb
@@ -39,6 +39,9 @@ module Hooks
         :post_render => [],
         :post_write  => [],
       },
+      :clean     => {
+        :on_obsolete => [],
+      },
     }
 
     # map of all hooks and their priorities

From 2023b44f2e884fae8df53888819fd6a1cf2fcfc4 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Mon, 30 Oct 2017 14:54:08 -0400
Subject: [PATCH 142/161] Update history to reflect merge of #6502 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 72ef2ba8d70..b4b22fc83ee 100644
--- a/History.markdown
+++ b/History.markdown
@@ -47,6 +47,7 @@
   * Upgrade to Rouge 3 (#6381)
   * Allow the user to set collections_dir to put all collections under one subdirectory (#6331)
   * Scope path glob (#6268)
+  * Allow plugins to modify the obsolete files. (#6502)
 
 ### Site Enhancements
 

From f72e2ccaa6dbfdece90d60917d2092a05613f0ce Mon Sep 17 00:00:00 2001
From: Jordon Bedwell <jordon@envygeeks.io>
Date: Wed, 1 Nov 2017 03:56:32 -0500
Subject: [PATCH 143/161] .sass-cache doesn't *always* land in
 options['source'] (#6500)

Merge pull request 6500
---
 lib/jekyll/commands/clean.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jekyll/commands/clean.rb b/lib/jekyll/commands/clean.rb
index 1c3e40bf6c4..1ef65db22db 100644
--- a/lib/jekyll/commands/clean.rb
+++ b/lib/jekyll/commands/clean.rb
@@ -22,7 +22,7 @@ def process(options)
           options = configuration_from_options(options)
           destination = options["destination"]
           metadata_file = File.join(options["source"], ".jekyll-metadata")
-          sass_cache = File.join(options["source"], ".sass-cache")
+          sass_cache = ".sass-cache"
 
           remove(destination, :checker_func => :directory?)
           remove(metadata_file, :checker_func => :file?)

From 7e31e274fbb1d1367908bf0203c68a396f855809 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Wed, 1 Nov 2017 04:56:33 -0400
Subject: [PATCH 144/161] Update history to reflect merge of #6500 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index b4b22fc83ee..7e700da75f2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -48,6 +48,7 @@
   * Allow the user to set collections_dir to put all collections under one subdirectory (#6331)
   * Scope path glob (#6268)
   * Allow plugins to modify the obsolete files. (#6502)
+  * .sass-cache doesn&#39;t *always* land in options[&#39;source&#39;] (#6500)
 
 ### Site Enhancements
 

From 8fc463bdce077ac20b51bb5baa63d1b544a08f13 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 2 Nov 2017 16:54:42 -0400
Subject: [PATCH 145/161] Add Utils::Internet.connected? to determine whether
 host machine has internet connection. (#5870)

Merge pull request 5870
---
 lib/jekyll/utils.rb          |  1 +
 lib/jekyll/utils/internet.rb | 39 ++++++++++++++++++++++++++++++++++++
 test/test_utils.rb           |  6 ++++++
 3 files changed, 46 insertions(+)
 create mode 100644 lib/jekyll/utils/internet.rb

diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index 2f5f55dcdcd..558a7586645 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -6,6 +6,7 @@ module Utils
     extend self
     autoload :Ansi, "jekyll/utils/ansi"
     autoload :Exec, "jekyll/utils/exec"
+    autoload :Internet, "jekyll/utils/internet"
     autoload :Platforms, "jekyll/utils/platforms"
     autoload :Rouge, "jekyll/utils/rouge"
     autoload :WinTZ, "jekyll/utils/win_tz"
diff --git a/lib/jekyll/utils/internet.rb b/lib/jekyll/utils/internet.rb
new file mode 100644
index 00000000000..f895596c548
--- /dev/null
+++ b/lib/jekyll/utils/internet.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Utils
+    module Internet
+
+      # Public: Determine whether the present device has a connection to
+      # the Internet. This allows plugin writers which require the outside
+      # world to have a neat fallback mechanism for offline building.
+      #
+      # Example:
+      #   if Internet.connected?
+      #     Typhoeus.get("https://pages.github.com/versions.json")
+      #   else
+      #     Jekyll.logger.warn "Warning:", "Version check has been disabled."
+      #     Jekyll.logger.warn "", "Connect to the Internet to enable it."
+      #     nil
+      #   end
+      #
+      # Returns true if a DNS call can successfully be made, or false if not.
+      module_function
+      def connected?
+        !dns("example.com").nil?
+      end
+
+      private
+      module_function
+      def dns(domain)
+        require "resolv"
+        Resolv::DNS.open do |resolver|
+          resolver.getaddress(domain)
+        end
+      rescue Resolv::ResolvError, Resolv::ResolvTimeout
+        nil
+      end
+
+    end
+  end
+end
diff --git a/test/test_utils.rb b/test/test_utils.rb
index 01c1d98c613..771f2ade231 100644
--- a/test/test_utils.rb
+++ b/test/test_utils.rb
@@ -403,4 +403,10 @@ class TestUtils < JekyllUnitTest
       assert_equal "bom|another", merged[:encoding]
     end
   end
+
+  context "Utils::Internet.connected?" do
+    should "return true if there's internet" do
+      assert Utils::Internet.connected?
+    end
+  end
 end

From 53d48d52e7db7aeecd801977a08db73715707f8a Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Thu, 2 Nov 2017 16:54:43 -0400
Subject: [PATCH 146/161] Update history to reflect merge of #5870 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 7e700da75f2..397a281ce26 100644
--- a/History.markdown
+++ b/History.markdown
@@ -49,6 +49,7 @@
   * Scope path glob (#6268)
   * Allow plugins to modify the obsolete files. (#6502)
   * .sass-cache doesn&#39;t *always* land in options[&#39;source&#39;] (#6500)
+  * Add Utils::Internet.connected? to determine whether host machine has internet connection. (#5870)
 
 ### Site Enhancements
 

From 93e3eb06d2ae38205c9705231671f3c211be6c97 Mon Sep 17 00:00:00 2001
From: Alex Tsui <alextsui05@gmail.com>
Date: Thu, 2 Nov 2017 20:07:25 -0700
Subject: [PATCH 147/161] Add latin mode to slugify (#6509)

Merge pull request 6509
---
 docs/_docs/templates.md | 14 ++++++++++
 jekyll.gemspec          |  1 +
 lib/jekyll.rb           |  2 ++
 lib/jekyll/utils.rb     | 61 ++++++++++++++++++++++++++---------------
 test/test_utils.rb      | 11 ++++++++
 5 files changed, 67 insertions(+), 22 deletions(-)

diff --git a/docs/_docs/templates.md b/docs/_docs/templates.md
index 38e55717ee2..81eb5b2a696 100644
--- a/docs/_docs/templates.md
+++ b/docs/_docs/templates.md
@@ -293,6 +293,18 @@ you come up with your own tags via plugins.
         <p>
           <code class="output">the-_config.yml-file</code>
         </p>
+        <p>
+         <code class="filter">{% raw %}{{ "The _cönfig.yml file" | slugify: 'ascii' }}{% endraw %}</code>
+        </p>
+        <p>
+          <code class="output">the-c-nfig-yml-file</code>
+        </p>
+        <p>
+         <code class="filter">{% raw %}{{ "The cönfig.yml file" | slugify: 'latin' }}{% endraw %}</code>
+        </p>
+        <p>
+          <code class="output">the-config-yml-file</code>
+        </p>
       </td>
     </tr>
     <tr>
@@ -416,6 +428,8 @@ The default is `default`. They are as follows (with what they filter):
 - `raw`: spaces
 - `default`: spaces and non-alphanumeric characters
 - `pretty`: spaces and non-alphanumeric characters except for `._~!$&'()+,;=@`
+- `ascii`: spaces, non-alphanumeric, and non-ASCII characters
+- `latin`: like `default`, except Latin characters are first transliterated (e.g. `àèïòü` to `aeiou`)
 
 ## Tags
 
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 74bcd8e3cf7..98fd53824f4 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency("addressable",           "~> 2.4")
   s.add_runtime_dependency("colorator",             "~> 1.0")
+  s.add_runtime_dependency("i18n",                  "~> 0.7")
   s.add_runtime_dependency("jekyll-sass-converter", "~> 1.0")
   s.add_runtime_dependency("jekyll-watch",          "~> 1.1")
   s.add_runtime_dependency("kramdown",              "~> 1.14")
diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index cdcab8bda5b..733796cc2af 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -32,8 +32,10 @@ def require_all(path)
 require "liquid"
 require "kramdown"
 require "colorator"
+require "i18n"
 
 SafeYAML::OPTIONS[:suppress_warnings] = true
+I18n.config.available_locales = :en
 
 module Jekyll
   # internal requires
diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index 558a7586645..55cf9be1e28 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 
 module Jekyll
@@ -12,7 +11,7 @@ module Utils
     autoload :WinTZ, "jekyll/utils/win_tz"
 
     # Constants for use in #slugify
-    SLUGIFY_MODES = %w(raw default pretty ascii).freeze
+    SLUGIFY_MODES = %w(raw default pretty ascii latin).freeze
     SLUGIFY_RAW_REGEXP = Regexp.new('\\s+').freeze
     SLUGIFY_DEFAULT_REGEXP = Regexp.new("[^[:alnum:]]+").freeze
     SLUGIFY_PRETTY_REGEXP = Regexp.new("[^[:alnum:]._~!$&'()+,;=@]+").freeze
@@ -170,6 +169,10 @@ def has_yaml_header?(file)
     # When mode is "ascii", some everything else except ASCII characters
     # a-z (lowercase), A-Z (uppercase) and 0-9 (numbers) are not replaced with hyphen.
     #
+    # When mode is "latin", the input string is first preprocessed so that
+    # any letters with accents are replaced with the plain letter. Afterwards,
+    # it follows the "default" mode of operation.
+    #
     # If cased is true, all uppercase letters in the result string are
     # replaced with their lowercase counterparts.
     #
@@ -184,7 +187,10 @@ def has_yaml_header?(file)
     #   # => "The-_config.yml file"
     #
     #   slugify("The _config.yml file", "ascii")
-    #   # => "the-config.yml-file"
+    #   # => "the-config-yml-file"
+    #
+    #   slugify("The _config.yml file", "latin")
+    #   # => "the-config-yml-file"
     #
     # Returns the slugified string.
     def slugify(string, mode: nil, cased: false)
@@ -195,26 +201,10 @@ def slugify(string, mode: nil, cased: false)
         return cased ? string : string.downcase
       end
 
-      # Replace each character sequence with a hyphen
-      re =
-        case mode
-        when "raw"
-          SLUGIFY_RAW_REGEXP
-        when "default"
-          SLUGIFY_DEFAULT_REGEXP
-        when "pretty"
-          # "._~!$&'()+,;=@" is human readable (not URI-escaped) in URL
-          # and is allowed in both extN and NTFS.
-          SLUGIFY_PRETTY_REGEXP
-        when "ascii"
-          # For web servers not being able to handle Unicode, the safe
-          # method is to ditch anything else but latin letters and numeric
-          # digits.
-          SLUGIFY_ASCII_REGEXP
-        end
+      # Drop accent marks from latin characters. Everything else turns to ?
+      string = ::I18n.transliterate(string) if mode == "latin"
 
-      # Strip according to the mode
-      slug = string.gsub(re, "-")
+      slug = replace_character_sequence_with_hyphen(string, :mode => mode)
 
       # Remove leading/trailing hyphen
       slug.gsub!(%r!^\-|\-$!i, "")
@@ -337,5 +327,32 @@ def duplicate_frozen_values(target)
         target[key] = val.dup if val.frozen? && duplicable?(val)
       end
     end
+
+    # Replace each character sequence with a hyphen.
+    #
+    # See Utils#slugify for a description of the character sequence specified
+    # by each mode.
+    private
+    def replace_character_sequence_with_hyphen(string, mode: "default")
+      replaceable_char =
+        case mode
+        when "raw"
+          SLUGIFY_RAW_REGEXP
+        when "pretty"
+          # "._~!$&'()+,;=@" is human readable (not URI-escaped) in URL
+          # and is allowed in both extN and NTFS.
+          SLUGIFY_PRETTY_REGEXP
+        when "ascii"
+          # For web servers not being able to handle Unicode, the safe
+          # method is to ditch anything else but latin letters and numeric
+          # digits.
+          SLUGIFY_ASCII_REGEXP
+        else
+          SLUGIFY_DEFAULT_REGEXP
+        end
+
+      # Strip according to the mode
+      string.gsub(replaceable_char, "-")
+    end
   end
 end
diff --git a/test/test_utils.rb b/test/test_utils.rb
index 771f2ade231..844ef825d35 100644
--- a/test/test_utils.rb
+++ b/test/test_utils.rb
@@ -207,6 +207,17 @@ class TestUtils < JekyllUnitTest
         Utils.slugify("fürtive glance!!!!", :mode => "ascii")
     end
 
+    should "map accented latin characters to ASCII characters" do
+      assert_equal "the-config-yml-file",
+        Utils.slugify("The _config.yml file?", :mode => "latin")
+      assert_equal "furtive-glance",
+        Utils.slugify("fürtive glance!!!!", :mode => "latin")
+      assert_equal "aaceeiioouu",
+        Utils.slugify("àáçèéíïòóúü", :mode => "latin")
+      assert_equal "a-z",
+        Utils.slugify("Aあわれ鬱господинZ", :mode => "latin")
+    end
+
     should "only replace whitespace if mode is raw" do
       assert_equal(
         "the-_config.yml-file?",

From fc272d4dfb1b16ff2554ace7820e8a7290f83d8c Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Thu, 2 Nov 2017 23:07:27 -0400
Subject: [PATCH 148/161] Update history to reflect merge of #6509 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 397a281ce26..9960a3fb7d8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -50,6 +50,7 @@
   * Allow plugins to modify the obsolete files. (#6502)
   * .sass-cache doesn&#39;t *always* land in options[&#39;source&#39;] (#6500)
   * Add Utils::Internet.connected? to determine whether host machine has internet connection. (#5870)
+  * Add latin mode to slugify (#6509)
 
 ### Site Enhancements
 

From 3838564d21f5382bec84d3d720a0d2cf89e0872a Mon Sep 17 00:00:00 2001
From: ashmaroli <ashmaroli@users.noreply.github.com>
Date: Fri, 3 Nov 2017 13:40:07 +0530
Subject: [PATCH 149/161] Remove unnecessary encoding comment (#6513)

Merge pull request 6513
---
 lib/jekyll/converters/markdown/kramdown_parser.rb | 1 -
 lib/jekyll/utils/ansi.rb                          | 1 -
 2 files changed, 2 deletions(-)

diff --git a/lib/jekyll/converters/markdown/kramdown_parser.rb b/lib/jekyll/converters/markdown/kramdown_parser.rb
index a9650cc7939..ea8053db1bc 100644
--- a/lib/jekyll/converters/markdown/kramdown_parser.rb
+++ b/lib/jekyll/converters/markdown/kramdown_parser.rb
@@ -1,5 +1,4 @@
 # Frozen-string-literal: true
-# Encoding: utf-8
 
 module Jekyll
   module Converters
diff --git a/lib/jekyll/utils/ansi.rb b/lib/jekyll/utils/ansi.rb
index 8bdd2322168..dedec1942d9 100644
--- a/lib/jekyll/utils/ansi.rb
+++ b/lib/jekyll/utils/ansi.rb
@@ -1,6 +1,5 @@
 # Frozen-string-literal: true
 # Copyright: 2015 Jekyll - MIT License
-# Encoding: utf-8
 
 module Jekyll
   module Utils

From 42c21aba86feb1da021eb274f4cdea00488683a9 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Fri, 3 Nov 2017 04:10:08 -0400
Subject: [PATCH 150/161] Update history to reflect merge of #6513 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 9960a3fb7d8..adf8cd1a7c7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -40,6 +40,7 @@
   * Added direct collection access to future collection item feature test (#6151)
   * Clean up Rubocop config (#6495)
   * Fix #6498: Use Gem to discover the location of bundler. (#6499)
+  * Remove unnecessary encoding comment (#6513)
 
 ### Minor Enhancements
 

From 94dc9265cbdc0677bd2bba49afe24359373de66a Mon Sep 17 00:00:00 2001
From: Frank Taillandier <frank.taillandier@gmail.com>
Date: Fri, 3 Nov 2017 09:13:09 +0100
Subject: [PATCH 151/161] Style: Remove line after magic comment

---
 lib/jekyll/utils/ansi.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/jekyll/utils/ansi.rb b/lib/jekyll/utils/ansi.rb
index dedec1942d9..b680528eb95 100644
--- a/lib/jekyll/utils/ansi.rb
+++ b/lib/jekyll/utils/ansi.rb
@@ -1,5 +1,4 @@
 # Frozen-string-literal: true
-# Copyright: 2015 Jekyll - MIT License
 
 module Jekyll
   module Utils

From a559dfaa6e50ce8aa5bd60488f8226b5258f79ea Mon Sep 17 00:00:00 2001
From: mrHoliday <ilia.aptsiauri@gmail.com>
Date: Sat, 4 Nov 2017 16:50:30 +0200
Subject: [PATCH 152/161] Update fmt (#6514)

Merge pull request 6514
---
 script/fmt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/script/fmt b/script/fmt
index e7c6b7cb29b..9585262831d 100755
--- a/script/fmt
+++ b/script/fmt
@@ -1,3 +1,8 @@
 #!/bin/bash
 echo "Rubocop $(bundle exec rubocop --version)"
 bundle exec rubocop -D $@
+success=$?
+if ((success != 0)); then
+   echo -e "\nTry running \`script/fmt -a\` to automatically fix errors"
+fi
+exit $success

From beed5513e4450ef3bfa7c88a2b719de129fd6e82 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sat, 4 Nov 2017 10:50:31 -0400
Subject: [PATCH 153/161] Update history to reflect merge of #6514 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index adf8cd1a7c7..69aa837ddfd 100644
--- a/History.markdown
+++ b/History.markdown
@@ -41,6 +41,7 @@
   * Clean up Rubocop config (#6495)
   * Fix #6498: Use Gem to discover the location of bundler. (#6499)
   * Remove unnecessary encoding comment (#6513)
+  * Suggest using Rubocop to automatically fix errors (#6514)
 
 ### Minor Enhancements
 

From a66c4780ccbf6dc4236548210ed1667038fe8ffe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <johannes.mueller@smj-fulda.org>
Date: Sun, 5 Nov 2017 16:17:51 +0100
Subject: [PATCH 154/161] filter relative_url should keep absolute urls with
 scheme/authority (#6490)

Merge pull request 6490
---
 lib/jekyll/filters/url_filters.rb |  5 ++++-
 test/test_filters.rb              | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/filters/url_filters.rb b/lib/jekyll/filters/url_filters.rb
index 151c4e71a55..9d86a0fb431 100644
--- a/lib/jekyll/filters/url_filters.rb
+++ b/lib/jekyll/filters/url_filters.rb
@@ -20,13 +20,16 @@ def absolute_url(input)
         ).normalize.to_s
       end
 
-      # Produces a URL relative to the domain root based on site.baseurl.
+      # Produces a URL relative to the domain root based on site.baseurl
+      # unless it is already an absolute url with an authority (host).
       #
       # input - the URL to make relative to the domain root
       #
       # Returns a URL relative to the domain root as a String.
       def relative_url(input)
         return if input.nil?
+        return input if Addressable::URI.parse(input.to_s).absolute?
+
         parts = [sanitized_baseurl, input]
         Addressable::URI.parse(
           parts.compact.map { |part| ensure_leading_slash(part.to_s) }.join
diff --git a/test/test_filters.rb b/test/test_filters.rb
index 588a1f30e33..39f7a66f3b9 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -526,6 +526,21 @@ def select; end
         filter = make_filter_mock({ "baseurl" => Value.new(proc { "/baseurl/" }) })
         assert_equal "/baseurl#{page_url}", filter.relative_url(page_url)
       end
+
+      should "transform protocol-relative url" do
+        url = "//example.com/"
+        assert_equal "/base//example.com/", @filter.relative_url(url)
+      end
+
+      should "not modify an absolute url with scheme" do
+        url = "file:///file.html"
+        assert_equal url, @filter.relative_url(url)
+      end
+
+      should "not normalize absolute international URLs" do
+        url = "https://example.com/错误"
+        assert_equal "https://example.com/错误", @filter.relative_url(url)
+      end
     end
 
     context "strip_index filter" do

From db2fc380a00579c3d0f508c4685a3f3c6265e0de Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sun, 5 Nov 2017 10:17:53 -0500
Subject: [PATCH 155/161] Update history to reflect merge of #6490 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 69aa837ddfd..1057b1387d4 100644
--- a/History.markdown
+++ b/History.markdown
@@ -53,6 +53,7 @@
   * .sass-cache doesn&#39;t *always* land in options[&#39;source&#39;] (#6500)
   * Add Utils::Internet.connected? to determine whether host machine has internet connection. (#5870)
   * Add latin mode to slugify (#6509)
+  * filter relative_url should keep absolute urls with scheme/authority (#6490)
 
 ### Site Enhancements
 

From 0205fb9e79b44ba189bf8ac448b084eba4322edb Mon Sep 17 00:00:00 2001
From: ashmaroli <ashmaroli@users.noreply.github.com>
Date: Mon, 6 Nov 2017 09:20:46 +0530
Subject: [PATCH 156/161] Assert raising Psych::SyntaxError when
 `"strict_front_matter"=>true` (#6520)

Merge pull request 6520
---
 lib/jekyll/document.rb   | 2 +-
 test/test_convertible.rb | 2 +-
 test/test_site.rb        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index d39d5d8cae2..5bb255666ea 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -266,7 +266,7 @@ def read(opts = {})
           merge_defaults
           read_content(opts)
           read_post_data
-        rescue StandardError => e
+        rescue SyntaxError, StandardError, Errors::FatalException => e
           handle_read_error(e)
         end
       end
diff --git a/test/test_convertible.rb b/test/test_convertible.rb
index cc5be8785a7..f05cb4fb2c7 100644
--- a/test/test_convertible.rb
+++ b/test/test_convertible.rb
@@ -38,7 +38,7 @@ class TestConvertible < JekyllUnitTest
     should "raise for broken front matter with `strict_front_matter` set" do
       name = "broken_front_matter2.erb"
       @convertible.site.config["strict_front_matter"] = true
-      assert_raises do
+      assert_raises(Psych::SyntaxError) do
         @convertible.read_yaml(@base, name)
       end
     end
diff --git a/test/test_site.rb b/test/test_site.rb
index 81b20f7ad09..a9ef16e3af2 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -308,7 +308,7 @@ def generate(site)
           "collections"         => ["broken"],
           "strict_front_matter" => true
         ))
-        assert_raises do
+        assert_raises(Psych::SyntaxError) do
           site.process
         end
       end

From 17bd584319456058a1d639572a4aff8bec6ed5e2 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sun, 5 Nov 2017 22:50:47 -0500
Subject: [PATCH 157/161] Update history to reflect merge of #6520 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 1057b1387d4..adf845f0ea1 100644
--- a/History.markdown
+++ b/History.markdown
@@ -42,6 +42,7 @@
   * Fix #6498: Use Gem to discover the location of bundler. (#6499)
   * Remove unnecessary encoding comment (#6513)
   * Suggest using Rubocop to automatically fix errors (#6514)
+  * Assert raising Psych::SyntaxError when `&#34;strict_front_matter&#34;=&gt;true` (#6520)
 
 ### Minor Enhancements
 

From bb42e6251ea3105dd92b7d0d1f97b7bb46588cbf Mon Sep 17 00:00:00 2001
From: ashmaroli <ashmaroli@users.noreply.github.com>
Date: Mon, 6 Nov 2017 18:05:43 +0530
Subject: [PATCH 158/161] enable `Style/UnneededCapitalW` cop (#6526)

Merge pull request 6526
---
 .rubocop.yml                      | 2 --
 lib/jekyll/commands/serve.rb      | 2 +-
 lib/jekyll/converters/markdown.rb | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index e168064a340..969c065ff70 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -152,5 +152,3 @@ Style/SymbolArray:
   Enabled: false
 Style/TrailingCommaInLiteral:
   EnforcedStyleForMultiline: consistent_comma
-Style/UnneededCapitalW:
-  Enabled: false
diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index 53973b66cb4..892749a8119 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -85,7 +85,7 @@ def webrick_opts(opts)
             :StartCallback      => start_callback(opts["detach"]),
             :BindAddress        => opts["host"],
             :Port               => opts["port"],
-            :DirectoryIndex     => %W(
+            :DirectoryIndex     => %w(
               index.htm
               index.html
               index.rhtml
diff --git a/lib/jekyll/converters/markdown.rb b/lib/jekyll/converters/markdown.rb
index 857b6ecf73e..17d102ff038 100644
--- a/lib/jekyll/converters/markdown.rb
+++ b/lib/jekyll/converters/markdown.rb
@@ -44,7 +44,7 @@ def get_processor
       # are not in safe mode.)
 
       def valid_processors
-        %W(rdiscount kramdown redcarpet) + third_party_processors
+        %w(rdiscount kramdown redcarpet) + third_party_processors
       end
 
       # Public: A list of processors that you provide via plugins.

From 52482ce88a92bd23db0665c8d1554f8e1a35b219 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Mon, 6 Nov 2017 07:35:45 -0500
Subject: [PATCH 159/161] Update history to reflect merge of #6526 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index adf845f0ea1..ef611eb4999 100644
--- a/History.markdown
+++ b/History.markdown
@@ -43,6 +43,7 @@
   * Remove unnecessary encoding comment (#6513)
   * Suggest using Rubocop to automatically fix errors (#6514)
   * Assert raising Psych::SyntaxError when `&#34;strict_front_matter&#34;=&gt;true` (#6520)
+  * [RuboCop] Enable `Style/UnneededCapitalW` cop (#6526)
 
 ### Minor Enhancements
 

From 7690fcb02b425c8875995fd54652c13c598c7650 Mon Sep 17 00:00:00 2001
From: ashmaroli <ashmaroli@users.noreply.github.com>
Date: Mon, 6 Nov 2017 20:06:19 +0530
Subject: [PATCH 160/161] use Kernel#Array instead of explicit Array check
 (#6525)

Merge pull request 6525
---
 lib/jekyll/configuration.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 575dca6503b..087fdf78f6f 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -164,8 +164,7 @@ def config_files(override)
         config_files = Jekyll.sanitized_path(source(override), "_config.#{default}")
         @default_config_file = true
       end
-      config_files = [config_files] unless config_files.is_a? Array
-      config_files
+      Array(config_files)
     end
 
     # Public: Read configuration and return merged Hash

From efd9864df6d248a1761d49f326d2219477c1816e Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Mon, 6 Nov 2017 09:36:21 -0500
Subject: [PATCH 161/161] Update history to reflect merge of #6525 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index ef611eb4999..e74d59b3fc6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -44,6 +44,7 @@
   * Suggest using Rubocop to automatically fix errors (#6514)
   * Assert raising Psych::SyntaxError when `&#34;strict_front_matter&#34;=&gt;true` (#6520)
   * [RuboCop] Enable `Style/UnneededCapitalW` cop (#6526)
+  * Use Kernel#Array instead of explicit Array check (#6525)
 
 ### Minor Enhancements